Skip to content

Commit ae9c710

Browse files
adauradaur
committed
Add model. to model hooks
1 parent 3165135 commit ae9c710

21 files changed

+310
-310
lines changed

‎featherbb/Model/Admin/Bans.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function add_ban_info($id = null)
3232
{
3333
$ban = array();
3434

35-
$id = $this->hook->fire('add_ban_info_start', $id);
35+
$id = $this->hook->fire('model.add_ban_info_start', $id);
3636

3737
// If the ID of the user to ban was provided through GET (a link from profile.php)
3838
if (is_numeric($id)) {
@@ -108,7 +108,7 @@ public function add_ban_info($id = null)
108108

109109
$ban['mode'] = 'add';
110110

111-
$ban = $this->hook->fire('add_ban_info', $ban);
111+
$ban = $this->hook->fire('model.add_ban_info', $ban);
112112

113113
return $ban;
114114
}
@@ -117,7 +117,7 @@ public function edit_ban_info($id)
117117
{
118118
$ban = array();
119119

120-
$id = $this->hook->fire('edit_ban_info_start', $id);
120+
$id = $this->hook->fire('model.edit_ban_info_start', $id);
121121

122122
$ban['id'] = $id;
123123

@@ -143,7 +143,7 @@ public function edit_ban_info($id)
143143

144144
$ban['mode'] = 'edit';
145145

146-
$ban = $this->hook->fire('edit_ban_info', $ban);
146+
$ban = $this->hook->fire('model.edit_ban_info', $ban);
147147

148148
return $ban;
149149
}
@@ -156,7 +156,7 @@ public function insert_ban()
156156
$ban_message = Utils::trim($this->request->post('ban_message'));
157157
$ban_expire = Utils::trim($this->request->post('ban_expire'));
158158

159-
$this->hook->fire('insert_ban_start', $ban_user, $ban_ip, $ban_email, $ban_message, $ban_expire);
159+
$this->hook->fire('model.insert_ban_start', $ban_user, $ban_ip, $ban_email, $ban_message, $ban_expire);
160160

161161
if ($ban_user == '' && $ban_ip == '' && $ban_email == '') {
162162
throw new Error(__('Must enter message'), 400);
@@ -259,7 +259,7 @@ public function insert_ban()
259259
'expire' => $ban_expire,
260260
);
261261

262-
$insert_update_ban = $this->hook->fire('insert_ban_data', $insert_update_ban);
262+
$insert_update_ban = $this->hook->fire('model.insert_ban_data', $insert_update_ban);
263263

264264
if ($this->request->post('mode') == 'add') {
265265
$insert_update_ban['ban_creator'] = $this->user->id;
@@ -285,7 +285,7 @@ public function insert_ban()
285285

286286
public function remove_ban($ban_id)
287287
{
288-
$ban_id = $this->hook->fire('remove_ban', $ban_id);
288+
$ban_id = $this->hook->fire('model.remove_ban', $ban_id);
289289

290290
$result = DB::for_table('bans')->where('id', $ban_id)
291291
->find_one();
@@ -302,7 +302,7 @@ public function find_ban($start_from = false)
302302
{
303303
$ban_info = array();
304304

305-
$this->hook->fire('find_ban_start');
305+
$this->hook->fire('model.find_ban_start');
306306

307307
// trim() all elements in $form
308308
$ban_info['conditions'] = $ban_info['query_str'] = array();
@@ -381,7 +381,7 @@ public function find_ban($start_from = false)
381381
$ban_info['num_bans'] = $result->count('id');
382382
}
383383

384-
$this->hook->fire('find_ban', $ban_info);
384+
$this->hook->fire('model.find_ban', $ban_info);
385385

386386
return $ban_info;
387387
}

‎featherbb/Model/Admin/Categories.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function __construct()
2525

2626
public function add_category($cat_name)
2727
{
28-
$cat_name = $this->hook->fire('add_category', $cat_name);
28+
$cat_name = $this->hook->fire('model.add_category', $cat_name);
2929

3030
$set_add_category = array('cat_name' => $cat_name);
3131

@@ -37,7 +37,7 @@ public function add_category($cat_name)
3737

3838
public function update_category(array $category)
3939
{
40-
$category = $this->hook->fire('update_category', $category);
40+
$category = $this->hook->fire('model.update_category', $category);
4141

4242
$set_update_category = array('cat_name' => $category['name'],
4343
'disp_position' => $category['order']);
@@ -50,7 +50,7 @@ public function update_category(array $category)
5050

5151
public function delete_category($cat_to_delete)
5252
{
53-
$cat_to_delete = $this->hook->fire('delete_category_start', $cat_to_delete);
53+
$cat_to_delete = $this->hook->fire('model.delete_category_start', $cat_to_delete);
5454

5555
$forums_in_cat = DB::for_table('forums')
5656
->select('id')

‎featherbb/Model/Admin/Censoring.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function add_word()
3939
$set_search_word = array('search_for' => $search_for,
4040
'replace_with' => $replace_with);
4141

42-
$set_search_word = $this->hook->fire('add_censoring_word_data', $set_search_word);
42+
$set_search_word = $this->hook->fire('model.add_censoring_word_data', $set_search_word);
4343

4444
$result = DB::for_table('censoring')
4545
->create()
@@ -67,7 +67,7 @@ public function update_word()
6767
$set_search_word = array('search_for' => $search_for,
6868
'replace_with' => $replace_with);
6969

70-
$set_search_word = $this->hook->fire('update_censoring_word_start', $set_search_word);
70+
$set_search_word = $this->hook->fire('model.update_censoring_word_start', $set_search_word);
7171

7272
$result = DB::for_table('censoring')
7373
->find_one($id)
@@ -84,7 +84,7 @@ public function update_word()
8484
public function remove_word()
8585
{
8686
$id = intval(key($this->request->post('remove')));
87-
$id = $this->hook->fire('remove_censoring_word_start', $id);
87+
$id = $this->hook->fire('model.remove_censoring_word_start', $id);
8888

8989
$result = DB::for_table('censoring')->find_one($id);
9090
$result = $this->hook->fireDB('remove_censoring_word', $result);

‎featherbb/Model/Admin/Forums.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function add_forum($cat_id, $forum_name)
3232
$set_add_forum = array('forum_name' => $forum_name,
3333
'cat_id' => $cat_id);
3434

35-
$set_add_forum = $this->hook->fire('add_forum', $set_add_forum);
35+
$set_add_forum = $this->hook->fire('model.add_forum', $set_add_forum);
3636

3737
$forum = DB::for_table('forums')
3838
->create()
@@ -55,7 +55,7 @@ public function update_forum($forum_id, array $forum_data)
5555

5656
public function delete_forum($forum_id)
5757
{
58-
$forum_id = $this->hook->fire('delete_forum_start', $forum_id);
58+
$forum_id = $this->hook->fire('model.delete_forum_start', $forum_id);
5959

6060
// Prune all posts and topics
6161
$this->maintenance = new \FeatherBB\Model\Admin\Maintenance();
@@ -104,7 +104,7 @@ public function get_forum_info($forum_id)
104104
public function get_forums()
105105
{
106106
$forum_data = array();
107-
$forum_data = $this->hook->fire('get_forums_start', $forum_data);
107+
$forum_data = $this->hook->fire('model.get_forums_start', $forum_data);
108108

109109
$select_get_forums = array('cid' => 'c.id', 'c.cat_name', 'cat_position' => 'c.disp_position', 'fid' => 'f.id', 'f.forum_name', 'forum_position' => 'f.disp_position');
110110

@@ -128,13 +128,13 @@ public function get_forums()
128128
'position' => $forum['forum_position']);
129129
}
130130

131-
$forum_data = $this->hook->fire('get_forums', $forum_data);
131+
$forum_data = $this->hook->fire('model.get_forums', $forum_data);
132132
return $forum_data;
133133
}
134134

135135
public function update_positions($forum_id, $position)
136136
{
137-
$this->hook->fire('update_positions_start', $forum_id, $position);
137+
$this->hook->fire('model.update_positions_start', $forum_id, $position);
138138

139139
return DB::for_table('forums')
140140
->find_one($forum_id)
@@ -149,7 +149,7 @@ public function update_positions($forum_id, $position)
149149
public function get_permissions($forum_id)
150150
{
151151
$perm_data = array();
152-
$forum_id = $this->hook->fire('get_permissions_start', $forum_id);
152+
$forum_id = $this->hook->fire('model.get_permissions_start', $forum_id);
153153

154154
$select_permissions = array('g.g_id', 'g.g_title', 'g.g_read_board', 'g.g_post_replies', 'g.g_post_topics', 'fp.read_forum', 'fp.post_replies', 'fp.post_topics');
155155

@@ -175,7 +175,7 @@ public function get_permissions($forum_id)
175175
$perm_data[] = $cur_perm;
176176
}
177177

178-
$perm_data = $this->hook->fire('get_permissions', $perm_data);
178+
$perm_data = $this->hook->fire('model.get_permissions', $perm_data);
179179
return $perm_data;
180180
}
181181

@@ -199,7 +199,7 @@ public function get_default_group_permissions($fetch_admin = true)
199199

200200
public function update_permissions(array $permissions_data)
201201
{
202-
$permissions_data = $this->hook->fire('update_permissions_start', $permissions_data);
202+
$permissions_data = $this->hook->fire('model.update_permissions_start', $permissions_data);
203203

204204
$permissions = DB::for_table('forum_perms')
205205
->where('forum_id', $permissions_data['forum_id'])

‎featherbb/Model/Admin/Groups.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function fetch_groups()
3636
$groups[$cur_group['g_id']] = $cur_group;
3737
}
3838

39-
$groups = $this->hook->fire('fetch_groups', $groups);
39+
$groups = $this->hook->fire('model.fetch_groups', $groups);
4040

4141
return $groups;
4242
}
@@ -47,7 +47,7 @@ public function info_add_group($groups, $id)
4747

4848
if ($this->request->post('add_group')) {
4949
$group['base_group'] = intval($this->request->post('base_group'));
50-
$group['base_group'] = $this->hook->fire('add_user_group', $group['base_group']);
50+
$group['base_group'] = $this->hook->fire('model.add_user_group', $group['base_group']);
5151
$group['info'] = $groups[$group['base_group']];
5252

5353
$group['mode'] = 'add';
@@ -57,14 +57,14 @@ public function info_add_group($groups, $id)
5757
throw new Error(__('Bad request'), 404);
5858
}
5959

60-
$groups[$id] = $this->hook->fire('update_user_group', $groups[$id]);
60+
$groups[$id] = $this->hook->fire('model.update_user_group', $groups[$id]);
6161

6262
$group['info'] = $groups[$id];
6363

6464
$group['mode'] = 'edit';
6565
}
6666

67-
$group = $this->hook->fire('info_add_group', $group);
67+
$group = $this->hook->fire('model.info_add_group', $group);
6868
return $group;
6969
}
7070

@@ -82,13 +82,13 @@ public function get_group_list($groups, $group)
8282
}
8383
}
8484

