diff --git a/includes/ajaxHandler.class.php b/includes/ajaxHandler.class.php index 7aebaaad..207b5ff0 100644 --- a/includes/ajaxHandler.class.php +++ b/includes/ajaxHandler.class.php @@ -149,8 +149,8 @@ class AjaxHandler */ private function handleCookie() { - if (User::$id && $this->params && !empty($this->get[$this->param[0]])) - if (DB::Aowow()->query('REPLACE INTO ?_account_cookies VALUES (?d, ?, ?)', User::$id, $this->param[0], $this->get[$this->param[0]])) + if (User::$id && $this->params && !empty($this->get[$this->params[0]])) + if (DB::Aowow()->query('REPLACE INTO ?_account_cookies VALUES (?d, ?, ?)', User::$id, $this->params[0], $this->get[$this->params[0]])) return 0; return null; diff --git a/includes/utilities.php b/includes/utilities.php index 4af5b0cb..97c25e9b 100644 --- a/includes/utilities.php +++ b/includes/utilities.php @@ -127,7 +127,7 @@ class SmartyAoWoW extends Smarty 'mode' => 1, 'status' => 1, 'name' => 'internal error', - 'style' => 'padding-left: 55px; background-image: url(static/images/announcements/warn-small.png); background-position: 10px center; border: dashed 2px #C03030;', + 'style' => 'padding-left: 55px; background-image: url('.STATIC_URL.'/images/announcements/warn-small.png); background-position: 10px center; border: dashed 2px #C03030;', 'text' => '[span id=inputbox-error]'.implode("[br]", $buff).'[/span]', ); } @@ -139,7 +139,7 @@ class SmartyAoWoW extends Smarty if (!isset($tv['announcements'])) $tv['announcements'] = []; - $ann = DB::Aowow()->Select('SELECT * FROM ?_announcements WHERE status = 1 AND (page = ? OR page = "*")', $match[1]); + $ann = DB::Aowow()->Select('SELECT * FROM ?_announcements WHERE status = 1 AND (page = ? OR page = "*") AND (groupMask = 0 OR groupMask & ?d)', $match[1], User::$groups); foreach ($ann as $k => $v) { diff --git a/pages/account.php b/pages/account.php index c522ad54..0e584f9f 100644 --- a/pages/account.php +++ b/pages/account.php @@ -247,11 +247,11 @@ function recoverUser() $smarty->updatePageVars(array( 'reqCSS' => array( - ['path' => 'static/css/Profiler.css'], + ['path' => STATIC_URL.'/css/Profiler.css'], ), 'reqJS' => array( - 'static/js/user.js', - 'static/js/profile.js', + STATIC_URL.'/js/user.js', + STATIC_URL.'/js/profile.js', ), )); diff --git a/pages/achievements.php b/pages/achievements.php index d863ca5c..057a234c 100644 --- a/pages/achievements.php +++ b/pages/achievements.php @@ -92,7 +92,7 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter)) 'path' => json_encode($path, JSON_NUMERIC_CHECK), 'tab' => 0, 'subCat' => $pageParam ? '='.$pageParam : '', - 'reqJS' => ['static/js/filters.js'] + 'reqJS' => [STATIC_URL.'/js/filters.js'] ), 'lv' => array( 'data' => $acvList->getListviewData(), diff --git a/pages/class.php b/pages/class.php index ac9259b5..1d78f5d8 100644 --- a/pages/class.php +++ b/pages/class.php @@ -70,7 +70,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData)) 'tab' => 0, 'type' => TYPE_CLASS, 'typeId' => $_id, - 'reqJS' => ['static/js/swfobject.js'], + 'reqJS' => [STATIC_URL.'/js/swfobject.js'], 'name' => $cl->getField('name', true), 'expansion' => Util::$expansionString[$cl->getField('expansion')], 'infobox' => '[ul][li]'.implode('[/li][li]', $infobox).'[/li][/ul]', diff --git a/pages/compare.php b/pages/compare.php index 0d088c30..1e0c54d1 100644 --- a/pages/compare.php +++ b/pages/compare.php @@ -12,15 +12,15 @@ $pageData = array( 'title' => Lang::$main['compareTool'], 'tab' => 1, 'reqCSS' => array( - ['path' => 'static/css/Summary.css'], - ['path' => 'static/css/Summary_ie6.css', 'ieCond' => 'lte IE 6'], + ['path' => STATIC_URL.'/css/Summary.css'], + ['path' => STATIC_URL.'/css/Summary_ie6.css', 'ieCond' => 'lte IE 6'], ), 'reqJS' => array( - 'static/js/profile.js', - 'static/js/Draggable.js', - 'static/js/filters.js', - 'static/js/Summary.js', - 'static/js/swfobject.js', + STATIC_URL.'/js/profile.js', + STATIC_URL.'/js/Draggable.js', + STATIC_URL.'/js/filters.js', + STATIC_URL.'/js/Summary.js', + STATIC_URL.'/js/swfobject.js', '?data=weight-presets.gems.enchants.itemsets&locale='.User::$localeId.'&t='.$_SESSION['dataKey'] ) ); diff --git a/pages/item.php b/pages/item.php index 70208348..505460dc 100644 --- a/pages/item.php +++ b/pages/item.php @@ -450,14 +450,14 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData)) 'type' => TYPE_ITEM, 'typeId' => $_id, 'reqJS' => array( - $pageText ? 'static/js/Book.js' : null, - 'static/js/swfobject.js', - 'static/js/profile.js', - 'static/js/filters.js', + $pageText ? STATIC_URL.'/js/Book.js' : null, + STATIC_URL.'/js/swfobject.js', + STATIC_URL.'/js/profile.js', + STATIC_URL.'/js/filters.js', '?data=weight-presets&locale='.User::$localeId.'&t='.$_SESSION['dataKey'] ), 'reqCSS' => array( - $pageText ? ['path' => 'static/css/Book.css'] : null, + $pageText ? ['path' => STATIC_URL.'/css/Book.css'] : null, ), 'redButtons' => array( BUTTON_WOWHEAD => true, diff --git a/pages/items.php b/pages/items.php index 43d75901..4ab365c1 100644 --- a/pages/items.php +++ b/pages/items.php @@ -185,8 +185,8 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter)) 'tab' => 0, 'subCat' => $pageParam !== null ? '='.$pageParam : '', 'reqJS' => array( - 'static/js/filters.js', - 'static/js/swfobject.js', + STATIC_URL.'/js/filters.js', + STATIC_URL.'/js/swfobject.js', '?data=weight-presets&locale='.User::$localeId.'&t='.$_SESSION['dataKey'] ) ), diff --git a/pages/itemset.php b/pages/itemset.php index 847316e8..15e5c466 100644 --- a/pages/itemset.php +++ b/pages/itemset.php @@ -188,8 +188,8 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData)) 'type' => TYPE_ITEMSET, 'typeId' => $_id, 'reqJS' => array( - 'static/js/Summary.js', - 'static/js/swfobject.js' + STATIC_URL.'/js/Summary.js', + STATIC_URL.'/js/swfobject.js' ), 'pieces' => $pieces, 'spells' => $spells, diff --git a/pages/itemsets.php b/pages/itemsets.php index 91def8b5..a6ee4c29 100644 --- a/pages/itemsets.php +++ b/pages/itemsets.php @@ -33,7 +33,7 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter)) 'tab' => 0, 'subCat' => $pageParam ? '='.$pageParam : '', 'reqJS' => array( - 'static/js/filters.js', + STATIC_URL.'/js/filters.js', '?data=weight-presets&locale='.User::$localeId.'&t='.$_SESSION['dataKey'] ) ), diff --git a/pages/maps.php b/pages/maps.php index 44c4e970..49d87a6d 100644 --- a/pages/maps.php +++ b/pages/maps.php @@ -10,12 +10,12 @@ $smarty->updatePageVars(array( 'tab' => 1, 'reqCSS' => array( ['string' => 'zone-picker { margin-left: 4px }'], - ['path' => 'static/css/Mapper.css'], - ['path' => 'static/css/Mapper_ie6.css', 'ieCond' => 'lte IE 6'] + ['path' => STATIC_URL.'/css/Mapper.css'], + ['path' => STATIC_URL.'/css/Mapper_ie6.css', 'ieCond' => 'lte IE 6'] ), 'reqJS' => array( - 'static/js/maps.js', - 'static/js/Mapper.js', + STATIC_URL.'/js/maps.js', + STATIC_URL.'/js/Mapper.js', '?data=zones&locale='.User::$localeId.'&t='.$_SESSION['dataKey'] ) )); diff --git a/pages/npc.php b/pages/npc.php index 4fa17e5e..7b18de8a 100644 --- a/pages/npc.php +++ b/pages/npc.php @@ -390,7 +390,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData)) 'tab' => 0, 'type' => TYPE_NPC, 'typeId' => $_id, - 'reqJS' => ['static/js/swfobject.js'], + 'reqJS' => [STATIC_URL.'/js/swfobject.js'], 'redButtons' => array( BUTTON_WOWHEAD => true, BUTTON_LINKS => true, diff --git a/pages/npcs.php b/pages/npcs.php index 7adaaf13..d96d0efe 100644 --- a/pages/npcs.php +++ b/pages/npcs.php @@ -50,7 +50,7 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter)) 'tab' => 0, 'subCat' => $pageParam ? '='.$pageParam : '', 'reqJS' => array( - 'static/js/filters.js' + STATIC_URL.'/js/filters.js' ) ), 'lv' => [] diff --git a/pages/object.php b/pages/object.php index 8b62446c..582da7d1 100644 --- a/pages/object.php +++ b/pages/object.php @@ -252,14 +252,14 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData)) BUTTON_VIEW3D => ['displayId' => $object->getField('displayId'), 'type' => TYPE_OBJECT, 'typeId' => $_id] ), 'reqCSS' => array( - $pageText ? ['path' => 'static/css/Book.css'] : null, - // ['path' => 'static/css/Mapper.css'], - // ['path' => 'static/css/Mapper_ie6.css', 'ieCond' => 'lte IE 6'] + $pageText ? ['path' => STATIC_URL.'/css/Book.css'] : null, + // ['path' => STATIC_URL.'/css/Mapper.css'], + // ['path' => STATIC_URL.'/css/Mapper_ie6.css', 'ieCond' => 'lte IE 6'] ), 'reqJS' => array( - $pageText ? 'static/js/Book.js' : null, - // 'static/js/Mapper.js', - 'static/js/swfobject.js' + $pageText ? STATIC_URL.'/js/Book.js' : null, + // STATIC_URL.'/js/Mapper.js', + STATIC_URL.'/js/swfobject.js' ) ), 'relTabs' => [] diff --git a/pages/objects.php b/pages/objects.php index 29e6062e..a9bcc294 100644 --- a/pages/objects.php +++ b/pages/objects.php @@ -39,7 +39,7 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter)) 'title' => implode(" - ", $title), 'path' => json_encode($path, JSON_NUMERIC_CHECK), 'subCat' => $pageParam ? '='.$pageParam : '', - 'reqJS' => ['static/js/filters.js'] + 'reqJS' => [STATIC_URL.'/js/filters.js'] ), 'lv' => [] ); diff --git a/pages/pet.php b/pages/pet.php index 6c095f7f..f96ef128 100644 --- a/pages/pet.php +++ b/pages/pet.php @@ -52,7 +52,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData)) 'tab' => 0, 'type' => TYPE_PET, 'typeId' => $_id, - 'reqJS' => ['static/js/swfobject.js'] + 'reqJS' => [STATIC_URL.'/js/swfobject.js'] ), 'relTabs' => [] ); diff --git a/pages/profile.php b/pages/profile.php index e1776534..e064bf6c 100644 --- a/pages/profile.php +++ b/pages/profile.php @@ -521,17 +521,17 @@ $pageData = array( 'region' => 'eu', 'realm' => 'realm Name', 'reqJS' => array( - 'static/js/filters.js', - 'static/js/TalentCalc.js', - 'static/js/swfobject.js', - 'static/js/profile_all.js', - 'static/js/profile.js', - 'static/js/Profiler.js', + STATIC_URL.'/js/filters.js', + STATIC_URL.'/js/TalentCalc.js', + STATIC_URL.'/js/swfobject.js', + STATIC_URL.'/js/profile_all.js', + STATIC_URL.'/js/profile.js', + STATIC_URL.'/js/Profiler.js', '?data=enchants.gems.glyphs.itemsets.pets.pet-talents.quick-excludes.realms.statistics.weight-presets&locale='.User::$localeId.'&t='.$_SESSION['dataKey'] ), 'reqCSS' => array( - ['path' => 'static/css/TalentCalc.css'], - ['path' => 'static/css/Profiler.css'] + ['path' => STATIC_URL.'/css/TalentCalc.css'], + ['path' => STATIC_URL.'/css/Profiler.css'] ) ) ); diff --git a/pages/profiles.php b/pages/profiles.php index 606b559f..68872ade 100644 --- a/pages/profiles.php +++ b/pages/profiles.php @@ -88,13 +88,13 @@ $smarty->updatePageVars(array( 'realm' => '', // not sure about the use 'region' => '', // seconded.. 'reqJS' => array( - 'static/js/filters.js', - 'static/js/profile_all.js', - 'static/js/profile.js', + STATIC_URL.'/js/filters.js', + STATIC_URL.'/js/profile_all.js', + STATIC_URL.'/js/profile.js', '?data=weight-presets.realms&locale='.User::$localeId.'&t='.$_SESSION['dataKey'] ), 'reqCSS' => array( - ['path' => 'static/css/profiler.css'] + ['path' => STATIC_URL.'/css/profiler.css'] ) )); $smarty->assign('lang', array_merge(Lang::$main, Lang::$game, ['colon' => Lang::$colon])); diff --git a/pages/quest.php b/pages/quest.php index 9d838312..f0a49940 100644 --- a/pages/quest.php +++ b/pages/quest.php @@ -746,12 +746,12 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData)) // 'som' => json_encode($som, JSON_NUMERIC_CHECK) // ), 'reqJS' => array( - // $map ? 'static/js/Mapper.js' : null + // $map ? STATIC_URL.'/js/Mapper.js' : null ), 'reqCSS' => array( - ['path' => 'static/css/Book.css'], - // $map ? ['path' => 'static/css/Mapper.css'] : null, - // $map ? ['path' => 'static/css/Mapper_ie6.css', 'ieCond' => 'lte IE 6'] : null + ['path' => STATIC_URL.'/css/Book.css'], + // $map ? ['path' => STATIC_URL.'/css/Mapper.css'] : null, + // $map ? ['path' => STATIC_URL.'/css/Mapper_ie6.css', 'ieCond' => 'lte IE 6'] : null ), 'redButtons' => array( BUTTON_LINKS => ['color' => 'ffffff00', 'linkId' => 'quest:'.$_id.':'.$_level.''], diff --git a/pages/quests.php b/pages/quests.php index 01505a7c..5dcfd4d4 100644 --- a/pages/quests.php +++ b/pages/quests.php @@ -77,7 +77,7 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter)) 'tab' => 0, 'subCat' => $pageParam ? '='.$pageParam : '', 'reqJS' => array( - 'static/js/filters.js' + STATIC_URL.'/js/filters.js' ) ), 'lv' => $lv diff --git a/pages/search.php b/pages/search.php index fded7afd..f367c5c1 100644 --- a/pages/search.php +++ b/pages/search.php @@ -1155,7 +1155,7 @@ else /* if ($searchMask & SEARCH_TYPE_REGULAR) */ 'title' => $search.' - '.Lang::$search['search'], 'tab' => 0, 'reqJS' => array( - 'static/js/swfobject.js' + STATIC_URL.'/js/swfobject.js' ) )); $smarty->assign('lang', array_merge(Lang::$main, Lang::$search)); diff --git a/pages/spell.php b/pages/spell.php index 4c9e15c2..9594a109 100644 --- a/pages/spell.php +++ b/pages/spell.php @@ -403,7 +403,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData)) 'tab' => 0, 'type' => TYPE_SPELL, 'typeId' => $_id, - 'reqJS' => ['static/js/swfobject.js'], + 'reqJS' => [STATIC_URL.'/js/swfobject.js'], 'redButtons' => array( BUTTON_LINKS => ['color' => 'ff71d5ff', 'linkId' => Util::$typeStrings[TYPE_SPELL].':'.$_id], BUTTON_VIEW3D => false, @@ -1542,7 +1542,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData)) $trigger->addGlobalsToJScript(GLOBALINFO_SELF); } - // used by - creature + // tab: used by - creature // SMART_SCRIPT_TYPE_CREATURE = 0; SMART_ACTION_CAST = 11; SMART_ACTION_ADD_AURA = 75; SMART_ACTION_INVOKER_CAST = 85; SMART_ACTION_CROSS_CAST = 86 $conditions = array( 'OR', @@ -1568,29 +1568,6 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData)) $ubCreature->addGlobalsToJScript(GLOBALINFO_SELF); } - // tab: questreward - $query = 'SELECT q.id FROM ?_quests q JOIN ?_spell s ON s.id = sourceSpellId OR s.id = rewardSpellCast OR (s.id = rewardSpell AND rewardSpellCast = 0) - WHERE (effect1Id IN (36, 57) AND effect1TriggerSpell = ?d) OR (effect2Id IN (36, 57) AND effect2TriggerSpell = ?d) OR (effect3Id IN (36, 57) AND effect3TriggerSpell = ?d)'; - - if ($ids = DB::Aowow()->selectCol($query, $_id, $_id, $_id)) - { - $tbQuest = new QuestList(array(['id', $ids])); - if (!$tbQuest->error) - { - $pageData['relTabs'][] = array( - 'file' => 'quest', - 'data' => $tbQuest->getListviewData(), - 'params' => [ - 'tabs' => '$tabsRelated', - 'id' => 'reward-from-quest', - 'name' => '$LANG.tab_rewardfrom' - ] - ); - - $tbQuest->addGlobalsToJScript(); - } - } - // tab: teaches if ($ids = Util::getTaughtSpells($spell)) { @@ -1689,11 +1666,13 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData)) ); $tbSpell = new SpellList($conditions); + $tbsData = []; if (!$tbSpell->error) { + $tbsData = $tbSpell->getListviewData(); $pageData['relTabs'][] = array( 'file' => 'spell', - 'data' => $tbSpell->getListviewData(), + 'data' => $tbsData, 'params' => [ 'tabs' => '$tabsRelated', 'id' => 'taught-by-spell', @@ -1704,6 +1683,33 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData)) $tbSpell->addGlobalsToJScript(GLOBALINFO_SELF); } + // tab: taught by quest + $conditions = ['OR', ['sourceSpellId', $_id], ['rewardSpell', $_id]]; + if ($tbsData) + { + $conditions[] = ['rewardSpell', array_keys($tbsData)]; + if (User::isInGroup(U_GROUP_STAFF)) + $conditions[] = ['rewardSpellCast', array_keys($tbsData)]; + } + if (User::isInGroup(U_GROUP_STAFF)) + $conditions[] = ['rewardSpellCast', $_id]; + + $tbQuest = new QuestList($conditions); + if (!$tbQuest->error) + { + $pageData['relTabs'][] = array( + 'file' => 'quest', + 'data' => $tbQuest->getListviewData(), + 'params' => [ + 'tabs' => '$tabsRelated', + 'id' => 'reward-from-quest', + 'name' => '$LANG.tab_rewardfrom' + ] + ); + + $tbQuest->addGlobalsToJScript(); + } + // tab: taught by item (i'd like to precheck $spell->sources, but there is no source:item only complicated crap like "drop" and "vendor") $conditions = array( 'OR', diff --git a/pages/spells.php b/pages/spells.php index 63336cdc..66693562 100644 --- a/pages/spells.php +++ b/pages/spells.php @@ -442,7 +442,7 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter)) 'tab' => 0, 'subCat' => $pageParam !== null ? '='.$pageParam : '', 'reqJS' => array( - 'static/js/filters.js' + STATIC_URL.'/js/filters.js' ) ), 'lv' => $lv diff --git a/pages/talent.php b/pages/talent.php index 5b6a9fba..c4991334 100644 --- a/pages/talent.php +++ b/pages/talent.php @@ -13,17 +13,17 @@ $smarty->updatePageVars(array( 'tab' => 1, 'dataKey' => $_SESSION['dataKey'], 'reqCSS' => array( - ['path' => 'static/css/TalentCalc.css'], - ['path' => 'static/css/talent.css'], - ['path' => 'static/css/TalentCalc_ie6.css', 'ieCond' => 'lte IE 6'], - ['path' => 'static/css/TalentCalc_ie67.css', 'ieCond' => 'lte IE 7'], - $petCalc ? ['path' => 'static/css/petcalc.css'] : null + ['path' => STATIC_URL.'/css/TalentCalc.css'], + ['path' => STATIC_URL.'/css/talent.css'], + ['path' => STATIC_URL.'/css/TalentCalc_ie6.css', 'ieCond' => 'lte IE 6'], + ['path' => STATIC_URL.'/css/TalentCalc_ie67.css', 'ieCond' => 'lte IE 7'], + $petCalc ? ['path' => STATIC_URL.'/css/petcalc.css'] : null ), 'reqJS' => array( - 'static/js/TalentCalc.js', + STATIC_URL.'/js/TalentCalc.js', ($petCalc ? '?data=pet-talents.pets' : '?data=glyphs').'&locale='.User::$localeId.'&t='.$_SESSION['dataKey'], - $petCalc ? 'static/js/petcalc.js' : 'static/js/talent.js', - $petCalc ? 'static/js/swfobject.js' : null + $petCalc ? STATIC_URL.'/js/petcalc.js' : STATIC_URL.'/js/talent.js', + $petCalc ? STATIC_URL.'/js/swfobject.js' : null ) )); $smarty->assign('tcType', $petCalc ? 'pc' : 'tc'); diff --git a/setup/tools/dataset/profiler.php b/setup/tools/dataset/profiler.php index 74067dcc..445519e3 100644 --- a/setup/tools/dataset/profiler.php +++ b/setup/tools/dataset/profiler.php @@ -90,7 +90,7 @@ if (!defined('AOWOW_REVISION')) } // categories to sort by - $buff .= "\ng_achievement_catorder = [92,14863,97,169,170,171,172,14802,14804,14803,14801,95,161,156,165,14806,14921,96,201,160,14923,14808,14805,14778,14865,14777,14779,155,14862,14861,14864,14866,158,162,14780,168,14881,187,14901,163,14922,159,14941,14961,14962,14981,15003,15002,15001,15041,15042,81]"; + $buff .= "\ng_achievement_catorder = [92, 14863, 97, 169, 170, 171, 172, 14802, 14804, 14803, 14801, 95, 161, 156, 165, 14806, 14921, 96, 201, 160, 14923, 14808, 14805, 14778, 14865, 14777, 14779, 155, 14862, 14861, 14864, 14866, 158, 162, 14780, 168, 14881, 187, 14901, 163, 14922, 159, 14941, 14961, 14962, 14981, 15003, 15002, 15001, 15041, 15042, 81]"; // sum points $buff .= "\ng_achievement_points = [".$sumPoints."];\n"; @@ -297,4 +297,4 @@ if (!defined('AOWOW_REVISION')) echo "
\nall done"; $stats = DB::Aowow()->getStatistics(); echo "
\n".$stats['count']." queries in: ".Util::formatTime($stats['time'] * 1000); -?> \ No newline at end of file +?> diff --git a/template/head.tpl b/template/head.tpl index 4cb5d5d8..3d9a5ffb 100644 --- a/template/head.tpl +++ b/template/head.tpl @@ -2,12 +2,12 @@ - - - - - - + + + + + + {foreach from=$reqCSS item=css} {if isset($css.string)} @@ -23,12 +23,12 @@ var g_dataKey = '{$dataKey}'; {/if} - - - - - - + + + + + + {foreach from=$reqJS item=file} {/foreach}