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

Merge branch 'master' of github.com:Sarjuuk/aowow

Browse Source
This commit is contained in:
Sarjuuk
2022-02-12 14:27:10 +01:00
parent c950cdc757 541224f87b
commit b777262670
6 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/ajaxHandler.class.php
View File

@@ -113,7 +113,7 @@ class AjaxHandler
protected static function checkFulltext(string $val) : string
{
// trim non-printable chars
return preg_replace('/[\p{Cf} \p{Co} \p{Cs} \p{Cn}]/ui', '', $val);
return preg_replace('/[\p{Cf}\p{Co}\p{Cs}\p{Cn}]/ui', '', $val);
}
}
?>

3
includes/markup.class.php
View File

@@ -31,7 +31,8 @@ class Markup
$match[1] = 'achievement';
else if ($match[1] == 'icondb')
$match[1] = 'icon';
else if ($match[1] == 'money')
if ($match[1] == 'money')
{
if (stripos($match[0], 'items'))
{

16
pages/spell.php
View File

@@ -1234,12 +1234,7 @@ class SpellPage extends GenericPage
return false;
$item = DB::Aowow()->selectRow('
SELECT name_loc0, name_loc2, name_loc3, name_loc6, name_loc8, i.id, ic.name AS iconString, quality,
IF ( (spellId1 > 0 AND spellCharges1 < 0) OR
(spellId2 > 0 AND spellCharges2 < 0) OR
(spellId3 > 0 AND spellCharges3 < 0) OR
(spellId4 > 0 AND spellCharges4 < 0) OR
(spellId5 > 0 AND spellCharges5 < 0), 1, 0) AS consumed
SELECT name_loc0, name_loc2, name_loc3, name_loc6, name_loc8, i.id, ic.name AS iconString, quality
FROM ?_items i
LEFT JOIN ?_icons ic ON ic.id = i.iconId
WHERE i.id = ?d',
@@ -1253,9 +1248,6 @@ class SpellPage extends GenericPage
$_level++;
if ($item['consumed'])
$_qty++;
$data = array(
'type' => TYPE_ITEM,
'typeId' => $item['id'],
@@ -1286,6 +1278,7 @@ class SpellPage extends GenericPage
SELECT reagent1, reagent2, reagent3, reagent4, reagent5, reagent6, reagent7, reagent8,
reagentCount1, reagentCount2, reagentCount3, reagentCount4, reagentCount5, reagentCount6, reagentCount7, reagentCount8,
name_loc0, name_loc2, name_loc3, name_loc6, name_loc8,
iconIdBak,
s.id AS ARRAY_KEY, ic.name AS iconString
FROM ?_spell s
JOIN ?_icons ic ON s.iconId = ic.id
@@ -1327,6 +1320,11 @@ class SpellPage extends GenericPage
if ($row['reagent'.$i] <= 0 || $row['reagentCount'.$i] <= 0)
continue;
// handle edge case elemental crafting material: Mote of X + Crystalized X
// on use items, that has require more reagents of itself
if ($row['reagentCount'.$i] == 9 && ($row['iconIdBak'] == 140 || $row['iconIdBak'] == 1921))
$row['reagentCount'.$i]++;
if ($this->appendReagentItem($reagentResult, $row['reagent'.$i], $row['reagentCount'.$i], $data['qty'], $data['level'], $data['path'], $_aU))
{
$hasUnusedReagents = true;

2
static/css/global.css
View File

@@ -477,7 +477,7 @@
}
.iconlist td {
padding: 4px 0 6px 0 !important;
padding: 4px 0 6px 0;
}
.iconlist var {

2
static/js/Markup.js
View File

@@ -2798,7 +2798,7 @@ var Markup = {
border: { req: false, valid: /^[0-9]+$/ },
cellspacing: { req: false, valid: /^[0-9]+$/ },
cellpadding: { req: false, valid: /^[0-9]+$/ },
width: { req: false, valid: /^[0-9]+(px|em|\%)$/ }
width: { req: false, valid: /^([0-9]+(px|em|\%)|auto)$/ }
},
toHtml: function(attr)
{

2
template/pages/home.tpl.php
View File

@@ -85,7 +85,7 @@ endif;
<a href="?aboutus"><?=Lang::main('aboutUs'); ?></a>|<a href="https://github.com/Sarjuuk/aowow" target="_blank">Github</a>|<a href="#" id="footer-links-language"><?=Lang::main('language'); ?></a>
</div>
<div class="footer-copy">
&#12484; 2021 Aowow<br />rev. <?=AOWOW_REVISION; ?>
&#12484; 2022 Aowow<br />rev. <?=AOWOW_REVISION; ?>
</div>
</div>