diff --git a/includes/utilities.php b/includes/utilities.php index 50d72d92..98d25b6d 100644 --- a/includes/utilities.php +++ b/includes/utilities.php @@ -1844,7 +1844,7 @@ abstract class Type $x = []; foreach (self::$data as $k => [$o, , , $f]) if ($o && (!$flags || $flags & $f)) - if (!$attr || self::checkClassAttrib($attr, $attrVal)) + if (!$attr || self::checkClassAttrib($k, $attr, $attrVal)) $x[$k] = $o; return $x; diff --git a/pages/admin.php b/pages/admin.php index 6ea4d02b..70b3b0c3 100644 --- a/pages/admin.php +++ b/pages/admin.php @@ -16,7 +16,7 @@ class AdminPage extends GenericPage 'all' => ['filter' => FILTER_UNSAFE_RAW], 'type' => ['filter' => FILTER_CALLBACK, 'options' => 'GenericPage::checkInt'], 'typeid' => ['filter' => FILTER_CALLBACK, 'options' => 'GenericPage::checkInt'], - 'user' => ['filter' => FILTER_CALLBACK, 'options' => 'urldecode'], + 'user' => ['filter' => FILTER_CALLBACK, 'options' => 'urldecode'] ); private $generator = ''; @@ -88,7 +88,7 @@ class AdminPage extends GenericPage [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; }'], + [CSS_STRING, '.grid .status { position:absolute; right:5px; }'] ); $head = ''; @@ -198,7 +198,7 @@ class AdminPage extends GenericPage $this->addScript( [JS_FILE, 'screenshot.js'], [CSS_STRING, '.layout {margin: 0px 25px; max-width: inherit; min-width: 1200px; }'], - [CSS_STRING, '#highlightedRow { background-color: #322C1C; }'], + [CSS_STRING, '#highlightedRow { background-color: #322C1C; }'] ); $ssGetAll = $this->_get['all']; @@ -235,7 +235,7 @@ class AdminPage extends GenericPage { $this->addScript( [JS_FILE, 'filters.js'], - [CSS_STRING, '.wt-edit {display:inline-block; vertical-align:top; width:350px;}'], + [CSS_STRING, '.wt-edit {display:inline-block; vertical-align:top; width:350px;}'] ); $head = $body = ''; diff --git a/pages/guides.php b/pages/guides.php index 0e039c14..44451737 100644 --- a/pages/guides.php +++ b/pages/guides.php @@ -10,7 +10,7 @@ class GuidesPage extends GenericPage { use TrListPage; - protected $type = Type::Guide; + protected $type = Type::GUIDE; protected $tpl = 'list-page-generic'; protected $path = [6]; protected $tabId = 6; diff --git a/pages/talent.php b/pages/talent.php index 79df675a..8ebe3b9f 100644 --- a/pages/talent.php +++ b/pages/talent.php @@ -33,7 +33,7 @@ class TalentPage extends GenericPage // add conditional js & 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'], + [JS_FILE, $this->isPetCalc ? 'petcalc.js' : 'talent.js'] ); if ($this->isPetCalc) diff --git a/setup/db_structure.sql b/setup/db_structure.sql index 26b984fb..daaa37f2 100644 --- a/setup/db_structure.sql +++ b/setup/db_structure.sql @@ -3184,7 +3184,7 @@ UNLOCK TABLES; LOCK TABLES `aowow_dbversion` WRITE; /*!40000 ALTER TABLE `aowow_dbversion` DISABLE KEYS */; -INSERT INTO `aowow_dbversion` VALUES (1645476215,0,NULL,NULL); +INSERT INTO `aowow_dbversion` VALUES (1647956310,0,NULL,NULL); /*!40000 ALTER TABLE `aowow_dbversion` ENABLE KEYS */; UNLOCK TABLES; diff --git a/static/js/locale_dede.js b/static/js/locale_dede.js index 71a7d4c2..5280c9cc 100644 --- a/static/js/locale_dede.js +++ b/static/js/locale_dede.js @@ -960,18 +960,7 @@ var mn_guides = [ [1, "Klassen", '?guides=1'], [4, "Neue Spieler & Stufenfortschritt", '?guides=4'], [5, "Schlachtzüge & Bosskämpfe", '?guides=5'], - [3, "Weltereignisse", '?guides=3', [ - [, "Aowow Leitfäden"], - ["lunar-festival","Mondfest","?guide=lunar-festival"], - ["love-is-in-the-air","Liebe liegt in der Luft","?guide=love-is-in-the-air"], - ["noblegarden","Nobelgartenfest","?guide=noblegarden"], - ["childrens-week","Kinderwoche","?guide=childrens-week"], - ["midsummer-fire-festival","Sonnenwendfest","?guide=midsummer-fire-festival"], - ["brewfest","Braufest","?guide=brewfest"], - ["hallows-end","Schlotternächte","?guide=hallows-end"], - ["pilgrims-bounty","Pilgerfreudenfest","?guide=pilgrims-bounty"], - ["winter-veil","Winterhauchfest","?guide=winter-veil"] - ]], + [3, "Weltereignisse", '?guides=3'], [6, "Wirtschaft & Währung", '?guides=6'], [9, "Anderes", '?guides=9'] ]; diff --git a/static/js/locale_enus.js b/static/js/locale_enus.js index aa320f56..7927e634 100644 --- a/static/js/locale_enus.js +++ b/static/js/locale_enus.js @@ -1007,18 +1007,7 @@ var mn_guides = [ [2, "Professions", '?guides=2'], [5, "Raid & Boss Fights", '?guides=5'], [8, "Vanity Items, Pets & Mounts", '?guides=8'], - [3, "World Events", '?guides=3', [ - [,"Aowow Guides"], - ["lunar-festival","Lunar Festival","?guide=lunar-festival"], - ["love-is-in-the-air","Love is in the Air","?guide=love-is-in-the-air"], - ["noblegarden","Noblegarden","?guide=noblegarden"], - ["childrens-week","Childrens Week","?guide=childrens-week"], - ["midsummer-fire-festival","Midsummer Fire Festival","?guide=midsummer-fire-festival"], - ["brewfest","Brewfest","?guide=brewfest"], - ["hallows-end","Hallow's End","?guide=hallows-end"], - ["pilgrims-bounty","Pilgrim's Bounty","?guide=pilgrims-bounty"], - ["winter-veil","Feast of Winter Veil","?guide=winter-veil"] - ]], + [3, "World Events", '?guides=3'], [9, "Other", '?guides=9'] ]; diff --git a/static/js/locale_eses.js b/static/js/locale_eses.js index b1dc0ec6..0cb9de05 100644 --- a/static/js/locale_eses.js +++ b/static/js/locale_eses.js @@ -957,18 +957,7 @@ var mn_guides = [ [1, "Clases", '?guides=1'], [5, "Combates de Bandas y Jefes", '?guides=5'], [6, "Economía y Dinero", '?guides=6'], - [3, "Eventos del mundo", '?guides=3', [ - [,"Aowow Guías"], - ["lunar-festival","Festival Lunar","?guide=lunar-festival"], - ["love-is-in-the-air","Amor en el aire","?guide=love-is-in-the-air"], - ["noblegarden","Jardín Noble","?guide=noblegarden"], - ["childrens-week","Los Niños","?guide=childrens-week"], - ["midsummer-fire-festival","Festival de Fuego del Solsticio de Verano","?guide=midsummer-fire-festival"], - ["brewfest","El festín del Festival de Invierno","?guide=brewfest"], - ["hallows-end","Halloween","?guide=hallows-end"], - ["pilgrims-bounty","Generosidad","?guide=pilgrims-bounty"], - ["winter-veil","Festival de Invierno","?guide=winter-veil"] - ]], + [3, "Eventos del mundo", '?guides=3'], [7, "Logros", '?guides=7'], [4, "Nuevos Jugadores y Leveling", '?guides=4'], [8, "Objetos de vanidad, Mascotas y Monturas", '?guides=8'], diff --git a/static/js/locale_frfr.js b/static/js/locale_frfr.js index c72ff2de..607fcfcd 100644 --- a/static/js/locale_frfr.js +++ b/static/js/locale_frfr.js @@ -956,18 +956,7 @@ var mn_database = [ var mn_guides = [ [1, "Classes", '?guides=1'], [6, "Economie et Argent", '?guides=6'], - [3, "Évènements mondiaux", '?guides=3', [ - [,"Aowow Guides"], - ["lunar-festival","Fête lunaire","?guide=lunar-festival"], - ["love-is-in-the-air","De l'amour dans l'air","?guide=love-is-in-the-air"], - ["noblegarden","Jardin des nobles","?guide=noblegarden"], - ["childrens-week","Semaine des enfants","?guide=childrens-week"], - ["midsummer-fire-festival","Fête du Feu du solstice d'été","?guide=midsummer-fire-festival"], - ["brewfest","Voile d'hiver","?guide=brewfest"], - ["hallows-end","Sanssaint","?guide=hallows-end"], - ["pilgrims-bounty","Bienfaits du pèlerin","?guide=pilgrims-bounty"], - ["winter-veil","Voile d'hiver","?guide=winter-veil"] - ]], + [3, "Évènements mondiaux", '?guides=3'], [7, "Hauts faits", '?guides=7'], [4, "Nouveaux Joueurs & Montée en niveau", '?guides=4'], [2, "Métiers", '?guides=2'], diff --git a/static/js/locale_ruru.js b/static/js/locale_ruru.js index 720a29fd..6d9b3d77 100644 --- a/static/js/locale_ruru.js +++ b/static/js/locale_ruru.js @@ -961,18 +961,7 @@ var mn_guides = [ [2, "Профессии", '?guides=2'], [5, "Подземелья и рейды", '?guides=5'], [8, "Забавные предметы", '?guides=8'], - [3, "Игровые события", '?guides=3', [ - [,"Aowow Гайды"], - ["lunar-festival","Лунный фестиваль","?guide=lunar-festival"], - ["love-is-in-the-air","Любовная лихорадка","?guide=love-is-in-the-air"], - ["noblegarden","Сад чудес","?guide=noblegarden"], - ["childrens-week","Детская неделя","?guide=childrens-week"], - ["winter-veil","Зимний Покров","?guide=winter-veil"], - ["hallows-end","Тыквовин","?guide=hallows-end"], - ["midsummer-fire-festival","Огненный солнцеворот","?guide=midsummer-fire-festival"], - ["winter-veil","Зимний Покров","?guide=winter-veil"], - ["pilgrims-bounty","Пиршество странников","?guide=pilgrims-bounty"] - ]], + [3, "Игровые события", '?guides=3'], [9, "Разное", '?guides=9'] ]; diff --git a/static/js/locale_zhcn.js b/static/js/locale_zhcn.js index fb8a67c7..a0b02959 100644 --- a/static/js/locale_zhcn.js +++ b/static/js/locale_zhcn.js @@ -1007,18 +1007,7 @@ var mn_guides = [ [2, "专业", '?guides=2'], [5, "地下城与团队副本", '?guides=5'], [8, "华丽收藏", '?guides=8'], - [3, "世界事件", '?guides=3', [ - [,"Aowow 指南"], - ["lunar-festival","春节","?guide=lunar-festival"], - ["love-is-in-the-air","情人节","?guide=love-is-in-the-air"], - ["noblegarden","复活节","?guide=noblegarden"], - ["childrens-week","儿童周","?guide=childrens-week"], - ["midsummer-fire-festival","仲夏火焰节","?guide=midsummer-fire-festival"], - ["brewfest","美酒节","?guide=brewfest"], - ["hallows-end","万圣节","?guide=hallows-end"], - ["pilgrims-bounty","感恩节","?guide=pilgrims-bounty"], - ["winter-veil","冬幕节","?guide=winter-veil"] - ]], + [3, "世界事件", '?guides=3'], [9, "杂项", '?guides=9'] ];
KeyValueOptions