Skip to content
Permalink
Browse files

some minor error suppresants

  • Loading branch information...
Sarjuuk committed May 26, 2015
1 parent ebc7a9b commit 03b90c438fa64a45037c69f70f8bf0dbeab8f08a
0 cache/template/index.html 100644 → 100755
No changes.
@@ -159,11 +159,12 @@
define('HOST_URL', ($secure ? 'https://' : 'http://').$host);
define('STATIC_URL', ($secure ? 'https://' : 'http://').$host.'/static');
if (User::isInGroup(U_GROUP_ADMIN) && !empty($AoWoWconf['aowow'])) // initial set
if (User::isInGroup(U_GROUP_ADMIN)) // initial set
{
DB::Aowow()->query('INSERT IGNORE INTO ?_config VALUES (?, ?, ?d, ?), (?, ?, ?d, ?)',
'site_host', $host, CON_FLAG_TYPE_STRING | CON_FLAG_PERSISTENT, 'default: '.$host.' - points js to executable files (automaticly set on first run)',
'static_host', $host.'/static', CON_FLAG_TYPE_STRING | CON_FLAG_PERSISTENT, 'default: '.$host.'/static - points js to images & scripts (automaticly set on first run)'
DB::Aowow()->query('REPLACE INTO ?_config VALUES (?a)',
[['site_host', $host, CON_FLAG_TYPE_STRING | CON_FLAG_PERSISTENT, 'default: '.$host.' - points js to executable files (automaticly set on first run)'],
['static_host', $host.'/static', CON_FLAG_TYPE_STRING | CON_FLAG_PERSISTENT, 'default: '.$host.'/static - points js to images & scripts (automaticly set on first run)']]
);
}
}
@@ -31,6 +31,7 @@ class AccountPage extends GenericPage
'username' => [FILTER_SANITIZE_SPECIAL_CHARS, 0xC], // FILTER_FLAG_STRIP_LOW | *_HIGH
'password' => [FILTER_UNSAFE_RAW, null],
'c_password' => [FILTER_UNSAFE_RAW, null],
'token' => [FILTER_UNSAFE_RAW, null],
'remember_me' => [FILTER_CALLBACK, ['options' => 'AccountPage::rememberCallback']],
'email' => [FILTER_SANITIZE_EMAIL, null]
);
@@ -923,9 +923,9 @@ private function getOnKillRep($dummyIds, $mapType)
private function getQuotes()
{
$nQuotes = 0;
$quotes = [];
$quoteQuery = '
$nQuotes = 0;
$quotes = [];
$quoteSrc = DB::World()->select('
SELECT
ct.groupid AS ARRAY_KEY, ct.id as ARRAY_KEY2, ct.`type`,
ct.TextRange AS `range`,
@@ -944,9 +944,11 @@ private function getQuotes()
LEFT JOIN
locales_broadcast_text lbct ON ct.BroadcastTextId = lbct.ID
WHERE
ct.entry = ?d';
ct.entry = ?d',
$this->typeId
);
foreach (DB::World()->select($quoteQuery, $this->typeId) as $text)
foreach ($quoteSrc as $text)
{
$group = [];
foreach ($text as $t)
@@ -110,7 +110,7 @@ protected function generateContent()
$this->filter = ['query' => 1];
$this->filter = ['query' => 1, 'fi' => []];
Lang::sort('game', 'cl');
@@ -121,12 +121,12 @@ private function getTalentDistribution($tString)
{
$classMask = 1 << ($this->character['classs'] - 1);
$distrib = DB::Aowow()->selectCol('SELECT COUNT(t.id) FROM dbc_talent t JOIN dbc_talenttab tt ON t.tabId = tt.id WHERE tt.classMask & ?d GROUP BY tt.id ORDER BY tt.tabNumber ASC', $classMask);
$result = [];
$result = [0, 0, 0];
$start = 0;
foreach ($distrib as $len)
foreach ($distrib as $idx => $len)
{
$result[] = array_sum(str_split(substr($tString, $start, $len)));
$result[$idx] = array_sum(str_split(substr($tString, $start, $len)));
$start += $len;
}
@@ -4,7 +4,6 @@
die('illegal access');
// exclude & weightscales are handled as Ajax
class UserPage extends GenericPage
{
protected $tpl = 'user';
@@ -28,10 +27,13 @@ public function __construct($pageCall, $pageParam)
$this->notFound(sprintf(Lang::user('notFound'), $pageParam));
}
else if (User::$id)
{
header('Location: ?user='.User::$displayName, true, 302);
die();
}
else
$this->forwardToSignIn('user');
}
}
protected function generateContent()
{
@@ -21,7 +21,7 @@ function simpleImg()
{
$result = null;
if (in_array(substr($path, -4, 4), ['.png', '.blp']))
if (in_array(substr($path, -4, 4), ['.png', '.blp', '.BLP', '.PNG']))
$path = substr($path, 0, strlen($path) - 4);
$file = $path.'.png';
@@ -44,11 +44,11 @@ function simpleImg()
if (isset(FileGen::$cliOpts['help']))
{
echo "\n";
echo "available Options for subScript 'simpleImg':\n";
echo "available options for subScript 'simpleImg':\n";
echo " --icons (generates square icons that are used for basicly everything)\n";
echo " --glyphs (decorative tidbit displayed on Infobox for Glyph Spells)\n";
echo " --pagetexts (imagery contained in PageTexts on readable GameObjects or Items)\n";
echo " --loadingscreens (loadingscreens (not used, skipped by default))\n";
echo " --loadingscreens (loading screens (not used, skipped by default))\n";
return true;
}
@@ -269,9 +269,9 @@ function simpleImg()
if (isset($paths[0]) || isset($paths[1])) // generates icons or glyphs
{
if (isset($paths[0]) && !isset($paths[1]))
$siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon WHERE iconPath NOT LIKE "glyph-rune"');
$siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon WHERE iconPath NOT LIKE "%glyph-rune%"');
else if (!isset($paths[0]) && isset($paths[1]))
$siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon WHERE iconPath LIKE "glyph-rune"');
$siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon WHERE iconPath LIKE "%glyph-rune%"');
else
$siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon');
@@ -33,22 +33,22 @@ function imagecreatefromblp($fileName, $imgId = 0)
{
if (!CLISetup::fileExists($fileName))
{
CLISetup::log('file '.$fileName.' could not be found', MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' could not be found', CLISetup::LOG_ERROR);
return;
}
$file = fopen($fileName, 'rb');
if (!$file)
{
CLISetup::log('could not open file '.$fileName, MSG_LVL_ERROR);
CLISetup::log('could not open file '.$fileName, CLISetup::LOG_ERROR);
return;
}
$fileSize = fileSize($fileName);
if ($fileSize < 16)
{
CLISetup::log('file '.$fileName.' is too small for a BLP file', MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' is too small for a BLP file', CLISetup::LOG_ERROR);
return;
}
@@ -64,14 +64,14 @@ function imagecreatefromblp($fileName, $imgId = 0)
$data = substr($data, 0x44);
else
{
CLISetup::log('file '.$fileName.' is an incremental patch file and cannot be used by this script.', MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' is an incremental patch file and cannot be used by this script.', CLISetup::LOG_ERROR);
return;
}
}
if (substr($data, 0, 4) != "BLP2")
{
CLISetup::log('file '.$fileName.' has incorrect/unsupported magic bytes', MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' has incorrect/unsupported magic bytes', CLISetup::LOG_ERROR);
return;
}
@@ -83,7 +83,7 @@ function imagecreatefromblp($fileName, $imgId = 0)
if ($header['format'] != 1)
{
CLISetup::log('file '.$fileName.' has unsupported format'.$debugStr, MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' has unsupported format'.$debugStr, CLISetup::LOG_ERROR);
return;
}
@@ -99,12 +99,12 @@ function imagecreatefromblp($fileName, $imgId = 0)
if ($size == 0)
{
CLISetup::log('file '.$fileName.' contains zeroes in a mips table'.$debugStr, MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' contains zeroes in a mips table'.$debugStr, CLISetup::LOG_ERROR);
return;
}
if ($offs + $size > $fileSize)
{
CLISetup::log('file '.$fileName.' is corrupted/incomplete'.$debugStr, MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' is corrupted/incomplete'.$debugStr, CLISetup::LOG_ERROR);
return;
}
@@ -116,7 +116,7 @@ function imagecreatefromblp($fileName, $imgId = 0)
$img = icfb3($header['width'], $header['height'], substr($data, $offs, $size));
else
{
CLISetup::log('file '.$fileName.' has unsupported type'.$debugStr, MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' has unsupported type'.$debugStr, CLISetup::LOG_ERROR);
return;
}
@@ -152,7 +152,7 @@ function icfb2($width, $height, $data, $alphaBits, $alphaType)
{
if (!in_array($alphaBits * 10 + $alphaType, [0, 10, 41, 81, 87, 88]))
{
CLISetup::log('unsupported compression type', MSG_LVL_ERROR);
CLISetup::log('unsupported compression type', CLISetup::LOG_ERROR);
return;
}
@@ -596,4 +596,4 @@ Listview.extraCols.signature = {
$WH.ae(a, $WH.ce('img', { src: '?signature=generate&id=' + sig.id + '.png', height: 60, width: 468 }));
$WH.ae(td, a);
}
};
};

0 comments on commit 03b90c4

Please sign in to comment.
You can’t perform that action at this time.