yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-12-01 21:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Misc/Formating

Browse Source 
* removed excess ;
This commit is contained in:
Sarjuuk
2024-03-16 16:38:02 +01:00
parent c01c9ce901
commit 676a7ef24e
16 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/types/quest.class.php
View File

@@ -656,7 +656,7 @@ class QuestListFilter extends Filter
if ($cr[1]) if ($cr[1])
return ['AND', ['zoneOrSort', 0, '>'], [['flags', QUEST_FLAG_DAILY | QUEST_FLAG_WEEKLY | QUEST_FLAG_REPEATABLE , '&'], 0], [['specialFlags', QUEST_FLAG_SPECIAL_REPEATABLE | QUEST_FLAG_SPECIAL_MONTHLY , '&'], 0]]; return ['AND', ['zoneOrSort', 0, '>'], [['flags', QUEST_FLAG_DAILY | QUEST_FLAG_WEEKLY | QUEST_FLAG_REPEATABLE , '&'], 0], [['specialFlags', QUEST_FLAG_SPECIAL_REPEATABLE | QUEST_FLAG_SPECIAL_MONTHLY , '&'], 0]];
else else
return ['OR', ['zoneOrSort', 0, '<'], ['flags', QUEST_FLAG_DAILY | QUEST_FLAG_WEEKLY | QUEST_FLAG_REPEATABLE , '&'], ['specialFlags', QUEST_FLAG_SPECIAL_REPEATABLE | QUEST_FLAG_SPECIAL_MONTHLY , '&']];; return ['OR', ['zoneOrSort', 0, '<'], ['flags', QUEST_FLAG_DAILY | QUEST_FLAG_WEEKLY | QUEST_FLAG_REPEATABLE , '&'], ['specialFlags', QUEST_FLAG_SPECIAL_REPEATABLE | QUEST_FLAG_SPECIAL_MONTHLY , '&']];
} }
protected function cbSpellRewards($cr) protected function cbSpellRewards($cr)

2
pages/areatriggers.php
View File

