EGroupware / egroupware

setup/inc/class.setup.inc.php

Braces +128 added lines, -37 removed lines

@@ -84,11 +84,20 @@ 
 		$this->detection = new setup_detection();
 		$this->process   = new setup_process();
 
-		if (preg_match('/^[a-z0-9-]+$/i', $_REQUEST['system_charset'])) $this->system_charset = $_REQUEST['system_charset'];
+		if (preg_match('/^[a-z0-9-]+$/i', $_REQUEST['system_charset']))
+		{
+			$this->system_charset = $_REQUEST['system_charset'];
+		}
 
 		/* The setup application needs these */
-		if ($html) $this->html = new setup_html();
-		if ($translation) $this->translation = new setup_translation();
+		if ($html)
+		{
+			$this->html = new setup_html();
+		}
+		if ($translation)
+		{
+			$this->translation = new setup_translation();
+		}
 	}
 
 	/**
@@ -131,12 +140,15 @@ 
 					$this->db_charset_was = $this->db->Link_ID->GetCharSet();	// needed for the update
 
 					// we can NOT set the DB charset for mysql, if the api version < 1.0.1.019, as it would mess up the DB content!!!
-					if (substr($this->db->Type,0,5) == 'mysql')	// we need to check the api version
+					if (substr($this->db->Type,0,5) == 'mysql')
+					{
+						// we need to check the api version
 					{
 						$api_version = $this->db->select($this->applications_table,'app_version',array(
 								'app_name'  => 'phpgwapi',
 							),__LINE__,__FILE__)->fetchColumn();
 					}
+					}
 					if (!$api_version || !$this->alessthanb($api_version,'1.0.1.019'))
 					{
 						$this->db->Link_ID->SetCharSet($this->system_charset);
@@ -205,7 +217,10 @@ 
 		}
 		else
 		{
-			if (!isset($_SESSION)) self::session_start();
+			if (!isset($_SESSION))
+			{
+				self::session_start();
+			}
 			$ConfigLang = $_SESSION['ConfigLang'];
 		}
 		$matches = null;
@@ -259,7 +274,10 @@ 
 					// if called via HTTPS, only send cookie for https and only allow cookie access via HTTP (true)
 					Api\Header\Http::schema() === 'https', true);
 
-				if (isset($_COOKIE[self::SESSIONID])) session_id($_COOKIE[self::SESSIONID]);
+				if (isset($_COOKIE[self::SESSIONID]))
+				{
+					session_id($_COOKIE[self::SESSIONID]);
+				}
 
 				$ok = @session_start();	// suppress notice if session already started or warning in CLI
 				break;
@@ -477,7 +495,10 @@ 
 	 */
 	function register_app($appname, $_enable=99, array $setup_info=null)
 	{
-		if (!isset($setup_info)) $setup_info = $GLOBALS['setup_info'];
+		if (!isset($setup_info))
+		{
+			$setup_info = $GLOBALS['setup_info'];
+		}
 
 		if(!$appname)
 		{
@@ -585,7 +606,10 @@ 
 	 */
 	function update_app($appname, array $setup_info=null)
 	{
-		if (!isset($setup_info)) $setup_info = $GLOBALS['setup_info'];
+		if (!isset($setup_info))
+		{
+			$setup_info = $GLOBALS['setup_info'];
+		}
 
 		if(!$appname)
 		{
@@ -737,7 +761,10 @@ 
 		{
 			$GLOBALS['settings'] = array();
 			include_once($file);
-			if ($GLOBALS['settings']) $settings = array_merge($settings,$GLOBALS['settings']);
+			if ($GLOBALS['settings'])
+			{
+				$settings = array_merge($settings,$GLOBALS['settings']);
+			}
 		}
 		$default = $forced = array();
 		foreach($settings as $name => $setting)
@@ -819,52 +846,72 @@ 
 
 		for($i=0;$i<count($testa);$i++)
 		{
-			if($DEBUG) { echo'<br>Checking if '. (int)$testa[$i] . ' is less than ' . (int)$testb[$i] . ' ...'; }
+			if($DEBUG)
+			{
+echo'<br>Checking if '. (int)$testa[$i] . ' is less than ' . (int)$testb[$i] . ' ...'; }
 			if((int)$testa[$i] < (int)$testb[$i])
 			{
-				if ($DEBUG) { echo ' yes.'; }
+				if ($DEBUG)
+				{
+echo ' yes.'; }
 				$less++;
 				if($i<3)
 				{
 					/* Ensure that this is definitely smaller */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
+					if($DEBUG)
+					{
+echo"  This is the $num[$i] octet, so A is definitely less than B."; }
 					$less = 5;
 					break;
 				}
 			}
 			elseif((int)$testa[$i] > (int)$testb[$i])
 			{
-				if($DEBUG) { echo ' no.'; }
+				if($DEBUG)
+				{
+echo ' no.'; }
 				$less--;
 				if($i<2)
 				{
 					/* Ensure that this is definitely greater */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
+					if($DEBUG)
+					{
+echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
 					$less = -5;
 					break;
 				}
 			}
 			else
 			{
-				if($DEBUG) { echo ' no, they are equal or of different length.'; }
+				if($DEBUG)
+				{
+echo ' no, they are equal or of different length.'; }
 				// makes sure eg. '1.0.0' is counted less the '1.0.0.xxx' !
 				$less = count($testa) < count($testb) ? 1 : 0;
 			}
 		}
-		if($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
+		if($DEBUG)
+		{
+echo '<br>Check value is: "'.$less.'"'; }
 		if($less>0)
 		{
-			if($DEBUG) { echo '<br>A is less than B'; }
+			if($DEBUG)
+			{
+echo '<br>A is less than B'; }
 			return True;
 		}
 		elseif($less<0)
 		{
-			if($DEBUG) { echo '<br>A is greater than B'; }
+			if($DEBUG)
+			{
+echo '<br>A is greater than B'; }
 			return False;
 		}
 		else
 		{
-			if($DEBUG) { echo '<br>A is equal to B'; }
+			if($DEBUG)
+			{
+echo '<br>A is equal to B'; }
 			return False;
 		}
 	}
@@ -901,51 +948,71 @@ 
 
 		for($i=0;$i<count($testa);$i++)
 		{
-			if($DEBUG) { echo'<br>Checking if '. (int)$testa[$i] . ' is more than ' . (int)$testb[$i] . ' ...'; }
+			if($DEBUG)
+			{
+echo'<br>Checking if '. (int)$testa[$i] . ' is more than ' . (int)$testb[$i] . ' ...'; }
 			if((int)$testa[$i] > (int)$testb[$i])
 			{
-				if($DEBUG) { echo ' yes.'; }
+				if($DEBUG)
+				{
+echo ' yes.'; }
 				$less++;
 				if($i<3)
 				{
 					/* Ensure that this is definitely greater */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
+					if($DEBUG)
+					{
+echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
 					$less = 5;
 					break;
 				}
 			}
 			elseif((int)$testa[$i] < (int)$testb[$i])
 			{
-				if($DEBUG) { echo ' no.'; }
+				if($DEBUG)
+				{
+echo ' no.'; }
 				$less--;
 				if($i<2)
 				{
 					/* Ensure that this is definitely smaller */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
+					if($DEBUG)
+					{
+echo"  This is the $num[$i] octet, so A is definitely less than B."; }
 					$less = -5;
 					break;
 				}
 			}
 			else
 			{
-				if($DEBUG) { echo ' no, they are equal.'; }
+				if($DEBUG)
+				{
+echo ' no, they are equal.'; }
 				$less = 0;
 			}
 		}
-		if($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
+		if($DEBUG)
+		{
+echo '<br>Check value is: "'.$less.'"'; }
 		if($less>0)
 		{
-			if($DEBUG) { echo '<br>A is greater than B'; }
+			if($DEBUG)
+			{
+echo '<br>A is greater than B'; }
 			return True;
 		}
 		elseif($less<0)
 		{
-			if($DEBUG) { echo '<br>A is less than B'; }
+			if($DEBUG)
+			{
+echo '<br>A is less than B'; }
 			return False;
 		}
 		else
 		{
-			if($DEBUG) { echo '<br>A is equal to B'; }
+			if($DEBUG)
+			{
+echo '<br>A is equal to B'; }
 			return False;
 		}
 	}
@@ -982,7 +1049,10 @@ 
 				echo "<p><b>".$e->getMessage()."</b></p>\n";
 				return false;
 			}
-			if (!isset($GLOBALS['egw']->accounts)) $GLOBALS['egw']->accounts = $this->accounts;
+			if (!isset($GLOBALS['egw']->accounts))
+			{
+				$GLOBALS['egw']->accounts = $this->accounts;
+			}
 			Api\Accounts::cache_invalidate();	// the cache is shared for all instances of the class
 		}
 		return true;
@@ -1019,7 +1089,10 @@ 
 		$passwd = $_passwd;
 		if ($username == 'anonymous')
 		{
-			if (!isset($this->anonpw)) $this->anonpw = Api\Auth::randomstring(16);
+			if (!isset($this->anonpw))
+			{
+				$this->anonpw = Api\Auth::randomstring(16);
+			}
 			$passwd = $anonpw = $this->anonpw;
 		}
 
@@ -1090,11 +1163,17 @@ 
 				'account_lid' => $username,
 			));
 		}
-		if ($primary_group)	// only for users, NOT groups
+		if ($primary_group)
+		{
+			// only for users, NOT groups
 		{
 			$this->set_memberships(array($primary_group_id), $accountid);
+		}
 
-			if (!$changepw) $this->add_acl('preferences','nopasswordchange',$accountid);
+			if (!$changepw)
+			{
+				$this->add_acl('preferences','nopasswordchange',$accountid);
+			}
 		}
 		//error_log("setup::add_account('$username','$first','$last',\$passwd,'$primary_group',$changepw,'$email') successfull created accountid=$accountid");
 		return $accountid;
@@ -1131,7 +1210,10 @@ 
 	function accounts_exist()
 	{
 		try {
-			if (!$this->setup_account_object()) return false;
+			if (!$this->setup_account_object())
+			{
+				return false;
+			}
 
 			$this->accounts->search(array(
 				'type'   => 'accounts',
@@ -1218,9 +1300,15 @@ 
 	{
 		static $table_names = False;
 
-		if (!$table_names || $force_refresh) $table_names = $this->db->table_names();
+		if (!$table_names || $force_refresh)
+		{
+			$table_names = $this->db->table_names();
+		}
 
-		if (!$table_names) return false;
+		if (!$table_names)
+		{
+			return false;
+		}
 
 		foreach($table_names as $data)
 		{
@@ -1250,10 +1338,13 @@ 
 		{
 			$table = $this->table_exist($tables,$force_refresh);
 
-			if ($table && $table != $this->$name)	// only overwrite the default name, if we realy got one (important for new installs)
+			if ($table && $table != $this->$name)
+			{
+				// only overwrite the default name, if we realy got one (important for new installs)
 			{
 				$this->$name = $table;
 			}
+			}
 			//echo "<p>setup::set_table_names: $name = '{$this->$name}'</p>\n";
 		}
 	}