Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

warning_settings isn't properly used. #201

Merged
merged 4 commits into from Mar 4, 2013
Merged

warning_settings isn't properly used. #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8c3a49
the 'issue a warning' button was enabled twice..
eurich Mar 2, 2013
c633570
We can't check an array value if the related info in$modSettings['war…
eurich Mar 2, 2013
5f17639
Add warning_enable as permanently accessible $modSetting. After all, …
norv Mar 4, 2013
edbfc2e
Merge pull request #1 from norv/warnings
eurich Mar 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions sources/Load.php
View file
Open in desktop
Expand Up @@ -61,6 +61,8 @@ function reloadSettings()
if (empty($modSettings['defaultMaxMembers']) || $modSettings['defaultMaxMembers'] <= 0 || $modSettings['defaultMaxMembers'] > 999)
$modSettings['defaultMaxMembers'] = 30;

$modSettings['warning_enable'] = $modSettings['warning_settings'][0];

if (!empty($modSettings['cache_enable']))
cache_put_data('modSettings', $modSettings, 90);
}
Expand Down
2 changes: 1 addition & 1 deletion sources/admin/Admin.php
View file
Open in desktop
Expand Up @@ -140,7 +140,7 @@ function AdminMain()
'general' => array($txt['mods_cat_security_general']),
'spam' => array($txt['antispam_title']),
'badbehavior' => array($txt['badbehavior_title']),
'moderation' => array($txt['moderation_settings_short'], 'enabled' => substr($modSettings['warning_settings'], 0, 1) == 1),
'moderation' => array($txt['moderation_settings_short'], 'enabled' => !empty($modSettings['warning_enable'])),
),
),
'languages' => array(
Expand Down
2 changes: 1 addition & 1 deletion sources/admin/ManageSettings.php
View file
Open in desktop
Expand Up @@ -775,7 +775,7 @@ function ModifyModerationSettings($return_config = false)
checkSession();

// Make sure these don't have an effect.
if (substr($modSettings['warning_settings'], 0, 1) != 1)
if ($modSettings['warning_settings'][0] != 1)
{
$_POST['warning_watch'] = 0;
$_POST['warning_moderate'] = 0;
Expand Down
2 changes: 1 addition & 1 deletion sources/controllers/Display.controller.php
View file
Open in desktop
Expand Up @@ -894,7 +894,7 @@ function Display()
$context['can_remove_poll'] &= $modSettings['pollMode'] == '1' && $topicinfo['id_poll'] > 0;
$context['can_reply'] &= empty($topicinfo['locked']) || allowedTo('moderate_board');
$context['can_reply_unapproved'] &= $modSettings['postmod_active'] && (empty($topicinfo['locked']) || allowedTo('moderate_board'));
$context['can_issue_warning'] &= in_array('w', $context['admin_features']) && $modSettings['warning_settings'][0] == 1;
$context['can_issue_warning'] &= in_array('w', $context['admin_features']) && !empty($modSettings['warning_enable']);

// Handle approval flags...
$context['can_reply_approved'] = $context['can_reply'];
Expand Down
4 changes: 2 additions & 2 deletions sources/controllers/ModerationCenter.controller.php
View file
Open in desktop
Expand Up @@ -90,7 +90,7 @@ function action_modcenter($dont_call = false)
),
'warnings' => array(
'label' => $txt['mc_warnings'],
'enabled' => in_array('w', $context['admin_features']) && $modSettings['warning_settings'][0] == 1 && $context['can_moderate_boards'],
'enabled' => in_array('w', $context['admin_features']) && !empty($modSettings['warning_enable']) && $context['can_moderate_boards'],
'function' => 'action_viewWarnings',
'subsections' => array(
'log' => array($txt['mc_warning_log']),
Expand Down Expand Up @@ -138,7 +138,7 @@ function action_modcenter($dont_call = false)
'areas' => array(
'userwatch' => array(
'label' => $txt['mc_watched_users_title'],
'enabled' => in_array('w', $context['admin_features']) && $modSettings['warning_settings'][0] == 1 && $context['can_moderate_boards'],
'enabled' => in_array('w', $context['admin_features']) && !empty($modSettings['warning_enable']) && $context['can_moderate_boards'],
'function' => 'action_viewWatchedUsers',
'subsections' => array(
'member' => array($txt['mc_watched_users_member']),
Expand Down
2 changes: 1 addition & 1 deletion sources/controllers/PersonalMessage.controller.php
View file
Open in desktop
Expand Up @@ -135,7 +135,7 @@ function action_pm()

// This is convenient. Do you know how annoying it is to do this every time?!
$context['current_label_redirect'] = 'action=pm;f=' . $context['folder'] . (isset($_GET['start']) ? ';start=' . $_GET['start'] : '') . (isset($_REQUEST['l']) ? ';l=' . $_REQUEST['l'] : '');
$context['can_issue_warning'] = in_array('w', $context['admin_features']) && allowedTo('issue_warning') && $modSettings['warning_settings'][0] == 1;
$context['can_issue_warning'] = in_array('w', $context['admin_features']) && allowedTo('issue_warning') && !empty($modSettings['warning_enable']);

// Are PM drafts enabled?
$context['drafts_pm_save'] = !empty($modSettings['drafts_enabled']) && !empty($modSettings['drafts_pm_enabled']) && allowedTo('pm_draft');
Expand Down
5 changes: 2 additions & 3 deletions sources/controllers/Profile.controller.php
View file
Open in desktop
Expand Up @@ -155,7 +155,7 @@ function action_modifyprofile()
),
'viewwarning' => array(
'label' => $txt['profile_view_warnings'],
'enabled' => in_array('w', $context['admin_features']) && $modSettings['warning_settings'][0] == 1 && $cur_profile['warning'] && (!empty($modSettings['warning_show']) && ($context['user']['is_owner'] || $modSettings['warning_show'] == 2)),
'enabled' => in_array('w', $context['admin_features']) && !empty($modSettings['warning_enable']) && $cur_profile['warning'] && (!empty($modSettings['warning_show']) && ($context['user']['is_owner'] || $modSettings['warning_show'] == 2)),
'file' => 'ProfileInfo.controller.php',
'function' => 'action_viewWarning',
'permission' => array(
Expand Down Expand Up @@ -297,11 +297,10 @@ function action_modifyprofile()
),
'issuewarning' => array(
'label' => $txt['profile_issue_warning'],
'enabled' => in_array('w', $context['admin_features']) && $modSettings['warning_settings'][0] == 1 && (!$context['user']['is_owner'] || $context['user']['is_admin']),
'enabled' => in_array('w', $context['admin_features']) && !empty($modSettings['warning_enable']) && (!$context['user']['is_owner'] || $context['user']['is_admin']),
'file' => 'ProfileAccount.controller.php',
'function' => 'action_issuewarning',
'token' => 'profile-iw%u',
'enabled' => !$context['user']['is_owner'],
'permission' => array(
'own' => array('issue_warning'),
'any' => array('issue_warning'),
Expand Down
3 changes: 1 addition & 2 deletions sources/controllers/ProfileInfo.controller.php
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ function action_summary($memID)
'can_send_pm' => allowedTo('pm_send'),
'can_send_email' => allowedTo('send_email_to_members'),
'can_have_buddy' => allowedTo('profile_identity_own') && !empty($modSettings['enable_buddylist']),
'can_issue_warning' => in_array('w', $context['admin_features']) && allowedTo('issue_warning') && $modSettings['warning_settings'][0] == 1,
'can_issue_warning' => in_array('w', $context['admin_features']) && allowedTo('issue_warning') && !empty($modSettings['warning_enable']),
);
$context['member'] = &$memberContext[$memID];
$context['can_view_warning'] = in_array('w', $context['admin_features']) && (allowedTo('issue_warning') && !$context['user']['is_owner']) || (!empty($modSettings['warning_show']) && ($modSettings['warning_show'] > 1 || $context['user']['is_owner']));
Expand All @@ -55,7 +55,6 @@ function action_summary($memID)
);

// See if they have broken any warning levels...
list ($modSettings['warning_enable'], $modSettings['user_limit']) = explode(',', $modSettings['warning_settings']);
if (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $context['member']['warning'])
$context['warning_status'] = $txt['profile_warning_is_muted'];
elseif (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $context['member']['warning'])
Expand Down