| Zeile 362 | Zeile 362 |
|---|
*/
function update_user($method='insert')
{
|
*/
function update_user($method='insert')
{
|
global $db, $mybb, $lang;
| global $db, $mybb, $lang, $cache, $groupscache;
|
if($mybb->settings['maxwarningpoints'] < 1)
{
$mybb->settings['maxwarningpoints'] = 10;
|
if($mybb->settings['maxwarningpoints'] < 1)
{
$mybb->settings['maxwarningpoints'] = 10;
|
| | }
if(!is_array($groupscache))
{
$groupscache = $cache->read("usergroups");
|
}
$warning = &$this->data;
| }
$warning = &$this->data;
|
| Zeile 392 | Zeile 397 |
|---|
$query = $db->simple_select("warninglevels", "*", "percentage<={$this->new_warning_level}", array("order_by" => "percentage", "order_dir" => "desc"));
$new_level = $db->fetch_array($query);
|
$query = $db->simple_select("warninglevels", "*", "percentage<={$this->new_warning_level}", array("order_by" => "percentage", "order_dir" => "desc"));
$new_level = $db->fetch_array($query);
|
if($new_level['lid'])
| if(!empty($new_level) && $new_level['lid'])
|
{
$expiration = 0;
$action = my_unserialize($new_level['action']);
| {
$expiration = 0;
$action = my_unserialize($new_level['action']);
|
| Zeile 462 | Zeile 467 |
|---|
"uid" => $user['uid'],
"gid" => $action['usergroup'],
"oldgroup" => $user['usergroup'],
|
"uid" => $user['uid'],
"gid" => $action['usergroup'],
"oldgroup" => $user['usergroup'],
|
"oldadditionalgroups" => $user['additionalgroups'],
| "oldadditionalgroups" => $db->escape_string($user['additionalgroups']),
|
"olddisplaygroup" => $user['displaygroup'],
"admin" => $mybb->user['uid'],
"dateline" => TIME_NOW,
| "olddisplaygroup" => $user['displaygroup'],
"admin" => $mybb->user['uid'],
"dateline" => TIME_NOW,
|
| Zeile 476 | Zeile 481 |
|---|
$db->delete_query("banned", "uid='{$user['uid']}' AND gid='{$action['usergroup']}'");
// Override new ban details with old group info
$new_ban['oldgroup'] = $existing_ban['oldgroup'];
|
$db->delete_query("banned", "uid='{$user['uid']}' AND gid='{$action['usergroup']}'");
// Override new ban details with old group info
$new_ban['oldgroup'] = $existing_ban['oldgroup'];
|
$new_ban['oldadditionalgroups'] = $existing_ban['oldadditionalgroups'];
| $new_ban['oldadditionalgroups'] = $db->escape_string($existing_ban['oldadditionalgroups']);
|
$new_ban['olddisplaygroup'] = $existing_ban['olddisplaygroup'];
}
| $new_ban['olddisplaygroup'] = $existing_ban['olddisplaygroup'];
}
|
| Zeile 587 | Zeile 592 |
|---|
{
case 1: // Ban
// we'll have to resort to letting the admin/mod remove the ban manually, since there's an issue if stacked bans are in force...
|
{
case 1: // Ban
// we'll have to resort to letting the admin/mod remove the ban manually, since there's an issue if stacked bans are in force...
|
continue;
| continue 2;
|
case 2: // Revoke posting
$current_expiry_field = 'suspensiontime';
$current_inforce_field = 'suspendposting';
| case 2: // Revoke posting
$current_expiry_field = 'suspensiontime';
$current_inforce_field = 'suspendposting';
|