mojotrollz/db.mojotrollz.eu
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

programm fixes

Browse Source
This commit is contained in:
Ulf Gebhardt 2017-01-12 01:22:25 +01:00
parent 24493b8646
commit a448d5ee2d
28 changed files with 1133 additions and 995 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
comment.php
View File

@ -26,11 +26,11 @@ switch ($_REQUEST["comment"]):
// $_POST['replyto'] - номер поста, на который отвечает
// $_SESSION['userid'] - номер пользователя
$newid = $DB->query('INSERT
INTO ?_aowow_comments(`type`, `typeid`, `userid`, `commentbody`, `post_date`{, ?#})
INTO '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments(`type`, `typeid`, `userid`, `commentbody`, `post_date`{, ?#})
VALUES (?d, ?d, ?d, ?, NOW(){, ?d})', (empty($_POST['replyto']) ? DBSIMPLE_SKIP : 'replyto'), $_GET["type"], $_GET["typeid"], (empty($_SESSION['userid']) ? 0 : $_SESSION['userid']), stripslashes($_POST['commentbody']), (empty($_POST['replyto']) ? DBSIMPLE_SKIP : $_POST['replyto'])
);
if (empty($_POST['replyto']))
$DB->query('UPDATE ?_aowow_comments SET `replyto`=?d WHERE `id`=?d LIMIT 1', $newid, $newid);
$DB->query('UPDATE '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments SET `replyto`=?d WHERE `id`=?d LIMIT 1', $newid, $newid);
echo '<meta http-equiv="Refresh" content="0; URL=?' . urlfromtype($_GET["type"], $_GET["typeid"]) . '">';
echo '<style type="text/css">';
echo 'body {background-color: black;}';
@ -40,7 +40,7 @@ switch ($_REQUEST["comment"]):
// Удаление комментарий (Ajax)
// Номер комментария: $_GET['id']
// Имя пользователя, удаляющего комментарий: $_GET['username']
$DB->query('DELETE FROM ?_aowow_comments WHERE `id`=?d {AND `userid`=?d} LIMIT 1', $_GET['id'], ($_SESSION['roles'] > 1) ? DBSIMPLE_SKIP : $_SESSION['userid']
$DB->query('DELETE FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments WHERE `id`=?d {AND `userid`=?d} LIMIT 1', $_GET['id'], ($_SESSION['roles'] > 1) ? DBSIMPLE_SKIP : $_SESSION['userid']
);
break;
case 'edit':
@ -49,7 +49,7 @@ switch ($_REQUEST["comment"]):
// Новое содержание комментария: $_POST['body']
// Номер пользователя: $_SESSION['userid']
if (IsSet($_POST['body']))
$DB->query('UPDATE ?_aowow_comments SET `commentbody`=?, `edit_userid`=?, `edit_date`=NOW() WHERE `id`=?d {AND `userid`=?d} LIMIT 1', stripslashes($_POST['body']), $_SESSION['userid'], $_GET['id'], ($_SESSION['roles'] > 1) ? DBSIMPLE_SKIP : $_SESSION['userid']
$DB->query('UPDATE '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments SET `commentbody`=?, `edit_userid`=?, `edit_date`=NOW() WHERE `id`=?d {AND `userid`=?d} LIMIT 1', stripslashes($_POST['body']), $_SESSION['userid'], $_GET['id'], ($_SESSION['roles'] > 1) ? DBSIMPLE_SKIP : $_SESSION['userid']
);
echo $_POST['body'];
break;
@ -61,8 +61,8 @@ switch ($_REQUEST["comment"]):
* Номер пользователя: $_SESSION['userid']
*/
// Проверка на хоть какое то значение рейтинга, и на то, что пользователь за этот коммент не голосовал
if (IsSet($_GET['rating']) and !($DB->selectCell('SELECT `commentid` FROM ?_aowow_comments_rates WHERE `userid`=?d AND `commentid`=?d LIMIT 1', $_SESSION['userid'], $_GET['id'])))
$DB->query('INSERT INTO ?_aowow_comments_rates(`commentid`, `userid`, `rate`) VALUES (?d, ?d, ?d)', $_GET['id'], $_SESSION['userid'], $_GET['rating']);
if (IsSet($_GET['rating']) and !($DB->selectCell('SELECT `commentid` FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments_rates WHERE `userid`=?d AND `commentid`=?d LIMIT 1', $_SESSION['userid'], $_GET['id'])))
$DB->query('INSERT INTO '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments_rates(`commentid`, `userid`, `rate`) VALUES (?d, ?d, ?d)', $_GET['id'], $_SESSION['userid'], $_GET['rating']);
break;
case 'undelete':
// Восстановление комментария

10
faction.php
View File

@ -32,7 +32,7 @@ if (!$faction = load_cache(18, intval($id))) {
$row = $DB->selectRow('
SELECT factionID, name_loc' . $_SESSION['locale'] . ', description1_loc' . $_SESSION['locale'] . ', description2_loc' . $_SESSION['locale'] . ', team, side
FROM ?_aowow_factions
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions
WHERE factionID=?d
LIMIT 1
', $id
@ -49,7 +49,7 @@ if (!$faction = load_cache(18, intval($id))) {
$faction['description2'] = $row['description2_loc' . $_SESSION['locale']];
// Команда/Группа фракции
if ($row['team'] != 0)
$faction['group'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_factions WHERE factionID=?d LIMIT 1', $row['team']);
$faction['group'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions WHERE factionID=?d LIMIT 1', $row['team']);
// Альянс(1)/Орда(2)
if ($row['side'] != 0)
$faction['side'] = $row['side'];
@ -57,7 +57,7 @@ if (!$faction = load_cache(18, intval($id))) {
// Итемы с requiredreputationfaction
$item_rows = $DB->select('
SELECT ?#, entry
FROM ?_item_template i, ?_aowow_icons a
FROM ?_item_template i, '.$UDWBaseconf['aowow']['db'].'?_aowow_icons a
WHERE
i.RequiredReputationFaction=?d
AND a.id=i.displayid
@ -73,9 +73,9 @@ if (!$faction = load_cache(18, intval($id))) {
// Персонажи, состоящие во фракции
$creature_rows = $DB->select('
SELECT ?#, entry
FROM ?_creature_template, ?_aowow_factiontemplate
FROM ?_creature_template, '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate
WHERE
FactionAlliance IN (SELECT factiontemplateID FROM ?_aowow_factiontemplate WHERE factionID=?d)
FactionAlliance IN (SELECT factiontemplateID FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate WHERE factionID=?d)
AND factiontemplateID=FactionAlliance
', $npc_cols[0], $id
);

4
factions.php
View File

@ -16,7 +16,7 @@ global $DB;
$rows = $DB->select('
SELECT factionID, team, name_loc' . $_SESSION['locale'] . ' as name, side
FROM ?_aowow_factions
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions
WHERE
reputationListID!=-1
'
@ -29,7 +29,7 @@ if (!$factions = load_cache(19, 'x')) {
$factions[$numRow] = array();
$factions[$numRow]['entry'] = $row['factionID'];
if ($row['team'] != 0)
$factions[$numRow]['group'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_factions WHERE factionID=? LIMIT 1', $row['team']);
$factions[$numRow]['group'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'?_aowow_factions WHERE factionID=? LIMIT 1', $row['team']);
if ($row['side'])
$factions[$numRow]['side'] = $row['side'];
$factions[$numRow]['name'] = $row['name'];

6
includes/allcomments.php
View File

@ -21,10 +21,10 @@ require_once('includes/game.php');
function getcomments($type, $typeid) {
global $DB;
global $rDB;
//TODO $UDWBaseconf['aowow']['db']
$rows = $DB->select('
SELECT id, userid, post_date, commentbody, replyto
FROM ?_aowow_comments
FROM '.'host_mojotrollz_aowow'.'.?_aowow_comments
WHERE type=? AND typeid=?
ORDER BY replyto, post_date
', $type, $typeid
@ -46,7 +46,7 @@ function getcomments($type, $typeid) {
$comments[$i]['indent'] = 1;
$comments[$i]['raters'] = array();
$comments[$i]['raters'] = $DB->select('SELECT userid, rate FROM ?_aowow_comments_rates WHERE commentid=?d', $comments[$i]['id']);
$comments[$i]['raters'] = $DB->select('SELECT userid, rate FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments_rates WHERE commentid=?d', $comments[$i]['id']);
$comments[$i]['rating'] = sum_subarrays_by_key($comments[$i]['raters'], 'rate');
$comments[$i]['purged'] = ($comments[$i]['rating'] <= -50) ? 1 : 0;
$comments[$i]['deleted'] = 0;

26
includes/allitems.php
View File

@ -132,7 +132,8 @@ function b_type($type, $value) {
*/
function req_spell($spell_id) {
global $aDB;
return $aDB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM ?_aowow_spell WHERE spellID=?d LIMIT 1', $spell_id);
//TODO $UDWBaseconf['aowow']['db']
return $aDB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=?d LIMIT 1', $spell_id);
}
/**
@ -177,7 +178,7 @@ function spell_to_bonus($spell_id, $trigger) {
function allitemsinfo2(&$Row, $level=0) {
// Empty string
if (!isset($Row['entry']))
return;
return array();
// Global array of information
global $allitems;
// Number of the next element
@ -241,6 +242,7 @@ function allitemsinfo($id, $level=0) {
if (isset($allitems[$id])) {
return $allitems[$id];
} else {
//TODO $UDWBaseconf['aowow']['db']
$row = $DB->selectRow('
SELECT i.?#
{
@ -248,7 +250,7 @@ function allitemsinfo($id, $level=0) {
, l.description_loc' . $_SESSION['locale'] . ' as `description_loc`
, ?
}
FROM ?_aowow_icons, ?_item_template i
FROM '.'host_mojotrollz_aowow'.'.?_aowow_icons, ?_item_template i
{
LEFT JOIN (?_locales_item l)
ON l.entry=i.entry AND ?
@ -300,7 +302,8 @@ function render_item_tooltip(&$Row) {
// Локация, для которой предназначен этот предмет
if ($Row['Map'])
$x .= '<br />' . $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_zones WHERE mapid=?d LIMIT 1', $Row['Map']);;
//TODO $UDWBaseconf['aowow']['db']
$x .= '<br />' . $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.'host_mojotrollz_aowow'.'.?_aowow_zones WHERE mapid=?d LIMIT 1', $Row['Map']);;
// Теперь в зависимости от типа предмета
if ($Row['ContainerSlots'] > 1)
@ -380,7 +383,8 @@ function render_item_tooltip(&$Row) {
// Требуемый скилл (755 - Jewecrafting)
if (($Row['RequiredSkill']) and ($Row['RequiredSkill'] != 755)) {
$x .= LOCALE_REQUIRES . ' ' . $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_skill WHERE skillID=?d LIMIT 1', $Row['RequiredSkill']);
//TODO $UDWBaseconf['aowow']['db']
$x .= LOCALE_REQUIRES . ' ' . $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.'host_mojotrollz_aowow'.'.?_aowow_skill WHERE skillID=?d LIMIT 1', $Row['RequiredSkill']);
if ($Row['RequiredSkillRank'])
$x .= ' (' . $Row['RequiredSkillRank'] . ')';
$x .= '<br />';
@ -427,7 +431,8 @@ function render_item_tooltip(&$Row) {
// Item Set
// Временное хранилище всех вещей;
$x_tmp = '';
$row = $DB->selectRow('SELECT ?# FROM ?_aowow_itemset WHERE (item1=?d or item2=?d or item3=?d or item4=?d or item5=?d or item6=?d or item7=?d or item8=?d or item9=?d or item10=?d) LIMIT 1', $itemset_col[1], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry']);
//TODO $UDWBaseconf['aowow']['db']
$row = $DB->selectRow('SELECT ?# FROM '.'host_mojotrollz_aowow'.'.?_aowow_itemset WHERE (item1=?d or item2=?d or item3=?d or item4=?d or item5=?d or item6=?d or item7=?d or item8=?d or item9=?d or item10=?d) LIMIT 1', $itemset_col[1], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry']);
if ($row) {
$num = 0; // Кол-во вещей в наборе
for ($i = 1; $i <= 10; $i++) {
@ -440,7 +445,8 @@ function render_item_tooltip(&$Row) {
$x .= '<span class="q"><a href="?itemset=' . $row['itemsetID'] . '" class="q">' . $row['name_loc' . $_SESSION['locale']] . '</a> (0/' . $num . ')</span>';
// Если требуется скилл
if ($row['skillID']) {
$name = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_skill WHERE skillID=?d LIMIT 1', $row['skillID']);
//TODO $UDWBaseconf['aowow']['db']
$name = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.'host_mojotrollz_aowow'.'.?_aowow_skill WHERE skillID=?d LIMIT 1', $row['skillID']);
$x .= LOCALE_REQUIRES . ' <a href="?spells=11.' . $row['skillID'] . '" class="q1">' . $name . '</a>';
if ($row['skilllevel'])
$x .= ' (' . $row['skilllevel'] . ')';
@ -579,9 +585,10 @@ function iteminfo2(&$Row, $level=0) {
}
// Открывает:
// Тип замков, для которых этот предмет является ключем:
//TODO $UDWBaseconf['aowow']['db']
$locks_row = $DB->selectCol('
SELECT lockID
FROM ?_aowow_lock
FROM '.'host_mojotrollz_aowow'.'.?_aowow_lock
WHERE
(type1=1 AND lockproperties1=?d) OR
(type2=1 AND lockproperties2=?d) OR
@ -621,6 +628,7 @@ function iteminfo2(&$Row, $level=0) {
function iteminfo($id, $level=0) {
global $item_cols;
global $DB;
//TODO $UDWBaseconf['aowow']['db']
$row = $DB->selectRow('
SELECT i.?#, i.entry, maxcount
{
@ -628,7 +636,7 @@ function iteminfo($id, $level=0) {
, l.description_loc' . $_SESSION['locale'] . ' as `description_loc`
, ?
}
FROM ?_aowow_icons, ?_item_template i
FROM '.'host_mojotrollz_aowow'.'.?_aowow_icons, ?_item_template i
{ LEFT JOIN (?_locales_item l) ON l.entry=i.entry AND ? }
WHERE
(i.entry=?d and id=displayid)

2
includes/allnpcs.php
View File

@ -59,7 +59,7 @@ function creatureinfo($id) {
, l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc`
, ?
}
FROM ?_aowow_factiontemplate, ?_creature_template c
FROM '.'host_mojotrollz_aowow'.'.?_aowow_factiontemplate, ?_creature_template c
{
LEFT JOIN (?_locales_creature l)
ON l.entry=c.entry AND ?

2
includes/allobjects.php
View File

@ -368,7 +368,7 @@ function objectinfo2(&$Row, $level=0) {
if ($object['lockid']) {
$lock_row = $DB->selectRow('
SELECT *
FROM ?_aowow_lock
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_lock
WHERE lockID=?d
LIMIT 1
', $object['lockid']

6
includes/allquests.php
View File

@ -430,7 +430,7 @@ function GetQuestInfo(&$data, $dataflag = QUEST_DATAFLAG_MINIMUM) {
if ($data['SpecialFlags'] & QUEST_SPECIALFLAGS_REPEATABLE)
$data['Repeatable'] = true;
if ($data['CharTitleId'] > 0)
$data['titlereward'] = $DB->selectCell('SELECT name FROM ?_aowow_char_titles WHERE id=?d LIMIT 1', $row['CharTitleId']);
$data['titlereward'] = $DB->selectCell('SELECT name FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_char_titles WHERE id=?d LIMIT 1', $row['CharTitleId']);
}
// Награды и задания
@ -441,12 +441,12 @@ function GetQuestInfo(&$data, $dataflag = QUEST_DATAFLAG_MINIMUM) {
for ($j = 0; $j <= 6; ++$j)
if (($data['RewChoiceItemId' . $j] != 0) and ($data['RewChoiceItemCount' . $j] != 0))
$data['itemchoices'][] = array_merge(
array(allitemsinfo($data['RewChoiceItemId' . $j], 0)), array('count' => $data['RewChoiceItemCount' . $j])
allitemsinfo($data['RewChoiceItemId' . $j], 0), array('count' => $data['RewChoiceItemCount' . $j])
);
for ($j = 0; $j <= 4; ++$j)
if (($data['RewItemId' . $j] != 0) and ($data['RewItemCount' . $j] != 0))
$data['itemrewards'][] = array_merge(
array(allitemsinfo($data['RewItemId' . $j], 0)), array('count' => $data['RewItemCount' . $j])
allitemsinfo($data['RewItemId' . $j], 0), array('count' => $data['RewItemCount' . $j])
);
// Вознаграждение репутацией
for ($j = 1; $j <= 5; $j++)

63
includes/allspells.php
View File

@ -314,7 +314,7 @@ function spell_desc($spellid, $type='tooltip') {
global $spell_cols;
$spellRow = $DB->selectRow('
SELECT ?#
FROM ?_aowow_spell, ?_aowow_spellicons
FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell, '.'host_mojotrollz_aowow'.'.?_aowow_spellicons
WHERE
spellID=?
AND id=spellicon
@ -333,12 +333,12 @@ function spell_desc($spellid, $type='tooltip') {
function spell_desc2($spellRow, $type='tooltip') {
global $DB;
// $spellRow = $DB->selectRow('SELECT s.*, i.iconname FROM ?_aowow_spell s, ?_aowow_spellicons i WHERE s.spellID=? AND i.id=s.spellicon LIMIT 1', $spellID);
// $spellRow = $DB->selectRow('SELECT s.*, i.iconname FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell s, '.'host_mojotrollz_aowow'.'.?_aowow_spellicons i WHERE s.spellID=? AND i.id=s.spellicon LIMIT 1', $spellID);
allspellsinfo2($spellRow);
if (!IsSet($spellRow['duration_base']))
$lastduration = $DB->selectRow('SELECT * FROM ?_aowow_spellduration WHERE durationID=? LIMIT 1', $spellRow['durationID']);
$lastduration = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spellduration WHERE durationID=? LIMIT 1', $spellRow['durationID']);
$signs = array('+', '-', '/', '*', '%', '^');
@ -380,7 +380,7 @@ function spell_desc2($spellRow, $type='tooltip') {
switch ($exprType) {
case 'r':
if (!IsSet($spellRow['rangeMax']))
$spellRow = array_merge($spellRow, $DB->selectRow('SELECT * FROM ?_aowow_spellrange WHERE rangeID=? LIMIT 1', $spellRow['rangeID']));
$spellRow = array_merge($spellRow, $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spellrange WHERE rangeID=? LIMIT 1', $spellRow['rangeID']));
$base = $spellRow['rangeMax'];
@ -395,7 +395,7 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 'c':
if ($lookup > 0)
$spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
$spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
else
$spell = $spellRow;
@ -411,7 +411,7 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 's':
if ($lookup > 0)
$spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
$spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
else
$spell = $spellRow;
@ -429,8 +429,8 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 'o':
if ($lookup > 0) {
$spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
$lastduration = $DB->selectRow('SELECT * FROM ?_aowow_spellduration WHERE durationID=? LIMIT 1', $spell['durationID']);
$spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
$lastduration = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spellduration WHERE durationID=? LIMIT 1', $spell['durationID']);
}
else
$spell = $spellRow;
@ -446,7 +446,7 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 't':
if ($lookup > 0)
$spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
$spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
else
$spell = $spellRow;
@ -468,7 +468,7 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 'm':
if ($lookup > 0)
$spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
$spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
else
$spell = $spellRow;
@ -487,7 +487,7 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 'x':
if ($lookup > 0)
$spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
$spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
else
$spell = $spellRow;
@ -502,7 +502,7 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 'q':
if ($lookup > 0)
$spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
$spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
else
$spell = $spellRow;
@ -519,12 +519,12 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 'a':
if ($lookup > 0)
$spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
$spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
else
$spell = $spellRow;
$exprData[0] = 1; // TODO
$radius = $DB->selectCell('SELECT radiusBase FROM ?_aowow_spellradius WHERE radiusID=? LIMIT 1', $spell['effect' . $exprData[0] . 'radius']);
$radius = $DB->selectCell('SELECT radiusBase FROM '.'host_mojotrollz_aowow'.'.?_aowow_spellradius WHERE radiusID=? LIMIT 1', $spell['effect' . $exprData[0] . 'radius']);
$base = $radius;
if (in_array($op, $signs) && is_numeric($oparg) && is_numeric($base)) {
@ -535,7 +535,7 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 'h':
if ($lookup > 0)
$spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
$spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
else
$spell = $spellRow;
@ -549,7 +549,7 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 'f':
if ($lookup > 0)
$spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
$spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
else
$spell = $spellRow;
@ -563,7 +563,7 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 'n':
if ($lookup > 0)
$spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
$spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
else
$spell = $spellRow;
@ -577,7 +577,7 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 'd':
if ($lookup > 0) {
$spell = $DB->selectRow('SELECT durationBase FROM ?_aowow_spell a, ?_aowow_spellduration b WHERE a.durationID = b.durationID AND a.spellID=? LIMIT 1', $lookup);
$spell = $DB->selectRow('SELECT durationBase FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell a, '.'host_mojotrollz_aowow'.'.?_aowow_spellduration b WHERE a.durationID = b.durationID AND a.spellID=? LIMIT 1', $lookup);
@$base = ($spell['durationBase'] > 0 ? $spell['durationBase'] + 1 : 0);
}
else
@ -600,7 +600,7 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 'e':
if ($lookup > 0)
$spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
$spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
else
$spell = $spellRow;
@ -625,7 +625,7 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 'u':
if ($lookup > 0)
$spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=?d LIMIT 1', $lookup);
$spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=?d LIMIT 1', $lookup);
else
$spell = $spellRow;
@ -642,7 +642,7 @@ function spell_desc2($spellRow, $type='tooltip') {
break;
case 'b': // only used at one spell (14179) should be 20, column 110/111/112?)
if ($lookup > 0)
$spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
$spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
else
$spell = $spellRow;
@ -686,9 +686,9 @@ function render_spell_tooltip(&$row) {
// Время каста
if ($row['spellcasttimesID'] > 1)
$casttime = ($DB->selectCell('SELECT base FROM ?_aowow_spellcasttimes WHERE id=? LIMIT 1', $row['spellcasttimesID'])) / 1000;
$casttime = ($DB->selectCell('SELECT base FROM '.'host_mojotrollz_aowow'.'.?_aowow_spellcasttimes WHERE id=? LIMIT 1', $row['spellcasttimesID'])) / 1000;
// Дальность действия
$range = $DB->selectCell('SELECT rangeMax FROM ?_aowow_spellrange WHERE rangeID=? LIMIT 1', $row['rangeID']);
$range = $DB->selectCell('SELECT rangeMax FROM '.'host_mojotrollz_aowow'.'.?_aowow_spellrange WHERE rangeID=? LIMIT 1', $row['rangeID']);
// Реагенты
$reagents = array();
@ -828,7 +828,7 @@ function allspellsinfo2(&$row, $level=0) {
if (IsSet($allitems[$row['effect1itemtype']]['icon']))
$allspells[$num]['icon'] = trim($allitems[$row['effect1itemtype']]['icon'], "\r");
else
$allspells[$num]['icon'] = trim($DB->selectCell('SELECT iconname FROM ?_aowow_icons WHERE id=(SELECT displayid FROM ?_item_template WHERE entry=?d LIMIT 1) LIMIT 1', $row['effect1itemtype']) , "\r");
$allspells[$num]['icon'] = trim($DB->selectCell('SELECT iconname FROM '.'host_mojotrollz_aowow'.'.?_aowow_icons WHERE id=(SELECT displayid FROM ?_item_template WHERE entry=?d LIMIT 1) LIMIT 1', $row['effect1itemtype']) , "\r");
} else {
$allspells[$num]['icon'] = trim($row['iconname'], "\r");
}
@ -863,7 +863,7 @@ function spell_buff_render($row) {
// Тип диспела
if ($row['dispeltypeID']) {
$dispel = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_spelldispeltype WHERE id=? LIMIT 1', $row['dispeltypeID']);
$dispel = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.'host_mojotrollz_aowow'.'.?_aowow_spelldispeltype WHERE id=? LIMIT 1', $row['dispeltypeID']);
$x .= '<th><b class="q">' . $dispel . '</b></th>';
}
@ -875,7 +875,7 @@ function spell_buff_render($row) {
$x .= spell_desc2($row, 'buff') . '<br>';
// Длительность баффа
$duration = $DB->selectCell("SELECT durationBase FROM ?_aowow_spellduration WHERE durationID=? LIMIT 1", $row['durationID']);
$duration = $DB->selectCell('SELECT durationBase FROM '.'host_mojotrollz_aowow'.'.?_aowow_spellduration WHERE durationID=? LIMIT 1', $row['durationID']);
if ($duration > 0)
$x .= '<span class="q">' . ($duration / 1000) . ' seconds remaining</span>';
@ -896,9 +896,10 @@ function allspellsinfo($id, $level=0) {
global $spell_cols;
if (isset($allitems[$id]))
return $allitems[$id];
//TODO $UDWBaseconf['aowow']['db'];
$row = $DB->selectRow('
SELECT ?#
FROM ?_aowow_spell s, ?_aowow_spellicons i
FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell s, '.'host_mojotrollz_aowow'.'.?_aowow_spellicons i
WHERE
s.spellID=?
AND i.id = s.spellicon
@ -920,9 +921,10 @@ function allspellsinfo($id, $level=0) {
*/
function spellinfo($id) {
global $DB;
//TODO $UDWBaseconf['aowow']['db']
$row = $DB->selectRow('
SELECT s.*, i.iconname
FROM ?_aowow_spell s, ?_aowow_spellicons i
FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell s, '.'host_mojotrollz_aowow'.'.?_aowow_spellicons i
WHERE
s.spellID=?
AND i.id = s.spellicon
@ -953,7 +955,7 @@ function spellinfo2(&$row) {
$spell['cat'] = 0;
// Скилл
// if(!(isset($row['skillID'])))
// $skillrow = list($row['skillID'],$row['req_skill_value'],$row['min_value'],$row['max_value']);//$DB->selectRow('SELECT skillID, req_skill_value, min_value, max_value FROM ?_aowow_skill_line_ability WHERE spellID=?d LIMIT 1', $spell['entry']);
// $skillrow = list($row['skillID'],$row['req_skill_value'],$row['min_value'],$row['max_value']);//$DB->selectRow('SELECT skillID, req_skill_value, min_value, max_value FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill_line_ability WHERE spellID=?d LIMIT 1', $spell['entry']);
if (isset($row['skillID'])) {
// if($skillrow['req_skill_value'] != 1)
// $spell['learnedat'] = $skillrow['req_skill_value'];
@ -994,9 +996,10 @@ function spellinfo2(&$row) {
$spell['creates'][$i]['entry'] = $row['effect' . $j . 'itemtype'];
$spell['creates'][$i]['count'] = $row['effect' . $j . 'BasePoints'] + 1;
if (!(isset($allitems[$spell['creates'][$i]['entry']]))) {
//TODO $UDWBaseconf['aowow']['db']
$createrow = $DB->selectRow('
SELECT ?#
FROM ?_item_template, ?_aowow_icons
FROM ?_item_template, '.'host_mojotrollz_aowow'.'.?_aowow_icons
WHERE
entry=?d
AND id=displayid

8
includes/game.php
View File

@ -244,7 +244,7 @@ function coord_db2wow($mapid, $x, $y, $global) {
// Подключение к базе
global $DB;
$rows = $DB->select("SELECT * FROM ?_aowow_zones WHERE (mapID=? and x_min<? and x_max>? and y_min<? and y_max>?)", $mapid, $x, $x, $y, $y);
$rows = $DB->select('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_zones WHERE (mapID=? and x_min<? and x_max>? and y_min<? and y_max>?)', $mapid, $x, $x, $y, $y);
foreach ($rows as $numRow => $row) {
// Сохраяняем имя карты и координаты
@ -279,7 +279,7 @@ function coord_db2wow($mapid, $x, $y, $global) {
if (count($rows) == 0) {
// Ничего не найдено. Мб инста??
$row = $DB->selectRow("SELECT * FROM ?_aowow_zones WHERE (mapID=? and x_min=0 and x_max=0 and y_min=0 and y_max=0)", $mapid);
$row = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_zones WHERE (mapID=? and x_min=0 and x_max=0 and y_min=0 and y_max=0)', $mapid);
if ($row) {
$wow['zone'] = $row['areatableID'];
$wow['name'] = $row['name_loc' . $_SESSION['locale']];
@ -345,7 +345,7 @@ function mass_coord(&$data) {
*/
function factioninfo($id) {
global $DB;
$faction['name'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_factions WHERE factionID = ?d LIMIT 1', $id);
$faction['name'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.'host_mojotrollz_aowow'.'.?_aowow_factions WHERE factionID = ?d LIMIT 1', $id);
$faction['entry'] = $id;
return $faction;
}
@ -374,7 +374,7 @@ function loot_table($table, $lootid, $max_percent=100) {
SELECT l.ChanceOrQuestChance, l.mincountOrRef, l.maxcount as `d-max`, l.groupid, ?#, i.entry, i.maxcount
{, loc.name_loc?d AS `name_loc`}
FROM ' . $table . ' l
LEFT JOIN (?_aowow_icons a, ?_item_template i) ON l.item=i.entry AND a.id=i.displayid
LEFT JOIN ('.$UDWBaseconf['aowow']['db'].'.?_aowow_icons a, ?_item_template i) ON l.item=i.entry AND a.id=i.displayid
{LEFT JOIN (?_locales_item loc) ON loc.entry=i.entry AND ?d}
WHERE
l.entry=?d

30
item.php
View File

@ -47,7 +47,7 @@ if (!$item = load_cache(5, $id)) {
, l.name_loc?d as `name_loc`
, l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc`
}
FROM ?_aowow_factiontemplate, ?_creature_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
{ LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ? }
WHERE
lootid=?d
@ -81,7 +81,7 @@ if (!$item = load_cache(5, $id)) {
, l.name_loc?d as `name_loc`
, l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc`
}
FROM ?_aowow_factiontemplate, ?_creature_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
{ LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ? }
WHERE
c.lootid = ?d
@ -108,7 +108,7 @@ if (!$item = load_cache(5, $id)) {
// Сундуки
$rows = $DB->select('
SELECT g.entry, g.name, g.type, a.lockproperties1
FROM ?_gameobject_template g, ?_aowow_lock a
FROM ?_gameobject_template g, '.$UDWBaseconf['aowow']['db'].'.?_aowow_lock a
WHERE
g.data1=?d
AND g.type=?d
@ -147,7 +147,7 @@ if (!$item = load_cache(5, $id)) {
, l.name_loc?d as `name_loc`
, l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc`
}
FROM ?_npc_vendor v, ?_aowow_factiontemplate, ?_creature_template c
FROM ?_npc_vendor v, '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
{ LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ? }
WHERE
v.item=?d
@ -166,7 +166,7 @@ if (!$item = load_cache(5, $id)) {
if ($row['ExtendedCost'])
{
$item['soldby'][$numRow]['cost'] = array();
$extcost = $DB->selectRow('SELECT * FROM ?_aowow_item_extended_cost WHERE extendedcostID=?d LIMIT 1', $row['ExtendedCost']);
$extcost = $DB->selectRow('SELECT * FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_item_extended_cost WHERE extendedcostID=?d LIMIT 1', $row['ExtendedCost']);
if ($extcost['reqhonorpoints']>0)
$item['soldby'][$numRow]['cost']['honor'] = (($row['A']==1)? 1: -1) * $extcost['reqhonorpoints'];
if ($extcost['reqarenapoints']>0)
@ -238,7 +238,7 @@ if (!$item = load_cache(5, $id)) {
$rows = $DB->select('
SELECT c.?#, c.entry, maxcount
{ , l.name_loc?d AS `name_loc`}
FROM ?_aowow_icons, ?_item_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
{ LEFT JOIN (?_locales_item l) ON l.entry=c.entry AND ? }
WHERE
c.entry=?d
@ -269,7 +269,7 @@ if (!$item = load_cache(5, $id)) {
, l.name_loc?d as `name_loc`
, l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc`
}
FROM ?_aowow_factiontemplate, ?_creature_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
{ LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ? }
WHERE
pickpocketloot=?d
@ -296,7 +296,7 @@ if (!$item = load_cache(5, $id)) {
, l.name_loc?d as `name_loc`
, l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc`
}
FROM ?_aowow_factiontemplate, ?_creature_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
{ LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ? }
WHERE
skinloot=?d
@ -326,7 +326,7 @@ if (!$item = load_cache(5, $id)) {
{
, l.name_loc?d as `name_loc`
}
FROM ?_aowow_icons, ?_item_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
{ LEFT JOIN (?_locales_item l) ON l.entry=c.entry AND ? }
WHERE
DisenchantID=?d
@ -352,7 +352,7 @@ if (!$item = load_cache(5, $id)) {
{
, l.name_loc?d as `name_loc`
}
FROM ?_aowow_icons, ?_item_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
{ LEFT JOIN (?_locales_item l) ON l.entry=c.entry AND ? }
WHERE
BagFamily=?d
@ -371,7 +371,7 @@ if (!$item = load_cache(5, $id)) {
// Реагент для...
$rows_r = $DB->select('
SELECT ?#, spellID
FROM ?_aowow_spell s, ?_aowow_spellicons i
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i
WHERE
(( reagent1=?d
OR reagent2=?d
@ -417,7 +417,7 @@ if (!$item = load_cache(5, $id)) {
// Создается из...
$rows_cf = $DB->select('
SELECT ?#, s.spellID
FROM ?_aowow_spell s, ?_aowow_spellicons i
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i
WHERE
((s.effect1itemtype=?d
OR s.effect2itemtype=?d
@ -430,7 +430,7 @@ if (!$item = load_cache(5, $id)) {
foreach ($rows_cf as $numRow => $row) {
$skillrow = $DB->selectRow('
SELECT skillID, min_value, max_value
FROM ?_aowow_skill_line_ability
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill_line_ability
WHERE spellID=?d
LIMIT 1', $row['spellID']
);
@ -449,7 +449,7 @@ if (!$item = load_cache(5, $id)) {
// Обычные локации
$row = $DB->selectRow('
SELECT name_loc' . $_SESSION['locale'] . ' AS name, areatableID as id
FROM ?_aowow_zones
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_zones
WHERE
areatableID=?d
AND (x_min!=0 AND x_max!=0 AND y_min!=0 AND y_max!=0)
@ -462,7 +462,7 @@ if (!$item = load_cache(5, $id)) {
// Инсты
$row = $DB->selectRow('
SELECT name_loc' . $_SESSION['locale'] . ' AS name, mapID as id
FROM ?_aowow_zones
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_zones
WHERE
areatableID=?d
LIMIT 1

2
items.php
View File

@ -29,7 +29,7 @@ if (!$items = load_cache(7, $cache_str)) {
$rows = $DB->select('
SELECT ?#, i.entry, maxcount
{, l.name_loc?d AS `name_loc`}
FROM ?_aowow_icons, ?_item_template i
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template i
{LEFT JOIN (?_locales_item l) ON l.entry=i.entry AND ?d}
WHERE
id=displayid

2
itemset.php
View File

@ -22,7 +22,7 @@ $id = $podrazdel;
if (!$itemset = load_cache(8, intval($id))) {
unset($itemset);
$row = $DB->selectRow("SELECT * FROM ?_aowow_itemset WHERE itemsetID=? LIMIT 1", $id);
$row = $DB->selectRow("SELECT * FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_itemset WHERE itemsetID=? LIMIT 1", $id);
if ($row) {
$itemset = array();
$itemset['entry'] = $row['itemsetID'];

2
itemsets.php
View File

@ -24,7 +24,7 @@ if (!$itemsets = load_cache(9, 'x')) {
$rows = $DB->select('
SELECT ?#
FROM ?_aowow_itemset
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_itemset
ORDER by name_loc' . $_SESSION['locale'] . '
{LIMIT ?d}', $itemset_col[0], ($UDWBaseconf['limit'] != 0) ? $UDWBaseconf['limit'] : DBSIMPLE_SKIP
);

10
latest.php
View File

@ -17,7 +17,7 @@ switch ($_GET['latest']) {
$comments = array();
$rows = $DB->select('
SELECT `id`, `type`, `typeID`, LEFT(`commentbody`, 120) as `preview`, `userID` as `user`, `post_date` as `date`, (NOW()-`post_date`) as `elapsed`
FROM ?_aowow_comments
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments
WHERE 1
ORDER BY post_date DESC
LIMIT 300');
@ -35,19 +35,19 @@ switch ($_GET['latest']) {
$comments[$i]['subject'] = $DB->selectCell('SELECT name FROM ?_item_template WHERE entry=?d LIMIT 1', $row['typeID']);
break;
case 4: // Item Set
$comments[$i]['subject'] = $DB->selectCell('SELECT name FROM ?_aowow_itemset WHERE itemsetID=?d LIMIT 1', $row['typeID']);
$comments[$i]['subject'] = $DB->selectCell('SELECT name FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_itemset WHERE itemsetID=?d LIMIT 1', $row['typeID']);
break;
case 5: // Quest
$comments[$i]['subject'] = $DB->selectCell('SELECT Title FROM ?_quest_template WHERE entry=?d LIMIT 1', $row['typeID']);
break;
case 6: // Spell
$comments[$i]['subject'] = $DB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM ?_aowow_spell WHERE spellID=?d LIMIT 1', $row['typeID']);
$comments[$i]['subject'] = $DB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell WHERE spellID=?d LIMIT 1', $row['typeID']);
break;
case 7: // Zone
// TODO
break;
case 8: // Faction
$comments[$i]['subject'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_factions WHERE factionID=?d LIMIT 1', $row['typeID']);
$comments[$i]['subject'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions WHERE factionID=?d LIMIT 1', $row['typeID']);
break;
default:
$comments[$i]['subject'] = $DB->selectCell('SELECT name FROM ?_' . $types[$row['type']] . '_template WHERE entry=?d LIMIT 1', $row['typeID']);
@ -56,7 +56,7 @@ switch ($_GET['latest']) {
$comments[$i]['user'] = $rDB->selectCell('SELECT username FROM ?_account WHERE id=?d LIMIT 1', $row['user']);
if (empty($comments[$i]['user']))
$comments[$i]['user'] = 'Anonymous';
$comments[$i]['rating'] = array_sum($DB->selectCol('SELECT rate FROM ?_aowow_comments_rates WHERE commentid=?d', $row['id']));
$comments[$i]['rating'] = array_sum($DB->selectCol('SELECT rate FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments_rates WHERE commentid=?d', $row['id']));
$comments[$i]['purged'] = ($comments[$i]['rating'] <= -50) ? 1 : 0;
$comments[$i]['deleted'] = 0;
}

2
main.php
View File

@ -11,7 +11,7 @@
*/
// Загружаем новости
$rows = @$DB->select('SELECT text_loc?d AS text FROM ?_aowow_news ORDER BY time DESC, id DESC LIMIT 5', $_SESSION['locale']);
$rows = @$DB->select('SELECT text_loc?d AS text FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_news ORDER BY time DESC, id DESC LIMIT 5', $_SESSION['locale']);
if ($rows)
$smarty->assign('news', $rows);

24
npc.php
View File

@ -37,7 +37,7 @@ if (!$npc = load_cache(1, intval($id))) {
?,
}
f.name_loc' . $_SESSION['locale'] . ' as `faction-name`, ft.factionID as `factionID`
FROM ?_aowow_factiontemplate ft, ?_aowow_factions f, ?_creature_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate ft, '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions f, ?_creature_template c
{
LEFT JOIN (?_locales_creature l)
ON l.entry=c.entry AND ?
@ -140,9 +140,9 @@ if (!$npc = load_cache(1, intval($id))) {
for ($k = 1; $k <= 3; $k++) {
$spellrow = $DB->selectRow('
SELECT ?#, spellID
FROM ?_aowow_spell, ?_aowow_spellicons
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons
WHERE
spellID=(SELECT effect' . $k . 'triggerspell FROM ?_aowow_spell WHERE spellID=?d AND (effect' . $k . 'id IN (36,57)))
spellID=(SELECT effect' . $k . 'triggerspell FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell WHERE spellID=?d AND (effect' . $k . 'id IN (36,57)))
AND id=spellicon
LIMIT 1
', $spell_cols[2], $row['Spell' . $j]
@ -159,7 +159,7 @@ if (!$npc = load_cache(1, intval($id))) {
// Если это просто тренер
$teachspells = $DB->select('
SELECT ?#, spellID
FROM ?_npc_trainer, ?_aowow_spell, ?_aowow_spellicons
FROM ?_npc_trainer, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons
WHERE
entry=?d
AND spellID=Spell
@ -181,7 +181,7 @@ if (!$npc = load_cache(1, intval($id))) {
$rows_s = $DB->select('
SELECT ?#, i.entry, i.maxcount, n.`maxcount` as `drop-maxcount`
{, l.name_loc?d AS `name_loc`}
FROM ?_npc_vendor n, ?_aowow_icons, ?_item_template i
FROM ?_npc_vendor n, '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template i
{LEFT JOIN (?_locales_item l) ON l.entry=i.entry AND ?d}
WHERE
n.entry=?
@ -198,7 +198,7 @@ if (!$npc = load_cache(1, intval($id))) {
$npc['sells'][$numRow]['cost'] = array();
/* if ($row['ExtendedCost']) [NOTE] overwrite with honor points?
{
$extcost = $DB->selectRow('SELECT * FROM ?_aowow_item_extended_cost WHERE extendedcostID=?d LIMIT 1', $row['ExtendedCost']);
$extcost = $DB->selectRow('SELECT * FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_item_extended_cost WHERE extendedcostID=?d LIMIT 1', $row['ExtendedCost']);
if ($extcost['reqhonorpoints']>0)
$npc['sells'][$numRow]['cost']['honor'] = (($npc['A']==1)? 1: -1) * $extcost['reqhonorpoints'];
if ($extcost['reqarenapoints']>0)
@ -234,10 +234,10 @@ if (!$npc = load_cache(1, intval($id))) {
// Начиниают квесты...
$rows_qs = $DB->select('
SELECT c.?#
FROM ?_quest_relations c, ?_quest_template q
SELECT ?#
FROM ?_creature_questrelation c, ?_quest_template q
WHERE
c.entry=?
c.id=?
AND q.entry=c.quest
', $quest_cols[2], $id
);
@ -251,10 +251,10 @@ if (!$npc = load_cache(1, intval($id))) {
// Заканчивают квесты...
$rows_qe = $DB->select('
SELECT c.?#
FROM ?_quest_relations c, ?_quest_template q
SELECT ?#
FROM ?_creature_questrelation c, ?_quest_template q
WHERE
c.entry=?
c.id=?
AND q.entry=c.quest
', $quest_cols[2], $id
);

2
npcs.php
View File

@ -34,7 +34,7 @@ if (!$npcs = load_cache(2, $cache_str)) {
, l.name_loc?d as `name_loc`
, l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc`
}
FROM ?_aowow_factiontemplate, ?_creature_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
{ LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ? }
WHERE 1=1
{AND creatureType=?}

8
object.php
View File

@ -33,9 +33,9 @@ if (!$object = load_cache(3, intval($id))) {
// Начиниают квесты...
$rows_qs = $DB->select('
SELECT o.?#
FROM ?_quest_relations q, ?_quest_template o
FROM ?_gameobject_questrelation q, ?_quest_template o
WHERE
q.entry = ?d
q.id = ?d
AND o.entry = q.quest
', $quest_cols[2], $id
);
@ -49,9 +49,9 @@ if (!$object = load_cache(3, intval($id))) {
// Заканчивают квесты...
$rows_qe = $DB->select('
SELECT i.?#
FROM ?_quest_relations i, ?_quest_template q
FROM ?_gameobject_questrelation i, ?_quest_template q
WHERE
i.entry = ?d
i.id = ?d
AND q.entry = i.quest
', $quest_cols[2], $id
);

2
objects.php
View File

@ -25,7 +25,7 @@ if (!$data = load_cache(4, intval($type))) {
$rows = $DB->select('
SELECT g.* {, a.requiredskill1 as ?#} {, a.requiredskill2 as ?#}
{, l.name_loc?d AS `name_loc`}
FROM {?_gameobject_questrelation ?#, } {?_aowow_lock ?#, } ?_gameobject_template g
FROM {?_gameobject_questrelation ?#, } {'.$UDWBaseconf['aowow']['db'].'.?_aowow_lock ?#, } ?_gameobject_template g
{LEFT JOIN (?_locales_gameobject l) ON l.entry=g.entry AND ?d}
WHERE
name != ""

2
opensearch.php
View File

@ -54,7 +54,7 @@ function SideByRace($race) {
// Ищем вещи:
$rows = $DB->select('
SELECT i.entry, ?#, iconname, quality
FROM ?_aowow_icons a, ?_item_template i{, ?# l}
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons a, ?_item_template i{, ?# l}
WHERE
?# LIKE ?
AND a.id = i.displayid

32
quest.php
View File

@ -208,7 +208,7 @@ if (!$quest = load_cache(10, intval($id))) {
// TODO: skill localization
$quest['reqskill'] = array(
'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_skill WHERE skillID=?d LIMIT 1', $quest['SkillOrClass']),
'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill WHERE skillID=?d LIMIT 1', $quest['SkillOrClass']),
'value' => $quest['RequiredSkillValue']
);
} elseif ($quest['SkillOrClass'] < 0)
@ -218,13 +218,13 @@ if (!$quest = load_cache(10, intval($id))) {
// Требуемые отношения с фракциями, что бы начать квест
if ($quest['RequiredMinRepFaction'] && $quest['RequiredMinRepValue'])
$quest['RequiredMinRep'] = array(
'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_factions WHERE factionID=?d LIMIT 1', $quest['RequiredMinRepFaction']),
'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions WHERE factionID=?d LIMIT 1', $quest['RequiredMinRepFaction']),
'entry' => $quest['RequiredMinRepFaction'],
'value' => $reputations[$quest['RequiredMinRepValue']]
);
if ($quest['RequiredMaxRepFaction'] && $quest['RequiredMaxRepValue'])
$quest['RequiredMaxRep'] = array(
'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_factions WHERE factionID=?d LIMIT 1', $quest['RequiredMaxRepFaction']),
'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions WHERE factionID=?d LIMIT 1', $quest['RequiredMaxRepFaction']),
'entry' => $quest['RequiredMaxRepFaction'],
'value' => $reputations[$quest['RequiredMaxRepValue']]
);
@ -235,7 +235,7 @@ if (!$quest = load_cache(10, intval($id))) {
if ($quest['SrcSpell']) {
$tmp = $DB->selectRow('
SELECT ?#, s.spellname_loc' . $_SESSION['locale'] . '
FROM ?_aowow_spell s, ?_aowow_spellicons si
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons si
WHERE
s.spellID=?d
AND si.id=s.spellicon
@ -254,7 +254,7 @@ if (!$quest = load_cache(10, intval($id))) {
if ($quest['RewSpellCast'] > 0 || $quest['RewSpell'] > 0) {
$tmp = $DB->SelectRow('
SELECT ?#, s.spellname_loc' . $_SESSION['locale'] . '
FROM ?_aowow_spell s, ?_aowow_spellicons si
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons si
WHERE
s.spellID=?d
AND si.id=s.spellicon
@ -292,7 +292,7 @@ if (!$quest = load_cache(10, intval($id))) {
// Спелл
if ($quest['ReqSpellCast' . $i])
$quest['coreqs'][$i]['spell'] = array(
'name' => $DB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM ?_aowow_spell WHERE spellid=?d LIMIT 1', $quest['ReqSpellCast' . $i]),
'name' => $DB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell WHERE spellid=?d LIMIT 1', $quest['ReqSpellCast' . $i]),
'entry' => $quest['ReqSpellCast' . $i]
);
}
@ -312,7 +312,7 @@ if (!$quest = load_cache(10, intval($id))) {
// Фракции необходимые для квеста
if ($quest['RepObjectiveFaction'] > 0 && $quest['RepObjectiveValue'] > 0) {
$quest['factionreq'] = array(
'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_factions WHERE factionID=?d LIMIT 1', $quest['RepObjectiveFaction']),
'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions WHERE factionID=?d LIMIT 1', $quest['RepObjectiveFaction']),
'entry' => $quest['RepObjectiveFaction'],
'value' => $reputations[$quest['RepObjectiveValue']]
);
@ -325,11 +325,11 @@ if (!$quest = load_cache(10, intval($id))) {
$rows = $DB->select('
SELECT c.entry, c.name, A, H
{, l.name_loc?d as `name_loc`}
FROM ?quest_relations q, ?_aowow_factiontemplate, ?_creature_template c
FROM ?_creature_questrelation q, '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
{LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ?}
WHERE
q.quest=?d
AND c.entry=q.entry
AND c.entry=q.id
AND factiontemplateID=c.FactionAlliance
', ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $quest['entry'], $quest['entry']
);
@ -350,11 +350,11 @@ if (!$quest = load_cache(10, intval($id))) {
$rows = $DB->select('
SELECT g.entry, g.name
{, l.name_loc?d as `name_loc`}
FROM ?_quest_relations q, ?_gameobject_template g
FROM ?_gameobject_questrelation q, ?_gameobject_template g
{LEFT JOIN (?_locales_gameobject l) ON l.entry = g.entry AND ?}
WHERE
q.quest=?d
AND g.entry=q.entry
AND g.entry=q.id
', ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $quest['entry']
);
if ($rows) {
@ -370,7 +370,7 @@ if (!$quest = load_cache(10, intval($id))) {
$rows = $DB->select('
SELECT i.name, i.entry, i.quality, LOWER(a.iconname) AS iconname
{, l.name_loc?d as `name_loc`}
FROM ?_aowow_icons a, ?_item_template i
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons a, ?_item_template i
{LEFT JOIN (?_locales_item l) ON l.entry=i.entry AND ?}
WHERE
startquest = ?d
@ -391,11 +391,11 @@ if (!$quest = load_cache(10, intval($id))) {
$rows = $DB->select('
SELECT c.entry, c.name, A, H
{, l.name_loc?d as `name_loc`}
FROM ?_quest_relations q, ?_aowow_factiontemplate, ?_creature_template c
FROM ?_creature_questrelation q, '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
{LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ?}
WHERE
q.quest=?d
AND c.entry=q.entry
AND c.entry=q.id
AND factiontemplateID=c.FactionAlliance
', ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $quest['entry']
);
@ -416,11 +416,11 @@ if (!$quest = load_cache(10, intval($id))) {
$rows = $DB->select('
SELECT g.entry, g.name
{, l.name_loc?d as `name_loc`}
FROM ?_quest_relations q, ?_gameobject_template g
FROM ?_gameobject_questrelation q, ?_gameobject_template g
{LEFT JOIN (?_locales_gameobject l) ON l.entry = g.entry AND ?}
WHERE
q.quest=?d
AND g.entry=q.entry
AND g.entry=q.id
', ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $quest['entry']
);
if ($rows) {

8
search.php
View File

@ -57,7 +57,7 @@ if ($_SESSION['locale'] > 0) {
$rows = $DB->select('
SELECT i.?#
{, l.name_loc?d AS `name_loc`}
FROM ?_aowow_icons a, ?_item_template i
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons a, ?_item_template i
{LEFT JOIN (?_locales_item l) ON l.entry=i.entry AND ?d}
WHERE
(i.name LIKE ? {OR i.entry IN (?a)})
@ -88,7 +88,7 @@ $rows = $DB->select('
SELECT ?#, c.entry
{, l.name_loc?d AS `name_loc`,
l.subname_loc' . ($_SESSION['locale']) . ' AS `subname_loc`}
FROM ?_aowow_factiontemplate, ?_creature_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
{LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ?d}
WHERE
(name LIKE ?
@ -160,7 +160,7 @@ foreach ($rows as $numRow => $row)
// Ищем наборы вещей
$rows = $DB->select('
SELECT *
FROM ?_aowow_itemset
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_itemset
WHERE name_loc' . $_SESSION['locale'] . ' LIKE ?
', $nsearch
);
@ -170,7 +170,7 @@ foreach ($rows as $numRow => $row)
// Ищем спеллы
$rows = $DB->select('
SELECT ?#, spellID
FROM ?_aowow_spell s, ?_aowow_spellicons i
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i
WHERE
s.spellname_loc' . $_SESSION['locale'] . ' like ?
AND i.id = s.spellicon

46
spell.php
View File

@ -35,7 +35,7 @@ if (!$spell = load_cache(13, intval($id))) {
// Данные об спелле:
$row = $DB->selectRow('
SELECT s.*, i.iconname
FROM ?_aowow_spell s, ?_aowow_spellicons i
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i
WHERE
s.spellID=?
AND i.id = s.spellicon
@ -57,14 +57,14 @@ if (!$spell = load_cache(13, intval($id))) {
// Уровень спелла
$spell['level'] = $row['levelspell'];
// Дальность
$RangeRow = $DB->selectRow('SELECT rangeMin, rangeMax, name_loc' . $_SESSION['locale'] . ' from ?_aowow_spellrange where rangeID=? limit 1', $row['rangeID']);
$RangeRow = $DB->selectRow('SELECT rangeMin, rangeMax, name_loc' . $_SESSION['locale'] . ' from '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellrange where rangeID=? limit 1', $row['rangeID']);
$spell['range'] = '';
if (($RangeRow['rangeMin'] != $RangeRow['rangeMax']) and ($RangeRow['rangeMin'] != 0))
$spell['range'] = $RangeRow['rangeMin'] . '-';
$spell['range'] .= $RangeRow['rangeMax'];
$spell['rangename'] = $RangeRow['name_loc' . $_SESSION['locale']];
// Время каста
$casttime = $DB->selectCell('SELECT base from ?_aowow_spellcasttimes where id=? limit 1', $row['spellcasttimesID']);
$casttime = $DB->selectCell('SELECT base from '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellcasttimes where id=? limit 1', $row['spellcasttimesID']);
if ($casttime > 0)
$spell['casttime'] = ($casttime / 1000) . ' ' . $smarty->get_config_vars('seconds');
else if ($row['ChannelInterruptFlags'])
@ -75,19 +75,19 @@ if (!$spell = load_cache(13, intval($id))) {
if ($row['cooldown'] > 0)
$spell['cooldown'] = $row['cooldown'] / 1000;
// Время действия спелла
$duration = $DB->selectCell('SELECT durationBase FROM ?_aowow_spellduration WHERE durationID=?d LIMIT 1', $row['durationID']);
$duration = $DB->selectCell('SELECT durationBase FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellduration WHERE durationID=?d LIMIT 1', $row['durationID']);
if ($duration > 0)
$spell['duration'] = ($duration / 1000) . ' ' . $smarty->get_config_vars('seconds');
else
$spell['duration'] = '<span class="q0">n/a</span>';
// Школа спелла
$spell['school'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_resistances WHERE id=?d LIMIT 1', $row['resistancesID']);
$spell['school'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_resistances WHERE id=?d LIMIT 1', $row['resistancesID']);
// Тип диспела
if ($row['dispeltypeID'])
$spell['dispel'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_spelldispeltype WHERE id=?d LIMIT 1', $row['dispeltypeID']);
$spell['dispel'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spelldispeltype WHERE id=?d LIMIT 1', $row['dispeltypeID']);
// Механика спелла
if ($row['mechanicID'])
$spell['mechanic'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_spellmechanic WHERE id=?d LIMIT 1', $row['mechanicID']);
$spell['mechanic'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellmechanic WHERE id=?d LIMIT 1', $row['mechanicID']);
// Информация о спелле
$spell['info'] = allspellsinfo2($row, 2);
@ -99,7 +99,7 @@ if (!$spell = load_cache(13, intval($id))) {
if ($row['tool' . $j]) {
$spell['tools'][$i] = array();
// Имя инструмента
$tool_row = $DB->selectRow('SELECT ?#, `quality` FROM ?_item_template, ?_aowow_icons WHERE entry=?d AND id=displayid LIMIT 1', $item_cols[0], $row['tool' . $j]);
$tool_row = $DB->selectRow('SELECT ?#, `quality` FROM ?_item_template, '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons WHERE entry=?d AND id=displayid LIMIT 1', $item_cols[0], $row['tool' . $j]);
$spell['tools'][$i]['name'] = $tool_row['name'];
$spell['tools'][$i]['quality'] = $tool_row['quality'];
// ID инструмента
@ -120,7 +120,7 @@ if (!$spell = load_cache(13, intval($id))) {
$reagentrow = $DB->selectRow('
SELECT c.?#, name
{ ,l.name_loc?d as `name_loc` }
FROM ?_aowow_icons, ?_item_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
{ LEFT JOIN (?_locales_item l) ON l.entry=c.entry AND ? }
WHERE
c.entry=?d
@ -168,7 +168,7 @@ if (!$spell = load_cache(13, intval($id))) {
}
// скиллы
case 118: {// "Require Skill"
$spell['effect'][$i]['name'] .= ' (' . $DB->selectCell('SELECT name FROM ?_aowow_skill WHERE skillID=? LIMIT 1', $row['effect' . $j . 'MiscValue']) . ')';
$spell['effect'][$i]['name'] .= ' (' . $DB->selectCell('SELECT name FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill WHERE skillID=? LIMIT 1', $row['effect' . $j . 'MiscValue']) . ')';
break;
}
// ауры
@ -194,7 +194,7 @@ if (!$spell = load_cache(13, intval($id))) {
$spell['effect'][$i]['name'] .= ' (' . $spell['school'] . ')';
// Радиус действия эффекта
if ($row['effect' . $j . 'radius'])
$spell['effect'][$i]['radius'] = $DB->selectCell("SELECT radiusbase from ?_aowow_spellradius where radiusID=? limit 1", $row['effect' . $j . 'radius']);
$spell['effect'][$i]['radius'] = $DB->selectCell('SELECT radiusbase from '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellradius where radiusID=? limit 1', $row['effect' . $j . 'radius']);
// Значение спелла (урон)
if ($row['effect' . $j . 'BasePoints'] && !$row['effect' . $j . 'itemtype'])
$spell['effect'][$i]['value'] = $row['effect' . $j . 'BasePoints'] + 1;
@ -224,7 +224,7 @@ if (!$spell = load_cache(13, intval($id))) {
$tmpRow = $DB->selectRow('
SELECT c.?#, name
{ ,l.name_loc?d as `name_loc` }
FROM ?_aowow_icons, ?_item_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
{ LEFT JOIN (?_locales_item l) ON l.entry=c.entry AND ? }
WHERE
c.entry=?d
@ -244,7 +244,7 @@ if (!$spell = load_cache(13, intval($id))) {
if ($row['effect' . $j . 'triggerspell'] > 0) {
$spell['effect'][$i]['spell'] = array();
$spell['effect'][$i]['spell']['entry'] = $row['effect' . $j . 'triggerspell'];
$spell['effect'][$i]['spell']['name'] = $DB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM ?_aowow_spell WHERE spellID=?d LIMIT 1', $spell['effect'][$i]['spell']['entry']);
$spell['effect'][$i]['spell']['name'] = $DB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell WHERE spellID=?d LIMIT 1', $spell['effect'][$i]['spell']['entry']);
allspellsinfo($spell['effect'][$i]['spell']['entry']);
}
$i++;
@ -257,7 +257,7 @@ if (!$spell = load_cache(13, intval($id))) {
// Спеллы с таким же названием
$seealso = $DB->select('
SELECT s.*, i.iconname
FROM ?_aowow_spell s, ?_aowow_spellicons i
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i
WHERE
s.spellname_loc' . $_SESSION['locale'] . ' = ?
AND s.spellID <> ?d
@ -282,7 +282,7 @@ if (!$spell = load_cache(13, intval($id))) {
$taughtbytrainers = $DB->select('
SELECT ?#, c.entry
{ , name_loc?d AS name_loc, subname_loc' . $_SESSION['locale'] . ' AS subname_loc }
FROM ?_aowow_factiontemplate, ?_creature_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
{ LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? }
WHERE
c.entry IN (SELECT entry FROM ?_npc_trainer WHERE spell=?d)
@ -300,7 +300,7 @@ if (!$spell = load_cache(13, intval($id))) {
$taughtbyitem = $DB->select('
SELECT ?#, c.entry
{ , name_loc?d AS name_loc }
FROM ?_aowow_icons, ?_item_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
{ LEFT JOIN (?_locales_item l) ON c.entry = l.entry AND ? }
WHERE
((spellid_2=?d)
@ -317,7 +317,7 @@ if (!$spell = load_cache(13, intval($id))) {
// Список спеллов, обучающих этому спеллу:
$taughtbyspells = $DB->selectCol('
SELECT spellID
FROM ?_aowow_spell
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell
WHERE
(effect1triggerspell=?d AND (effect1id=57 OR effect1id=36))
OR (effect2triggerspell=?d AND (effect2id=57 OR effect2id=36))
@ -330,7 +330,7 @@ if (!$spell = load_cache(13, intval($id))) {
$taughtbypets = $DB->select('
SELECT ?#, c.entry
{ , name_loc?d AS name_loc, subname_loc' . $_SESSION['locale'] . ' AS subname_loc }
FROM ?_aowow_factiontemplate, ?_creature_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
{ LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? }
WHERE
c.entry IN (SELECT entry FROM ?_petcreateinfo_spell WHERE (Spell1 IN (?a)) OR (Spell2 IN (?a)) OR (Spell3 IN (?a)) OR (Spell4 IN (?a)))
@ -365,7 +365,7 @@ if (!$spell = load_cache(13, intval($id))) {
$taughtbytrainers = $DB->select('
SELECT ?#, c.entry
{ , name_loc?d AS name_loc, subname_loc' . $_SESSION['locale'] . ' AS subname_loc }
FROM ?_aowow_factiontemplate, ?_creature_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
{ LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? }
WHERE
c.entry IN (SELECT entry FROM ?_npc_trainer WHERE spell in (?a))
@ -382,7 +382,7 @@ if (!$spell = load_cache(13, intval($id))) {
$taughtbyitem = $DB->select('
SELECT ?#, c.entry
{ , name_loc?d AS name_loc }
FROM ?_aowow_icons, ?_item_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
{ LEFT JOIN (?_locales_item l) ON c.entry = l.entry AND ? }
WHERE
((spellid_1 IN (?a))
@ -404,7 +404,7 @@ if (!$spell = load_cache(13, intval($id))) {
$usedbynpc = $DB->select('
SELECT ?#, c.entry
{ , name_loc?d AS name_loc, subname_loc' . $_SESSION['locale'] . ' AS subname_loc }
FROM ?_aowow_factiontemplate, ?_creature_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
{ LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? }
WHERE
factiontemplateID=FactionAlliance
@ -421,7 +421,7 @@ if (!$spell = load_cache(13, intval($id))) {
$usedbyitem = $DB->select('
SELECT ?#, c.entry
{ , name_loc?d AS name_loc }
FROM ?_aowow_icons, ?_item_template c
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
{ LEFT JOIN (?_locales_item l) ON c.entry = l.entry AND ? }
WHERE
(spellid_1=?d OR (spellid_2=?d AND spelltrigger_2!=6) OR spellid_3=?d OR spellid_4=?d OR spellid_5=?d)
@ -438,7 +438,7 @@ if (!$spell = load_cache(13, intval($id))) {
// Используется наборами вещей:
$usedbyitemset = $DB->select('
SELECT *
FROM ?_aowow_itemset
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_itemset
WHERE spell1=?d or spell2=?d or spell3=?d or spell4=?d or spell5=?d or spell6=?d or spell7=?d or spell8=?d
', $spell['entry'], $spell['entry'], $spell['entry'], $spell['entry'], $spell['entry'], $spell['entry'], $spell['entry'], $spell['entry']
);

12
spells.php
View File

@ -31,7 +31,7 @@ if (!$spells = load_cache(15, $cache_str)) {
// Классовые
$rows = $DB->select('
SELECT ?#, s.`spellID`, sk.skillID
FROM ?_aowow_spell s, ?_aowow_skill_line_ability sla, ?_aowow_spellicons i, ?_aowow_skill sk
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill_line_ability sla, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i, '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill sk
WHERE
s.spellID = sla.spellID
AND s.levelspell >= 1
@ -70,7 +70,7 @@ if (!$spells = load_cache(15, $cache_str)) {
SELECT
?#, `s`.`spellID`,
sla.skillID, sla.min_value, sla.max_value
FROM ?_aowow_spell s, ?_aowow_skill_line_ability sla, ?_aowow_spellicons i, ?_aowow_skill sk
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill_line_ability sla, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i, '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill sk
WHERE
s.spellID = sla.spellID
AND i.id=s.spellicon
@ -89,7 +89,7 @@ if (!$spells = load_cache(15, $cache_str)) {
$rows = $DB->select('
SELECT
?#, `s`.`spellID`, sk.skillID
FROM ?_aowow_spell s, ?_aowow_skill_line_ability sla, ?_aowow_spellicons i, ?_aowow_skill sk
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill_line_ability sla, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i, '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill sk
WHERE
s.spellID = sla.spellID
AND s.levelspell > 0
@ -108,9 +108,9 @@ if (!$spells = load_cache(15, $cache_str)) {
$rows = $DB->select('
SELECT
?#, `s`.`spellID`
FROM ?_aowow_spell s, ?_aowow_spellicons i
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i
WHERE
s.spellID IN (SELECT spellID FROM ?_aowow_skill_line_ability WHERE racemask>0)
s.spellID IN (SELECT spellID FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill_line_ability WHERE racemask>0)
AND i.id=s.spellicon
{LIMIT ?d}
', $spell_cols[2], ($UDWBaseconf['limit'] != 0) ? $UDWBaseconf['limit'] : DBSIMPLE_SKIP
@ -124,7 +124,7 @@ if (!$spells = load_cache(15, $cache_str)) {
$rows = $DB->select('
SELECT
?#, `s`.`spellID`
FROM ?_aowow_spell s, ?_aowow_spellicons i
FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i
WHERE
i.id=s.spellicon
{LIMIT ?d}

1756
templates/wowhead/js/locale_enus.js
View File

File diff suppressed because it is too large Load Diff

47
templates/wowhead/maps.tpl
View File

@ -21,12 +21,16 @@
<option value="10">Duskwood</option>
<option value="139">Eastern Plaguelands</option>
<option value="12">Elwynn Forest</option>
<option value="3430">Eversong Woods</option>
<option value="3433">Ghostlands</option>
<option value="267">Hillsbrad Foothills</option>
<option value="1537">Ironforge</option>
<option value="4080">Isle of Quel'Danas</option>
<option value="38">Loch Modan</option>
<option value="44">Redridge Mountains</option>
<option value="51">Searing Gorge</option>
<option value="3487">Silvermoon City</option>
<option value="130">Silverpine Forest</option>
<option value="1519">Stormwind City</option>
@ -43,6 +47,8 @@
<option value="0">Kalimdor</option>
<option value="331">Ashenvale</option>
<option value="16">Azshara</option>
<option value="3524">Azuremyst Isle</option>
<option value="3525">Bloodmyst Isle</option>
<option value="148">Darkshore</option>
<option value="1657">Darnassus</option>
<option value="405">Desolace</option>
@ -60,26 +66,52 @@
<option value="440">Tanaris</option>
<option value="141">Teldrassil</option>
<option value="17">The Barrens</option>
<option value="3557">The Exodar</option>
<option value="400">Thousand Needles</option>
<option value="1638">Thunder Bluff</option>
<option value="490">Un'Goro Crater</option>
<option value="618">Winterspring</option>
</select><select onchange="mapperChooseZone(this)" class="zone-picker">
<option value="0">Outland</option>
<option value="3522">Blade's Edge Mts.</option>
<option value="3483">Hellfire Peninsula</option>
<option value="3518">Nagrand</option>
<option value="3523">Netherstorm</option>
<option value="3520">Shadowmoon Valley</option>
<option value="3703">Shattrath City</option>
<option value="3519">Terokkar Forest</option>
<option value="3521">Zangarmarsh</option>
</select>
<div style="padding-bottom: 4px"></div>
<select onchange="mapperChooseZone(this)" class="zone-picker">
<option value="0">Instances</option>
<optgroup label="Dungeons">
<option value="3790">Auch.: Auchenai Crypts</option>
<option value="3792">Auch.: Mana-Tombs</option>
<option value="3791">Auch.: Sethekk Halls</option>
<option value="3789">Auch.: Shadow Labyrinth</option>
<option value="719">Blackfathom Deeps</option>
<option value="1584">Blackrock Depths</option>
<option value="1583b">Blackrock Spire (Upper)</option>
<option value="3717">CFR: The Slave Pens</option>
<option value="3715">CFR: The Steamvault</option>
<option value="3716">CFR: The Underbog</option>
<option value="2367">CoT: Old Hillsbrad Foothills</option>
<option value="2366">CoT: The Black Morass</option>
<option value="2557">Dire Maul</option>
<option value="2557e">&nbsp;- East</option>
<option value="2557n">&nbsp;- North</option>
<option value="2557w">&nbsp;- West</option>
<option value="3562">HFC: Hellfire Ramparts</option>
<option value="3713">HFC: The Blood Furnace</option>
<option value="3714">HFC: The Shattered Halls</option>
<option value="133">Gnomeregan</option>
<option value="4095">Magisters' Terrace</option>
<option value="2100">Maraudon</option>
<option value="2437">Ragefire Chasm</option>
<option value="722">Razorfen Downs</option>
@ -95,17 +127,28 @@
<option value="1417">Sunken Temple</option>
<option value="717">The Stockade</option>
<option value="3846">TK: The Arcatraz</option>
<option value="3847">TK: The Botanica</option>
<option value="3849">TK: The Mechanar</option>
<option value="1337">Uldaman</option>
<option value="718">Wailing Caverns</option>
<option value="978">Zul'Farrak</option>
</optgroup>
<optgroup label="Raids">
<option value="3959">Black Temple</option>
<option value="3607">CFR: Serpentshrine Cavern</option>
<option value="3606">CoT: Hyjal Summit</option>
<option value="3618">Gruul's Lair</option>
<option value="3836">HFC: Magtheridon's Lair</option>
<option value="2717">Molten Core</option>
<option value="3456">Naxxramas</option>
<option value="2159">Onyxia's Lair</option>
<option value="3429">Ruins of Ahn'Qiraj</option>
<option value="3428">Temple of Ahn'Qiraj</option>
<option value="3842">TK: The Eye</option>
<option value="3805">Zul'Aman</option>
<option value="19">Zul'Gurub</option>
</optgroup>
</select>
@ -114,12 +157,16 @@
<optgroup label="Battlegrounds">
<option value="2597">Alterac Valley</option>
<option value="3358">Arathi Basin</option>
<option value="3820">Eye of the Storm</option>
<option value="3277">Warsong Gulch</option>
</optgroup>
<optgroup label="Miscellaneous">
<option value="-1">Azeroth</option>
<option value="-3">Eastern Kingdoms</option>
<option value="457">Kalimdor</option>
<option value="-2">Outland</option>
<option value="-4">Cosmic Map</option>
</optgroup>
</select>

2
templates/wowhead/quest.tpl
View File

@ -27,7 +27,7 @@
{if $quest.MinLevel>0}<li><div>{#Requires_level#}: {$quest.MinLevel}</div></li>{/if}
{if $quest.typename}<li><div>{#Type#}: {$quest.typename}</div></li>{/if}
{if isset($quest.side)}<li><div>{#Side#}: <span class="{if ($quest.side.side==1)}alliance{elseif ($quest.side.side==2)}horde{else}both{/if}-icon">{$quest.side.name}</span></div></li>{/if}
{if isset($quest.start)}<li><div>{#Start#}: {section loop=$quest.start name=i}{if $quest.start[i].side}<span class="{$quest.start[i].side}-icon">{/if}<a href="?{$quest.start[i].type}={$quest.start[i].entry}"{if $quest.start[i].type == 'item'} class="icontiny q{$quest.start[i].quality}" style="background-image: url(images/icons/tiny/{$quest.start[i].iconname}.gif);"{/if}>{$quest.start[i].name}</a>{if $quest.start[i].side}</span>{/if}{if $smarty.section.i.last}{else}, <br><span style="visibility: hidden;">{#Start#}: </span>{/if}{/section}</div></li>{/if}
{if isset($quest.start)}<li><div>{#Start#}: {section loop=$quest.start name=i}{if $quest.start[i].side}<span class="{$quest.start[i].side}-icon">{/if}<a href="?{$quest.start[i].type}={$quest.start[i].entry}"{if $quest.start[i].type == 'item'} class="icontiny q{$quest.start[i].quality}" style="background-image: url(images/icons/tiny/{$quest.start[i].iconname}.png);"{/if}>{$quest.start[i].name}</a>{if $quest.start[i].side}</span>{/if}{if $smarty.section.i.last}{else}, <br><span style="visibility: hidden;">{#Start#}: </span>{/if}{/section}</div></li>{/if}
{if isset($quest.end)}<li><div>{#End#}: {section loop=$quest.end name=i}{if $quest.end[i].side}<span class="{$quest.start[i].side}-icon">{/if}<a href="?{$quest.end[i].type}={$quest.end[i].entry}">{$quest.end[i].name}</a>{if $quest.end[i].side}</span>{/if}{if $smarty.section.i.last}{else}, <br><span style="visibility: hidden;">{#End#}: </span>{/if}{/section}</div></li>{/if}
{if isset($quest.reqskill)}<li><div>{#Skill#}: {$quest.reqskill.name} ({$quest.reqskill.value})</div></li>{/if}
{if isset($quest.reqclass)}<li><div>{#Class#}: {$quest.reqclass}</div></li>{/if}