diff --git a/ch.php b/ch.php index 1852a67..cce445b 100644 --- a/ch.php +++ b/ch.php @@ -263,7 +263,7 @@ if (isset($_GET['online']) && $_GET['online'] != null) { $aa = preg_replace("/sell ", "", $aa); $act_line = " {$act[0]} "; } else $act_line = ''; - echo 'w(\'', $row['login'], '\',', $row['id'], ',', $in_battle, ',\'', $row['align'], '\',\'' . ClanImage($row['klan']) . '\', \'' . $act_line . '\',\'', $row['level'], '\',\'', $row['slp'], '\',\'', $row['trv'], '\',\'', '\',\'', $row['login2'], '\');'; + echo 'w(\'', $row['login'], '\',', $row['id'], ',', $in_battle, ',\'', $row['align'], '\',\'' . $row['klan'] . '\', \'' . $act_line . '\',\'', $row['level'], '\',\'', $row['slp'], '\',\'', $row['trv'], '\',\'', '\',\'', $row['login2'], '\');'; } } ?> diff --git a/classes/User.php b/classes/User.php index d4794a8..165a5e9 100644 --- a/classes/User.php +++ b/classes/User.php @@ -121,7 +121,7 @@ class User $nameString .= ' ' . $this->login . ' '; } if ($this->clan) { - $nameString .= sprintf('', ClanImage($this->clan)); + $nameString .= sprintf('', $this->clan); } echo '
'; echo '
'; diff --git a/functions.php b/functions.php index bfabde0..6f7d811 100644 --- a/functions.php +++ b/functions.php @@ -232,16 +232,6 @@ function check_proc($u) return $r; } -function ClanImage($clan_id) -{ - $clanimg = db::c()->query('SELECT `short` FROM `clans` WHERE `id` = ?i ', $clan_id)->fetch_assoc(); - if ($clanimg['short']) { - return $clanimg['short']; - } else { - return "1x1"; - } -} - function GiveExp($id, $exp) { db::c()->query('UPDATE users SET exp = exp + ?i WHERE id = ?i', $exp, $id);