85-
$output = $this->hook->fire('get_group_list', $output);
85+
$output = $this->hook->fire('model.get_group_list', $output);
8686
return $output;
8787
}
8888

8989
public function get_group_list_delete($group_id)
9090
{
91-
$group_id = $this->hook->fire('get_group_list_delete_start', $group_id);
91+
$group_id = $this->hook->fire('model.get_group_list_delete_start', $group_id);
9292

9393
$select_get_group_list_delete = array('g_id', 'g_title');
9494
$result = DB::for_table('groups')->select_many($select_get_group_list_delete)
@@ -109,7 +109,7 @@ public function get_group_list_delete($group_id)
109109
}
110110
}
111111

112-
$output = $this->hook->fire('get_group_list.output', $output);
112+
$output = $this->hook->fire('model.get_group_list.output', $output);
113113
return $output;
114114
}
115115

@@ -121,7 +121,7 @@ public function add_edit_group($groups)
121121
$group_id = 0;
122122
}
123123

124-
$group_id = $this->hook->fire('add_edit_group_start', $group_id);
124+
$group_id = $this->hook->fire('model.add_edit_group_start', $group_id);
125125

126126
// Is this the admin group? (special rules apply)
127127
$is_admin_group = ($this->request->post('group_id') && $this->request->post('group_id') == $this->feather->forum_env['FEATHER_ADMIN']) ? true : false;
@@ -131,11 +131,11 @@ public function add_edit_group($groups)
131131
if ($title == '') {
132132
throw new Error(__('Must enter title message'), 400);
133133
}
134-
$title = $this->hook->fire('add_edit_group_set_title', $title);
134+
$title = $this->hook->fire('model.add_edit_group_set_title', $title);
135135
// Set user title
136136
$user_title = Utils::trim($this->request->post('user_title'));
137137
$user_title = ($user_title != '') ? $user_title : 'NULL';
138-
$user_title = $this->hook->fire('add_edit_group_set_user_title', $user_title);
138+
$user_title = $this->hook->fire('model.add_edit_group_set_user_title', $user_title);
139139

