lopar/battles
0
0
Fork 0
Code Issues 21 Pull Requests Releases Wiki Activity

nick3() and partially nick7() functions replaced by nick class

Browse Source
This commit is contained in:
lopar
2018-03-04 00:54:41 +02:00
parent 7c612d6088
commit e5d14473db
46 changed files with 125 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zayavka.php
+25 -29
View File
@@ -223,13 +223,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 .= nick3($v);
$rr .= nick::id($v)->full(1);
}
if($row['team2']) {
$rr .= " <i>против</i> ";
foreach($row['team2'] as $k => $v) {
$rr .= nick3($v);
$rr .= nick::id($v)->full(1);
}
}
@@ -261,14 +261,14 @@ 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> <b>{$row['t1c']}</b>({$range1}) (";
foreach($row['team1'] as $k => $v) {
if($k != 0) { $rr .= ", "; }
$rr .= nick3($v);
$rr .= nick::id($v)->full(1);
}
$rr .= ") <i>против</i> <b>{$row['t2c']}</b>({$range2})(";
foreach($row['team2'] as $k => $v) {
if($k != 0) { $rr .= ", "; }
$rr .= nick3($v);
$rr .= nick::id($v)->full(1);
}
if(count($row['team2']) ==0) { $rr .= "<i>группа не набрана</i>"; }
@@ -306,24 +306,20 @@ 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 .= nick3(10962); $rr .= ", ";
$rr .= nick3(10964); $rr .= ", ";
$rr .= nick3(10965); $rr .= ", ";
} elseif($row['bots'] == '8') {
$rr .= nick3(10124); $rr .= ", ";
$rr .= nick3(10125); $rr .= ", ";
$rr .= nick3(10126); $rr .= ", ";
} elseif($row['bots'] == '13') {
$rr .= nick3(10124); $rr .= ", ";
$rr .= nick3(10125); $rr .= ", ";
$rr .= nick3(10126); $rr .= ", ";
$rr .= nick::id(10962)->full(1); $rr .= ", ";
$rr .= nick::id(10964)->full(1); $rr .= ", ";
$rr .= nick::id(10965)->full(1); $rr .= ", ";
} elseif($row['bots'] == '8' || $row['bots'] == '13') {
$rr .= nick::id(10124)->full(1); $rr .= ", ";
$rr .= nick::id(10125)->full(1); $rr .= ", ";
$rr .= nick::id(10126)->full(1); $rr .= ", ";
}
foreach($row['team1'] as $k => $v) {
if($k != 0) {
$rr .= ", ";
}
$rr .= nick3($v);
$rr .= nick::id($v)->full(1);
}
if(count($row['team1']) == 0 && $row['bots'] == 0) { $rr.= "<i>группа не набрана</i>"; }
@@ -506,7 +502,7 @@ class zayavka {
foreach($z['team1'] as $k => $v) {
if($k != 0) { $rr .= ", "; }
$rr .= nick3($v);
$rr .= nick::id($v)->full(1);
addchp('<font color=red>Внимание!</font> Ваш бой начался!<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \' ', '{[]}'.nick7($v).'{[]}');
}
@@ -514,7 +510,7 @@ class zayavka {
foreach($z['team2'] as $k => $v) {
if($k != 0) { $rr .= ", "; }
$rr .= nick3($v);
$rr .= nick::id($v)->full(1);
addchp('<font color=red>Внимание!</font> Ваш бой начался!<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \' ', '{[]}'.nick7($v).'{[]}');
}
@@ -635,11 +631,11 @@ if ($_REQUEST['level'] == 'begin') {
if($_POST['cansel']) {
$z = $zay->getlist(1,null,$user['zayavka']);
echo $zay->delteam (2,$z[$user['zayavka']]['team2'][0], $user['zayavka'], 1);
addchp ('<font color=red>Внимание!</font> '.nick3($user['id']).' отказался от поединка. ','{[]}'.nick7 ($z[$user['zayavka']]['team2'][0]).'{[]}');
addchp ('<font color=red>Внимание!</font> '.nick::id($user['id'])->full(1).' отказался от поединка. ','{[]}'.nick7 ($z[$user['zayavka']]['team2'][0]).'{[]}');
}
if($_POST['confirm2']) {
$z = $zay->getlist(1,null,$_REQUEST['gocombat']);
addchp ('<font color=red>Внимание!</font> '.nick3($user['id']).' принял заявку, нужно принять вызов или отказать. ','{[]}'.nick7 ($z[$_REQUEST['gocombat']]['team1'][0]).'{[]}');
addchp ('<font color=red>Внимание!</font> '.nick::id($user['id'])->full(1).' принял заявку, нужно принять вызов или отказать. ','{[]}'.nick7 ($z[$_REQUEST['gocombat']]['team1'][0]).'{[]}');
echo $zay->addteam (2,$user['id'], $_REQUEST['gocombat'], 1);
die("<script>document.location='zayavka.php?level=begin';</script>");
}
@@ -659,7 +655,7 @@ if ($_REQUEST['level'] == 'begin') {
}
if( $zay->ustatus($user['id'])==1 ) {
if(count($z[$user['zayavka']]['team2'])>0){
echo "<B><font color=red>Внимание! ".nick3($z[$user['zayavka']]['team2'][0])." принял заявку на бой, нужно отказать или принять вызов.</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'] == 1)
@@ -691,7 +687,7 @@ if ($_REQUEST['level'] == 'begin') {
$id = mysql_insert_id();
mysql_query("INSERT INTO `logs` (`id`,`log`) VALUES('{$id}','Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>');");
mysql_query("UPDATE `bots` SET `battle` = {$id} WHERE `id` = {$bot} LIMIT 1;");
$rr = "<b>".nick3($user['id'])."</b> и <b>".nick3($bot)."</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']};");
@@ -740,20 +736,20 @@ if ($_REQUEST['level'] == 'fiz') {
}
if($_POST['back2']) {
$z = $zay->getlist(2,null,$user['zayavka']);
addchp ('<font color=red>Внимание!</font> '.nick3($user['id']).' отозвал заявку.','{[]}'.nick7 ($z[$user['zayavka']]['team1'][0]).'{[]}');
addchp ('<font color=red>Внимание!</font> '.nick::id($user['id'])->full(1).' отозвал заявку.','{[]}'.nick7 ($z[$user['zayavka']]['team1'][0]).'{[]}');
echo $zay->delteam (2,$user['id'], $user['zayavka'], 2);
}
if($_POST['cansel']) {
$z = $zay->getlist(2,null,$user['zayavka']);
echo $zay->delteam (2,$z[$user['zayavka']]['team2'][0], $user['zayavka'], 2);
addchp ('<font color=red>Внимание!</font> '.nick3($user['id']).' отказался от поединка.','{[]}'.nick7 ($z[$user['zayavka']]['team2'][0]).'{[]}');
addchp ('<font color=red>Внимание!</font> '.nick::id($user['id'])->full(1).' отказался от поединка.','{[]}'.nick7 ($z[$user['zayavka']]['team2'][0]).'{[]}');
}
if($_POST['confirm2'] && !$user['zayavka']) {
$z = $zay->getlist(2,null,$_REQUEST['gocombat']);
$toper = $z[$_REQUEST['gocombat']]['team1'][0];
$toper = mysql_fetch_array(mysql_query("SELECT `klan` FROM `users` WHERE `id`='{$toper}' LIMIT 1;"));
if($user['klan'] != $toper['klan'] || $user['klan']==''){
addchp ('<font color=red>Внимание!</font> '.nick3($user['id']).' принял заявку, нужно принять вызов или отказать. ','{[]}'.nick7 ($z[$_REQUEST['gocombat']]['team1'][0]).'{[]}');
addchp ('<font color=red>Внимание!</font> '.nick::id($user['id'])->full(1).' принял заявку, нужно принять вызов или отказать. ','{[]}'.nick7 ($z[$_REQUEST['gocombat']]['team1'][0]).'{[]}');
}
echo $zay->addteam (2,$user['id'], $_REQUEST['gocombat'], 2);
echo "</b></font><BR>Ожидаем подтверждения боя. <input type=submit name=back2 value='Отозвать заявку'>";
@@ -769,7 +765,7 @@ if ($_REQUEST['level'] == 'fiz') {
$z = $zay->getlist(2,null,$user['zayavka']);
if( $zay->ustatus($user['id'])==1 ) {
if(count($z[$user['zayavka']]['team2'])>0){
echo "<B><font color=red>Внимание! ".nick3($z[$user['zayavka']]['team2'][0])." принял заявку на бой, нужно отказать или принять вызов.</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) {
@@ -799,7 +795,7 @@ if ($_REQUEST['level'] == 'fiz') {
$id = mysql_insert_id();
mysql_query("UPDATE `bots` SET `battle` = {$id} WHERE `id` = {$bot} LIMIT 1");
$rr = "<b>".nick3($user['id'])."</b> и <b>".nick3($bot)."</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>");
@@ -914,12 +910,12 @@ if ($_REQUEST['level'] == 'group') {
<TD align=center>';
foreach( $z[$_POST['gocombat']]['team1'] as $k=>$v ) {
if ($k!=0) $rr.="<BR>";
echo nick3($v);
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 nick3($v);
echo nick::id($v)->full(1);
}
echo '</TD></TR><TR>';