Add Settings - RPC Servers (start of multi-server work).

[irc/unrealircd/unrealircd-webpanel.git] / inc / common.php

diff --git a/inc/common.php b/inc/common.php
index f2364b5b467642b9c86c93910c6f0c0cf591bbe7..8a485aeae6f05a99b885491e222ad513630082af 100644 (file)
--- a/inc/common.php
+++ b/inc/common.php
@@ -59,6 +59,24 @@ function read_config_file()
                return false;
        if (isset($config['unrealircd']))
                $config_transition_unreal_server = true;
+       /* Upgrade needed? */
+       $plugins_modified = false;
+       foreach ($config["plugins"] as $k=>$v)
+       {
+               if ($v == "sql_auth")
+               {
+                       $config["plugins"][$k] = "sql_db";
+                       $plugins_modified = true;
+               } else
+               if ($v == "file_auth")
+               {
+                       $config["plugins"][$k] = "file_db";
+                       $plugins_modified = true;
+               }
+       }
+       if ($plugins_modified)
+               write_config_file();
+
        return true;
 }
 
@@ -246,6 +264,14 @@ function upgrade_check()
                        write_config('unrealircd');
                }
        }
+       /* $config["unrealircd"] should be an array now.. */
+       if (isset($config['unrealircd']) && isset($config['unrealircd']['rpc_password']))
+       {
+               $config["unrealircd"]["default"] = true;
+               $config['unrealircd'] = [
+                       "Primary" => $config['unrealircd']];
+               write_config("unrealircd");
+       }
 
        $version = get_version();
        if (!isset($config['webpanel_version']))
@@ -352,6 +378,7 @@ $pages = [
        ],
        "Settings" => [
                "Plugins" => "settings/plugins.php",
+               "RPC Servers" => "settings/rpc-servers.php",
        ],
        
        "News" => "news.php",
@@ -362,14 +389,15 @@ if (!panel_start_session())
        if (!page_requires_no_login())
        {
                if (!is_auth_provided())
-                       die("No authentication plugin loaded. You must load either sql_auth, file_auth, or a similar auth plugin!");
+                       die("No authentication plugin loaded. You must load either sql_db, file_db, or a similar auth plugin!");
                $current_page = $_SERVER['REQUEST_URI'];
                header("Location: ".get_config("base_url")."login/?redirect=".urlencode($current_page));
                die;
        }
 } else {
        $pages["Settings"]["Accounts"] = "settings";
-
+       if (current_user_can(PERMISSION_MANAGE_USERS))
+               $pages["Settings"]["Role Editor"] = "settings/user-role-edit.php";
        $user = unreal_get_current_user();
        if ($user)
        {