X-Git-Url: https://jfr.im/git/irc/unrealircd/unrealircd-webpanel.git/blobdiff_plain/c06c1713af2db485d55a91073bbc5b63b6aa8c0b..41aad10cbe0755aee50f597cb2cadd3029de7e1d:/inc/common.php

diff --git a/inc/common.php b/inc/common.php
index fa3f7c7..8a485ae 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -7,7 +7,7 @@ if (version_compare(PHP_VERSION, '8.0.0', '<'))
 	    "<code>apt-get remove libapache2-mod-php7.4</code> (or a similar version). ".
 	    "You may also need to choose again the PHP module to load in apache via <code>a2enmod php8.2</code>");
 
-define('UPATH', dirname(dirname(__FILE__)));
+define('UPATH', dirname(__DIR__));
 
 function get_config($setting)
 {
@@ -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']))
@@ -310,7 +336,7 @@ if (!is_dir(UPATH . "/vendor"))
 	die("The vendor/ directory is missing. Most likely the admin forgot to run 'composer install'\n");
 require_once UPATH . '/vendor/autoload.php';
 require_once UPATH . "/Classes/class-cmodes.php";
-require_once UPATH . "/cfg/defines.php";
+require_once UPATH . "/inc/defines.php";
 require_once UPATH . "/misc/strings.php";
 require_once UPATH . "/misc/channel-lookup-misc.php";
 require_once UPATH . "/misc/user-lookup-misc.php";
@@ -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)
 	{