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

moved error code for wrong Ids and pageNames to Tempate-Class

Browse Source 
throw an error if an invalid category-parameter is passed
This commit is contained in:
Sarjuuk
2013-03-13 21:33:22 +01:00
parent 06ed69c6a1
commit 5e8d1a2a39
9 changed files with 145 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/class.worldevent.php
View File

@@ -73,7 +73,7 @@ class WorldEventList extends BaseType
{
// template
$this->curTpl['name_loc0'] = $this->curTpl['description'];
$this->curTpl['iconString'] = 'INV_Misc_QuestionMark';
$this->curTpl['iconString'] = 'trade_engineering';
$replace[$this->id] = $this->curTpl;
// names

41
includes/kernel.php
View File

@@ -73,18 +73,45 @@ class Smarty_AoWoW extends Smarty
public function display($tpl)
{
// since it's the same for every page, except index..
if ($this->_tpl_vars['query'][0])
{
$ann = DB::Aowow()->Select('SELECT * FROM ?_announcements WHERE flags & 0x10 AND (page = ?s OR page = "*")', $this->_tpl_vars['query'][0]);
foreach ($ann as $k => $v)
$ann[$k]['text'] = Util::localizedString($v, 'text');
if (!$this->_tpl_vars['query'][0])
return;
$this->_tpl_vars['announcements'] = $ann;
}
// sanitize
if (preg_match('/[^a-z]/i', $this->_tpl_vars['query'][0]))
return;
$ann = DB::Aowow()->Select('SELECT * FROM ?_announcements WHERE flags & 0x10 AND (page = ?s OR page = "*")', $this->_tpl_vars['query'][0]);
foreach ($ann as $k => $v)
$ann[$k]['text'] = Util::localizedString($v, 'text');
$this->_tpl_vars['announcements'] = $ann;
parent::display($tpl);
}
public function notFound($subject)
{
$this->updatePageVars(array(
'subject' => ucfirst($subject),
'id' => intVal($this->_tpl_vars['query'][1]),
'notFound' => sprintf(Lang::$main['pageNotFound'], $subject),
));
$this->assign('lang', Lang::$main);
$this->display('404.tpl');
exit();
}
public function error()
{
$this->assign('lang', array_merge(Lang::$main, Lang::$error));
$this->assign('mysql', DB::Aowow()->getStatistics());
$this->display('error.tpl');
exit();
}
// creates the actual cache file
public function saveCache($key, $data)
{

2
pages/account.php
View File

@@ -27,7 +27,7 @@ enum(array( // UserPropsLimits
*/
if (!in_array($pageParam, array('dashboard', '', 'signin', 'signup', 'signout', 'signin_do', 'signup_do', 'forgotpassword', 'forgotusername')))
require 'error.php';
$smarty->error();
function signin()
{

11
pages/achievement.php
View File

@@ -55,16 +55,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
{
if ($acv->error)
{
$smarty->updatePageVars(array(
'subject' => ucfirst(Lang::$achievement['achievement']),
'id' => $id,
'notFound' => sprintf(Lang::$main['pageNotFound'], Lang::$achievement['achievement']),
));
$smarty->assign('lang', Lang::$main);
$smarty->display('404.tpl');
exit();
}
$smarty->notFound(Lang::$achievement['achievement']);
$pageData['path'] = [];
$pageData['title'] = [ucfirst(Lang::$achievement['achievement'])];

12
pages/error.php
View File

@@ -1,12 +0,0 @@
<?php
if (!defined('AOWOW_REVISION'))
die('illegal access');
$smarty->assign('lang', array_merge(Lang::$main, Lang::$error));
$smarty->assign('mysql', DB::Aowow()->getStatistics());
$smarty->display('error.tpl');
exit();
?>

60
pages/events.php
View File

@@ -3,27 +3,41 @@
if (!defined('AOWOW_REVISION'))
die('illegal access');
@list($cat) = Util::extractURLParams($pageParam);
$condition = [];
$path = [0, 11];
$cacheKeyPage = implode('_', [CACHETYPE_PAGE, TYPE_WORLDEVENT, -1, $cat, User::$localeId]);
if ($cat)
$path[] = $cat;
$cat = Util::extractURLParams($pageParam)[0];
$condition = [];
$path = [0, 11];
$validCats = [0, 1, 2, 3];
$title = [Lang::$game['events']];
$cacheKey = implode('_', [CACHETYPE_PAGE, TYPE_WORLDEVENT, -1, $cat, User::$localeId]);
if (!$smarty->loadCache($cacheKeyPage, $pageData))
if (!in_array($cat, $validCats))
$smarty->error();
$path[] = $cat;
if (isset($cat))
array_unshift($title, Lang::$event['category'][$cat]);
if (!$smarty->loadCache($cacheKey, $pageData))
{
switch ($cat)
if ($cat !== null)
{
case 1:
$condition[] = ['h.scheduleType', -1];
break;
case 2:
$condition[] = ['h.scheduleType', [0, 1]];
break;
case 3:
$condition[] = ['h.scheduleType', 2];
break;
switch ($cat)
{
case 0:
$condition[] = ['e.holidayId', 0];
break;
case 1:
$condition[] = ['h.scheduleType', -1];
break;
case 2:
$condition[] = ['h.scheduleType', [0, 1]];
break;
case 3:
$condition[] = ['h.scheduleType', 2];
break;
}
}
$events = new WorldEventList($condition);
@@ -37,7 +51,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
$events->addGlobalsToJScript($pageData);
$smarty->saveCache($cacheKeyPage, $pageData);
$smarty->saveCache($cacheKey, $pageData);
}
// recalculate dates with now(); can't be cached, obviously
@@ -48,12 +62,12 @@ foreach ($pageData['page'] as &$data)
$data['endDate'] = date(Util::$dateFormatLong, $updated['end']);
}
$page = array(
'tab' => 0, // for g_initHeader($tab)
'title' => ($cat ? Lang::$event['category'][$cat].' - ' : null) . Lang::$game['events'],
'path' => json_encode($path, JSON_NUMERIC_CHECK),
);
$page = array(
'tab' => 0, // for g_initHeader($tab)
'title' => implode(" - ", $title),
'path' => "[".implode(", ", $path)."]"
);
$smarty->updatePageVars($page);
$smarty->assign('lang', Lang::$main);

14
pages/spell.php
View File

@@ -594,19 +594,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
$smarty->saveCache($cacheKeyPage, $pageData);
}
else
{
$smarty->updatePageVars(array(
'subject' => ucfirst(Lang::$game['spell']),
'id' => $id,
'notFound' => sprintf(Lang::$main['pageNotFound'], Lang::$game['spell']),
));
$smarty->assign('lang', Lang::$main);
$smarty->display('404.tpl');
exit();
}
$smarty->notFound(Lang::$game['spell']);
}
$smarty->updatePageVars(array(

130
pages/title.php
View File

@@ -14,83 +14,73 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
{
$title = new TitleList(array(['id', $id]));
if ($title->error)
{
$smarty->updatePageVars(array(
'subject' => ucfirst(Lang::$game['title']),
'id' => $id,
'notFound' => sprintf(Lang::$main['pageNotFound'], Lang::$game['title']),
));
$smarty->assign('lang', Lang::$main);
$smarty->display('404.tpl');
exit();
}
$smarty->notFound(Lang::$game['title']);
$title->addGlobalsToJscript($pageData);
$infobox = [];
$colon = User::$localeId == LOCALE_FR ? ' : ' : ': '; // Je suis un prick! <_<
if ($title->getField('side') == 1)
$infobox[] = Lang::$main['side'].$colon.'[span class=alliance-icon]'.Lang::$game['alliance'].'[/span]';
else if ($title->getField('side') == 2)
$infobox[] = Lang::$main['side'].$colon.'[span class=horde-icon]'.Lang::$game['horde'].'[/span]';
else
$infobox[] = Lang::$main['side'].$colon.Lang::$main['both'];
if ($g = $title->getField('gender'))
$infobox[] = Lang::$main['gender'].$colon.'[span class='.($g == 2 ? 'female' : 'male').'-icon]'.Lang::$main['sex'][$g].'[/span]';
if ($e = $title->getField('eventId'))
$infobox[] = Lang::$game['eventShort'].$colon.'[url=?event='.$e.']'.WorldEvent::getName($e).'[/url]';
$title->reset();
$pageData = array(
'page' => array(
'name' => $title->getHtmlizedName(),
'id' => $id,
'expansion' => Util::$expansionString[$title->getField('expansion')]
),
'infobox' => '[li][ul]'.implode('[/ul][ul]', $infobox).'[/ul][/li]',
);
foreach ($title->sources[$id] as $type => $entries)
{
$title->addGlobalsToJscript($pageData);
$infobox = [];
$colon = User::$localeId == LOCALE_FR ? ' : ' : ': '; // Je suis un prick! <_<
if ($title->getField('side') == 1)
$infobox[] = Lang::$main['side'].$colon.'[span class=alliance-icon]'.Lang::$game['alliance'].'[/span]';
else if ($title->getField('side') == 2)
$infobox[] = Lang::$main['side'].$colon.'[span class=horde-icon]'.Lang::$game['horde'].'[/span]';
else
$infobox[] = Lang::$main['side'].$colon.Lang::$main['both'];
if ($g = $title->getField('gender'))
$infobox[] = Lang::$main['gender'].$colon.'[span class='.($g == 2 ? 'female' : 'male').'-icon]'.Lang::$main['sex'][$g].'[/span]';
if ($e = $title->getField('eventId'))
$infobox[] = Lang::$game['eventShort'].$colon.'[url=?event='.$e.']'.WorldEvent::getName($e).'[/url]';
$pageData = array(
'page' => array(
'name' => $title->getHtmlizedName(),
'id' => $id,
'expansion' => Util::$expansionString[$title->getField('expansion')]
),
'infobox' => '[li][ul]'.implode('[/ul][ul]', $infobox).'[/ul][/li]',
);
foreach ($title->sources[$id] as $type => $entries)
// todo: hidden-/visibleCols by actual use
switch ($type)
{
// todo: hidden-/visibleCols by actual use
switch ($type)
{
case 4:
$quests = new QuestList(array(['id', $entries]));
$quests->addRewardsToJscript($pageData);
case 4:
$quests = new QuestList(array(['id', $entries]));
$quests->addRewardsToJscript($pageData);
$pageData['page']['questReward'] = $quests->getListviewData();
$pageData['page']['questParams'] = array(
'id' => 'reward-from-quest',
'name' => '$LANG.tab_rewardfrom',
'hiddenCols' => "$['side']",
'visibleCols' => "$['category']"
);
break;
case 12:
$acvs = new AchievementList(array(['id', $entries]));
$acvs->addGlobalsToJscript($pageData);
$acvs->addRewardsToJscript($pageData);
$pageData['page']['questReward'] = $quests->getListviewData();
$pageData['page']['questParams'] = array(
'id' => 'reward-from-quest',
'name' => '$LANG.tab_rewardfrom',
'hiddenCols' => "$['side']",
'visibleCols' => "$['category']"
);
break;
case 12:
$acvs = new AchievementList(array(['id', $entries]));
$acvs->addGlobalsToJscript($pageData);
$acvs->addRewardsToJscript($pageData);
$pageData['page']['acvReward'] = $acvs->getListviewData();
$pageData['page']['acvParams'] = array(
'id' => 'reward-from-achievement',
'name' => '$LANG.tab_rewardfrom',
'visibleCols' => "$['category']",
'sort' => "$['reqlevel', 'name']"
);
break;
case 13:
// not displayed
}
$pageData['page']['acvReward'] = $acvs->getListviewData();
$pageData['page']['acvParams'] = array(
'id' => 'reward-from-achievement',
'name' => '$LANG.tab_rewardfrom',
'visibleCols' => "$['category']",
'sort' => "$['reqlevel', 'name']"
);
break;
// case 13:
// not displayed
}
$pageData['title'] = ucFirst(trim(str_replace('%s', '', str_replace(',', '', $title->name[0]))));
$pageData['path'] = '[0, 10, '.$title->getField('category').']';
$smarty->saveCache($cacheKeyPage, $pageData);
}
$pageData['title'] = ucFirst(trim(str_replace('%s', '', str_replace(',', '', $title->names[$title->id][0]))));
$pageData['path'] = '[0, 10, '.$title->getField('category').']';
$smarty->saveCache($cacheKeyPage, $pageData);
}
$smarty->updatePageVars(array(

15
pages/titles.php
View File

@@ -4,10 +4,14 @@ if (!defined('AOWOW_REVISION'))
die('illegal access');
$cat = Util::extractURLParams($pageParam)[0];
$path = [0, 10];
$cacheKey = implode('_', [CACHETYPE_PAGE, TYPE_TITLE, -1, isset($cat) ? $cat : -1, User::$localeId]);
$title = [ucFirst(Lang::$game['titles'])];
$cat = Util::extractURLParams($pageParam)[0];
$path = [0, 10];
$validCats = [0, 1, 2, 3, 4, 5, 6];
$title = [ucFirst(Lang::$game['titles'])];
$cacheKey = implode('_', [CACHETYPE_PAGE, TYPE_TITLE, -1, isset($cat) ? $cat : -1, User::$localeId]);
if (!in_array($cat, $validCats))
$smarty->error();
$path[] = $cat; // should be only one parameter anyway
@@ -36,10 +40,11 @@ if (!$smarty->loadCache($cacheKey, $pageData))
$smarty->saveCache($cacheKey, $pageData);
}
$page = array(
'tab' => 0, // for g_initHeader($tab)
'title' => implode(" - ", $title),
'path' => "[".implode(", ", $path)."]",
'path' => "[".implode(", ", $path)."]"
);
$smarty->updatePageVars($page);