JS/CSS

* unify handling
2025-11-29 15:58:16 +08:00 · 2022-03-12 23:59:06 +01:00
parent 4b32811424
commit 3cb02f2204
49 changed files with 179 additions and 159 deletions
--- a/includes/defines.php
+++ b/includes/defines.php
@@ -64,6 +64,11 @@ define('CACHE_TYPE_XML',                    4);             // only used by item
 define('CACHE_MODE_FILECACHE',              0x1);
 define('CACHE_MODE_MEMCACHED',              0x2);

+define ('CSS_FILE',                         1);
+define ('CSS_STRING',                       2);
+define ('JS_FILE',                          3);
+define ('JS_STRING',                        4);
+
 define('SEARCH_TYPE_REGULAR',               0x10000000);
 define('SEARCH_TYPE_OPEN',                  0x20000000);
 define('SEARCH_TYPE_JSON',                  0x40000000);
--- a/pages/account.php
+++ b/pages/account.php
@@ -8,8 +8,8 @@ if (!defined('AOWOW_REVISION'))
 class AccountPage extends GenericPage
 {
    protected $tpl       = 'acc-dashboard';
-    protected $js        = ['user.js', 'profile.js'];
-    protected $css       = [['path' => 'Profiler.css']];
+    protected $js        = [[JS_FILE, 'user.js'], [JS_FILE, 'profile.js']];
+    protected $css       = [[CSS_FILE, 'Profiler.css']];
    protected $mode      = CACHE_TYPE_NONE;
    protected $category  = null;
    protected $validCats = array(
--- a/pages/achievement.php
+++ b/pages/achievement.php
@@ -173,7 +173,7 @@ class AchievementPage extends GenericPage
        );

        if ($reqBook)
-            $this->addCss(['path' => 'Book.css']);
+            $this->addScript([CSS_FILE, 'Book.css']);

        // create rewards
        if ($foo = $this->subject->getField('rewards'))
--- a/pages/achievements.php
+++ b/pages/achievements.php
@@ -15,7 +15,7 @@ class AchievementsPage extends GenericPage
    protected $path          = [0, 9];
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
-    protected $js            = ['filters.js'];
+    protected $js            = [[JS_FILE, 'filters.js']];

    protected $_get          = ['filter' => ['filter' => FILTER_UNSAFE_RAW]];

--- a/pages/admin.php
+++ b/pages/admin.php
@@ -73,15 +73,15 @@ class AdminPage extends GenericPage

    private function handleConfig()
    {
-        $this->addCSS(array(
-            ['string' => '.grid input[type=\'text\'], .grid input[type=\'number\'] { width:250px; text-align:left; }'],
-            ['string' => '.grid input[type=\'button\'] { width:65px; padding:2px; }'],
-            ['string' => '.grid a.tip { margin:0px 5px; opacity:0.8; }'],
-            ['string' => '.grid a.tip:hover  { opacity:1; }'],
-            ['string' => '.grid tr { height:30px; }'],
-            ['string' => '.grid .disabled { opacity:0.4 !important; }'],
-            ['string' => '.grid .status { position:absolute; right:5px; }'],
-        ));
+        $this->addScript(
+            [CSS_STRING, '.grid input[type=\'text\'], .grid input[type=\'number\'] { width:250px; text-align:left; }'],
+            [CSS_STRING, '.grid input[type=\'button\'] { width:65px; padding:2px; }'],
+            [CSS_STRING, '.grid a.tip { margin:0px 5px; opacity:0.8; }'],
+            [CSS_STRING, '.grid a.tip:hover  { opacity:1; }'],
+            [CSS_STRING, '.grid tr { height:30px; }'],
+            [CSS_STRING, '.grid .disabled { opacity:0.4 !important; }'],
+            [CSS_STRING, '.grid .status { position:absolute; right:5px; }'],
+        );

        $head = '<table class="grid"><tr><th><b>Key</b></th><th><b>Value</b></th><th style="width:150px;"><b>Options</b></th></tr>';
        $mainTab = [];
@@ -123,8 +123,8 @@ class AdminPage extends GenericPage

    private function handlePhpInfo()
    {
-        $this->addCSS([
-            'string' => "\npre {margin: 0px; font-family: monospace;}\n" .
+        $this->addScript([
+            CSS_STRING, "\npre {margin: 0px; font-family: monospace;}\n" .
                        "td, th { border: 1px solid #000000; vertical-align: baseline;}\n" .
                        ".p {text-align: left;}\n" .
                        ".e {background-color: #ccccff; font-weight: bold; color: #000000;}\n" .
@@ -187,11 +187,11 @@ class AdminPage extends GenericPage

    private function handleScreenshots()
    {
-        $this->addJS('screenshot.js');
-        $this->addCSS(array(
-            ['string' => '.layout {margin: 0px 25px; max-width: inherit; min-width: 1200px; }'],
-            ['string' => '#highlightedRow { background-color: #322C1C; }']
-        ));
+        $this->addScript(
+            [JS_FILE,    'screenshot.js'],
+            [CSS_STRING, '.layout {margin: 0px 25px; max-width: inherit; min-width: 1200px; }'],
+            [CSS_STRING, '#highlightedRow { background-color: #322C1C; }'],
+        );

        $ssGetAll = $this->_get['all'];
        $ssPages  = [];
@@ -225,8 +225,10 @@ class AdminPage extends GenericPage

    private function handleWeightPresets()
    {
-        $this->addCSS(['string' => '.wt-edit {display:inline-block; vertical-align:top; width:350px;}']);
-        $this->addJS('filters.js');
+        $this->addScript(
+            [JS_FILE,    'filters.js'],
+            [CSS_STRING, '.wt-edit {display:inline-block; vertical-align:top; width:350px;}'],
+        );

        $head = $body = '';

--- a/pages/areatrigger.php
+++ b/pages/areatrigger.php
@@ -45,7 +45,7 @@ class AreaTriggerPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $_type = $this->subject->getField('type');

--- a/pages/areatriggers.php
+++ b/pages/areatriggers.php
@@ -16,7 +16,7 @@ class AreaTriggersPage extends GenericPage
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
    protected $validCats     = [0, 1, 2, 3, 4, 5];
-    protected $js            = ['filters.js'];
+    protected $js            = [[JS_FILE, 'filters.js']];
    protected $reqUGroup     = U_GROUP_STAFF;

    protected $_get          = ['filter' => ['filter' => FILTER_UNSAFE_RAW]];
--- a/pages/arenateam.php
+++ b/pages/arenateam.php
@@ -17,8 +17,8 @@ class ArenaTeamPage extends GenericPage
    protected $tabId    = 1;
    protected $path     = [1, 5, 3];
    protected $tpl      = 'roster';
-    protected $js       = ['profile_all.js', 'profile.js'];
-    protected $css      = [['path' => 'Profiler.css']];
+    protected $js       = [[JS_FILE, 'profile_all.js'], [JS_FILE, 'profile.js']];
+    protected $css      = [[CSS_FILE, 'Profiler.css']];

    public function __construct($pageCall, $pageParam)
    {
@@ -97,7 +97,7 @@ class ArenaTeamPage extends GenericPage
        if ($this->doResync)
            return;

-        $this->addJS('?data=realms.weight-presets&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=realms.weight-presets&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $this->redButtons[BUTTON_RESYNC] = [$this->subjectGUID, 'arena-team'];

--- a/pages/arenateams.php
+++ b/pages/arenateams.php
@@ -15,7 +15,7 @@ class ArenaTeamsPage extends GenericPage
    protected $tabId    = 1;
    protected $path     = [1, 5, 3];
    protected $tpl      = 'arena-teams';
-    protected $js       = ['filters.js', 'profile_all.js', 'profile.js'];
+    protected $js       = [[JS_FILE, 'filters.js'], [JS_FILE, 'profile_all.js'], [JS_FILE, 'profile.js']];

    protected $_get     = ['filter' => ['filter' => FILTER_UNSAFE_RAW]];

@@ -57,7 +57,7 @@ class ArenaTeamsPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=realms&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=realms&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $conditions = [];
        if (!User::isInGroup(U_GROUP_EMPLOYEE))
--- a/pages/class.php
+++ b/pages/class.php
@@ -16,7 +16,7 @@ class ClassPage extends GenericPage
    protected $path          = [0, 12];
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
-    protected $js            = ['swfobject.js'];
+    protected $js            = [[JS_FILE, 'swfobject.js']];

    public function __construct($pageCall, $id)
    {
@@ -43,7 +43,7 @@ class ClassPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $infobox   = Lang::getInfoBoxForFlags($this->subject->getField('cuFlags'));
        $_mask     = 1 << ($this->typeId - 1);
--- a/pages/compare.php
+++ b/pages/compare.php
@@ -12,13 +12,13 @@ class ComparePage extends GenericPage
    protected $path          = [1, 3];
    protected $mode          = CACHE_TYPE_NONE;
    protected $js            = array(
-        'profile.js',
-        'Draggable.js',
-        'filters.js',
-        'Summary.js',
-        'swfobject.js',
+        [JS_FILE, 'profile.js'],
+        [JS_FILE, 'Draggable.js'],
+        [JS_FILE, 'filters.js'],
+        [JS_FILE, 'Summary.js'],
+        [JS_FILE, 'swfobject.js'],
    );
-    protected $css           = [['path' => 'Summary.css']];
+    protected $css           = [[CSS_FILE, 'Summary.css']];

    protected $summary       = [];
    protected $cmpItems      = [];
@@ -44,7 +44,7 @@ class ComparePage extends GenericPage
    protected function generateContent()
    {
        // add conditional js
-        $this->addJS('?data=weight-presets.gems.enchants.itemsets&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=weight-presets.gems.enchants.itemsets&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $this->summary = array(
            'template' => 'compare',
--- a/pages/currency.php
+++ b/pages/currency.php
@@ -50,7 +50,7 @@ class CurrencyPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $_itemId = $this->subject->getField('itemId');

--- a/pages/enchantments.php
+++ b/pages/enchantments.php
@@ -15,7 +15,7 @@ class EnchantmentsPage extends GenericPage
    protected $path          = [0, 101];
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
-    protected $js            = ['filters.js'];
+    protected $js            =[JS_FILE, 'filters.js']];

    protected $_get          = ['filter' => ['filter' => FILTER_UNSAFE_RAW]];

--- a/pages/event.php
+++ b/pages/event.php
@@ -67,7 +67,7 @@ class EventPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        /***********/
        /* Infobox */
--- a/pages/faction.php
+++ b/pages/faction.php
@@ -48,7 +48,7 @@ class FactionPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        /***********/
        /* Infobox */
--- a/pages/genericPage.class.php
+++ b/pages/genericPage.class.php
@@ -426,35 +426,36 @@ class GenericPage
        $this->sumSQLStats();
    }

-    public function addJS($name, bool $unshift = false) : void
+    public function addScript(array ...$structs) : void
    {
-        if (is_array($name))
+        foreach ($structs as $s)                            // iType, sContent, bFront, sIeCnd
        {
-            foreach ($name as $n)
-                $this->addJS($n, $unshift);
-        }
-        else if (!in_array($name, $this->js))
+            if (empty($s[1]))
            {
-            if ($unshift)
-                array_unshift($this->js, $name);
-            else
-                $this->js[] = $name;
-        }
+                trigger_error('GenericPage::addScript - content empty', E_USER_WARNING);
+                continue;
            }

-    public function addCSS(array $struct, bool $unshift = false) : void
+            $s = array_pad($s, 4, '');
+            switch ($s[0])
            {
-        if (is_array($struct) && empty($struct['path']) && empty($struct['string']))
-        {
-            foreach ($struct as $s)
-                $this->addCSS($s, $unshift);
-        }
-        else if (!in_array($struct, $this->css))
-        {
-            if ($unshift)
-                array_unshift($this->css, $struct);
+                case JS_FILE:
+                case JS_STRING:
+                    if (empty($s[2]))
+                        $this->js[] = $s;
                    else
-                $this->css[] = $struct;
+                        array_unshift($this->js, $s);
+                    break;
+                case CSS_FILE:
+                case CSS_STRING:
+                    if (empty($s[2]))
+                        $this->css[] = $s;
+                    else
+                        array_unshift($this->css, $s);
+                    break;
+                default:
+                    trigger_error('GenericPage::addScript - unknown script type #'.$s[0], E_USER_WARNING);
+            }
        }
    }

--- a/pages/guild.php
+++ b/pages/guild.php
@@ -17,8 +17,8 @@ class GuildPage extends GenericPage
    protected $tabId    = 1;
    protected $path     = [1, 5, 2];
    protected $tpl      = 'roster';
-    protected $js       = ['profile_all.js', 'profile.js'];
-    protected $css      = [['path' => 'Profiler.css']];
+    protected $js       = [[JS_FILE, 'profile_all.js'], [JS_FILE, 'profile.js']];
+    protected $css      = [[CSS_FILE, 'Profiler.css']];

    public function __construct($pageCall, $pageParam)
    {
@@ -97,7 +97,7 @@ class GuildPage extends GenericPage
        if ($this->doResync)
            return;

-        $this->addJS('?data=realms.weight-presets&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=realms.weight-presets&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $this->redButtons[BUTTON_RESYNC] = [$this->subjectGUID, 'guild'];

--- a/pages/guilds.php
+++ b/pages/guilds.php
@@ -15,7 +15,7 @@ class GuildsPage extends GenericPage
    protected $tabId    = 1;
    protected $path     = [1, 5, 2];
    protected $tpl      = 'guilds';
-    protected $js       = ['filters.js', 'profile_all.js', 'profile.js'];
+    protected $js       = [[JS_FILE, 'filters.js'], [JS_FILE, 'profile_all.js'], [JS_FILE, 'profile.js']];

    protected $_get     = ['filter' => ['filter' => FILTER_UNSAFE_RAW]];

@@ -57,7 +57,7 @@ class GuildsPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=realms&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=realms&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $conditions = array(
            ['c.deleteInfos_Account', null],
--- a/pages/home.php
+++ b/pages/home.php
@@ -7,8 +7,8 @@ if (!defined('AOWOW_REVISION'))
 class HomePage extends GenericPage
 {
    protected $tpl      = 'home';
-    protected $js       = ['home.js'];
-    protected $css      = [['path' => 'home.css']];
+    protected $js       = [[JS_FILE, 'home.js']];
+    protected $css      = [[CSS_FILE, 'home.css']];

    protected $featuredBox = [];
    protected $oneliner    = '';
@@ -21,7 +21,7 @@ class HomePage extends GenericPage

    protected function generateContent()
    {
-        $this->addCSS(['string' => '.announcement { margin: auto; max-width: 1200px; padding: 0px 15px 15px 15px }']);
+        $this->addScript([CSS_STRING, '.announcement { margin: auto; max-width: 1200px; padding: 0px 15px 15px 15px }']);

        // load oneliner
        if ($_ = DB::Aowow()->selectRow('SELECT * FROM ?_home_oneliner WHERE active = 1 LIMIT 1'))
--- a/pages/icons.php
+++ b/pages/icons.php
@@ -15,7 +15,7 @@ class IconsPage extends GenericPage
    protected $path          = [0, 31];
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
-    protected $js            = ['filters.js'];
+    protected $js            = [[JS_FILE, 'filters.js']];

    protected $_get          = ['filter' => ['filter' => FILTER_UNSAFE_RAW]];

--- a/pages/item.php
+++ b/pages/item.php
@@ -18,9 +18,9 @@ class ItemPage extends genericPage
    protected $mode          = CACHE_TYPE_PAGE;
    protected $enhancedTT    = [];
    protected $js            = array(
-        'swfobject.js',                                     // view in 3d, ok
-        'profile.js',                                       // item upgrade search, also ok
-        'filters.js'                                        // lolwut?
+        [JS_FILE, 'swfobject.js'],                          // view in 3d, ok
+        [JS_FILE, 'profile.js'],                            // item upgrade search, also ok
+        [JS_FILE, 'filters.js']                             // lolwut?
    );

    protected $_get          = array(
@@ -121,7 +121,7 @@ class ItemPage extends genericPage

    protected function generateContent()
    {
-        $this->addJS('?data=weight-presets.zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=weight-presets.zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $_flags     = $this->subject->getField('flags');
        $_slot      = $this->subject->getField('slot');
@@ -349,8 +349,10 @@ class ItemPage extends genericPage
        $pageText = [];
        if ($this->pageText = Game::getPageText($this->subject->getField('pageTextId')))
        {
-            $this->addJS('Book.js');
-            $this->addCSS(['path' => 'Book.css']);
+            $this->addScript(
+                [JS_FILE,  'Book.js'],
+                [CSS_FILE, 'Book.css']
+            );
        }

        $this->headIcons  = [$this->subject->getField('iconString', true, true), $this->subject->getField('stackable')];
--- a/pages/items.php
+++ b/pages/items.php
@@ -15,7 +15,7 @@ class ItemsPage extends GenericPage
    protected $path          = [0, 0];
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
-    protected $js            = ['filters.js', 'swfobject.js'];
+    protected $js            = [[JS_FILE, 'filters.js'], [JS_FILE, 'swfobject.js']];

    protected $_get          = ['filter' => ['filter' => FILTER_UNSAFE_RAW]];

@@ -96,7 +96,7 @@ class ItemsPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=weight-presets&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=weight-presets&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $conditions = [];

--- a/pages/itemset.php
+++ b/pages/itemset.php
@@ -16,10 +16,7 @@ class ItemsetPage extends GenericPage
    protected $path          = [0, 2];
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
-    protected $js            = array(
-        'swfobject.js',
-        'Summary.js'
-    );
+    protected $js            = [[JS_FILE, 'swfobject.js'], [JS_FILE, 'Summary.js']];

    protected $_get          = ['domain' => ['filter' => FILTER_CALLBACK, 'options' => 'GenericPage::checkDomain']];

--- a/pages/itemsets.php
+++ b/pages/itemsets.php
@@ -15,7 +15,7 @@ class ItemsetsPage extends GenericPage
    protected $path     = [0, 2];
    protected $tabId    = 0;
    protected $mode     = CACHE_TYPE_PAGE;
-    protected $js       = ['filters.js'];
+    protected $js       = [[JS_FILE, 'filters.js']];

    protected $_get          = ['filter' => ['filter' => FILTER_UNSAFE_RAW]];

@@ -31,7 +31,7 @@ class ItemsetsPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=weight-presets&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=weight-presets&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $conditions = [];

--- a/pages/maps.php
+++ b/pages/maps.php
@@ -11,8 +11,8 @@ class MapsPage extends GenericPage
    protected $tabId         = 1;
    protected $path          = [1, 1];
    protected $mode          = CACHE_TYPE_NONE;
-    protected $js            = ['maps.js'];
-    protected $css           = [['string' => 'zone-picker { margin-left: 4px }']];
+    protected $js            = [[JS_FILE, 'maps.js']];
+    protected $css           = [[CSS_STRING, 'zone-picker { margin-left: 4px }']];

    public function __construct($pageCall, $__)
    {
@@ -24,7 +24,7 @@ class MapsPage extends GenericPage
    protected function generateContent()
    {
        // add conditional js
-        $this->addJS('?data=zones&locale=' . User::$localeId . '&t=' . $_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);
    }

    protected function generateTitle()
--- a/pages/more.php
+++ b/pages/more.php
@@ -14,7 +14,7 @@ class MorePage extends GenericPage
    protected $path         = [];
    protected $tabId        = 0;
    protected $mode         = CACHE_TYPE_NONE;
-    protected $js           = ['swfobject.js'];
+    protected $js           = [[JS_FILE, 'swfobject.js']];

    private   $page         = [];
    private   $req2priv     = array(
--- a/pages/npc.php
+++ b/pages/npc.php
@@ -16,8 +16,8 @@ class NpcPage extends GenericPage
    protected $path          = [0, 4];
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
-    protected $js            = ['swfobject.js'];
-    protected $css           = [['path' => 'Profiler.css']];
+    protected $js            = [[JS_FILE, 'swfobject.js']];
+    protected $css           = [[CSS_FILE, 'Profiler.css']];

    protected $_get          = ['domain' => ['filter' => FILTER_CALLBACK, 'options' => 'GenericPage::checkDomain']];

@@ -57,7 +57,7 @@ class NpcPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $_typeFlags  = $this->subject->getField('typeFlags');
        $_altIds     = [];
--- a/pages/npcs.php
+++ b/pages/npcs.php
@@ -16,7 +16,7 @@ class NpcsPage extends GenericPage
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
    protected $validCats     = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13];
-    protected $js            = ['filters.js'];
+    protected $js            = [[JS_FILE, 'filters.js']];

    protected $_get          = ['filter' => ['filter' => FILTER_UNSAFE_RAW]];

@@ -33,7 +33,7 @@ class NpcsPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $conditions = [];

--- a/pages/object.php
+++ b/pages/object.php
@@ -16,7 +16,7 @@ class ObjectPage extends GenericPage
    protected $path          = [0, 5];
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
-    protected $js            = ['swfobject.js'];
+    protected $js            = [[JS_FILE, 'swfobject.js']];

    protected $_get          = ['domain' => ['filter' => FILTER_CALLBACK, 'options' => 'GenericPage::checkDomain']];

@@ -51,7 +51,7 @@ class ObjectPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        /***********/
        /* Infobox */
@@ -215,8 +215,10 @@ class ObjectPage extends GenericPage
        // pageText
        if ($this->pageText = Game::getPageText($next = $this->subject->getField('pageTextId')))
        {
-            $this->addCSS(['path' => 'Book.css']);
-            $this->addJS('Book.js');
+            $this->addScript(
+                [JS_FILE,  'Book.js'],
+                [CSS_FILE, 'Book.css']
+            );
        }

        // get spawns and path
--- a/pages/objects.php
+++ b/pages/objects.php
@@ -16,7 +16,7 @@ class ObjectsPage extends GenericPage
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
    protected $validCats     = [-2, -3, -4, -5, -6, 0, 3, 9, 25];
-    protected $js            = ['filters.js'];
+    protected $js            = [[JS_FILE, 'filters.js']];

    protected $_get          = ['filter' => ['filter' => FILTER_UNSAFE_RAW]];

@@ -33,7 +33,7 @@ class ObjectsPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $conditions = [];

--- a/pages/pet.php
+++ b/pages/pet.php
@@ -16,7 +16,7 @@ class PetPage extends GenericPage
    protected $path          = [0, 8];
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
-    protected $js            = ['swfobject.js'];
+    protected $js            = [[JS_FILE, 'swfobject.js']];

    public function __construct($pageCall, $id)
    {
@@ -43,7 +43,7 @@ class PetPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        /***********/
        /* Infobox */
--- a/pages/profile.php
+++ b/pages/profile.php
@@ -18,10 +18,17 @@ class ProfilePage extends GenericPage
    protected $tabId     = 1;
    protected $path      = [1, 5, 1];
    protected $tpl       = 'profile';
-    protected $js        = ['filters.js', 'TalentCalc.js', 'swfobject.js', 'profile_all.js', 'profile.js', 'Profiler.js'];
+    protected $js        = array(
+        [JS_FILE, 'filters.js'],
+        [JS_FILE, 'TalentCalc.js'],
+        [JS_FILE, 'swfobject.js'],
+        [JS_FILE, 'profile_all.js'],
+        [JS_FILE, 'profile.js'],
+        [JS_FILE, 'Profiler.js']
+    );
    protected $css       = array(
-        ['path' => 'talentcalc.css'],
-        ['path' => 'Profiler.css']
+        [CSS_FILE, 'talentcalc.css'],
+        [CSS_FILE, 'Profiler.css']
    );

    protected $_get      = array(
@@ -142,7 +149,7 @@ class ProfilePage extends GenericPage
            return;

        // + .titles ?
-        $this->addJS('?data=enchants.gems.glyphs.itemsets.pets.pet-talents.quick-excludes.realms.statistics.weight-presets.achievements&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=enchants.gems.glyphs.itemsets.pets.pet-talents.quick-excludes.realms.statistics.weight-presets.achievements&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        // as demanded by the raid activity tracker
        $bossIds = array(
--- a/pages/profiler.php
+++ b/pages/profiler.php
@@ -10,8 +10,8 @@ class ProfilerPage extends GenericPage
    protected $tabId    = 1;
    protected $tpl      = 'profiler';
    protected $gDataKey = true;
-    protected $js       = ['profile_all.js', 'profile.js'];
-    protected $css      = [['path' => 'Profiler.css']];
+    protected $js       = [[JS_FILE, 'profile_all.js'], [JS_FILE, 'profile.js']];
+    protected $css      = [[CSS_FILE, 'Profiler.css']];

    public function __construct($pageCall, $pageParam)
    {
@@ -23,7 +23,7 @@ class ProfilerPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=realms&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=realms&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);
    }

    protected function generatePath() { }
--- a/pages/profiles.php
+++ b/pages/profiles.php
@@ -17,8 +17,8 @@ class ProfilesPage extends GenericPage
    protected $tabId    = 1;
    protected $path     = [1, 5, 0];
    protected $tpl      = 'profiles';
-    protected $js       = ['filters.js', 'profile_all.js', 'profile.js'];
-    protected $css      = [['path' => 'Profiler.css']];
+    protected $js       = [[JS_FILE, 'filters.js'], [JS_FILE, 'profile_all.js'], [JS_FILE, 'profile.js']];
+    protected $css      = [[CSS_FILE, 'Profiler.css']];

    protected $_get     = ['filter' => ['filter' => FILTER_UNSAFE_RAW]];

@@ -62,7 +62,7 @@ class ProfilesPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=weight-presets.realms&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=weight-presets.realms&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $conditions = [];

--- a/pages/quest.php
+++ b/pages/quest.php
@@ -16,8 +16,8 @@ class QuestPage extends GenericPage
    protected $path          = [0, 3];
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
-    protected $css           = [['path' => 'Book.css']];
-    protected $js            = ['ShowOnMap.js'];
+    protected $js            = [[JS_FILE, 'ShowOnMap.js']];
+    protected $css           = [[CSS_FILE, 'Book.css']];

    protected $_get          = ['domain' => ['filter' => FILTER_CALLBACK, 'options' => 'GenericPage::checkDomain']];

@@ -570,7 +570,7 @@ class QuestPage extends GenericPage
        /* Mapper */
        /**********/

-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        // gather points of interest
        $mapNPCs = $mapGOs = [];                            // [typeId, start|end|objective, startItemId]
--- a/pages/quests.php
+++ b/pages/quests.php
@@ -15,7 +15,7 @@ class QuestsPage extends GenericPage
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
    protected $validCats     = [];
-    protected $js            = ['filters.js'];
+    protected $js            = [[JS_FILE, 'filters.js']];

    protected $_get          = ['filter' => ['filter' => FILTER_UNSAFE_RAW]];

--- a/pages/race.php
+++ b/pages/race.php
@@ -16,7 +16,7 @@ class RacePage extends GenericPage
    protected $path          = [0, 13];
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
-    protected $js            = ['swfobject.js'];
+    protected $js            = [[JS_FILE, 'swfobject.js']];

    public function __construct($pageCall, $id)
    {
--- a/pages/screenshot.php
+++ b/pages/screenshot.php
@@ -12,8 +12,8 @@ class ScreenshotPage extends GenericPage
    const     MAX_H        = 325;

    protected $tpl         = 'screenshot';
-    protected $js          = ['Cropper.js'];
-    protected $css         = [['path' => 'Cropper.css']];
+    protected $js          = [[JS_FILE, 'Cropper.js']];
+    protected $css         = [[CSS_FILE, 'Cropper.css']];
    protected $reqAuth     = true;
    protected $tabId       = 0;

--- a/pages/search.php
+++ b/pages/search.php
@@ -30,7 +30,7 @@ class SearchPage extends GenericPage
    protected $tpl           = 'search';
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_SEARCH;
-    protected $js            = ['swfobject.js'];
+    protected $js            = [[JS_FILE, 'swfobject.js']];
    protected $lvTabs        = [];                          // [file, data, extraInclude, osInfo]       // osInfo:[type, appendix, nMatches, param1, param2]
    protected $forceTabs     = true;
    protected $search        = '';                          // output
@@ -208,7 +208,7 @@ class SearchPage extends GenericPage
        if ($this->mode == CACHE_TYPE_NONE)                 // search is invalid
            return;

-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $this->performSearch();
    }
--- a/pages/skill.php
+++ b/pages/skill.php
@@ -264,7 +264,7 @@ class SkillPage extends GenericPage
            $list = $spellIds ? DB::World()->selectCol('SELECT cdt.CreatureId FROM creature_default_trainer cdt JOIN trainer_spell ts ON ts.TrainerId = cdt.TrainerId WHERE ts.SpellID IN (?a)', $spellIds) : [];
            if ($list)
            {
-                $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+                $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

                $trainer = new CreatureList(array(CFG_SQL_LIMIT_NONE, ['ct.id', $list], ['s.guid', NULL, '!'], ['ct.npcflag', 0x10, '&']));

--- a/pages/sound.php
+++ b/pages/sound.php
@@ -78,7 +78,7 @@ class SoundPage extends GenericPage
        /* Main Content */
        /****************/

-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        // get spawns
        $map = null;
@@ -331,7 +331,7 @@ class SoundPage extends GenericPage
            $npcs = new CreatureList($cnds);
            if (!$npcs->error)
            {
-                $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+                $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

                $this->extendGlobalData($npcs->getJSGlobals(GLOBALINFO_SELF));
                $this->lvTabs[] = ['creature', ['data' => array_values($npcs->getListviewData())]];
--- a/pages/sounds.php
+++ b/pages/sounds.php
@@ -16,7 +16,7 @@ class SoundsPage extends GenericPage
    protected $tabId     = 0;
    protected $mode      = CACHE_TYPE_PAGE;
    protected $validCats = [1, 2, 3, 4, 6, 9, 10, 12, 13, 14, 16, 17, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 50, 52, 53];
-    protected $js        = ['filters.js'];
+    protected $js        = [[JS_FILE, 'filters.js']];

    protected $_get      = ['filter' => ['filter' => FILTER_UNSAFE_RAW]];

--- a/pages/spell.php
+++ b/pages/spell.php
@@ -16,7 +16,7 @@ class SpellPage extends GenericPage
    protected $path          = [0, 1];
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
-    protected $js            = ['swfobject.js'];
+    protected $js            = [[JS_FILE, 'swfobject.js']];

    protected $_get          = ['domain' => ['filter' => FILTER_CALLBACK, 'options' => 'GenericPage::checkDomain']];

@@ -130,7 +130,7 @@ class SpellPage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        $_cat = $this->subject->getField('typeCat');

--- a/pages/spells.php
+++ b/pages/spells.php
@@ -15,7 +15,7 @@ class SpellsPage extends GenericPage
    protected $path          = [0, 1];
    protected $tabId         = 0;
    protected $mode          = CACHE_TYPE_PAGE;
-    protected $js            = ['filters.js'];
+    protected $js            = [[JS_FILE, 'filters.js']];

    protected $_get          = ['filter' => ['filter' => FILTER_UNSAFE_RAW]];

--- a/pages/talent.php
+++ b/pages/talent.php
@@ -12,10 +12,10 @@ class TalentPage extends GenericPage
    protected $path          = [1];
    protected $mode          = CACHE_TYPE_NONE;
    protected $gDataKey      = true;
-    protected $js            = ['TalentCalc.js'];
+    protected $js            = [[JS_FILE, 'TalentCalc.js']];
    protected $css           = array(
-        ['path' => 'talentcalc.css'],
-        ['path' => 'talent.css']
+        [CSS_FILE, 'talentcalc.css'],
+        [CSS_FILE, 'talent.css']
    );

    private   $isPetCalc     = false;
@@ -31,12 +31,16 @@ class TalentPage extends GenericPage
    protected function generateContent()
    {
        // add conditional js & css
-        $this->addJS(array(
-           ($this->isPetCalc ? '?data=pet-talents.pets' : '?data=glyphs').'&locale='.User::$localeId.'&t='.$_SESSION['dataKey'],
-            $this->isPetCalc ? 'petcalc.js'   : 'talent.js',
-            $this->isPetCalc ? 'swfobject.js' : null
-        ));
-        $this->addCSS($this->isPetCalc ? ['path' => 'petcalc.css'] : []);
+        $this->addScript(
+            [JS_FILE, ($this->isPetCalc ? '?data=pet-talents.pets' : '?data=glyphs').'&locale='.User::$localeId.'&t='.$_SESSION['dataKey']],
+            [JS_FILE,  $this->isPetCalc ? 'petcalc.js'             : 'talent.js'],
+        );
+
+        if ($this->isPetCalc)
+            $this->addScript(
+                [JS_FILE,  'swfobject.css'],
+                [CSS_FILE, 'petcalc.css']
+            );

        $this->tcType  = $this->isPetCalc ? 'pc' : 'tc';
    }
--- a/pages/user.php
+++ b/pages/user.php
@@ -7,8 +7,8 @@ if (!defined('AOWOW_REVISION'))
 class UserPage extends GenericPage
 {
    protected $tpl      = 'user';
-    protected $js       = ['user.js', 'profile.js'];
-    protected $css      = [['path' => 'Profiler.css']];
+    protected $js       = [[JS_FILE, 'user.js'], [JS_FILE, 'profile.js']];
+    protected $css      = [[CSS_FILE, 'Profiler.css']];
    protected $mode     = CACHE_TYPE_NONE;

    protected $typeId   = 0;
@@ -236,7 +236,7 @@ class UserPage extends GenericPage
        $profiles = new LocalProfileList($conditions);
        if (!$profiles->error)
        {
-            $this->addJS('?data=weight-presets&t='.$_SESSION['dataKey']);
+            $this->addScript([JS_FILE, '?data=weight-presets&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

            // Characters
            if ($chars = $profiles->getListviewData(PROFILEINFO_CHARACTER | PROFILEINFO_USER))
--- a/pages/zone.php
+++ b/pages/zone.php
@@ -14,7 +14,7 @@ class ZonePage extends GenericPage
    protected $tabId     = 0;
    protected $type      = TYPE_ZONE;
    protected $tpl       = 'detail-page-generic';
-    protected $js        = ['ShowOnMap.js'];
+    protected $js        = [[JS_FILE, 'ShowOnMap.js']];

    protected $zoneMusic = [];

@@ -33,7 +33,7 @@ class ZonePage extends GenericPage

    protected function generateContent()
    {
-        $this->addJS('?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']);
+        $this->addScript([JS_FILE, '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey']]);

        /***********/
        /* Infobox */
--- a/pages/zones.php
+++ b/pages/zones.php
@@ -16,7 +16,7 @@ class ZonesPage extends GenericPage
    protected $tabId     = 0;
    protected $mode      = CACHE_TYPE_PAGE;
    protected $validCats = [true, true, [0, 1, 2], [0, 1, 2], false, false, true, false, true, true, true];
-    protected $js        = ['ShowOnMap.js'];
+    protected $js        = [[JS_FILE, 'ShowOnMap.js']];

    public function __construct($pageCall, $pageParam)
    {
--- a/template/bricks/head.tpl.php
+++ b/template/bricks/head.tpl.php
@@ -12,13 +12,11 @@ if (User::isInGroup(U_GROUP_STAFF | U_GROUP_SCREENSHOT | U_GROUP_VIDEO)):
    echo '    <link rel="stylesheet" type="text/css" href="'.STATIC_URL.'/css/staff.css?'.AOWOW_REVISION."\" />\n";
 endif;

-foreach ($this->css as $css):
-    if (!empty($css['string'])):
-        echo '    <style type="text/css">'.$css['string']."</style>\n";
-    elseif (!empty($css['path'])):
-        echo '    '.(!empty($css['ieCond']) ? '<!--[if '.$css['ieCond'].']>' : null) .
-                '<link rel="stylesheet" type="text/css" href="'.STATIC_URL.'/css/'.$css['path'].'?'.AOWOW_REVISION.'" />' .
-                (!empty($css['ieCond']) ? '<![endif]-->' : null)."\n";
+foreach ($this->css as [$type, $css]):
+    if ($type == CSS_FILE):
+        echo '    <link rel="stylesheet" type="text/css" href="'.STATIC_URL.'/css/'.$css.'?'.AOWOW_REVISION."\" />\n";
+    elseif ($type == CSS_STRING):
+        echo '    <style type="text/css">'.$css."</style>\n";
    endif;
 endforeach;
 ?>
@@ -44,9 +42,11 @@ if (User::isInGroup(U_GROUP_STAFF | U_GROUP_SCREENSHOT | U_GROUP_VIDEO)):
    echo '    <script src="'.STATIC_URL.'/js/staff.js?'.AOWOW_REVISION."\" type=\"text/javascript\"></script>\n";
 endif;

-foreach ($this->js as $js):
-    if (!empty($js)):
-        echo '    <script src="'.($js[0] == '?' ? $js.'&' : STATIC_URL.'/js/'.$js.'?').AOWOW_REVISION."\" type=\"text/javascript\"></script>\n";
+foreach ($this->js as [$type, $js]):
+    if ($type == JS_FILE):
+        echo '    <script type="text/javascript" src="'.($js[0] == '?' ? $js.'&' : STATIC_URL.'/js/'.$js.'?').AOWOW_REVISION."\"></script>\n";
+    elseif ($type == JS_STRING):
+        echo '    <script type="text/javascript">'.$js."</script>\n";
    endif;
 endforeach;
 ?>