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/Fixups

Browse Source 
* added forgotten mapper strings for esES, ruRU, frFR
 * readded default name for screenshots and videos tab
 * fixed referencing not set $id in opensearch (wich now displays icons once again)
 * fixed referencing a long removed variable in admin=screenshots, preventing delete operations
This commit is contained in:
Sarjuuk
2016-03-23 22:10:28 +01:00
parent 44c90b71fa
commit c75777e5c3
6 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ class AjaxAdmin extends AjaxHandler
protected $_post = array(
'alt' => [FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW],
'id' => [FILTER_SANITIZE_NUMBER_INT, null],
'scale' => [FILTER_CALLBACK, ['options' => 'AjaxAccount::checkScale']],
'scale' => [FILTER_CALLBACK, ['options' => 'AjaxAdmin::checkScale']],
'__icon' => [FILTER_CALLBACK, ['options' => 'AjaxAdmin::checkKey']],
);
@@ -237,7 +237,7 @@ class AjaxAdmin extends AjaxHandler
}
// flag as deleted if not aready
DB::Aowow()->query('UPDATE ?_screenshots SET status = ?d, userIdDelete = ?d WHERE id IN (?a)', CC_FLAG_DELETED, User::$id, $ids);
DB::Aowow()->query('UPDATE ?_screenshots SET status = ?d, userIdDelete = ?d WHERE id IN (?a)', CC_FLAG_DELETED, User::$id, $this->_get['id']);
return '';
}

2
localization/locale_eses.php
View File

