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

implemented Itemset detail page

Browse Source 
- while the code and strings are there, no rules have been set concerning availability

User:
 - HTTP_ACCEPT_LANGUAGE may not be set.

Compare:
 - removed some relic code, that, once uppon a time, was used to link virtual item sets with real item sets or something..

Titles:
 - fixed a few forgotten changes

Lang:
 - hide DND-entries for locks

BaseType:
 - improved getField to automaticaly cast numerics to float
 - improved __construct to check for numeric instead of int
This commit is contained in:
Sarjuuk
2013-06-23 21:36:39 +02:00
parent 88bfae9c0a
commit 3d66eacb90
16 changed files with 515 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
includes/utilities.php
View File

@@ -117,7 +117,7 @@ abstract class BaseType
$op = (isset($c[2]) && $c[2] == '!') ? 'NOT LIKE' : 'LIKE';
$val = '"%'.$val.'%"';
}
else if (is_int($c[1]))
else if (is_numeric($c[1]))
{
$op = (isset($c[2]) && $c[2] == '!') ? '<>' : '=';
$val = Util::sqlEscape($c[1]);
@@ -203,10 +203,11 @@ abstract class BaseType
if (!$this->curTpl || (!$localized && !isset($this->curTpl[$field])))
return '';
if (!$localized)
return $this->curTpl[$field];
else
if ($localized)
return Util::localizedString($this->curTpl, $field);
$value = $this->curTpl[$field];
return is_numeric($value) ? floatVal($value) : $value;
}
public function getMatches()
@@ -307,6 +308,7 @@ trait listviewHelper
}
class Lang
{
public static $main;
@@ -324,6 +326,7 @@ class Lang
public static $maps;
public static $npc;
public static $pet;
public static $quest;
public static $spell;
public static $talent;
public static $title;
@@ -365,7 +368,7 @@ class Lang
$rnk = $lock['requiredskill'.$i];
$name = '';
if ($lock['type'.$i] == 1) // opened by item
if ($lock['type'.$i] == 1) // opened by item
{
$name = ItemList::getName($prop);
if (!$name)
@@ -374,8 +377,11 @@ class Lang
if ($interactive)
$name = '<a class="q1" href="?item='.$prop.'">'.$name.'</a>';
}
else if ($lock['type'.$i] == 2) // opened by skill
else if ($lock['type'.$i] == 2) // opened by skill
{
if (in_array($prop, [6, 7, 15, 19])) // dnd stuff
continue;
$txt = DB::Aowow()->selectRow('SELECT * FROM ?_locktype WHERE id = ?d', $prop); // todo (low): convert to static text
$name = Util::localizedString($txts, 'name');
if (!$name)
@@ -385,7 +391,7 @@ class Lang
$name .= ' ('.$rnk.')';
}
$locks[] = sprintf(Lang::$game['requires'], $n);
$locks[$lock['type'.$i] == 1 ? $i : -$i] = sprintf(Lang::$game['requires'], $name);
}
return $locks;
@@ -479,9 +485,6 @@ class Lang
if ($classMask == CLASS_MASK_ALL) // available to all classes
return false;
if (!$classMask) // no restrictions left
return false;
$tmp = [];
$i = 1;
@@ -505,9 +508,6 @@ class Lang
if ($raceMask == RACE_MASK_ALL) // available to all races (we don't display 'both factions')
return false;
if (!$raceMask) // no restrictions left (we don't display 'both factions')
return false;
$tmp = [];
$side = 0;
$i = 1;