Skip to content

Commit dacf42d

Browse files
beaver-devbeaver-dev
committed
Migrate g_moderator
1 parent 40d6c88 commit dacf42d

10 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎featherbb/Controller/Admin/Users.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function display($req, $res, $args)
9696

9797
// Some helper variables for permissions
9898
$can_delete = $can_move = User::get()->g_id == ForumEnv::get('FEATHER_ADMIN');
99-
$can_ban = User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::get()->g_moderator == '1' && User::get()->g_mod_ban_users == '1');
99+
$can_ban = User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::getPref('mod.is_mod') == '1' && User::get()->g_mod_ban_users == '1');
100100
$can_action = ($can_delete || $can_ban || $can_move) && $num_users > 0;
101101
View::addAsset('js', 'style/imports/common.js', array('type' => 'text/javascript'));
102102

‎featherbb/Controller/Forum.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function display($req, $res, $args)
3636

3737
// Sort out who the moderators are and if we are currently a moderator (or an admin)
3838
$mods_array = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
39-
$is_admmod = (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::get()->g_moderator == '1' && array_key_exists(User::get()->username, $mods_array))) ? true : false;
39+
$is_admmod = (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::getPref('mod.is_mod') == '1' && array_key_exists(User::get()->username, $mods_array))) ? true : false;
4040

4141
$sort_by = $this->model->sort_forum_by($cur_forum['sort_by']);
4242

@@ -94,7 +94,7 @@ public function moderate($req, $res, $args)
9494
$moderators = $this->model->get_moderators($args['id']);
9595
$mods_array = ($moderators != '') ? unserialize($moderators) : array();
9696

97-
if (User::get()->g_id != ForumEnv::get('FEATHER_ADMIN') && (User::get()->g_moderator == '0' || !array_key_exists(User::get()->username, $mods_array))) {
97+
if (User::get()->g_id != ForumEnv::get('FEATHER_ADMIN') && (User::getPref('mod.is_mod') == '0' || !array_key_exists(User::get()->username, $mods_array))) {
9898
throw new Error(__('No permission'), 403);
9999
}
100100

@@ -165,7 +165,7 @@ public function dealposts($req, $res, $args)
165165
$moderators = $this->model->get_moderators($args['id']);
166166
$mods_array = ($moderators != '') ? unserialize($moderators) : array();
167167

168-
if (User::get()->g_id != ForumEnv::get('FEATHER_ADMIN') && (User::get()->g_moderator == '0' || !array_key_exists(User::get()->username, $mods_array))) {
168+
if (User::get()->g_id != ForumEnv::get('FEATHER_ADMIN') && (User::getPref('mod.is_mod') == '0' || !array_key_exists(User::get()->username, $mods_array))) {
169169
throw new Error(__('No permission'), 403);
170170
}
171171

‎featherbb/Controller/Post.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function newpost($req, $res, $args)
7171

7272
// Sort out who the moderators are and if we are currently a moderator (or an admin)
7373
$mods_array = ($cur_posting['moderators'] != '') ? unserialize($cur_posting['moderators']) : array();
74-
$is_admmod = (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::get()->g_moderator == '1' && array_key_exists(User::get()->username, $mods_array))) ? true : false;
74+
$is_admmod = (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::getPref('mod.is_mod') == '1' && array_key_exists(User::get()->username, $mods_array))) ? true : false;
7575

7676
// Do we have permission to post?
7777
if ((($args['tid'] && (($cur_posting['post_replies'] == '' && User::get()->g_post_replies == '0') || $cur_posting['post_replies'] == '0')) ||
@@ -208,7 +208,7 @@ public function delete($req, $res, $args)
208208

209209
// Sort out who the moderators are and if we are currently a moderator (or an admin)
210210
$mods_array = ($cur_post['moderators'] != '') ? unserialize($cur_post['moderators']) : array();
211-
$is_admmod = (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::get()->g_moderator == '1' && array_key_exists(User::get()->username, $mods_array))) ? true : false;
211+
$is_admmod = (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::getPref('mod.is_mod') == '1' && array_key_exists(User::get()->username, $mods_array))) ? true : false;
212212

213213
$is_topic_post = ($args['id'] == $cur_post['first_post_id']) ? true : false;
214214

