- more work on settings for FroxlorClients (upcoming multiserver-mode)

lib/classes/froxlorclient/class.froxlorclient.php

@@ -2,7 +2,6 @@
 
 /**
  * This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
  * Copyright (c) 2010 the Froxlor Team (see authors).
  *
  * For the full copyright and license information, please view the COPYING
@@ -323,11 +322,19 @@ class froxlorclient
 		if(isset($this->cid)
 			&& $this->cid != - 1
 		) {
-			$_settings = $this->db->query("SELECT * FROM `".TABLE_PANEL_SETTINGS."` WHERE `sid` = '".(int)$this->cid."'");
+			$spath = makeCorrectDir(dirname(dirname(dirname(dirname(__FILE__)))));
+			$settings_data = loadConfigArrayDir(
+								makeCorrectDir($spath.'/actions/admin/settings/'),
+								makeCorrectDir($spath.'/actions/multiserver/clientsettings/')
+							);
+			$settings = loadSettings($settings_data, $db, $this->cid);
 
-			while($_s = mysql_fetch_array($_settings))
+			foreach($settings as $group => $fv)
 			{
-				$this->_setSetting($_s['settinggroup'], $_s['varname'], $_s['value'], true, true, true);
+				foreach($fv as $field => $value)
+				{
+					$this->_setSetting($group, $field, $value, true, true, true);					
+				}
 			}
 		}
 	}

lib/functions/froxlor/function.loadConfigArrayDir.php

@@ -17,25 +17,44 @@
  * @version    $Id$
  */
 
-function loadConfigArrayDir($data_dirname)
+function loadConfigArrayDir()
 {
 	// Workaround until we use gettext
 	global $lng;
-	
+
+	// we now use dynamic function parameters
+	// so we can read from more than one directory
+	// and still be valid for old calls
+	$numargs = func_num_args();
+	if($numargs <= 0) { return null; }
+
+	$configdirs = array();
+	for($x=0;$x<$numargs;$x++) {
+		$configdirs[] = func_get_arg($x);
+	}
+
 	$data = array();
+	$data_files = array();
+	$has_data = false;
 
-	if(is_dir($data_dirname))
+	foreach($configdirs as $data_dirname)
 	{
-		$data_files = array();
-		$data_dirhandle = opendir($data_dirname);
-		while(false !== ($data_filename = readdir($data_dirhandle)))
+		if(is_dir($data_dirname))
 		{
-			if($data_filename != '.' && $data_filename != '..' && $data_filename != '' && substr($data_filename, -4 ) == '.php')
+			$data_dirhandle = opendir($data_dirname);
+			while(false !== ($data_filename = readdir($data_dirhandle)))
 			{
-				$data_files[] = $data_dirname . $data_filename;
+				if($data_filename != '.' && $data_filename != '..' && $data_filename != '' && substr($data_filename, -4 ) == '.php')
+				{
+					$data_files[] = $data_dirname . $data_filename;
+				}
 			}
+			$has_data = true;
 		}
-
+	}
+	
+	if($has_data)
+	{
 		sort($data_files);
 
 		foreach($data_files as $data_filename)

lib/functions/settings/function.loadSettings.php

@@ -17,13 +17,10 @@
  * @version    $Id$
  */
 
-function loadSettings(&$settings_data, $db)
+function loadSettings(&$settings_data, $db, $server_id = 0)
 {
 	global $version;
 
-	// multi-server-support, get the destination server id (master = 0)
-	$server_id = getServerId();
-
 	$settings = array();
 
 	if(is_array($settings_data) && isset($settings_data['groups']) && is_array($settings_data['groups']))