@@ -413,6 +413,7 @@ $lang = array(
'trap' => "Trampa",
'triggeredBy' => "Accionado por",
'capturePoint' => "Punto de captura",
'foundIn' => "Este entidad se puede encontrar en",
'restock' => "[Restocks every %s.]"
),
'npc' => array(
@@ -435,6 +436,7 @@ $lang = array(
'melee' => "Cuerpo a cuerpo",
'ranged' => "Ataque a distancia",
'armor' => "Armadura",
'foundIn' => "Este PNJ se puede encontrar en",
'tameable' => "Domesticable (%s)",
'waypoint' => "punto de recorrido",
'wait' => "Tiempo de espera",

2
localization/locale_frfr.php
View File

@@ -412,6 +412,7 @@ $lang = array(
'trap' => "Piège",
'triggeredBy' => "Déclenché par",
'capturePoint' => "Point de capture",
'foundIn' => "Cette entité se trouve dans",
'restock' => "Se remplit toutes les %s.]"
),
'npc' => array(
@@ -434,6 +435,7 @@ $lang = array(
'melee' => "de mêlée",
'ranged' => "à distance",
'armor' => "Armure",
'foundIn' => "Ce PNJ se trouve dans",
'tameable' => "Domptable (%s)",
'waypoint' => "Point de route",
'wait' => "Période d'attente",

2
localization/locale_ruru.php
View File

@@ -412,6 +412,7 @@ $lang = array(
'trap' => "Ловушки",
'triggeredBy' => "Срабатывает от",
'capturePoint' => "Точка захвата",
'foundIn' => "Этот НИП может быть найден в следующих зонах:",
'restock' => "[Restocks every %s.]"
),
'npc' => array(
@@ -434,6 +435,7 @@ $lang = array(
'melee' => "Ближнего боя",
'ranged' => "Дальнего боя",
'armor' => "Броня",
'foundIn' => "Этот объект может быть найден в следующих зонах:",
'tameable' => "Можно приручить (%s)",
'waypoint' => "Путевой точки",
'wait' => "Период ожидания",

4
pages/genericPage.class.php
View File

@@ -125,11 +125,11 @@ class GenericPage
'race' => ['template' => 'race', 'id' => 'races', 'parent' => 'lv-generic', 'data' => [], 'name' => '$LANG.tab_races' ],
'replypreview' => ['template' => 'replypreview', 'id' => 'comment-replies', 'parent' => 'lv-generic', 'data' => [], 'name' => '$LANG.tab_commentreplies'],
'reputationhistory' => ['template' => 'reputationhistory', 'id' => 'reputation', 'parent' => 'lv-generic', 'data' => [], 'name' => '$LANG.tab_reputation' ],
'screenshot' => ['template' => 'screenshot', 'id' => 'screenshots', 'parent' => 'lv-generic', 'data' => [] ],
'screenshot' => ['template' => 'screenshot', 'id' => 'screenshots', 'parent' => 'lv-generic', 'data' => [], 'name' => '$LANG.tab_screenshots' ],
'skill' => ['template' => 'skill', 'id' => 'skills', 'parent' => 'lv-generic', 'data' => [], 'name' => '$LANG.tab_skills' ],
'spell' => ['template' => 'spell', 'id' => 'spells', 'parent' => 'lv-generic', 'data' => [], 'name' => '$LANG.tab_spells' ],
'title' => ['template' => 'title', 'id' => 'titles', 'parent' => 'lv-generic', 'data' => [], 'name' => '$LANG.tab_titles' ],
'video' => ['template' => 'video', 'id' => 'videos', 'parent' => 'lv-generic', 'data' => [], ],
'video' => ['template' => 'video', 'id' => 'videos', 'parent' => 'lv-generic', 'data' => [], 'name' => '$LANG.tab_videos' ],
'zone' => ['template' => 'zone', 'id' => 'zones', 'parent' => 'lv-generic', 'data' => [], 'name' => '$LANG.tab_zones' ]
);

22
pages/search.php
View File

@@ -706,7 +706,7 @@ class SearchPage extends GenericPage
if ($this->searchMask & SEARCH_TYPE_OPEN)
{
foreach ($talents->iterate() as $__)
foreach ($talents->iterate() as $id => $__)
{
$osInfo[3][$id] = strToLower($talents->getField('iconString'));
$osInfo[4][$id] = $talents->ranks[$talents->id];
@@ -752,7 +752,7 @@ class SearchPage extends GenericPage
);
if ($this->searchMask & SEARCH_TYPE_OPEN)
foreach ($glyphs->iterate() as $__)
foreach ($glyphs->iterate() as $id => $__)
$osInfo[3][$id] = strToLower($glyphs->getField('iconString'));
if ($glyphs->getMatches() > $this->maxResults)
@@ -794,7 +794,7 @@ class SearchPage extends GenericPage
);
if ($this->searchMask & SEARCH_TYPE_OPEN)
foreach ($prof->iterate() as $__)
foreach ($prof->iterate() as $id => $__)
$osInfo[3][$id] = strToLower($prof->getField('iconString'));
if ($prof->getMatches() > $this->maxResults)
@@ -836,7 +836,7 @@ class SearchPage extends GenericPage
);
if ($this->searchMask & SEARCH_TYPE_OPEN)
foreach ($prof->iterate() as $__)
foreach ($prof->iterate() as $id => $__)
$osInfo[3][$id] = strToLower($prof->getField('iconString'));
if ($prof->getMatches() > $this->maxResults)
@@ -878,7 +878,7 @@ class SearchPage extends GenericPage
);
if ($this->searchMask & SEARCH_TYPE_OPEN)
foreach ($vPets->iterate() as $__)
foreach ($vPets->iterate() as $id => $__)
$osInfo[3][$id] = strToLower($vPets->getField('iconString'));
if ($vPets->getMatches() > $this->maxResults)
@@ -919,7 +919,7 @@ class SearchPage extends GenericPage
);
if ($this->searchMask & SEARCH_TYPE_OPEN)
foreach ($mounts->iterate() as $__)
foreach ($mounts->iterate() as $id => $__)
$osInfo[3][$id] = strToLower($mounts->getField('iconString'));
if ($mounts->getMatches() > $this->maxResults)
@@ -1027,7 +1027,7 @@ class SearchPage extends GenericPage
);
if ($this->searchMask & SEARCH_TYPE_OPEN)
foreach ($acvs->iterate() as $__)
foreach ($acvs->iterate() as $id => $__)
$osInfo[3][$id] = strToLower($acvs->getField('iconString'));
if ($acvs->getMatches() > $this->maxResults)
@@ -1175,7 +1175,7 @@ class SearchPage extends GenericPage
if ($this->searchMask & SEARCH_TYPE_OPEN)
foreach ($skills->iterate() as $id => $__)
$osInf[3][$id] = $skills->getField('iconString');
$osInfo[3][$id] = $skills->getField('iconString');
if ($skills->getMatches() > $this->maxResults)
{
@@ -1203,7 +1203,7 @@ class SearchPage extends GenericPage
);
if ($this->searchMask & SEARCH_TYPE_OPEN)
foreach ($pets->iterate() as $__)
foreach ($pets->iterate() as $id => $__)
$osInfo[3][$id] = $pets->getField('iconString');
if ($pets->getMatches() > $this->maxResults)
@@ -1241,7 +1241,7 @@ class SearchPage extends GenericPage
);
if ($this->searchMask & SEARCH_TYPE_OPEN)
foreach ($npcAbilities->iterate() as $__)
foreach ($npcAbilities->iterate() as $id => $__)
$osInfo[3][$id] = strToLower($npcAbilities->getField('iconString'));
if ($npcAbilities->getMatches() > $this->maxResults)
@@ -1287,7 +1287,7 @@ class SearchPage extends GenericPage
);
if ($this->searchMask & SEARCH_TYPE_OPEN)
foreach ($misc->iterate() as $__)
foreach ($misc->iterate() as $id => $__)
$osInfo[3][$id] = strToLower($misc->getField('iconString'));
if ($misc->getMatches() > $this->maxResults)