Функция nick() переехала в класс Nick.

This commit is contained in:
Igor Barkov (iwork)
2020-08-27 15:17:02 +03:00
parent a6ec244474
commit 782aa0632d
346 changed files with 574 additions and 567 deletions
+23 -23
View File
@@ -225,13 +225,13 @@ class zayavka
$rr = "<input type=\"radio\" " . ((in_array($user['id'], $row['team1']) || in_array($user['id'], $row['team2']) || $row['team2']) ? "disabled " : "") . " name=\"gocombat\" value=\"{$row['id']}\" /><font class=date>{$row['podan']}</font> ";
foreach ($row['team1'] as $k => $v) {
$rr .= nick::id($v)->full(1);
$rr .= Nick::id($v)->full(1);
}
if ($row['team2']) {
$rr .= " <i>против</i> ";
foreach ($row['team2'] as $k => $v) {
$rr .= nick::id($v)->full(1);
$rr .= Nick::id($v)->full(1);
}
}
@@ -266,7 +266,7 @@ class zayavka
if ($k != 0) {
$rr .= ", ";
}
$rr .= nick::id($v)->full(1);
$rr .= Nick::id($v)->full(1);
}
$rr .= ") <i>против</i> <b>{$row['t2c']}</b>({$range2})(";
@@ -275,7 +275,7 @@ class zayavka
if ($k != 0) {
$rr .= ", ";
}
$rr .= nick::id($v)->full(1);
$rr .= Nick::id($v)->full(1);
}
if (count($row['team2']) == 0) {
@@ -315,18 +315,18 @@ class zayavka
$rr = "<input type=\"radio\" " . ((in_array($user['id'], $row['team1']) || in_array($user['id'], $row['team2'])) ? "disabled " : "") . " name=\"gocombat\" value=\"{$row['id']}\" /><font class=\"date\">{$row['podan']}</font> (";
if ($row['bots'] == '7') {
$rr .= nick::id(10962)->full(1);
$rr .= Nick::id(10962)->full(1);
$rr .= ", ";
$rr .= nick::id(10964)->full(1);
$rr .= Nick::id(10964)->full(1);
$rr .= ", ";
$rr .= nick::id(10965)->full(1);
$rr .= Nick::id(10965)->full(1);
$rr .= ", ";
} elseif ($row['bots'] == '8' || $row['bots'] == '13') {
$rr .= nick::id(10124)->full(1);
$rr .= Nick::id(10124)->full(1);
$rr .= ", ";
$rr .= nick::id(10125)->full(1);
$rr .= Nick::id(10125)->full(1);
$rr .= ", ";
$rr .= nick::id(10126)->full(1);
$rr .= Nick::id(10126)->full(1);
$rr .= ", ";
}
@@ -334,7 +334,7 @@ class zayavka
if ($k != 0) {
$rr .= ", ";
}
$rr .= nick::id($v)->full(1);
$rr .= Nick::id($v)->full(1);
}
if (count($row['team1']) == 0 && $row['bots'] == 0) {
@@ -533,7 +533,7 @@ VALUES ("?s","?s",?i,?i,?i,"?s","?s",?i,?i,?i,?i)',
if ($k != 0) {
$rr .= ", ";
}
$rr .= nick::id($v)->full(1);
$rr .= Nick::id($v)->full(1);
//TODO Написать добавлялку в чат для определённого чеговека. Плясать от AddChatSystem().[3]
#addchp('<font color=red>Внимание!</font> Ваш бой начался!<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \' ', '{[]}' . nick::id($v)->short() . '{[]}');
}
@@ -544,7 +544,7 @@ VALUES ("?s","?s",?i,?i,?i,"?s","?s",?i,?i,?i,?i)',
if ($k != 0) {
$rr .= ", ";
}
$rr .= nick::id($v)->full(1);
$rr .= Nick::id($v)->full(1);
//TODO Написать добавлялку в чат для определённого чеговека. Плясать от AddChatSystem().[4]
#addchp('<font color=red>Внимание!</font> Ваш бой начался!<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \' ', '{[]}' . nick::id($v)->short() . '{[]}');
}
@@ -610,7 +610,7 @@ if (!empty($_POST['open'])) {
<TABLE width=100% cellspacing=1 cellpadding=1>
<TR>
<TD colspan=5>
<?php if (!empty($level)) echo nick($user); ?>
<?php if (!empty($level)) {echo Nick::id($user)->battle();} ?>
</TD>
<TD colspan=4 align=right>
<INPUT TYPE=button value="Вернуться" onclick="location.href='main.php?top=<?= mt_rand() ?>';">
@@ -650,19 +650,19 @@ if (!empty($_POST['open'])) {
}
if (!empty($_POST['back2'])) {
$z = $zay->getlist(2, null, $user['zayavka']);
AddChatSystem('Внимание!' . nick::id($user['id'])->short() . ' отозвал заявку.');
AddChatSystem('Внимание!' . Nick::id($user['id'])->short() . ' отозвал заявку.');
echo $zay->delteam($user['id'], $user['zayavka'], 2);
}
if (!empty($_POST['cansel'])) {
$z = $zay->getlist(2, null, $user['zayavka']);
echo $zay->delteam($z[$user['zayavka']]['team2'][0], $user['zayavka'], 2);
AddChatSystem('Внимание!' . nick::id($user['id'])->short() . ' отказался от поединка.');
AddChatSystem('Внимание!' . Nick::id($user['id'])->short() . ' отказался от поединка.');
}
if (!empty($_POST['confirm2']) AND empty($user['zayavka'])) {
$z = $zay->getlist(2, null, $_REQUEST['gocombat']);
$toper = db::c()->query('SELECT `klan` FROM `users` WHERE `id` = ?i', $z[$_REQUEST['gocombat']]['team1'][0])->fetch_assoc();
if ($user['klan'] != $toper['klan'] || $user['klan'] == '') {
AddChatSystem('Внимание!' . nick::id($user['id'])->short() . ' принял заявку, нужно принять вызов или отказать.');
AddChatSystem('Внимание!' . Nick::id($user['id'])->short() . ' принял заявку, нужно принять вызов или отказать.');
}
echo $zay->addteam(2, 2);
echo "</b></font><BR>Ожидаем подтверждения боя. <input type=submit name=back2 value='Отозвать заявку'>";
@@ -694,7 +694,7 @@ if (!empty($_POST['open'])) {
$z = $zay->getlist(2, null, $user['zayavka']);
if ($zay->user_status($user['id']) == 1) {
if (count($z[$user['zayavka']]['team2']) > 0) {
echo "<B><font color=red>Внимание! " . nick::id($z[$user['zayavka']]['team2'][0])->full(1) . " принял заявку на бой, нужно отказать или принять вызов.</font></b> <input type=submit value='Битва!' name=gofi> <input type=submit value='Отказать' name=cansel>";
echo "<B><font color=red>Внимание! " . Nick::id($z[$user['zayavka']]['team2'][0])->full(1) . " принял заявку на бой, нужно отказать или принять вызов.</font></b> <input type=submit value='Битва!' name=gofi> <input type=submit value='Отказать' name=cansel>";
} else {
if ($z[$user['zayavka']]['level'] == 2) {
echo "Заявка на бой подана, ожидаем противника. <input type=submit name=back value='Отозвать заявку'>";
@@ -723,7 +723,7 @@ if (!empty($_POST['open'])) {
$id = mysql_insert_id();
mysql_query("UPDATE `bots` SET `battle` = {$id} WHERE `id` = {$bot} LIMIT 1");
$rr = "<b>" . nick::id($user['id'])->full(1) . "</b> и <b>" . nick::id($bot)->full(1) . "</b>";
$rr = "<b>" . Nick::id($user['id'])->full(1) . "</b> и <b>" . Nick::id($bot)->full(1) . "</b>";
addlog($id, "Часы показывали <span class=date>" . date("Y.m.d H.i") . "</span>, когда " . $rr . " бросили вызов друг другу. <BR>");
mysql_query("UPDATE users SET `battle` ={$id},`zayavka`=0 WHERE `id`= {$user['id']};");
die("<script>location.href='fbattle.php';</script>");
@@ -845,12 +845,12 @@ if (!empty($_POST['goconfirm']) AND empty($user['zayavka'])) {
<TD align=center>';
foreach ($z[$_POST['gocombat']]['team1'] as $k => $v) {
if ($k != 0) $rr .= "<BR>";
echo nick::id($v)->full(1);
echo Nick::id($v)->full(1);
}
echo '</TD><TD align=center>';
foreach ($z[$_POST['gocombat']]['team2'] as $k => $v) {
if ($k != 0) $rr .= "<BR>";
echo nick::id($v)->full(1);
echo Nick::id($v)->full(1);
}
echo '</TD></TR><TR>';
@@ -1042,7 +1042,7 @@ if ($get == 'current') {
if ($k > 0) {
echo ",";
}
nick::id($v)->full();
Nick::id($v)->full();
}
echo " против ";
$z = explode(";", $row['t2']);
@@ -1050,7 +1050,7 @@ if ($get == 'current') {
if ($k > 0) {
echo ",";
}
nick::id($v)->full();
Nick::id($v)->full();
}
echo "<img src='i/fighttype{$row['type']}.gif'> <a href='logs.php?log={$row['id']}' target=_blank>»»</a><br />";
}