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

Misc/Fixup

Browse Source 
* obligatory after-the-fact fixups
This commit is contained in:
Sarjuuk
2022-03-22 16:25:36 +01:00
parent d819bf60f5
commit 7caabc0fa8
11 changed files with 14 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/utilities.php
View File

@@ -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;

8
pages/admin.php
View File

@@ -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 = '<table class="grid"><tr><th><b>Key</b></th><th><b>Value</b></th><th style="width:150px;"><b>Options</b></th></tr>';
@@ -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 = '';

2
pages/guides.php
View File

@@ -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;

2
pages/talent.php
View File

@@ -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)

2
setup/db_structure.sql
View File

@@ -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;

13
static/js/locale_dede.js
View File

@@ -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']
];

13
static/js/locale_enus.js
View File

@@ -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']
];

13
static/js/locale_eses.js
View File

@@ -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'],

13
static/js/locale_frfr.js
View File

@@ -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'],

13
static/js/locale_ruru.js
View File

@@ -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']
];

13
static/js/locale_zhcn.js
View File

@@ -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']
];