@@ -249,7 +249,7 @@ public function editpost($req, $res, $args)
249249

250250
// Sort out who the moderators are and if we are currently a moderator (or an admin)
251251
$mods_array = ($cur_post['moderators'] != '') ? unserialize($cur_post['moderators']) : array();
252-
$is_admmod = (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::get()->g_moderator == '1' && array_key_exists(User::get()->username, $mods_array))) ? true : false;
252+
$is_admmod = (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::getPref('mod.is_mod') == '1' && array_key_exists(User::get()->username, $mods_array))) ? true : false;
253253

254254
$can_edit_subject = $args['id'] == $cur_post['first_post_id'];
255255

‎featherbb/Controller/Profile.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function display($req, $res, $args)
4747

4848
return $this->model->update_mod_forums($args['id']);
4949
} elseif (Input::post('ban')) {
50-
if (User::get()->g_id != ForumEnv::get('FEATHER_ADMIN') && (User::get()->g_moderator != '1' || User::get()->g_mod_ban_users == '0')) {
50+
if (User::get()->g_id != ForumEnv::get('FEATHER_ADMIN') && (User::getPref('mod.is_mod') != '1' || User::get()->g_mod_ban_users == '0')) {
5151
throw new Error(__('No permission'), 403);
5252
}
5353

@@ -199,7 +199,7 @@ public function display($req, $res, $args)
199199

200200
} elseif ($args['section'] == 'admin') {
201201

202-
if (!User::get()->is_admmod || (User::get()->g_moderator == '1' && User::get()->g_mod_ban_users == '0')) {
202+
if (!User::get()->is_admmod || (User::getPref('mod.is_mod') == '1' && User::get()->g_mod_ban_users == '0')) {
203203
throw new Error(__('Bad request'), 404);
204204
}
205205

@@ -244,7 +244,7 @@ public function action($req, $res, $args)
244244

245245
if (!User::get()->is_admmod) { // A regular user trying to change another user's password?
246246
throw new Error(__('No permission'), 403);
247-
} elseif (User::get()->g_moderator == '1') {
247+
} elseif (User::getPref('mod.is_mod') == '1') {
248248
// A moderator trying to change a user's password?
249249
$user['select'] = array('u.group_id', 'g.g_moderator');
250250

@@ -285,7 +285,7 @@ public function action($req, $res, $args)
285285

286286
if (!User::get()->is_admmod) { // A regular user trying to change another user's email?
287287
throw new Error(__('No permission'), 403);
288-
} elseif (User::get()->g_moderator == '1') {
288+
} elseif (User::getPref('mod.is_mod') == '1') {
289289
// A moderator trying to change a user's email?
290290
$user['select'] = array('u.group_id', 'g.g_moderator');
291291

@@ -348,7 +348,7 @@ public function action($req, $res, $args)
348348

349349
return Router::redirect(Router::pathFor('profileSection', array('id' => $args['id'], 'section' => 'personality')), __('Avatar deleted redirect'));
350350
} elseif ($args['action'] == 'promote') {
351-
if (User::get()->g_id != ForumEnv::get('FEATHER_ADMIN') && (User::get()->g_moderator != '1' || User::get()->g_mod_promote_users == '0')) {
351+
if (User::get()->g_id != ForumEnv::get('FEATHER_ADMIN') && (User::getPref('mod.is_mod') != '1' || User::get()->g_mod_promote_users == '0')) {
352352
throw new Error(__('No permission'), 403);
353353
}
354354

‎featherbb/Controller/Topic.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function display($req, $res, $args)
4949

5050
// Sort out who the moderators are and if we are currently a moderator (or an admin)
5151
$mods_array = ($cur_topic['moderators'] != '') ? unserialize($cur_topic['moderators']) : array();
52-
$is_admmod = (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::get()->g_moderator == '1' && array_key_exists(User::get()->username, $mods_array))) ? true : false;
52+
$is_admmod = (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::getPref('mod.is_mod') == '1' && array_key_exists(User::get()->username, $mods_array))) ? true : false;
5353

5454
// Can we or can we not post replies?
5555
$post_link = $this->model->get_post_link($args['id'], $cur_topic['closed'], $cur_topic['post_replies'], $is_admmod);
@@ -210,7 +210,7 @@ public function moderate($req, $res, $args)
210210
$moderators = $forumModel->get_moderators($args['fid']);
211211
$mods_array = ($moderators != '') ? unserialize($moderators) : array();
212212

213-
if (User::get()->g_id != ForumEnv::get('FEATHER_ADMIN') && (User::get()->g_moderator == '0' || !array_key_exists(User::get()->username, $mods_array))) {
213+
if (User::get()->g_id != ForumEnv::get('FEATHER_ADMIN') && (User::getPref('mod.is_mod') == '0' || !array_key_exists(User::get()->username, $mods_array))) {
214214
throw new Error(__('No permission'), 403);
215215
}
216216

‎featherbb/Middleware/Auth.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public function __invoke($req, $res, $next)
256256
$expires = ($jwt->exp > Container::get('now') + ForumSettings::get('o_timeout_visit')) ? Container::get('now') + 1209600 : Container::get('now') + ForumSettings::get('o_timeout_visit');
257257

258258
$user->is_guest = false;
259-
$user->is_admmod = $user->g_id == ForumEnv::get('FEATHER_ADMIN') || $user->g_moderator == '1';
259+
$user->is_admmod = $user->g_id == ForumEnv::get('FEATHER_ADMIN') || User::getPref('mod.is_mod', $jwt->data->userId) == '1';
260260

261261
if (!$user->disp_topics) {
262262
$user->disp_topics = ForumSettings::get('o_disp_topics_default');

‎featherbb/Model/Profile.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ public function update_profile($id, $info, $section)
713713
$form['admin_note'] = Utils::trim(Input::post('admin_note'));
714714

715715
// Are we allowed to change usernames?
716-
if (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::get()->g_moderator == '1' && User::get()->g_mod_rename_users == '1')) {
716+
if (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::getPref('mod.is_mod') == '1' && User::get()->g_mod_rename_users == '1')) {
717717
$form['username'] = Utils::trim(Input::post('req_username'));
718718

719719
if ($form['username'] != $info['old_username']) {

‎featherbb/Model/Topic.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -918,7 +918,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
918918
}
919919
}
920920

921-
if (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::get()->g_moderator == '1' && User::get()->g_mod_promote_users == '1')) {
921+
if (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::getPref('mod.is_mod') == '1' && User::get()->g_mod_promote_users == '1')) {
922922
if ($cur_post['g_promote_next_group']) {
923923
$cur_post['user_info'][] = '<dd><span><a href="'.Router::pathFor('profileAction', ['id' => $cur_post['poster_id'], 'action' => 'promote', 'pid' => $cur_post['id']]).'">'.__('Promote user').'</a></span></dd>';
924924
}

‎featherbb/View/profile/menu.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<?php endif;?>
2828
<li<?php if ($page == 'display') {echo ' class="isactive"';}?>><a href="<?= Router::pathFor('profileSection', ['id' => $id, 'section' => 'display']) ?>"><?php _e('Section display') ?></a></li>
2929
<li<?php if ($page == 'privacy') {echo ' class="isactive"';}?>><a href="<?= Router::pathFor('profileSection', ['id' => $id, 'section' => 'privacy']) ?>"><?php _e('Section privacy') ?></a></li>
30-
<?php if (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::get()->g_moderator == '1' && User::get()->g_mod_ban_users == '1')): ?>
30+
<?php if (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::getPref('mod.is_mod') == '1' && User::get()->g_mod_ban_users == '1')): ?>
3131
<li<?php if ($page == 'admin') {echo ' class="isactive"';}?>><a href="<?= Router::pathFor('profileSection', ['id' => $id, 'section' => 'admin']) ?>"><?php _e('Section admin') ?></a></li>
3232
<?php endif;?>
3333
</ul>

‎featherbb/View/profile/section_admin.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<fieldset>
2727
<?php
2828

29-
if (User::get()->g_moderator == '1') {
29+
if (User::getPref('mod.is_mod') == '1') {
3030
?>
3131
<legend><?php _e('Delete ban legend') ?></legend>
3232
<div class="infldset">

0 commit comments

Comments
 (0)