Index: trunk/ahstats.php =================================================================== --- trunk/ahstats.php (revision 491) +++ trunk/ahstats.php (working copy) @@ -233,7 +233,7 @@ $value = ($value >= 0)? (floor($value / 86400).$lang_auctionhouse['dayshortcut']." ". floor(($value % 86400)/3600).$lang_auctionhouse['hourshortcut']." ".floor((($value % 86400)%3600)/60).$lang_auctionhouse['mnshortcut']) : $lang_auctionhouse['auction_over']; break; case 5: - $value = "".((!empty($rows[10])) ? "".htmlentities($value)."" : "N/A").""; + $value = "".((!empty($rows[10])) ? "".$value."" : "N/A").""; break; case 7: case 6: @@ -249,7 +249,7 @@ $value = "\"$value\"
$value".(($rows[8]>1) ? " (x$rows[8])" : "").""; break; case 0: - $value = "".((!empty($rows[9])) ? "".htmlentities($value)."" : "N/A").""; + $value = "".((!empty($rows[9])) ? "".$value."" : "N/A").""; break; } if (!in_array($row,$hiddencols)) Index: trunk/arenateam.php =================================================================== --- trunk/arenateam.php (revision 491) +++ trunk/arenateam.php (working copy) @@ -120,8 +120,8 @@ $output .= " $data[0] - ".htmlentities($data[1])." - ".htmlentities($data[4])." + ".$data[1]." + ".$data[4]." {$lang_arenateam[$data[3]]} $data[5] $arenateam_online @@ -189,7 +189,7 @@ {$lang_arenateam['arenateam']} ({$arenateam_data[2]}v{$arenateam_data[2]}) - + @@ -261,7 +261,7 @@ else $ws_pct = $member[6]; $output .= " - + Index: trunk/char.php =================================================================== --- trunk/char.php (revision 491) +++ trunk/char.php (working copy) @@ -250,14 +250,14 @@ - + + - + "; if ($showcountryflag) Index: trunk/char_mail.php =================================================================== --- trunk/char_mail.php (revision 491) +++ trunk/char_mail.php (working copy) @@ -101,7 +101,7 @@
- '.htmlentities($char['name']).' - + '.$char['name'].' -
- '.htmlentities($char['name']).' - + '.$char['name'].' -
- '.htmlentities($char['name']).' - + '.$char['name'].' -
- + '; } @@ -169,7 +169,7 @@ - + '; Index: trunk/char_rep.php =================================================================== --- trunk/char_rep.php (revision 491) +++ trunk/char_rep.php (working copy) @@ -82,7 +82,7 @@
- '.htmlentities($char['name']).' - + '.$char['name'].' -
- '.htmlentities($char['name']).' - + '.$char['name'].' -
- '.htmlentities($char['name']).' - + '.$char['name'].' -
- '.htmlentities($char['name']).' - + '.$char['name'].' - '.(($user_lvl >= $action_permission['update']) ? '
' : '').' - - + + '; } unset($comm); Index: trunk/creature.php =================================================================== --- trunk/creature.php (revision 491) +++ trunk/creature.php (working copy) @@ -357,7 +357,7 @@ "; if ($loc_language) $output .= " - "; + "; else $output .= " "; Index: trunk/game_object.php =================================================================== --- trunk/game_object.php (revision 491) +++ trunk/game_object.php (working copy) @@ -179,7 +179,7 @@ $output .= " - + Index: trunk/guild.php =================================================================== --- trunk/guild.php (revision 491) +++ trunk/guild.php (working copy) @@ -75,11 +75,11 @@ "; - $output .= ($user_lvl < $owner_gmlvl ) ? "" : ""; + $output .= ($user_lvl < $owner_gmlvl ) ? "" : ""; $output .= " - + "; } @@ -201,8 +201,8 @@ $output .= " "; - $output .= ($user_lvl >= $action_permission['update']) ? "" : ""; - $output .= ($user_lvl < $owner_gmlvl ) ? "" : ""; + $output .= ($user_lvl >= $action_permission['update']) ? "" : ""; + $output .= ($user_lvl < $owner_gmlvl ) ? "" : ""; $output .= " @@ -388,15 +388,15 @@ "; $output .= ($user_lvl < $owner_gmlvl ) ? " - " : " - "; + " : " + "; $output .= " - - - + + + "; Index: trunk/header.php =================================================================== --- trunk/header.php (revision 491) +++ trunk/header.php (working copy) @@ -202,7 +202,7 @@ { $set = ($realm_id === $realm['id']) ? '>' : ''; $output .= ' -
  • '.htmlentities($set.' '.$realm['name']).'
    • '; +
  • '.$set.' '.$realm['name'].'
    • '; } } unset($set); Index: trunk/honor.php =================================================================== --- trunk/honor.php (revision 491) +++ trunk/honor.php (working copy) @@ -40,7 +40,7 @@ { $guild_name = $sql->fetch_row($sql->query("SELECT `name` FROM `guild` WHERE `guildid`=".$char[8].";")); $output .= "     - + @@ -48,7 +48,7 @@ - + "; } $output .= "
    ".htmlentities($arenateam_data[1])."".$arenateam_data[1]."
    {$lang_arenateam['tot_members']}: $total_members".htmlentities($member[1])."".$member[1]." $member[2] - '.htmlentities($char['name']).' - + '.$char['name'].' - - lvl '.char_get_level_color($char['level']).'
    '.get_map_name($char['map'], $sqlm).' - '.get_zone_name($char['zone'], $sqlm).'
    '.$lang_char['honor_points'].': '.$char['totalHonorPoints'].' / '.$char['arenaPoints'].' - '.$lang_char['honor_kills'].': '.$char['totalKills'].' -
    '.$lang_char['guild'].': '.$guild_name.' | '.$lang_char['rank'].': '.htmlentities($guild_rank).' +
    '.$lang_char['guild'].': '.$guild_name.' | '.$lang_char['rank'].': '.$guild_rank.'
    '.(($char['online']) ? 'online' : 'offline'); if ($showcountryflag) { Index: trunk/char_achieve.php =================================================================== --- trunk/char_achieve.php (revision 491) +++ trunk/char_achieve.php (working copy) @@ -219,7 +219,7 @@
    - '.htmlentities($char['name']).' - + '.$char['name'].' -
    - '.htmlentities($char['name']).' - + '.$char['name'].' -
    - '.htmlentities($char['name']).' - + '.$char['name'].' - ".htmlentities($char[1])."
    		".htmlentities($owner_acc_name)."".$char[1]."".$owner_acc_name." \"\" \"\" ".char_get_level_color($char[9])." ".get_map_name($char[6], $sqlm)." ".get_zone_name($char[5], $sqlm)." $char[7]".htmlentities($guild_name[0])."".$guild_name[0]." $lastseen ".(($char[8]) ? "\"\"" : "-")." '.$data[0].' ('.$data[1].')'.htmlentities($data[2]).''.$data[2].'
    '.$data[0].' ('.$data[1].')'.htmlentities($data[2]).''.$data[2].'
    '.$data['name'].''.htmlentities(ereg_replace("[a-zA-Z ]+:* *\.", ".", $comm[0])).''.(isset($comm[1]) ? str_replace("\r\n", "
    ", str_replace("\r\n\r\n", "
    ", htmlentities($comm[1]))): '').'    		'.ereg_replace("[a-zA-Z ]+:* *\.", ".", $comm[0]).''.(isset($comm[1]) ? str_replace("\r\n", "
    ", str_replace("\r\n\r\n", "
    ", $comm[1])): '').'
    $creature[0]".htmlentities($creature[6])." ( {$creature[1]} )".$creature[6]." ( {$creature[1]} )$creature[1]
    $go[0]".htmlentities($go[3])."".$go[3]." ".get_go_type($go[1])." $go[2] $go[4]
    $data[0] $data[1]".htmlentities($data[3])."".htmlentities($data[3])."".$data[3]."".$data[3]."\"\" $data[5]/$data[6]".htmlentities($data[7])." ...".$data[7]." ... ".date('o-m-d', $data[8])."
    $data[0]".htmlentities($data[1])."".htmlentities($data[1])."".htmlentities($data[3])."".htmlentities($data[3])."".$data[1]."".$data[1]."".$data[3]."".$data[3]."\"\" $data[5] ".htmlentities($member[1])."".htmlentities($member[1])."".$member[1]."".$member[1]."\"\" \"\" ".char_get_level_color($member[4])."".htmlentities($member[6])." (".$member[5].")".htmlentities($member[7])."".htmlentities($member[8])."".$member[6]." (".$member[5].")".$member[7]."".$member[8]." ".get_days_with_color($member[12])." ".(($member[10]) ? "\"\"" : "-")."
    ".htmlentities($char[1])."".$char[1]." ".char_get_level_color($char[6])."$char[4] $char[5] $char[7]".htmlentities($guild_name[0])."".$guild_name[0]."

    "; @@ -81,7 +81,7 @@ { $guild_name = $sql->fetch_row($sql->query("SELECT `name` FROM `guild` WHERE `guildid`=".$char[8].";")); $output .= " - ".htmlentities($char[1])." + ".$char[1]." ".char_get_level_color($char[6])." @@ -89,7 +89,7 @@ $char[4] $char[5] $char[7] - ".htmlentities($guild_name[0])." + ".$guild_name[0]." "; } $output .= "
    "; Index: trunk/index.php =================================================================== --- trunk/index.php (revision 491) +++ trunk/index.php (working copy) @@ -57,7 +57,7 @@ return $uptimeString; } - $staticUptime = $lang_index['realm'].' '.htmlentities(get_realm_name($realm_id)).' '.$lang_index['online'].' for '.format_uptime($uptimetime); + $staticUptime = $lang_index['realm'].' '.get_realm_name($realm_id).' '.$lang_index['online'].' for '.format_uptime($uptimetime); unset($uptimetime); $output .= '
    @@ -70,7 +70,7 @@ else { $output .= ' -

    '.$lang_index['realm'].' '.htmlentities(get_realm_name($realm_id)).' '.$lang_index['offline_or_let_high'].'

    '; +

    '.$lang_index['realm'].' '.get_realm_name($realm_id).' '.$lang_index['offline_or_let_high'].'

    '; $online = false; } @@ -249,11 +249,11 @@ if (($user_lvl >= $gm)) $output .= ' - '.htmlentities($char['name']).' + '.$char['name'].' '; else $output .=' - '.htmlentities($char['name']).''; + '.$char['name'].''; $output .= ' @@ -267,7 +267,7 @@ - '.htmlentities($guild_name).' + '.$guild_name.' '.get_map_name($char['map'], $sqlm).' '.get_zone_name($char['zone'], $sqlm).''; Index: trunk/item.php =================================================================== --- trunk/item.php (revision 491) +++ trunk/item.php (working copy) @@ -351,7 +351,7 @@ - ".htmlentities($item[2])." + ".$item[2]." $item[3] $item[4] Index: trunk/login.php =================================================================== --- trunk/login.php (revision 491) +++ trunk/login.php (working copy) @@ -117,7 +117,7 @@ while ($realm = $sqlr->fetch_assoc($result)) if(isset($server[$realm['id']])) $output .= ' - '; + '; $output .= ' Index: trunk/repair.php =================================================================== --- trunk/repair.php (revision 491) +++ trunk/repair.php (working copy) @@ -1,237 +1,8 @@ -
    -'.$lang_repair['repair_optimize'].' -
    '; - if($user_lvl >= $action_permission['update']) - { - $output .= ' - - - - - - - -

    '.$lang_repair['select_tables'].'

    '; - } -$output .= ' - - - '; - if($user_lvl >= $action_permission['update']) - $output .= ' - '; - $output .= ' - - - - -
    '.$lang_repair['table_name'].''.$lang_repair['status'].''.$lang_repair['num_records'].'
    '; -$sql = new SQL; -$mm_dbs=array($realm_db, $mmfpm_db); -foreach ($mm_dbs as $db) -{ - $output.= ' - - - - -
    - '; - $sql->connect($db['addr'], $db['user'], $db['pass'], $db['name']); - $result = $sql->query('SHOW TABLES FROM '.$db['name'].''); - - while ($table = $sql->fetch_row($result)) - { - $result1 = $sql->query('SELECT count(*) FROM '.$table[0].''); - $result2 = $sql->query('CHECK TABLE '.$table[0].' CHANGED'); - $output .= ' - '; - if($user_lvl >= $action_permission['update']) - $output .= ' - '; - $output .= ' - - - - '; - } -$output .= ' -'; -} -$mm_dbs=array($world_db, $characters_db); -foreach ($mm_dbs as $dbs) -{ - foreach ($dbs as $dbr => $db) - { - $output .= ' - - - - -
    - '; - $sql->connect($db['addr'], $db['user'], $db['pass'], $db['name']); - $result = $sql->query('SHOW TABLES FROM '.$db['name'].''); - - while ($table = $sql->fetch_row($result)) - { - $result1 = $sql->query('SELECT count(*) FROM '.$table[0].''); - $result2 = $sql->query('CHECK TABLE '.$table[0].' CHANGED'); - $output .= ' - '; - if($user_lvl >= $action_permission['update']) - $output .= ' - '; - $output .= ' - - - - '; - } - $output .= ' - '; - } -} -unset($dbs); -unset($db); -unset($result); -unset($result2); -unset($result1); -unset($table); -unset($mm_dbs); -$output .= ' -
    -
    -

    -'; -} -//############################################################################################## -// EXECUTE TABLE REPAIR OR OPTIMIZATION -//############################################################################################## -function do_repair() -{ -global $output, $realm_db, $mmfpm_db, $world_db, $characters_db, $action_permission; -valid_login($action_permission['update']); - -if ((empty($_POST['repair_action']) && '' === $_POST['repair_action']) || (empty($_POST['check'])) ) -redirect('repair.php?error=1'); -else -{ - $table_list = $_POST['check']; - $table_action = addslashes($_POST['repair_action']); -} - -$sql = new SQL; -$counter = 0; - -foreach($table_list as $table) -{ - $table_data = explode('~', $table); - if ($table_data[2] == $realm_db['name']) - $sql->connect($realm_db['addr'], $realm_db['user'], $realm_db['pass'], $realm_db['name']); - elseif ($table_data[2] == $mmfpm_db['name']) - $sql->connect($mmfpm_db['addr'], $mmfpm_db['user'], $mmfpm_db['pass'], $mmfpm_db['name']); - elseif ($table_data[2] == $world_db[$table_data[1]]['name']) - $sql->connect($world_db[$table_data[1]]['addr'], $world_db[$table_data[1]]['user'], $world_db[$table_data[1]]['pass']); - elseif ($table_data[2] == $characters_db[$table_data[1]]['name']) - $sql->connect($characters_db[$table_data[1]]['addr'], $characters_db[$table_data[1]]['user'], $characters_db[$table_data[1]]['pass']); - $action_result = $sql->fetch_row($sql->query(''.$table_action.' TABLE '.$table_data[2].'.'.$table_data[3].'')); - - if ($action_result[3] === 'OK') ++$counter; - else $err = $action_result[3]; -} -unset($action_result); -unset($table_data); -unset($table); -unset($table_action); -unset($table_list); - -if ($counter) -redirect('repair.php?error=2&num='.$counter.''); -else -redirect('repair.php?error=4&rep_err='.$err.''); -} -//######################################################################################################################## -// MAIN -//######################################################################################################################## -$err = (isset($_GET['error'])) ? $_GET['error'] : NULL; -$num = (isset($_GET['num'])) ? $_GET['num'] : NULL; -$rep_err = (isset($_GET['rep_err'])) ? $_GET['rep_err'] : NULL; - -$output .= ' -
    '; - -$lang_repair = lang_repair(); - -if (1 == $err) -$output .= ' -

    '.$lang_global['empty_fields'].'

    '; -elseif (2 == $err) -$output .= ' -

    '.$lang_repair['repair_finished'].' : '.$num.' '.$lang_repair['tables'].'

    '; -elseif (3 == $err) -$output .= ' -

    '.$lang_repair['no_table_selected'].'

    '; -elseif (4 == $err) -$output .= ' -

    '.$lang_repair['repair_error'].' : '.$rep_err.'

    '; -else -$output .= ' -

    '.$lang_repair['repair_optimize'].'

    '; - -$output .= ' -
    '; - -unset($err); -unset($num); -unset($rep_err); - -$action = (isset($_GET['action'])) ? $_GET['action'] : NULL; - -if ('repair_form' == $action) -repair_form(); -elseif ('do_repair' == $action) -do_repair(); -else -repair_form(); - -unset($action); -unset($action_permission); -unset($lang_repair); - include_once 'footer.php'; ?> Index: trunk/ticket.php =================================================================== --- trunk/ticket.php (revision 491) +++ trunk/ticket.php (working copy) @@ -80,8 +80,8 @@ {$lang_global['edit']}"; $output .=" $ticket[0] - ".htmlentities($ticket[3])." - ".htmlentities($ticket[2])." ... + ".$ticket[3]." + ".$ticket[2]." ... "; } unset($query); @@ -178,11 +178,11 @@ {$lang_ticket['submitted_by']}: - ".htmlentities($ticket[2])." + ".$ticket[2]." {$lang_ticket['ticket_text']} - + "; Index: trunk/top100.php =================================================================== --- trunk/top100.php (revision 491) +++ trunk/top100.php (working copy) @@ -137,7 +137,7 @@ @@ -235,7 +235,7 @@ $output .= ' '.(++$i+$start).' - '.htmlentities($char['name']).' + '.$char['name'].' '.char_get_race_name($char['race']).' '.char_get_class_name($char['class']).' @@ -253,7 +253,7 @@ $time .= $hours.' hours'; $output .= ' - '.htmlentities($guild_name).' + '.$guild_name.' '.substr($char['money'], 0, -4).' '.substr($char['money'], -4, 2).'