@@ -23,7 +23,7 @@ class AreaTriggersPage extends GenericPage
public function __construct($pageCall, $pageParam) public function __construct($pageCall, $pageParam)
{ {
$this->getCategoryFromUrl($pageParam);; $this->getCategoryFromUrl($pageParam);
if (isset($this->category[0])) if (isset($this->category[0]))
header('Location: ?areatriggers&filter=ty='.$this->category[0], true, 302); header('Location: ?areatriggers&filter=ty='.$this->category[0], true, 302);

2
pages/enchantments.php
View File

@@ -21,7 +21,7 @@ class EnchantmentsPage extends GenericPage
public function __construct($pageCall, $pageParam) public function __construct($pageCall, $pageParam)
{ {
$this->getCategoryFromUrl($pageParam);; $this->getCategoryFromUrl($pageParam);
$this->filterObj = new EnchantmentListFilter(false, ['parentCats' => $this->category]); $this->filterObj = new EnchantmentListFilter(false, ['parentCats' => $this->category]);
parent::__construct($pageCall, $pageParam); parent::__construct($pageCall, $pageParam);

2
pages/events.php
View File

@@ -21,7 +21,7 @@ class EventsPage extends GenericPage
public function __construct($pageCall, $pageParam) public function __construct($pageCall, $pageParam)
{ {
$this->getCategoryFromUrl($pageParam);; $this->getCategoryFromUrl($pageParam);
parent::__construct($pageCall, $pageParam); parent::__construct($pageCall, $pageParam);

2
pages/factions.php
View File

@@ -24,7 +24,7 @@ class FactionsPage extends GenericPage
public function __construct($pageCall, $pageParam) public function __construct($pageCall, $pageParam)
{ {
$this->getCategoryFromUrl($pageParam);; $this->getCategoryFromUrl($pageParam);
parent::__construct($pageCall, $pageParam); parent::__construct($pageCall, $pageParam);

2
pages/genericPage.class.php
View File

@@ -1126,7 +1126,7 @@ class GenericPage
return true; return true;
} }
return false;; return false;
} }
private function memcached() : Memcached private function memcached() : Memcached

2
pages/npcs.php
View File

@@ -24,7 +24,7 @@ class NpcsPage extends GenericPage
public function __construct($pageCall, $pageParam) public function __construct($pageCall, $pageParam)
{ {
$this->getCategoryFromUrl($pageParam);; $this->getCategoryFromUrl($pageParam);
$this->filterObj = new CreatureListFilter(false, ['parentCats' => $this->category]); $this->filterObj = new CreatureListFilter(false, ['parentCats' => $this->category]);
parent::__construct($pageCall, $pageParam); parent::__construct($pageCall, $pageParam);

2
pages/pets.php
View File

@@ -19,7 +19,7 @@ class PetsPage extends GenericPage
public function __construct($pageCall, $pageParam) public function __construct($pageCall, $pageParam)
{ {
$this->getCategoryFromUrl($pageParam);; $this->getCategoryFromUrl($pageParam);
parent::__construct($pageCall, $pageParam); parent::__construct($pageCall, $pageParam);

2
pages/skills.php
View File

@@ -19,7 +19,7 @@ class SkillsPage extends GenericPage
public function __construct($pageCall, $pageParam) public function __construct($pageCall, $pageParam)
{ {
$this->getCategoryFromUrl($pageParam);; $this->getCategoryFromUrl($pageParam);
parent::__construct($pageCall, $pageParam); parent::__construct($pageCall, $pageParam);

2
pages/sounds.php
View File

@@ -22,7 +22,7 @@ class SoundsPage extends GenericPage
public function __construct($pageCall, $pageParam) public function __construct($pageCall, $pageParam)
{ {
$this->getCategoryFromUrl($pageParam);; $this->getCategoryFromUrl($pageParam);
if (isset($this->category[0])) if (isset($this->category[0]))
header('Location: ?sounds&filter=ty='.$this->category[0], true, 302); header('Location: ?sounds&filter=ty='.$this->category[0], true, 302);

10
pages/spell.php
View File

@@ -1761,7 +1761,7 @@ class SpellPage extends GenericPage
if ($_ = QuestList::getName($effMV)) if ($_ = QuestList::getName($effMV))
$foo['name'] .= '(<a href="?quest='.$effMV.'">'.$_.'</a>)'; $foo['name'] .= '(<a href="?quest='.$effMV.'">'.$_.'</a>)';
else else
$foo['name'] .= Util::ucFirst(Lang::game('quest')).' #'.$effMV;; $foo['name'] .= Util::ucFirst(Lang::game('quest')).' #'.$effMV;
break; break;
case SPELL_EFFECT_SUMMON: case SPELL_EFFECT_SUMMON:
case SPELL_EFFECT_SUMMON_PET: case SPELL_EFFECT_SUMMON_PET:
@@ -1845,7 +1845,7 @@ class SpellPage extends GenericPage
$foo['name'] .= Util::ucFirst(Lang::game('spell')).' #'.$effMV; $foo['name'] .= Util::ucFirst(Lang::game('spell')).' #'.$effMV;
} }
else else
$foo['name'] .= ' #'.$effMV;; $foo['name'] .= ' #'.$effMV;
break; break;
case SPELL_EFFECT_SKINNING: case SPELL_EFFECT_SKINNING:
switch ($effMV) switch ($effMV)
@@ -1877,7 +1877,7 @@ class SpellPage extends GenericPage
if ($_ = SkillList::getName($effMV)) if ($_ = SkillList::getName($effMV))
$foo['name'] .= '(<a href="?skill='.$effMV.'">'.$_.'</a>)'; $foo['name'] .= '(<a href="?skill='.$effMV.'">'.$_.'</a>)';
else else
$foo['name'] .= Util::ucFirst(Lang::game('skill')).' #'.$effMV;; $foo['name'] .= Util::ucFirst(Lang::game('skill')).' #'.$effMV;
break; break;
case SPELL_EFFECT_ACTIVATE_RUNE: case SPELL_EFFECT_ACTIVATE_RUNE:
$_ = Lang::spell('powerRunes', $effMV); $_ = Lang::spell('powerRunes', $effMV);
@@ -2105,7 +2105,7 @@ class SpellPage extends GenericPage
if ($n = SkillList::getName($effMV)) if ($n = SkillList::getName($effMV))
$bar = ' (<a href="?skill='.$effMV.'">'.$n.'</a>)'; $bar = ' (<a href="?skill='.$effMV.'">'.$n.'</a>)';
else else
$bar = Lang::main('colon').Util::ucFirst(Lang::game('skill')).' #'.$effMV;; $bar = Lang::main('colon').Util::ucFirst(Lang::game('skill')).' #'.$effMV;
break; break;
case SPELL_AURA_ADD_FLAT_MODIFIER: case SPELL_AURA_ADD_FLAT_MODIFIER:
@@ -2164,7 +2164,7 @@ class SpellPage extends GenericPage
$bar = $transform['typeId'] ? ' (<a href="?npc='.$transform['typeId'].'">'.$transform['displayName'].'</a>)' : ' (#0)'; $bar = $transform['typeId'] ? ' (<a href="?npc='.$transform['typeId'].'">'.$transform['displayName'].'</a>)' : ' (#0)';
} }
else else
$bar = Lang::main('colon').Lang::game('npc').' #'.$effMV;; $bar = Lang::main('colon').Lang::game('npc').' #'.$effMV;
break; break;
case SPELL_AURA_FORCE_REACTION: case SPELL_AURA_FORCE_REACTION:

2
pages/spells.php
View File

@@ -91,7 +91,7 @@ class SpellsPage extends GenericPage
public function __construct($pageCall, $pageParam) public function __construct($pageCall, $pageParam)
{ {
$this->getCategoryFromUrl($pageParam);; $this->getCategoryFromUrl($pageParam);
$this->filterObj = new SpellListFilter(false, ['parentCats' => $this->category]); $this->filterObj = new SpellListFilter(false, ['parentCats' => $this->category]);
parent::__construct($pageCall, $pageParam); parent::__construct($pageCall, $pageParam);

2
pages/titles.php
View File

@@ -19,7 +19,7 @@ class TitlesPage extends GenericPage
public function __construct($pageCall, $pageParam) public function __construct($pageCall, $pageParam)
{ {
$this->getCategoryFromUrl($pageParam);; $this->getCategoryFromUrl($pageParam);
parent::__construct($pageCall, $pageParam); parent::__construct($pageCall, $pageParam);

2
pages/zones.php
View File

@@ -22,7 +22,7 @@ class ZonesPage extends GenericPage
public function __construct($pageCall, $pageParam) public function __construct($pageCall, $pageParam)
{ {
$this->getCategoryFromUrl($pageParam);; $this->getCategoryFromUrl($pageParam);
parent::__construct($pageCall, $pageParam); parent::__construct($pageCall, $pageParam);

2
setup/tools/filegen/templates/searchbox.js.in
View File

@@ -1,6 +1,6 @@
(function () { (function () {
function create(w, h) { function create(w, h) {
var body = 'STATIC_URL/widgets/searchbox/searchbox.html';; var body = 'STATIC_URL/widgets/searchbox/searchbox.html';
var buff = '<iframe src="' + body + '" width="' + w + '" height="' + h + '" frameborder="0" class="aowow-searchbox"'; var buff = '<iframe src="' + body + '" width="' + w + '" height="' + h + '" frameborder="0" class="aowow-searchbox"';
buff += "></iframe>"; buff += "></iframe>";

4
static/js/global.js
View File

@@ -23672,7 +23672,7 @@ var ConditionList = new function() {
else if (i > 0) else if (i > 0)
buff += ', '; buff += ', ';
buff += $WH.sprintf(tpl, arr[i], src[arr[i]]);; buff += $WH.sprintf(tpl, arr[i], src[arr[i]]);
} }
return buff; return buff;
@@ -23688,7 +23688,7 @@ var ConditionList = new function() {
if (strIdx == 22 || strIdx == 23) if (strIdx == 22 || strIdx == 23)
strIdx = 4; strIdx = 4;
else if (strIdx == 16 || strIdx == 30 || strIdx == 32) else if (strIdx == 16 || strIdx == 30 || strIdx == 32)
strIdx--;; strIdx--;
if (!g_conditions[strIdx]) if (!g_conditions[strIdx])
return 'unknown condition index ' + strIdx; return 'unknown condition index ' + strIdx;