Make ban durations work

diff --git a/Classes/class-rpc.php b/Classes/class-rpc.php
index 3823db630a9e3ebeec911800cd2a0ee42479b5d1..cff23df04bf125e6e9bc48b73a9a5f80c7888516 100644 (file)
--- a/Classes/class-rpc.php
+++ b/Classes/class-rpc.php
@@ -84,6 +84,9 @@ class RPC
                );
                curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
 
+               if (UNREALIRCD_DEBUG)
+                       do_log("SENDING JSON:", $this->content['body']);
+                       
                curl_setopt($curl, CURLOPT_POSTFIELDS, $this->content['body']);
 
                //for debug only!

diff --git a/config.php b/config.php
index c40af52c2ac1a25ce6ab93f4eadfe472b4b446be..c8728908a36bf0729bc9da5fb626e0ea2665498a 100644 (file)
--- a/config.php
+++ b/config.php
@@ -38,4 +38,4 @@ define( 'UNREALIRCD_SSL_VERIFY', false );
 /**
  * You should only need this if you're developing something.
 */
-define( 'UNREALIRCD_DEBUG', false );
\ No newline at end of file
+define( 'UNREALIRCD_DEBUG', 0 );
\ No newline at end of file

diff --git a/index.php b/index.php
index 7b9bc7c9d30bdd70d395d13a1819c9e6eaeb777f..ea1f8f2d2e0b4873be7892baf2b1804801db2e10 100644 (file)
--- a/index.php
+++ b/index.php
@@ -23,16 +23,55 @@ include "Classes/class-rpc.php";
 do_log($_POST);
 
 if (!empty($_POST)) {
-       if (!($bantype = $_POST["bantype"])) {
+       if (!($bantype = $_POST['bantype'])) {
 
        } else if (!($users = $_POST["userch"])) {
                Message::Fail("No user was specified");
        } else {
                foreach ($_POST["userch"] as $user) {
                        $user = base64_decode($user);
-                       $bantype = $_POST["bantype"];
-                       rpc_tkl_add($user, $bantype, "2h", "You have been banned lol");
-                       Message::Success($user . " has been banned");
+                       $bantype = (isset($_POST['bantype'])) ? $_POST['bantype'] : NULL;
+                       if (!$bantype)
+                       {
+                               Message::Fail("An error occured");
+                               return;
+                       }
+                       $banlen_w = (isset($_POST['banlen_w'])) ? $_POST['banlen_w'] : NULL;
+                       $banlen_d = (isset($_POST['banlen_d'])) ? $_POST['banlen_d'] : NULL;
+                       $banlen_h = (isset($_POST['banlen_h'])) ? $_POST['banlen_h'] : NULL;
+
+                       $duration = "";
+                       if (!$banlen_d && !$banlen_h && !$banlen_w)
+                               $duration .= "0";
+                       
+                       else
+                       {
+                               if ($banlen_w)
+                                       $duration .= $banlen_w;
+                               if ($banlen_d)
+                                       $duration .= $banlen_d;
+                               if ($banlen_h)
+                                       $duration .= $banlen_h;
+                       }
+
+                       $rpc = new RPC();
+                       $rpc->set_method("user.get");
+                       $rpc->set_params(["nick" => "$user"]);
+                       $rpc->execute();
+                       $nick = ($rpc->result) ? $rpc->fetch_assoc() : NULL;
+                       if (!$nick)
+                       {
+                               Message::Fail("Could not find that user. Maybe they disconnected after you clicked this?");
+                               return;
+                       }
+
+                       $msg_msg = ($duration == 0) ? "permanently" : "for $duration";
+
+                       if (rpc_tkl_add($user, $bantype, $duration, "You have been banned lol"))
+                       {
+                               $c = $nick['result']['client'];
+                               Message::Success($c['name'] . " (*@".$c['hostname'].") has been $bantype" . "'d $msg_msg");
+                       }
                }
        }
 
@@ -40,7 +79,8 @@ if (!empty($_POST)) {
                foreach ($_POST as $key => $value) {
                        foreach ($value as $tok) {
                                $tok = explode(",", $tok);
-                               rpc_tkl_del(base64_decode($tok[0]), base64_decode($tok[1]));
+                               if (rpc_tkl_del(base64_decode($tok[0]), base64_decode($tok[1])))
+                                       Message::Success(base64_decode($tok[1])." has been removed for ".base64_decode($tok[0]));
                        }
                }
 
@@ -49,11 +89,12 @@ if (!empty($_POST)) {
                        foreach ($value as $tok) {
                                $tok = explode(",", $tok);
                                rpc_sf_del(base64_decode($tok[0]), base64_decode($tok[1]), base64_decode($tok[2]), base64_decode($tok[3]));
+                               Message::Success(base64_decode($tok[1])." has been added for ".base64_decode($tok[0]));
                        }
                }
 }
 
-rpc_pop_lists(); // populate our static lists (users, channels, tkl, spamfilter)
+rpc_pop_lists();
 ?>
 
 <div class="tab-content\">
@@ -295,5 +336,3 @@ rpc_pop_lists(); // populate our static lists (users, channels, tkl, spamfilter)
        </div></div>
        
 </body>
-
-<div class="footer"><p>Copyright 2022-2023 © <a href="https://unrealircd.org/">UnrealIRCd</a></p></div>
\ No newline at end of file