Deal with empty RPC servers better.

diff --git a/inc/common.php b/inc/common.php
index bd812e9eb467992cf5a37735bddfd9e85a353273..e38f5eb459e75f29ef467b673fec90e5dbe30887 100644 (file)
--- a/inc/common.php
+++ b/inc/common.php
@@ -211,9 +211,12 @@ function generate_secrets()
 
 function get_active_rpc_server()
 {
+       $servers = get_config("unrealircd");
+       if (empty($servers))
+               return;
        // TODO: make user able to override this - either in user or in session
 
-       foreach (get_config("unrealircd") as $displayname=>$e)
+       foreach ($servers as $displayname=>$e)
        {
                if (isset($e["default"]) && $e["default"])
                        return $displayname;

diff --git a/settings/rpc-servers.php b/settings/rpc-servers.php
index bf0554543f9ee9635de8f8cccc7e624e0b91f1dc..583115996ae589a2cf72eb29cc0f0066012495c6 100644 (file)
--- a/settings/rpc-servers.php
+++ b/settings/rpc-servers.php
@@ -222,7 +222,10 @@ border-radius: 3px;
        </thead>
        <tbody>
        <?php
-               foreach($config['unrealircd'] as $name=>$e)
+               $servers = get_config('unrealircd');
+               if (!$servers)
+                       $servers = [];
+               foreach($servers as $name=>$e)
                {
                        $primary = "";
                        if (isset($e["default"]) && $e["default"])