EGroupware / egroupware

setup/inc/class.setup_detection.inc.php

Spacing +85 added lines, -85 removed lines

@@ -25,12 +25,12 @@ 
 	{
 		$setup_info = array();
 		$d = dir(EGW_SERVER_ROOT);
-		while($entry=$d->read())
+		while ($entry = $d->read())
 		{
-			if($entry != ".." && $entry != 'setup' && is_dir(EGW_SERVER_ROOT . '/' . $entry))
+			if ($entry != ".." && $entry != 'setup' && is_dir(EGW_SERVER_ROOT.'/'.$entry))
 			{
-				$f = EGW_SERVER_ROOT . '/' . $entry . '/setup/setup.inc.php';
-				if (@file_exists ($f))
+				$f = EGW_SERVER_ROOT.'/'.$entry.'/setup/setup.inc.php';
+				if (@file_exists($f))
 				{
 					include($f);
 					$setup_info[$entry]['filename'] = $f;
@@ -50,18 +50,18 @@ 
 	 * @param array $setup_info
 	 * @return array $setup_info
 	 */
-	function get_db_versions($setup_info=null)
+	function get_db_versions($setup_info = null)
 	{
 		try {	// catch DB errors
 			$GLOBALS['egw_setup']->set_table_names();
 
-			if($GLOBALS['egw_setup']->table_exist(array($GLOBALS['egw_setup']->applications_table),true))
+			if ($GLOBALS['egw_setup']->table_exist(array($GLOBALS['egw_setup']->applications_table), true))
 			{
 				/* one of these tables exists. checking for post/pre beta version */
-				if($GLOBALS['egw_setup']->applications_table != 'applications')
+				if ($GLOBALS['egw_setup']->applications_table != 'applications')
 				{
-					$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'*',false,__LINE__,__FILE__);
-					while(@$GLOBALS['egw_setup']->db->next_record())
+					$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table, '*', false, __LINE__, __FILE__);
+					while (@$GLOBALS['egw_setup']->db->next_record())
 					{
 						$app = $GLOBALS['egw_setup']->db->f('app_name');
 						if (!isset($setup_info[$app]))	// app source no longer there
@@ -77,7 +77,7 @@ 
 					}
 					/* This is to catch old setup installs that did not have phpgwapi listed as an app */
 					$tmp = @$setup_info['phpgwapi']['version']; /* save the file version */
-					if(!@$setup_info['phpgwapi']['currentver'])
+					if (!@$setup_info['phpgwapi']['currentver'])
 					{
 						$setup_info['phpgwapi']['currentver'] = $setup_info['admin']['currentver'];
 						$setup_info['phpgwapi']['version'] = $setup_info['admin']['currentver'];
@@ -97,9 +97,9 @@ 
 				else
 				{
 					$GLOBALS['egw_setup']->db->query('select * from applications');
-					while(@$GLOBALS['egw_setup']->db->next_record())
+					while (@$GLOBALS['egw_setup']->db->next_record())
 					{
-						if($GLOBALS['egw_setup']->db->f('app_name') == 'admin')
+						if ($GLOBALS['egw_setup']->db->f('app_name') == 'admin')
 						{
 							$setup_info['phpgwapi']['currentver'] = $GLOBALS['egw_setup']->db->f('app_version');
 						}
@@ -127,25 +127,25 @@ 
 	 * 	V	Version mismatch at end of upgrade (Not used, proposed only)
 	 * 	M	Missing files at start of upgrade (Not used, proposed only)
 	 */
-	function compare_versions($setup_info,$try_downgrade=false)
+	function compare_versions($setup_info, $try_downgrade = false)
 	{
-		foreach($setup_info as $key => $value)
+		foreach ($setup_info as $key => $value)
 		{
 			//echo '<br>'.$value['name'].'STATUS: '.$value['status'];
 			/* Only set this if it has not already failed to upgrade - Milosch */
-			if(!( (@$value['status'] == 'F') || (@$value['status'] == 'C') ))
+			if (!((@$value['status'] == 'F') || (@$value['status'] == 'C')))
 			{
 				//if ($setup_info[$key]['currentver'] > $setup_info[$key]['version'])
-				if(!$try_downgrade && $GLOBALS['egw_setup']->amorethanb($value['currentver'],@$value['version']) ||
+				if (!$try_downgrade && $GLOBALS['egw_setup']->amorethanb($value['currentver'], @$value['version']) ||
 					$value['version'] == 'deleted')
 				{
 					$setup_info[$key]['status'] = 'V';
 				}
-				elseif(@$value['currentver'] == @$value['version'])
+				elseif (@$value['currentver'] == @$value['version'])
 				{
 					$setup_info[$key]['status'] = 'C';
 				}
-				elseif($GLOBALS['egw_setup']->alessthanb(@$value['currentver'],@$value['version']))
+				elseif ($GLOBALS['egw_setup']->alessthanb(@$value['currentver'], @$value['version']))
 				{
 					$setup_info[$key]['status'] = 'U';
 				}
@@ -162,35 +162,35 @@ 
 	function check_depends($setup_info)
 	{
 		/* Run the list of apps */
-		foreach($setup_info as $key => $value)
+		foreach ($setup_info as $key => $value)
 		{
 			/* Does this app have any depends */
-			if(isset($value['depends']))
+			if (isset($value['depends']))
 			{
 				/* If so find out which apps it depends on */
-				foreach($value['depends'] as $depkey => $depvalue)
+				foreach ($value['depends'] as $depkey => $depvalue)
 				{
 					/* I set this to False until we find a compatible version of this app */
 					$setup_info['depends'][$depkey]['status'] = False;
 					/* Now we loop thru the versions looking for a compatible version */
 
-					foreach($depvalue['versions'] as $depsvalue)
+					foreach ($depvalue['versions'] as $depsvalue)
 					{
 						$currentver = $setup_info[$depvalue['appname']]['currentver'];
-						if ($depvalue['appname'] == 'phpgwapi' && substr($currentver,0,6) == '0.9.99')
+						if ($depvalue['appname'] == 'phpgwapi' && substr($currentver, 0, 6) == '0.9.99')
 						{
 							$currentver = '0.9.14.508';
 						}
 						$major = $GLOBALS['egw_setup']->get_major($currentver);
-						if ($major >= $depsvalue || $major == $depsvalue && substr($major,0,strlen($depsvalue)+1) == $depsvalue.'.')
+						if ($major >= $depsvalue || $major == $depsvalue && substr($major, 0, strlen($depsvalue) + 1) == $depsvalue.'.')
 						{
 							$setup_info['depends'][$depkey]['status'] = True;
 						}
 						else	// check if majors are equal and minors greater or equal
 						{
 							$major_depsvalue = $GLOBALS['egw_setup']->get_major($depsvalue);
-							$tmp = explode('.',$depsvalue); $minor_depsvalue = array_pop($tmp);
-							$tmp2 = explode('.',$currentver); $minor = array_pop($tmp2);
+							$tmp = explode('.', $depsvalue); $minor_depsvalue = array_pop($tmp);
+							$tmp2 = explode('.', $currentver); $minor = array_pop($tmp2);
 							if ($major == $major_depsvalue && $minor <= $minor_depsvalue)
 							{
 								$setup_info['depends'][$depkey]['status'] = True;
@@ -203,17 +203,17 @@ 
 				 Finally, we loop through the dependencies again to look for apps that still have a failure status
 				 If we find one, we set the apps overall status as a dependency failure.
 				*/
-				foreach($value['depends'] as $depkey => $depvalue)
+				foreach ($value['depends'] as $depkey => $depvalue)
 				{
 					if ($setup_info['depends'][$depkey]['status'] == False)
 					{
 						/* Only set this if it has not already failed to upgrade - Milosch */
-						if($setup_info[$key]['status'] != 'F')//&& $setup_info[$key]['status'] != 'C')
+						if ($setup_info[$key]['status'] != 'F')//&& $setup_info[$key]['status'] != 'C')
 						{
 							/* Added check for status U - uninstalled apps carry this flag (upgrade from nothing == install).
 							 * This should fix apps showing post-install dep failure when they are not yet installed.
 							 */
-							if($setup_info[$key]['status'] == 'C' || $setup_info[$key]['status'] == 'U')
+							if ($setup_info[$key]['status'] == 'C' || $setup_info[$key]['status'] == 'U')
 							{
 								$setup_info[$key]['status'] = 'D';
 							}
@@ -235,9 +235,9 @@ 
 	 */
 	function upgrade_exclude($setup_info)
 	{
-		foreach($setup_info as $key => $value)
+		foreach ($setup_info as $key => $value)
 		{
-			if(isset($value['no_mass_update']))
+			if (isset($value['no_mass_update']))
 			{
 				unset($setup_info[$key]);
 			}
@@ -252,24 +252,24 @@ 
 	 */
 	function check_header()
 	{
-		if(!file_exists(EGW_SERVER_ROOT.'/header.inc.php') || filesize(EGW_SERVER_ROOT.'/header.inc.php') < 200)
+		if (!file_exists(EGW_SERVER_ROOT.'/header.inc.php') || filesize(EGW_SERVER_ROOT.'/header.inc.php') < 200)
 		{
 			$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One';
 			return '1';
 		}
 		else
 		{
-			if(!@isset($GLOBALS['egw_info']['server']['header_admin_password']))
+			if (!@isset($GLOBALS['egw_info']['server']['header_admin_password']))
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One (No header admin password set)';
 				return '2';
 			}
-			elseif(!@isset($GLOBALS['egw_domain']))
+			elseif (!@isset($GLOBALS['egw_domain']))
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One (Add domains to your header.inc.php)';
 				return '3';
 			}
-			elseif(@$GLOBALS['egw_info']['server']['versions']['header'] != @$GLOBALS['egw_info']['server']['versions']['current_header'])
+			elseif (@$GLOBALS['egw_info']['server']['versions']['header'] != @$GLOBALS['egw_info']['server']['versions']['current_header'])
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One (Upgrade your header.inc.php)';
 				return '4';
@@ -286,7 +286,7 @@ 
 	 * @param array $setup_info =null default use $GLOBALS['setup_info']
 	 * @return int 1=no database, 3=empty, 4=need upgrade, 10=complete
 	 */
-	function check_db($setup_info=null)
+	function check_db($setup_info = null)
 	{
 		if (!$setup_info) $setup_info = $GLOBALS['setup_info'];
 
@@ -294,14 +294,14 @@ 
 			if (!$GLOBALS['egw_setup']->db->Link_ID)
 			{
 				$old = error_reporting();
-				error_reporting($old & ~E_WARNING);	// no warnings
+				error_reporting($old&~E_WARNING); // no warnings
 				$GLOBALS['egw_setup']->db->connect();
 				error_reporting($old);
 
 				$GLOBALS['egw_setup']->set_table_names();
 			}
 		}
-		catch(egw_exception_db $e) {
+		catch (egw_exception_db $e) {
 			// ignore error
 		}
 
@@ -310,14 +310,14 @@ 
 			$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Create Database)';
 			return 1;
 		}
-		if(!isset($setup_info['phpgwapi']['currentver']))
+		if (!isset($setup_info['phpgwapi']['currentver']))
 		{
 			$setup_info = $this->get_db_versions($setup_info);
 		}
 		//_debug_array($setup_info);
 		if (isset($setup_info['phpgwapi']['currentver']))
 		{
-			if(@$setup_info['phpgwapi']['currentver'] == @$setup_info['phpgwapi']['version'])
+			if (@$setup_info['phpgwapi']['currentver'] == @$setup_info['phpgwapi']['version'])
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Tables Complete)';
 				return 10;
@@ -351,14 +351,14 @@ 
 	 */
 	function check_config()
 	{
-		if(@$GLOBALS['egw_info']['setup']['stage']['db'] != 10)
+		if (@$GLOBALS['egw_info']['setup']['stage']['db'] != 10)
 		{
 			return '';
 		}
 
 		try {	// catch db errors
-			$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table,'config_name,config_value',array('config_app' => 'phpgwapi'),__LINE__,__FILE__);
-			while($GLOBALS['egw_setup']->db->next_record())
+			$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table, 'config_name,config_value', array('config_app' => 'phpgwapi'), __LINE__, __FILE__);
+			while ($GLOBALS['egw_setup']->db->next_record())
 			{
 				$config[$GLOBALS['egw_setup']->db->f(0)] = $GLOBALS['egw_setup']->db->f(1);
 			}
@@ -368,21 +368,21 @@ 
 			// ignore db errors
 		}
 		$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 2 (Needs Configuration)';
-		if(!count($config))
+		if (!count($config))
 		{
 			return 1;
 		}
-		$config_errors =& $GLOBALS['egw_info']['setup']['config_errors'];
+		$config_errors = & $GLOBALS['egw_info']['setup']['config_errors'];
 		$GLOBALS['egw_info']['setup']['config_errors'] = array();
 		$error_msg = null;
-		if (!$this->check_dir($config['temp_dir'],$error_msg))
+		if (!$this->check_dir($config['temp_dir'], $error_msg))
 		{
-			$config_errors[] = lang("Your temporary directory '%1' %2",$config['temp_dir'],$error_msg);
+			$config_errors[] = lang("Your temporary directory '%1' %2", $config['temp_dir'], $error_msg);
 		}
 
-		if (!$this->check_dir($config['files_dir'],$error_msg,true))
+		if (!$this->check_dir($config['files_dir'], $error_msg, true))
 		{
-			$config_errors[] = lang("Your files directory '%1' %2",$config['files_dir'],$error_msg);
+			$config_errors[] = lang("Your files directory '%1' %2", $config['files_dir'], $error_msg);
 		}
 		// set and create the default backup_dir
 		if (@is_writeable($config['files_dir']) && empty($config['backup_dir']))
@@ -390,35 +390,35 @@ 
 			$config['backup_dir'] = $config['files_dir'].'/db_backup';
 			if (!is_dir($config['backup_dir']) && mkdir($config['backup_dir']))
 			{
-				$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+				$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
 					'config_value' => $config['backup_dir'],
-				),array(
+				), array(
 					'config_app'  => 'phpgwapi',
 					'config_name' => 'backup_dir',
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 		}
 		if (isset($config['backup_mincount']))
 		{
-			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
 				'config_value' => $config['backup_mincount'],
-				),array(
+				), array(
 				'config_app'  => 'phpgwapi',
 				'config_name' => 'backup_mincount',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		if (isset($config['backup_files']))
 		{
-			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
 				'config_value' => (int)$config['backup_files'],
-				),array(
+				), array(
 				'config_app'  => 'phpgwapi',
 				'config_name' => 'backup_files',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
-		if (!$this->check_dir($config['backup_dir'],$error_msg,true))
+		if (!$this->check_dir($config['backup_dir'], $error_msg, true))
 		{
-			$config_errors[] = lang("Your backup directory '%1' %2",$config['backup_dir'],$error_msg);
+			$config_errors[] = lang("Your backup directory '%1' %2", $config['backup_dir'], $error_msg);
 		}
 		if ($config_errors)
 		{
@@ -430,7 +430,7 @@ 
 
 	function check_lang($check = True)
 	{
-		if($check && $GLOBALS['egw_info']['setup']['stage']['db'] != 10)
+		if ($check && $GLOBALS['egw_info']['setup']['stage']['db'] != 10)
 		{
 			return '';
 		}
@@ -439,21 +439,21 @@ 
 			$GLOBALS['setup_info'] = $GLOBALS['egw_setup']->detection->get_db_versions($GLOBALS['setup_info']);
 		}
 		try {
-			$GLOBALS['egw_setup']->db->query($q = "SELECT DISTINCT lang FROM {$GLOBALS['egw_setup']->lang_table}",__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->query($q = "SELECT DISTINCT lang FROM {$GLOBALS['egw_setup']->lang_table}", __LINE__, __FILE__);
 		}
 		catch (egw_exception_db $e) {
 			// ignore db error
 		}
-		if($e || $GLOBALS['egw_setup']->db->num_rows() == 0)
+		if ($e || $GLOBALS['egw_setup']->db->num_rows() == 0)
 		{
 			$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 3 (No languages installed)';
 			return 1;
 		}
-		while(@$GLOBALS['egw_setup']->db->next_record())
+		while (@$GLOBALS['egw_setup']->db->next_record())
 		{
 			$GLOBALS['egw_info']['setup']['installed_langs'][$GLOBALS['egw_setup']->db->f('lang')] = $GLOBALS['egw_setup']->db->f('lang');
 		}
-		foreach($GLOBALS['egw_info']['setup']['installed_langs'] as $value)
+		foreach ($GLOBALS['egw_info']['setup']['installed_langs'] as $value)
 		{
 			$sql = "SELECT lang_name FROM {$GLOBALS['egw_setup']->languages_table} WHERE lang_id = '".$value."'";
 			$GLOBALS['egw_setup']->db->query($sql);
@@ -471,19 +471,19 @@ 
 	 * @param $appname
 	 * @param $any		optional, set to True to see if any of the apps tables are installed
 	 */
-	function check_app_tables($appname,$any=False)
+	function check_app_tables($appname, $any = False)
 	{
 		$none = 0;
 		$setup_info = $GLOBALS['setup_info'];
 
-		if(@$setup_info[$appname]['tables'])
+		if (@$setup_info[$appname]['tables'])
 		{
 			/* Make a copy, else we send some callers into an infinite loop */
 			$copy = $setup_info;
 			$tables = Array();
 			try {
 				$table_names = $GLOBALS['egw_setup']->db->table_names();
-				foreach($table_names as $key => $val)
+				foreach ($table_names as $key => $val)
 				{
 					$tables[] = $val['table_name'];
 				}
@@ -492,19 +492,19 @@ 
 				unset($e);
 				// ignore db error
 			}
-			foreach($copy[$appname]['tables'] as $key => $val)
+			foreach ($copy[$appname]['tables'] as $key => $val)
 			{
-				if($GLOBALS['DEBUG'])
+				if ($GLOBALS['DEBUG'])
 				{
-					echo '<br>check_app_tables(): Checking: ' . $appname . ',table: ' . $val;
+					echo '<br>check_app_tables(): Checking: '.$appname.',table: '.$val;
 				}
-				if(!in_array($val,$tables) && !in_array(strtolower($val),$tables))	// names in tables might be lowercase
+				if (!in_array($val, $tables) && !in_array(strtolower($val), $tables))	// names in tables might be lowercase
 				{
-					if($GLOBALS['DEBUG'])
+					if ($GLOBALS['DEBUG'])
 					{
-						echo '<br>check_app_tables(): ' . $val . ' missing!';
+						echo '<br>check_app_tables(): '.$val.' missing!';
 					}
-					if(!$any)
+					if (!$any)
 					{
 						return False;
 					}
@@ -515,9 +515,9 @@ 
 				}
 				else
 				{
-					if($any)
+					if ($any)
 					{
-						if($GLOBALS['DEBUG'])
+						if ($GLOBALS['DEBUG'])
 						{
 							echo '<br>check_app_tables(): Some tables installed';
 						}
@@ -526,9 +526,9 @@ 
 				}
 			}
 		}
-		if($none && $any)
+		if ($none && $any)
 		{
-			if($GLOBALS['DEBUG'])
+			if ($GLOBALS['DEBUG'])
 			{
 				echo '<br>check_app_tables(): No tables installed';
 			}
@@ -536,7 +536,7 @@ 
 		}
 		else
 		{
-			if($GLOBALS['DEBUG'])
+			if ($GLOBALS['DEBUG'])
 			{
 				echo '<br>check_app_tables(): All tables installed';
 			}
@@ -552,9 +552,9 @@ 
 	 * @param boolean $check_in_docroot =false run an optional in docroot check
 	 * @return boolean
 	 */
-	static function check_dir($dir,&$msg,$check_in_docroot=false)
+	static function check_dir($dir, &$msg, $check_in_docroot = false)
 	{
-		if (!@is_dir($dir) && !@mkdir($dir,0700,true))
+		if (!@is_dir($dir) && !@mkdir($dir, 0700, true))
 		{
 			$msg = lang('does not exist');
 			return false;
@@ -566,16 +566,16 @@ 
 		}
 		if ($check_in_docroot)
 		{
-			$docroots = array(realpath(EGW_SERVER_ROOT),realpath($_SERVER['DOCUMENT_ROOT']));
+			$docroots = array(realpath(EGW_SERVER_ROOT), realpath($_SERVER['DOCUMENT_ROOT']));
 			$dir = realpath($dir);
 
 			foreach ($docroots as $docroot)
 			{
 				$len = strlen($docroot);
 
-				if ($docroot == substr($dir,0,$len) && $len>0)
+				if ($docroot == substr($dir, 0, $len) && $len > 0)
 				{
-					$rest = substr($dir,$len);
+					$rest = substr($dir, $len);
 
 					if (!strlen($rest) || $rest[0] == DIRECTORY_SEPARATOR)
 					{

setup/inc/hook_config_validate.inc.php

Spacing +21 added lines, -21 removed lines

@@ -30,12 +30,12 @@ 
  */
 function auth_type($settings)
 {
-	switch($settings['auth_type'])
+	switch ($settings['auth_type'])
 	{
 		case 'mail':
 			if (class_exists('Horde_Imap_Client_Socket') && !in_array($settings['mail_server_type'], array('pop', 'pops')))
 			{
-				return;	// we use Horde code instead of imap extension
+				return; // we use Horde code instead of imap extension
 			}
 			try {
 				check_load_extension('imap', true);
@@ -55,33 +55,33 @@ 
  */
 function vfs_storage_mode($settings)
 {
-	switch($settings['vfs_storage_mode'])
+	switch ($settings['vfs_storage_mode'])
 	{
 		case 'fs':
-			config::save_value('vfs_fstab','','phpgwapi');
+			config::save_value('vfs_fstab', '', 'phpgwapi');
 			break;
 		case 'db':
 			config::save_value('vfs_fstab', array(
 				'/' => 'sqlfs://$host/?storage=db',
 				'/apps' => 'links://$host/apps?storage=db',
-			),'phpgwapi');
+			), 'phpgwapi');
 			break;
 	}
 }
 
 function temp_dir($settings)
 {
-	if (!setup_detection::check_dir($settings['temp_dir'],$error_msg))
+	if (!setup_detection::check_dir($settings['temp_dir'], $error_msg))
 	{
-		$GLOBALS['config_error'] = lang("Your temporary directory '%1' %2",$settings['temp_dir'],$error_msg);
+		$GLOBALS['config_error'] = lang("Your temporary directory '%1' %2", $settings['temp_dir'], $error_msg);
 	}
 }
 
 function files_dir($settings)
 {
-	if (!setup_detection::check_dir($settings['files_dir'],$error_msg,true))
+	if (!setup_detection::check_dir($settings['files_dir'], $error_msg, true))
 	{
-		$GLOBALS['config_error'] = lang("Your files directory '%1' %2",$settings['files_dir'],$error_msg);
+		$GLOBALS['config_error'] = lang("Your files directory '%1' %2", $settings['files_dir'], $error_msg);
 	}
 }
 
@@ -91,20 +91,20 @@ 
 	{
 		$settings['backup_dir'] = $settings['files_dir'].'/db_backup';
 	}
-	if (!setup_detection::check_dir($settings['backup_dir'],$error_msg,true))
+	if (!setup_detection::check_dir($settings['backup_dir'], $error_msg, true))
 	{
-		$GLOBALS['config_error'] = lang("Your backup directory '%1' %2",$settings['backup_dir'],$error_msg);
+		$GLOBALS['config_error'] = lang("Your backup directory '%1' %2", $settings['backup_dir'], $error_msg);
 	}
 }
 
-function _mcrypt_test_module_mode($module,$mode)
+function _mcrypt_test_module_mode($module, $mode)
 {
 	/* Data */
 	$key = 'this is a very long key, even too long for the cipher';
 	$plain_text = 'very important data';
 
 	/* Open module, and create IV */
-	if(!$GLOBALS['td'] = @mcrypt_module_open($module, '',$mode, ''))
+	if (!$GLOBALS['td'] = @mcrypt_module_open($module, '', $mode, ''))
 	{
 		@mcrypt_module_close($GLOBALS['td']);
 		return False;
@@ -114,7 +114,7 @@ 
 	$iv = @mcrypt_create_iv($iv_size, MCRYPT_RAND);
 
 	/* Initialize encryption handle */
-	if(mcrypt_generic_init($GLOBALS['td'], $key, $iv) != -1)
+	if (mcrypt_generic_init($GLOBALS['td'], $key, $iv) != -1)
 	{
 		/* Encrypt data */
 		$c_t = mcrypt_generic($GLOBALS['td'], $plain_text);
@@ -148,14 +148,14 @@ 
 	$modes = mcrypt_list_modes();
 	$algorithms = mcrypt_list_algorithms();
 
-	foreach($algorithms as $cipher)
+	foreach ($algorithms as $cipher)
 	{
-		if(mcrypt_module_self_test($cipher))
+		if (mcrypt_module_self_test($cipher))
 		{
 			$GLOBALS['ciphers'][$cipher] = array();
-			foreach($modes as $mode)
+			foreach ($modes as $mode)
 			{
-				if(_mcrypt_test_module_mode($cipher,$mode))
+				if (_mcrypt_test_module_mode($cipher, $mode))
 				{
 					$result = True;
 				}
@@ -174,10 +174,10 @@ 
 function mcrypt_algo($settings)
 {
 	/* _debug_array($settings);exit; */
-	if(@function_exists('mcrypt_list_modes'))
+	if (@function_exists('mcrypt_list_modes'))
 	{
 		mcrypt_check_sanity();
-		if(!@$GLOBALS['ciphers'][$settings['mcrypt_algo']][$settings['mcrypt_mode']])
+		if (!@$GLOBALS['ciphers'][$settings['mcrypt_algo']][$settings['mcrypt_mode']])
 		{
 			$GLOBALS['config_error'] = lang('Invalid Mcrypt Algorithm/Mode combination');
 		}
@@ -191,7 +191,7 @@ 
  */
 function ldap_search_filter(&$settings)
 {
-	$filter =& $settings['ldap_search_filter'];
+	$filter = & $settings['ldap_search_filter'];
 
 	if ($filter && $filter{0} != '(') $filter = '('.$filter.')';
 }