static $channel = [];
static $tkl = [];
static $spamfilter = [];
+ static $server = [];
+ static $nameban = [];
+ static $exception = [];
static $opercount = 0;
static $services_count = 0;
$ret = $rpc->user()->getAll();
// TODO: error checking
- foreach($ret->list as $r)
+ foreach($ret as $r)
{
RPC_List::$user[] = $r;
if (strpos($r->user->modes,"o") !== false && strpos($r->user->modes,"S") == false)
/* Get the channels list */
$ret = $rpc->channel()->getAll();
- foreach($ret->list as $r)
+ foreach($ret as $r)
{
RPC_List::$channel[] = $r;
if ($r->num_users > RPC_List::$channel_pop_count)
/* Get the tkl list */
$ret = $rpc->serverban()->getAll();
- foreach($ret->list as $r)
+ foreach($ret as $r)
RPC_List::$tkl[] = $r;
/* Get the spamfilter list */
- $ret = $rpc->query("spamfilter.list");
- // TODO: convert to new style
- foreach($ret->list as $r)
+ $ret = $rpc->spamfilter()->getAll();
+ foreach($ret as $r)
RPC_List::$spamfilter[] = $r;
-
-}
-
-/** RPC Spamfilter Delete
- * TODO: get rid of this, use unrealircd-rpc-php api when the call is there...
- */
-function rpc_sf_del($name, $mtype, $targets, $action) : bool
-{
- GLOBAL $rpc;
-
- $params = ["name" => $name, "match_type" => $mtype, "spamfilter_targets" => $targets, "ban_action" => $action, "set_by" => "YoMama"];
- $result = $rpc->query("spamfilter.del", $params);
- if ($result->error)
- {
- $msg = "The spamfilter entry could not be deleted: $name - ".$result['error']['message'] . " (" . $result['error']['code'] . ")";
- Message::Fail($msg);
- return false;
- }
- else
- {
- $r = $result->tkl;
- Message::Success("Deleted spamfilter entry: ".$r->name." [type: ".$r->match_type."] [targets: ".$r->spamfilter_targets. "] [action: ".$r->ban_action."] [reason: ".$r->reason."] [set by: ".$r->set_by."]");
- }
- return true;
+
+ foreach ($rpc->nameban()->getAll() as $r)
+ RPC_List::$nameban[] = $r;
+
+ foreach ($rpc->serverbanexception()->getAll() as $r)
+ RPC_List::$exception[] = $r;
+
+ foreach ($rpc->server()->getAll() as $r)
+ RPC_List::$server[] = $r;
}
/** Convert the duration_string */