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

Errors

Browse Source 
* try to die a bit more gracefull if errors occur
This commit is contained in:
Sarjuuk
2017-03-21 02:58:16 +01:00
parent 62a95effb8
commit 00de81c60d
27 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/ajaxHandler.class.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
class AjaxHandler class AjaxHandler

2
includes/ajaxHandler/account.class.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
class AjaxAccount extends AjaxHandler class AjaxAccount extends AjaxHandler
{ {

2
includes/ajaxHandler/admin.class.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
class AjaxAdmin extends AjaxHandler class AjaxAdmin extends AjaxHandler
{ {

2
includes/ajaxHandler/comment.class.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
class AjaxComment extends AjaxHandler class AjaxComment extends AjaxHandler
{ {

2
includes/ajaxHandler/contactus.class.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
class AjaxContactus extends AjaxHandler class AjaxContactus extends AjaxHandler
{ {

2
includes/ajaxHandler/cookie.class.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
class AjaxCookie extends AjaxHandler class AjaxCookie extends AjaxHandler
{ {

2
includes/ajaxHandler/data.class.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
class AjaxData extends AjaxHandler class AjaxData extends AjaxHandler
{ {

2
includes/ajaxHandler/gotocomment.class.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
class AjaxGotocomment extends AjaxHandler class AjaxGotocomment extends AjaxHandler
{ {

2
includes/ajaxHandler/locale.class.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
class AjaxLocale extends AjaxHandler class AjaxLocale extends AjaxHandler
{ {

2
includes/ajaxHandler/profile.class.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
class AjaxProfile extends AjaxHandler class AjaxProfile extends AjaxHandler
{ {

2
includes/defines.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
/* /*
* Page * Page

2
includes/loot.class.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
/* from TC wiki /* from TC wiki

2
includes/utilities.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
class SimpleXML extends SimpleXMLElement class SimpleXML extends SimpleXMLElement

2
pages/compare.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
// tabId 1: Tools g_initHeader() // tabId 1: Tools g_initHeader()

12
pages/genericPage.class.php
View File

@@ -480,6 +480,7 @@ class GenericPage
$this->articleUrl = 'page-not-found'; $this->articleUrl = 'page-not-found';
$this->title[] = Lang::main('errPageTitle'); $this->title[] = Lang::main('errPageTitle');
$this->name = Lang::main('errPageTitle'); $this->name = Lang::main('errPageTitle');
$this->lvTabs = [];
$this->addArticle(); $this->addArticle();
@@ -521,7 +522,10 @@ class GenericPage
$this->prepareContent(); $this->prepareContent();
if (!$this->isSaneInclude('template/pages/', $this->tpl)) if (!$this->isSaneInclude('template/pages/', $this->tpl))
die(User::isInGroup(U_GROUP_EMPLOYEE) ? 'Error: nonexistant template requested: template/pages/'.$this->tpl.'.tpl.php' : null); {
trigger_error('Error: nonexistant template requested: template/pages/'.$this->tpl.'.tpl.php', E_USER_ERROR);
$this->error();
}
$this->addAnnouncements(); $this->addAnnouncements();
@@ -584,7 +588,7 @@ class GenericPage
$$n = $v; $$n = $v;
if (!$this->isSaneInclude('template/bricks/', $file)) if (!$this->isSaneInclude('template/bricks/', $file))
trigger_error("Nonexistant template requested: template/bricks/".$file.".tpl.php"); trigger_error('Nonexistant template requested: template/bricks/'.$file.'.tpl.php', E_USER_ERROR);
else else
include('template/bricks/'.$file.'.tpl.php'); include('template/bricks/'.$file.'.tpl.php');
} }
@@ -592,7 +596,7 @@ class GenericPage
public function lvBrick($file) // load listview addIns public function lvBrick($file) // load listview addIns
{ {
if (!$this->isSaneInclude('template/listviews/', $file)) if (!$this->isSaneInclude('template/listviews/', $file))
trigger_error('Nonexistant Listview addin requested: template/listviews/'.$file.'.tpl.php'); trigger_error('Nonexistant Listview addin requested: template/listviews/'.$file.'.tpl.php', E_USER_ERROR);
else else
include('template/listviews/'.$file.'.tpl.php'); include('template/listviews/'.$file.'.tpl.php');
} }
@@ -602,7 +606,7 @@ class GenericPage
if (!$this->isSaneInclude('template/localized/', $file.'_'.$loc)) if (!$this->isSaneInclude('template/localized/', $file.'_'.$loc))
{ {
if ($loc == LOCALE_EN || !$this->isSaneInclude('template/localized/', $file.'_'.LOCALE_EN)) if ($loc == LOCALE_EN || !$this->isSaneInclude('template/localized/', $file.'_'.LOCALE_EN))
trigger_error("Nonexistant template requested: template/localized/".$file.'_'.$loc.".tpl.php"); trigger_error('Nonexistant template requested: template/localized/'.$file.'_'.$loc.'.tpl.php', E_USER_ERROR);
else else
include('template/localized/'.$file.'_'.LOCALE_EN.'.tpl.php'); include('template/localized/'.$file.'_'.LOCALE_EN.'.tpl.php');
} }

2
pages/profiles.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
// !do not cache! // !do not cache!
/* older version /* older version

2
pages/search.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
/* /*

2
setup/setup.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
if (!CLI) if (!CLI)
die('not in cli mode'); die('not in cli mode');

2
setup/tools/CLISetup.class.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
if (!CLI) if (!CLI)
die('not in cli mode'); die('not in cli mode');

2
setup/tools/clisetup/account.func.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
if (!CLI) if (!CLI)
die('not in cli mode'); die('not in cli mode');

2
setup/tools/clisetup/build.func.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
if (!CLI) if (!CLI)
die('not in cli mode'); die('not in cli mode');

2
setup/tools/clisetup/dbconfig.func.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
if (!CLI) if (!CLI)
die('not in cli mode'); die('not in cli mode');

2
setup/tools/clisetup/firstrun.func.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
if (!CLI) if (!CLI)
die('not in cli mode'); die('not in cli mode');

2
setup/tools/clisetup/siteconfig.func.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
if (!CLI) if (!CLI)
die('not in cli mode'); die('not in cli mode');

2
setup/tools/clisetup/sql.func.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
if (!CLI) if (!CLI)
die('not in cli mode'); die('not in cli mode');

2
setup/tools/clisetup/update.func.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!defined('AOWOW_REVISION')) if (!defined('AOWOW_REVISION'))
die('invalid access'); die('illegal access');
if (!CLI) if (!CLI)
die('not in cli mode'); die('not in cli mode');

4
setup/tools/filegen/sounds.func.php
View File

@@ -30,7 +30,7 @@ if (!CLI)
else // expected file.mp3.mp3 else // expected file.mp3.mp3
$filePath .= '.mp3'; $filePath .= '.mp3';
// just use the first locale available .. i there is no support for multiple audio files anyway // just use the first locale available .. there is no support for multiple audio files anyway
foreach (CLISetup::$expectedPaths as $locStr => $__) foreach (CLISetup::$expectedPaths as $locStr => $__)
{ {
// get your paths straight! // get your paths straight!
@@ -43,7 +43,7 @@ if (!CLI)
{ {
$ok = false; $ok = false;
CLISetup::log(' - could not copy '.CLISetup::bold($p).' into '.CLISetup::bold('static/wowsounds/'.$fileId), CLISetup::LOG_ERROR); CLISetup::log(' - could not copy '.CLISetup::bold($p).' into '.CLISetup::bold('static/wowsounds/'.$fileId), CLISetup::LOG_ERROR);
die(); break 2;
} }
continue 2; continue 2;