Skip to content

Commit da0b32f

Browse files
eLeCTr1CiPlayeLeCTr1CiPlay
authored
feat: show soft/silent values in admin session (#588)
1 parent 91635c0 commit da0b32f

2 files changed

Lines changed: 47 additions & 17 deletions

File tree

‎actions/viewplayer.php‎

Lines changed: 41 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
$UUID = playerNameToUUID($_GET['player'], $server);
2727

2828
// Check if the player exists
29-
$currentBans = cache("SELECT b.id, reason, created, expires, a.name AS actor_name FROM ".$server['playerBansTable']." b JOIN ".$server['playersTable']." a ON b.actor_id = a.id WHERE player_id = UNHEX('".$UUID."')", $settings['cache_viewplayer'], $_GET['server'].'/players', $server);
30-
$pastBans = cache("SELECT b.id, reason, created, expired, a.name AS actor_name, pa.name AS pastActor_name, pastCreated FROM ".$server['playerBanRecordsTable']." b LEFT OUTER JOIN ".$server['playersTable']." a ON b.actor_id = a.id JOIN ".$server['playersTable']." pa ON b.pastActor_id = pa.id WHERE player_id = UNHEX('".$UUID."') AND pastCreated <> 0", $settings['cache_viewplayer'], $_GET['server'].'/players', $server);
31-
$currentMutes = cache("SELECT b.id, reason, created, expires, a.name AS actor_name FROM ".$server['playerMutesTable']." b JOIN ".$server['playersTable']." a ON b.actor_id = a.id WHERE player_id = UNHEX('".$UUID."')", $settings['cache_viewplayer'], $_GET['server'].'/players', $server);
32-
$pastMutes = cache("SELECT b.id, reason, created, expired, a.name AS actor_name, pa.name AS pastActor_name, pastCreated FROM ".$server['playerMuteRecordsTable']." b LEFT OUTER JOIN ".$server['playersTable']." a ON b.actor_id = a.id JOIN ".$server['playersTable']." pa ON b.pastActor_id = pa.id WHERE player_id = UNHEX('".$UUID."')", $settings['cache_viewplayer'], $_GET['server'].'/players', $server);
29+
$currentBans = cache("SELECT b.id, reason, created, expires, silent, a.name AS actor_name FROM ".$server['playerBansTable']." b JOIN ".$server['playersTable']." a ON b.actor_id = a.id WHERE player_id = UNHEX('".$UUID."')", $settings['cache_viewplayer'], $_GET['server'].'/players', $server);
30+
$pastBans = cache("SELECT b.id, reason, created, expired, silent, a.name AS actor_name, pa.name AS pastActor_name, pastCreated FROM ".$server['playerBanRecordsTable']." b LEFT OUTER JOIN ".$server['playersTable']." a ON b.actor_id = a.id JOIN ".$server['playersTable']." pa ON b.pastActor_id = pa.id WHERE player_id = UNHEX('".$UUID."') AND pastCreated <> 0", $settings['cache_viewplayer'], $_GET['server'].'/players', $server);
31+
$currentMutes = cache("SELECT b.id, reason, created, expires, soft, silent, a.name AS actor_name FROM ".$server['playerMutesTable']." b JOIN ".$server['playersTable']." a ON b.actor_id = a.id WHERE player_id = UNHEX('".$UUID."')", $settings['cache_viewplayer'], $_GET['server'].'/players', $server);
32+
$pastMutes = cache("SELECT b.id, reason, created, expired, soft, silent, a.name AS actor_name, pa.name AS pastActor_name, pastCreated FROM ".$server['playerMuteRecordsTable']." b LEFT OUTER JOIN ".$server['playersTable']." a ON b.actor_id = a.id JOIN ".$server['playersTable']." pa ON b.pastActor_id = pa.id WHERE player_id = UNHEX('".$UUID."')", $settings['cache_viewplayer'], $_GET['server'].'/players', $server);
3333
$pastKicks = cache("SELECT b.id, reason, created, a.name AS actor_name FROM ".$server['playerKicksTable']." b JOIN ".$server['playersTable']." a ON b.actor_id = a.id WHERE player_id = UNHEX('".$UUID."')", $settings['cache_viewplayer'], $_GET['server'].'/players', $server);
3434
$pastWarnings = cache("SELECT b.id, reason, created, a.name AS actor_name FROM ".$server['playerWarningsTable']." b JOIN ".$server['playersTable']." a ON b.actor_id = a.id WHERE player_id = UNHEX('".$UUID."')", $settings['cache_viewplayer'], $_GET['server'].'/players', $server);
3535

@@ -116,6 +116,12 @@
116116
<td>'.$language['viewplayer']['current_ban']['ban_reason'].':</td>
117117
<td class="reason">'.$currentBans['reason'].'</td>
118118
</tr>';
119+
if ($admin) {
120+
echo '<tr>
121+
<td>'.$language['viewplayer']['current_ban']['silent'].':</td>
122+
<td>'.($currentBans['silent'] == 1 ? '<span class="glyphicon glyphicon-ok"></span>' : '<span class="glyphicon glyphicon-remove"></span>').'</td>
123+
</tr>';
124+
}
119125
if(!empty($currentBans['server'])) {
120126
echo '
121127
<tr>
@@ -269,8 +275,17 @@
269275
<tr>
270276
<td>'.$language['viewplayer']['current_mute']['mute_reason'].':</td>
271277
<td class="reason">'.$currentMutes['reason'].'</td>
278+
</tr>';
279+
if ($admin) {
280+
echo '<tr>
281+
<td>'.$language['viewplayer']['current_mute']['soft'].':</td>
282+
<td>'.($currentMutes['soft'] == 1 ? '<span class="glyphicon glyphicon-ok"></span>' : '<span class="glyphicon glyphicon-remove"></span>').'</td>
272283
</tr>
273-
<tr>';
284+
<tr>
285+
<td>'.$language['viewplayer']['current_mute']['silent'].':</td>
286+
<td>'.($currentMutes['silent'] == 1 ? '<span class="glyphicon glyphicon-ok"></span>' : '<span class="glyphicon glyphicon-remove"></span>').'</td>
287+
</tr>';
288+
}
274289
if(!empty($currentMutes['server'])) {
275290
echo '
276291
<tr>
@@ -411,18 +426,19 @@
411426
echo '
412427
<th>'.$language['viewplayer']['previous_bans']['server'].'</th>';
413428
}
414-
if($admin)
429+
if($admin) {
415430
echo '
416-
<th></th>';
417-
?>
431+
<th>'.$language['viewplayer']['previous_bans']['silent'].'</th>
432+
<th><center><span class="glyphicon glyphicon-trash"></span></center></th>';
433+
}?>
418434

419435
</tr>
420436
</thead>
421437
<tbody><?php
422438
if(isset($pastBans[0]) && count($pastBans[0]) == 0) {
423439
echo '
424440
<tr>
425-
<td colspan="8">'.$language['viewplayer']['previous_bans']['none'].'</td>
441+
<td colspan="9">'.$language['viewplayer']['previous_bans']['none'].'</td>
426442
</tr>';
427443
} else {
428444
$i = 1;
@@ -431,6 +447,7 @@
431447
$r['expired'] = ($r['expired'] != 0 ? $r['expired'] + $mysqlSecs : $r['expired']);
432448
$r['pastCreated'] = $r['pastCreated'] + $mysqlSecs;
433449
$r['created'] = $r['created'] + $mysqlSecs;
450+
$r['silent'] = ($r['silent'] ? $r['silent'] = '<center><span class="glyphicon glyphicon-ok"></span></center>' : $r['silent'] = '<center><span class="glyphicon glyphicon-remove"></span></center>');
434451

435452
echo '
436453
<tr>
@@ -442,6 +459,7 @@
442459
<td>'.$r['actor_name'].'</td>
443460
<td>'.date('H:i:s d/m/y', $r['created']).'</td>'.($serverName ? '
444461
<td>'.$r['server'].'</td>' : '').($admin ? '
462+
<td>'.$r['silent'].'</td>
445463
<td class="admin-options"><a href="#" class="btn btn-danger delete btn-xs" title="'.$language['viewplayer']['previous_bans']['admin-remove'].'" data-server="'.$_GET['server'].'" data-record-id="'.$r['id'].'"><span class="glyphicon glyphicon-trash"></span></a></td>' : '').'
446464
</tr>';
447465
++$i;
@@ -480,25 +498,29 @@
480498
echo '
481499
<th>'.$language['viewplayer']['previous_mutes']['server'].'</th>';
482500
}
483-
if($admin)
501+
if($admin) {
484502
echo '
485-
<th></th>';
486-
?>
503+
<th>'.$language['viewplayer']['previous_mutes']['soft'].'</th>
504+
<th>'.$language['viewplayer']['previous_mutes']['silent'].'</th>
505+
<th><center><span class="glyphicon glyphicon-trash"></span></center></th>';
506+
}?>
487507

488508
</tr>
489509
</thead>
490510
<tbody><?php
491511
if(count($pastMutes) == 0) {
492512
echo '
493513
<tr>
494-
<td colspan="8">'.$language['viewplayer']['previous_mutes']['none'].'</td>
514+
<td colspan="10">'.$language['viewplayer']['previous_mutes']['none'].'</td>
495515
</tr>';
496516
} else {
497517
$i = 1;
498518
foreach($pastMutes as $r) {
499519
$r['reason'] = str_replace(array('&quot;', '"'), array('&#039;', '\''), $r['reason']);
500520
$r['expired'] = ($r['expired'] != 0 ? $r['expired'] + $mysqlSecs : $r['expired']);
501521
$r['created'] = $r['created'] + $mysqlSecs;
522+
$r['soft'] = ($r['soft'] ? $r['soft'] = '<center><span class="glyphicon glyphicon-ok"></span></center>' : $r['soft'] = '<center><span class="glyphicon glyphicon-remove"></span></center>');
523+
$r['silent'] = ($r['silent'] ? $r['silent'] = '<center><span class="glyphicon glyphicon-ok"></span></center>' : $r['silent'] = '<center><span class="glyphicon glyphicon-remove"></span></center>');
502524
echo '
503525
<tr>
504526
<td>'.$i.'</td>
@@ -509,6 +531,8 @@
509531
<td>'.$r['actor_name'].'</td>
510532
<td>'.date('d/m/y', $r['pastCreated']).'</td>'.($serverName ? '
511533
<td>'.$r['server'].'</td>' : '').($admin ? '
534+
<td>'.$r['soft'].'</td>
535+
<td>'.$r['silent'].'</td>
512536
<td class="admin-options"><a href="#" class="btn btn-danger delete btn-xs" title="'.$language['viewplayer']['previous_mutes']['admin-remove'].'" data-server="'.$_GET['server'].'" data-record-id="'.$r['id'].'"><span class="glyphicon glyphicon-trash"></span></a></td>' : '').'
513537
</tr>';
514538
++$i;
@@ -544,10 +568,10 @@
544568
echo '
545569
<th>'.$language['viewplayer']['warnings']['server'].'</th>';
546570
}
547-
if($admin)
571+
if($admin) {
548572
echo '
549573
<th></th>';
550-
?>
574+
}?>
551575

552576
</tr>
553577
</thead>
@@ -605,10 +629,10 @@
605629
echo '
606630
<th>'.$language['viewplayer']['previous_kicks']['server'].'</th>';
607631
}
608-
if($admin)
632+
if($admin) {
609633
echo '
610634
<th></th>';
611-
?>
635+
}?>
612636

613637
</tr>
614638
</thead>

‎l10n/en.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
"banned_by": "Banned by",
169169
"banned_at": "Banned at",
170170
"ban_reason": "Reason",
171+
"silent": "Silent",
171172
"server": "Server",
172173
"edit": "Edit",
173174
"unban": "Unban",
@@ -192,6 +193,8 @@
192193
"muted_by": "Muted by",
193194
"muted_at": "Muted at",
194195
"mute_reason": "Reason",
196+
"soft": "Soft",
197+
"silent": "Silent",
195198
"server": "Server",
196199
"edit": "Edit",
197200
"unmute": "Unmute",
@@ -217,6 +220,7 @@
217220
"unbanned_by": "Unbanned By",
218221
"at": "At",
219222
"server": "Server",
223+
"silent": "Silent",
220224
"none": "None",
221225
"admin-remove": "Remove"
222226
},
@@ -230,6 +234,8 @@
230234
"unmuted_by": "Unmuted By",
231235
"at": "At",
232236
"server": "Server",
237+
"soft": "Soft",
238+
"silent": "Silent",
233239
"none": "None",
234240
"admin-remove": "Remove"
235241
},

0 commit comments

Comments
 (0)