yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

internalErrors renamed; can now also be set to apply to certain userGroups

Browse Source
This commit is contained in:
Sarjuuk
2013-12-15 23:49:07 +01:00
parent 60533ff27a
commit edaaba6139
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
includes/utilities.php
View File

@@ -323,9 +323,9 @@ class SmartyAoWoW extends Smarty
} }
// use, if you want to alert the staff to a problem with Trinity // use, if you want to alert the staff to a problem with Trinity
public function internalError($str) public function internalNotice($uGroupMask, $str)
{ {
$this->errors[] = $str; $this->notices[] = [$uGroupMask, $str];
} }
public function display($tpl) public function display($tpl)
@@ -364,20 +364,28 @@ class SmartyAoWoW extends Smarty
} }
} }
// display occured errors // display occured notices
if (User::isInGroup(U_GROUP_STAFF) && $this->errors) if ($this->notices)
{ {
if (!isset($tv['announcements'])) $buff = [];
$tv['announcements'] = []; foreach ($this->notices as $data)
if (User::isInGroup($data[0]))
$buff[] = $data[1];
$tv['announcements'][] = array( if ($buff)
'id' => 0, {
'mode' => 1, if (!isset($tv['announcements']))
'status' => 1, $tv['announcements'] = [];
'name' => 'internal error',
'style' => 'padding-left: 45px; background-image: url(template/images/report.gif); background-size: 15px 15px; background-position: 10px center; border: dashed 2px #C03030;', $tv['announcements'][] = array(
'text' => '<span id="inputbox-error">- '.implode("<br>- ", $this->errors).'</span>', 'id' => 0,
); 'mode' => 1,
'status' => 1,
'name' => 'internal error',
'style' => 'padding-left: 40px; background-image: url(template/images/report.gif); background-size: 15px 15px; background-position: 12px center; border: dashed 2px #C03030;',
'text' => '<span id="inputbox-error">'.implode("<br>", $buff).'</span>',
);
}
} }
// fetch announcements // fetch announcements
@@ -1928,7 +1936,7 @@ class Util
} }
else // shouldn't happened else // shouldn't happened
{ {
Util::$pageTemplate->internalError('Loot by LootId: unhandled case in calculating chance for item '.$entry['item'].'!'); Util::$pageTemplate->internalNotice(U_GROUP_EMPLOYEE, 'Loot by LootId: unhandled case in calculating chance for item '.$entry['item'].'!');
continue; continue;
} }
@@ -1942,7 +1950,7 @@ class Util
$sum = 0; $sum = 0;
else if ($sum > 100) else if ($sum > 100)
{ {
Util::$pageTemplate->internalError('Loot by LootId: entry '.$lootId.' / group '.$k.' has a total chance of '.$sum.'%. Some items cannot drop!'); Util::$pageTemplate->internalNotice(U_GROUP_EMPLOYEE, 'Loot by LootId: entry '.$lootId.' / group '.$k.' has a total chance of '.$sum.'%. Some items cannot drop!');
$sum = 100; $sum = 100;
} }
@@ -2100,13 +2108,13 @@ class Util
{ {
// check for possible database inconsistencies // check for possible database inconsistencies
if (!$ref['chance'] && !$ref['isGrouped']) if (!$ref['chance'] && !$ref['isGrouped'])
Util::$pageTemplate->internalError('Loot by Item: ungrouped Item/Ref '.$ref['item'].' has 0% chance assigned!'); Util::$pageTemplate->internalNotice(U_GROUP_EMPLOYEE, 'Loot by Item: ungrouped Item/Ref '.$ref['item'].' has 0% chance assigned!');
if ($ref['isGrouped'] && $ref['sumChance'] > 100) if ($ref['isGrouped'] && $ref['sumChance'] > 100)
Util::$pageTemplate->internalError('Loot by Item: group with Item/Ref '.$ref['item'].' has '.$ref['sumChance'].'% total chance! Some items cannot drop!'); Util::$pageTemplate->internalNotice(U_GROUP_EMPLOYEE, 'Loot by Item: group with Item/Ref '.$ref['item'].' has '.$ref['sumChance'].'% total chance! Some items cannot drop!');
if ($ref['isGrouped'] && $ref['sumChance'] == 100 && !$ref['chance']) if ($ref['isGrouped'] && $ref['sumChance'] == 100 && !$ref['chance'])
Util::$pageTemplate->internalError('Loot by Item: Item/Ref '.$ref['item'].' with adaptive chance cannot drop. Group already at 100%!'); Util::$pageTemplate->internalNotice(U_GROUP_EMPLOYEE, 'Loot by Item: Item/Ref '.$ref['item'].' with adaptive chance cannot drop. Group already at 100%!');
$chance = abs($ref['chance'] ? $ref['chance'] : (100 - $ref['sumChance']) / $ref['nZeroItems']) / 100; $chance = abs($ref['chance'] ? $ref['chance'] : (100 - $ref['sumChance']) / $ref['nZeroItems']) / 100;

2
index.php
View File

@@ -14,6 +14,8 @@ require 'includes/kernel.php';
if ($AoWoWconf['maintenance'] && !User::isInGroup(U_GROUP_EMPLOYEE)) if ($AoWoWconf['maintenance'] && !User::isInGroup(U_GROUP_EMPLOYEE))
$smarty->brb(); $smarty->brb();
else if ($AoWoWconf['maintenance'] && User::isInGroup(U_GROUP_EMPLOYEE))
$smarty->internalNotice(U_GROUP_EMPLOYEE, 'Maintenance mode enabled!');
switch ($pageCall) switch ($pageCall)
{ {