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

Screenshots:

Browse Source 
fixed sql-error in manager
Comments:
  no longer appear as upvoted for anonymous user
  can be voted on, again
Class detail page:
  removed default limit on class ability query (300). now shows all spells
Filter/Items:
  added missing table-prefix; fixed search for iconString
Spells/Search:
  display triggered player abilities as misc. spells. (previously hidden)
Misc:
  removed some obscure piece of old config
This commit is contained in:
Sarjuuk
2015-07-01 14:06:58 +02:00
parent 7673e256c8
commit a3c9b52073
7 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/ajaxHandler.class.php
View File

@@ -408,7 +408,7 @@ class AjaxHandler
$result = ['success' => 1, 'up' => 0, 'down' => 0];
break;
case 'vote': // up, down and remove
if (!User::$id || !$this->get('id') || $this->get('rating'))
if (!User::$id || !$this->get('id') || !$this->get('rating'))
{
$result = ['error' => 1, 'message' => Lang::main('genericError')];
break;

6
includes/community.class.php
View File

@@ -29,8 +29,8 @@ class CommunityContent
a3.displayName AS deleteUser,
a4.displayName AS responseUser,
IFNULL(SUM(cr.value), 0) AS rating,
SUM(IF (cr.userId = ?d, value, 0)) AS userRating,
SUM(IF (r.userId = ?d, 1, 0)) AS userReported
SUM(IF(cr.userId > 0 AND cr.userId = ?d, cr.value, 0)) AS userRating,
SUM(IF( r.userId > 0 AND r.userId = ?d, 1, 0)) AS userReported
FROM
?_comments c
JOIN
@@ -238,7 +238,7 @@ class CommunityContent
{
$screenshots = DB::Aowow()->select('
SELECT s.id, a.displayName AS user, s.date, s.width, s.height, s.type, s.typeId, s.caption, s.status, s.status AS "flags"
FROM ?_screenshots s,
FROM ?_screenshots s
LEFT JOIN ?_account a ON s.userIdOwner = a.id
WHERE
{ s.type = ?d}

20
includes/kernel.php
View File

@@ -145,6 +145,9 @@ if (defined('CFG_SITE_HOST')) // points js to exec
if (!CLI)
{
if (!defined('CFG_SITE_HOST') || !defined('CFG_STATIC_HOST'))
die('error: SITE_HOST or STATIC_HOST not configured');
// Setup Session
session_set_cookie_params(15 * YEAR, '/', '', $secure, true);
session_cache_limiter('private');
@@ -152,23 +155,6 @@ if (!CLI)
if (!empty($AoWoWconf['aowow']) && User::init())
User::save(); // save user-variables in session
// todo: (low) - move to setup web-interface (when it begins its existance)
if (!defined('CFG_SITE_HOST') || !defined('CFG_STATIC_HOST'))
{
$host = substr($_SERVER['SERVER_NAME'].strtr($_SERVER['SCRIPT_NAME'], ['index.php' => '']), 0, -1);
define('HOST_URL', ($secure ? 'https://' : 'http://').$host);
define('STATIC_URL', ($secure ? 'https://' : 'http://').$host.'/static');
if (User::isInGroup(U_GROUP_ADMIN)) // initial set
{
DB::Aowow()->query('REPLACE INTO ?_config VALUES (?a)',
[['site_host', $host, CON_FLAG_TYPE_STRING | CON_FLAG_PERSISTENT, 'default: '.$host.' - points js to executable files (automaticly set on first run)'],
['static_host', $host.'/static', CON_FLAG_TYPE_STRING | CON_FLAG_PERSISTENT, 'default: '.$host.'/static - points js to images & scripts (automaticly set on first run)']]
);
}
}
// hard-override locale for this call (should this be here..?)
// all strings attached..
if (!empty($AoWoWconf['aowow']))

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

@@ -1725,7 +1725,7 @@ class ItemListFilter extends Filter
59 => [FILTER_CR_NUMERIC, 'durability', null, true], // dura
104 => [FILTER_CR_STRING, 'description', true ], // flavortext
7 => [FILTER_CR_BOOLEAN, 'description_loc0', true ], // hasflavortext
142 => [FILTER_CR_STRING, 'iconString', ], // icon
142 => [FILTER_CR_STRING, 'ic.iconString', ], // icon
12 => [FILTER_CR_BOOLEAN, 'itemset', ], // partofset
13 => [FILTER_CR_BOOLEAN, 'randomEnchant', ], // randomlyenchanted
14 => [FILTER_CR_BOOLEAN, 'pageTextId', ], // readable

3
pages/class.php
View File

@@ -126,7 +126,8 @@ class ClassPage extends GenericPage
'OR',
['s.cuFlags', SPELL_CU_LAST_RANK, '&'],
['s.rankNo', 0]
]
],
CFG_SQL_LIMIT_NONE
);
$genSpells = new SpellList($conditions);

9
pages/search.php
View File

@@ -680,7 +680,6 @@ class SearchPage extends GenericPage
{
$data[$abilities->id]['param1'] = strToLower($abilities->getField('iconString'));
$data[$abilities->id]['param2'] = $abilities->ranks[$abilities->id];
}
}
@@ -1360,11 +1359,15 @@ class SearchPage extends GenericPage
return $result;
}
private function _searchSpell($cndBase) // 24 Spells (Misc + GM) $searchMask & 0x1000000
private function _searchSpell($cndBase) // 24 Spells (Misc + GM + triggered abilities) $searchMask & 0x1000000
{
$result = [];
$cnd = array_merge($cndBase, array(
['s.typeCat', [0, -9]],
[
'OR',
['s.typeCat', [0, -9]],
['AND', ['s.cuFlags', SPELL_CU_TRIGGERED, '&'], ['s.typeCat', [7, -2]]]
],
$this->createLookup()
));
$misc = new SpellList($cnd);

14
pages/spells.php
View File

@@ -345,10 +345,15 @@ class SpellsPage extends GenericPage
}
break;
case 0: // misc. Spells
case 0: // misc. Spells & triggered player abilities
array_push($visibleCols, 'level');
$conditions[] = ['s.typeCat', 0];
$conditions[] = [
'OR',
['s.typeCat', 0],
['AND', ['s.cuFlags', SPELL_CU_TRIGGERED, '&'], ['s.typeCat', [7, -2]]]
];
break;
}
}
@@ -387,13 +392,16 @@ class SpellsPage extends GenericPage
if (in_array(9, $_['cr']) && !in_array('source', $visibleCols))
$visibleCols[] = 'source';
$mask = $spells->hasSetFields(['reagent1', 'skillLines', 'trainingCost']);
$mask = $spells->hasSetFields(['reagent1', 'skillLines', 'trainingCost', 'reqClassMask']);
if ($mask & 0x1)
$visibleCols[] = 'reagents';
if (!($mask & 0x2) && $this->category && !in_array($this->category[0], [9, 11]))
$hiddenCols[] = 'skill';
if (($mask & 0x4))
$visibleCols[] = 'trainingcost';
if (($mask & 0x8) && !in_array('singleclass', $visibleCols))
$visibleCols[] = 'singleclass';
if ($visibleCols)
$tab['params']['visibleCols'] = '$'.Util::toJSON($visibleCols);