Some visual enhancements

[irc/unrealircd/unrealircd-webpanel.git] / server_bans.php

diff --git a/server_bans.php b/server_bans.php
index 527a905d3d21940ab0ac1ef93dcb0431f0b2af38..fd009fe9ee5f607ffbfb46fe1c1ee0d046cd334a 100644 (file)
--- a/server_bans.php
+++ b/server_bans.php
@@ -15,7 +15,16 @@ if (!empty($_POST))
                                $tok = explode(",", $tok);
                                $ban = base64_decode($tok[0]);
                                $type = base64_decode($tok[1]);
-                               if ($rpc->serverban()->delete($ban, $type))
+                               $success = false;
+                               if ($type == "except")
+                                       $success = $rpc->serverbanexception()->delete($ban);
+                               else if ($type == "qline" || $type == "local-qline")
+                                       $success = $rpc->nameban()->delete($ban);
+                               else
+                                       $success = $rpc->serverban()->delete($ban, $type);
+
+
+                               if ($success)
                                        Message::Success("$type has been removed for $ban");
                                else
                                        Message::Fail("Unable to remove $type on $ban: $rpc->error");
@@ -71,7 +80,7 @@ if (!empty($_POST))
                }
                elseif ($bantype == "except")
                {
-                       if ($rpc->exception()->add($iphost, "", $duration, $reason))
+                       if ($rpc->serverbanexception()->add($iphost, "", $duration, $reason))
                                Message::Success("Exception set for \"$iphost\": $reason");
                        else
                                Message::Fail("Exception could not be set \"$iphost\": $rpc->error");
@@ -88,6 +97,8 @@ if (!empty($_POST))
 $tkl = $rpc->serverban()->getAll();
 foreach ($rpc->nameban()->getAll() as $v)
        $tkl[] = $v;
+foreach ($rpc->serverbanexception()->getAll() as $v)
+       $tkl[] = $v;
 ?>
 <h4>Server Bans Overview</h4><br>
 <p><button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">
@@ -184,17 +195,17 @@ foreach ($rpc->nameban()->getAll() as $v)
        </div>
        </div>
 
-       <table class="table table-responsive caption-top table-striped">
+       <table class="container-xxl table table-responsive caption-top table-striped">
        <thead class="table-primary">
        <form method="post">
-       <th><input type="checkbox" label='selectall' onClick="toggle_tkl(this)" />Select all</th>
+       <th><input type="checkbox" label='selectall' onClick="toggle_tkl(this)" /></th>
        <th>Mask</th>
        <th>Type</th>
+       <th>Duration</th>
+       <th>Reason</th>
        <th>Set By</th>
        <th>Set On</th>
        <th>Expires</th>
-       <th>Duration</th>
-       <th>Reason</th>
        </thead>
        
        <?php
@@ -204,12 +215,12 @@ foreach ($rpc->nameban()->getAll() as $v)
                        echo "<td><input type=\"checkbox\" value='" . base64_encode($tkl->name).",".base64_encode($tkl->type) . "' name=\"tklch[]\"></td>";
                        echo "<td>".$tkl->name."</td>";
                        echo "<td>".$tkl->type_string."</td>";
+                       echo "<td>".$tkl->duration_string."</td>";
+                       echo "<td>".$tkl->reason."</td>";
                        $set_by = ($tkl->set_by == "-config-") ? "<span class=\"badge-pill badge-secondary\">Config</span>" : show_nick_only($tkl->set_by);
                        echo "<td>".$set_by."</td>";
                        echo "<td>".$tkl->set_at_string."</td>";
                        echo "<td>".$tkl->expire_at_string."</td>";
-                       echo "<td>".$tkl->duration_string."</td>";
-                       echo "<td>".$tkl->reason."</td>";
                }
        ?></table><p><button type="button" class="btn btn-danger" data-toggle="modal" data-target="#myModal2">
        Delete selected