140140
$promote_min_posts = $this->request->post('promote_min_posts') ? intval($this->request->post('promote_min_posts')) : '0';
141141
if ($this->request->post('promote_next_group') &&
@@ -199,7 +199,7 @@ public function add_edit_group($groups)
199199
'g_report_flood' => $report_flood,
200200
);
201201

202-
$insert_update_group = $this->hook->fire('add_edit_group_data', $insert_update_group);
202+
$insert_update_group = $this->hook->fire('model.add_edit_group_data', $insert_update_group);
203203

204204
if ($this->request->post('mode') == 'add') {
205205
// Creating a new group
@@ -213,7 +213,7 @@ public function add_edit_group($groups)
213213
->set($insert_update_group)
214214
->save();
215215
$new_group_id = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'groups');
216-
$new_group_id = $this->hook->fire('add_edit_group.new_group_id', $new_group_id);
216+
$new_group_id = $this->hook->fire('model.add_edit_group.new_group_id', $new_group_id);
217217

218218
// Now lets copy the forum specific permissions from the group which this group is based on
219219
$select_forum_perms = array('forum_id', 'read_forum', 'post_replies', 'post_topics');
@@ -256,7 +256,7 @@ public function add_edit_group($groups)
256256
}
257257

258258
$group_id = $this->request->post('mode') == 'add' ? $new_group_id : $this->request->post('group_id');
259-
$group_id = $this->hook->fire('add_edit_group.group_id', $group_id);
259+
$group_id = $this->hook->fire('model.add_edit_group.group_id', $group_id);
260260

261261
// Regenerate the quick jump cache
262262
$this->feather->cache->store('quickjump', Cache::get_quickjump());
@@ -271,7 +271,7 @@ public function add_edit_group($groups)
271271
public function set_default_group($groups)
272272
{
273273
$group_id = intval($this->request->post('default_group'));
274-
$group_id = $this->hook->fire('set_default_group.group_id', $group_id);
274+
$group_id = $this->hook->fire('model.set_default_group.group_id', $group_id);
275275

276276
// Make sure it's not the admin or guest groups
277277
if ($group_id == $this->feather->forum_env['FEATHER_ADMIN'] || $group_id == $this->feather->forum_env['FEATHER_GUEST']) {
@@ -294,7 +294,7 @@ public function set_default_group($groups)
294294

295295
public function check_members($group_id)
296296
{
297-
$group_id = $this->hook->fire('check_members_start', $group_id);
297+
$group_id = $this->hook->fire('model.check_members_start', $group_id);
298298

299299
$is_member = DB::for_table('groups')->table_alias('g')
300300
->select('g.g_title')
@@ -311,11 +311,11 @@ public function check_members($group_id)
311311

312312
public function delete_group($group_id)
313313
{
314-
$group_id = $this->hook->fire('delete_group.group_id', $group_id);
314+
$group_id = $this->hook->fire('model.delete_group.group_id', $group_id);
315315

316316
if ($this->request->post('del_group')) {
317317
$move_to_group = intval($this->request->post('move_to_group'));
318-
$move_to_group = $this->hook->fire('delete_group.move_to_group', $move_to_group);
318+
$move_to_group = $this->hook->fire('model.delete_group.move_to_group', $move_to_group);
319319
DB::for_table('users')->where('group_id', $group_id)
320320
->update_many('group_id', $move_to_group);
321321
}
@@ -348,7 +348,7 @@ public function get_group_title($group_id)
348348

349349
public function get_title_members($group_id)
350350
{
351-
$group_id = $this->hook->fire('get_title_members.group_id', $group_id);
351+
$group_id = $this->hook->fire('model.get_title_members.group_id', $group_id);
352352

353353
$group = DB::for_table('groups')->table_alias('g')
354354
->select('g.g_title')
@@ -363,7 +363,7 @@ public function get_title_members($group_id)
363363
$group_info['title'] = $group['g_title'];
364364
$group_info['members'] = $group['members'];
365365

366-
$group_info = $this->hook->fire('get_title_members.group_info', $group_info);
366+
$group_info = $this->hook->fire('model.get_title_members.group_info', $group_info);
367367
return $group_info;
368368
}
369369
}

0 commit comments

Comments
 (0)