EGroupware / egroupware

setup/inc/class.setup_detection.inc.php

Braces +20 added lines, -5 removed lines

@@ -65,7 +65,9 @@ 
 					foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'*',false,__LINE__,__FILE__) as $row)
 					{
 						$app = $row['app_name'];
-						if (!isset($setup_info[$app]))	// app source no longer there
+						if (!isset($setup_info[$app]))
+						{
+							// app source no longer there
 						{
 							$setup_info[$app] = array(
 								'name' => $app,
@@ -73,6 +75,7 @@ 
 								'version' => 'deleted',
 							);
 						}
+						}
 						$setup_info[$app]['currentver'] = $row['app_version'];
 						$setup_info[$app]['enabled'] = $row['app_enabled'];
 					}
@@ -212,7 +215,9 @@ 
 					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.
@@ -220,6 +225,7 @@ 
 							if($setup_info[$key]['status'] == 'C' || $setup_info[$key]['status'] == 'U')
 							{
 								$setup_info[$key]['status'] = 'D';
+						}
 							}
 							else
 							{
@@ -292,7 +298,10 @@ 
 	 */
 	function check_db($setup_info=null)
 	{
-		if (!$setup_info) $setup_info = $GLOBALS['setup_info'];
+		if (!$setup_info)
+		{
+			$setup_info = $GLOBALS['setup_info'];
+		}
 
 		try {	// catch DB errors
 			if (!$GLOBALS['egw_setup']->db->Link_ID)
@@ -482,11 +491,14 @@ 
 				{
 					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'])
 					{
 						echo '<br>check_app_tables(): ' . $val . ' missing!';
+				}
 					}
 					if(!$any)
 					{
@@ -543,9 +555,12 @@ 
 			$msg = lang('does not exist');
 			return false;
 		}
-		if (!@is_writeable($dir) && $_SERVER['HTTP_HOST'])	// only do the check if we run by the webserver
+		if (!@is_writeable($dir) && $_SERVER['HTTP_HOST'])
+		{
+			// only do the check if we run by the webserver
 		{
 			$msg = lang('is not writeable by the webserver');
+		}
 			return false;
 		}
 		if ($check_in_docroot)

setup/inc/hook_config.inc.php

Braces +12 added lines, -3 removed lines

@@ -23,17 +23,23 @@ 
 	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default=array(
 		'/' => 'sqlfs://$host/',
 		'/apps' => 'links://$host/apps',
-	)) || $config['vfs_fstab'] == serialize($default))	// detect old serialized value too
+	)) || $config['vfs_fstab'] == serialize($default))
+	{
+		// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'fs';
 	}
+	}
 	elseif($config['vfs_fstab'] == json_encode($default_db=array(
 		'/' => 'sqlfs://$host/?storage=db',
 		'/apps' => 'links://$host/apps?storage=db',
-	)) || $config['vfs_fstab'] == serialize($default_db))	// detect old serialized value too
+	)) || $config['vfs_fstab'] == serialize($default_db))
+	{
+		// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'db';
 	}
+	}
 	else
 	{
 		$config['vfs_storage_mode'] = 'custom';
@@ -45,11 +51,14 @@ 
 		'custom' => lang('Custom set via %1','filemanager/cli.php mount'),
 	) as $name => $label)
 	{
-		if ($name != 'custom' || $name === $config['vfs_storage_mode'])	// dont show custom, if not custom
+		if ($name != 'custom' || $name === $config['vfs_storage_mode'])
+		{
+			// dont show custom, if not custom
 		{
 			$options .= '<option value="'.$name.($name === $config['vfs_storage_mode'] ? '" selected="selected' : '').
 				'">'.htmlspecialchars($label)."</options>\n";
 		}
+		}
 	}
 	//echo "<pre>".htmlspecialchars($options)."</pre>\n";
 	return $options;

setup/inc/class.setup_cmd_showheader.inc.php

Braces +13 added lines, -3 removed lines

@@ -56,11 +56,18 @@ 
 	 */
 	function exec($check_only=false)
 	{
-		if ($this->remote_id && $check_only) return true;	// cant check for the remote site locally!
+		if ($this->remote_id && $check_only)
+		{
+			return true;
+		}
+		// cant check for the remote site locally!
 
 		$this->_check_header_access();
 
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		$egw_info_backup = $GLOBALS['egw_info'];
 		$GLOBALS['egw_info'] = array (
@@ -92,7 +99,10 @@ 
 				$data['remote_hash'] = admin_cmd::remote_hash($data['install_id'],$data['config_passwd']);
 			}
 			catch(Exception $e) {
-				if ($data['install_id']) $data['error'] .= $e->getMessage();
+				if ($data['install_id'])
+				{
+					$data['error'] .= $e->getMessage();
+				}
 			}
 			if ($this->hash_only)
 			{

setup/inc/class.setup_cmd_update.inc.php

Braces +8 added lines, -2 removed lines

@@ -70,7 +70,10 @@ 
 		{
 			return lang('No update necessary, domain %1(%2) is up to date.',$this->domain,$GLOBALS['egw_domain'][$this->domain]['db_type']);
 		}
-		if ($check_only) return lang('Update necessary.');
+		if ($check_only)
+		{
+			return lang('Update necessary.');
+		}
 
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
@@ -119,7 +122,10 @@ 
 		}
 		$messages = ob_get_contents();
 		ob_end_clean();
-		if ($messages && $this->verbose) echo strip_tags($messages)."\n";
+		if ($messages && $this->verbose)
+		{
+			echo strip_tags($messages)."\n";
+		}
 
 		$this->restore_db();
 

setup/inc/class.setup_cmd_admin.inc.php

Braces +8 added lines, -2 removed lines

@@ -76,8 +76,14 @@
 		}
 		$this->check_installed($this->domain,15);
 
-		if (!$this->admin_firstname) $this->set_defaults['admin_firstname'] = $this->admin_firstname = lang('Admin');
-		if (!$this->admin_lastname) $this->set_defaults['admin_lastname'] = $this->admin_lastname = lang('User');
+		if (!$this->admin_firstname)
+		{
+			$this->set_defaults['admin_firstname'] = $this->admin_firstname = lang('Admin');
+		}
+		if (!$this->admin_lastname)
+		{
+			$this->set_defaults['admin_lastname'] = $this->admin_lastname = lang('User');
+		}
 		if (strpos($this->admin_email,'$') !== false)
 		{
 			$this->set_defaults['email'] = $this->admin_email = str_replace(

setup/inc/functions.inc.php

Braces +12 added lines, -3 removed lines

@@ -30,14 +30,20 @@ 
 	include('../header.inc.php');
 }
 // for an old header we need to setup a reference for the domains
-if (!is_array($GLOBALS['egw_domain'])) $GLOBALS['egw_domain'] =& $GLOBALS['phpgw_domain'];
+if (!is_array($GLOBALS['egw_domain']))
+{
+	$GLOBALS['egw_domain'] =& $GLOBALS['phpgw_domain'];
+}
 
 /*  If we included the header.inc.php, but it is somehow broken, cover ourselves... */
 if(!defined('EGW_SERVER_ROOT') && !defined('EGW_INCLUDE_ROOT'))
 {
-	if (defined('PHPGW_SERVER_ROOT') && defined('PHPGW_INCLUDE_ROOT'))	// pre 1.2 install
+	if (defined('PHPGW_SERVER_ROOT') && defined('PHPGW_INCLUDE_ROOT'))
+	{
+		// pre 1.2 install
 	{
 		define('EGW_SERVER_ROOT',PHPGW_SERVER_ROOT);
+	}
 		define('EGW_INCLUDE_ROOT',PHPGW_INCLUDE_ROOT);
 	}
 	else	// no install
@@ -84,7 +90,10 @@ 
 
 if (!function_exists('version_compare') || version_compare(PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,'<'))
 {
-	if (isset($_SERVER['HTTP_HOST'])) echo "<pre>\n";
+	if (isset($_SERVER['HTTP_HOST']))
+	{
+		echo "<pre>\n";
+	}
 	echo "EGroupware now requires PHP {$GLOBALS['egw_setup']->required_php_version} or greater.\nYour PHP version is: ".PHP_VERSION."\n";
 	echo 'Please contact your System Administrator.';
 	exit;

setup/inc/hook_config_validate.inc.php

Braces +5 added lines, -2 removed lines

@@ -199,5 +199,8 @@
 {
 	$filter =& $settings['ldap_search_filter'];
 
-	if ($filter && $filter{0} != '(') $filter = '('.$filter.')';
-}
+	if ($filter && $filter{0} != '(')
+	{
+		$filter = '('.$filter.')';
+	}
+	}

setup/inc/class.setup_cmd_install.inc.php

Braces +8 added lines, -2 removed lines

@@ -113,8 +113,14 @@
 		self::$egw_setup->db->Link_ID->SetCharSet($this->charset);
 		$_POST['ConfigLang'] = $this->lang;
 
-		if ($this->verbose) echo lang('Installation started, this might take a few minutes ...')."\n";
-		if (true) $setup_info = self::$egw_setup->process->pass($setup_info,'new',false,True,$this->config);
+		if ($this->verbose)
+		{
+			echo lang('Installation started, this might take a few minutes ...')."\n";
+		}
+		if (true)
+		{
+			$setup_info = self::$egw_setup->process->pass($setup_info,'new',false,True,$this->config);
+		}
 
 		$this->restore_db();
 

setup/inc/class.setup_process.inc.php

Braces +53 added lines, -16 removed lines

@@ -108,7 +108,9 @@ 
 		while($pass_string != $passing_string)
 		{
 			$passing = array();
-			if($DEBUG) { echo '<br>process->pass(): #' . $i . ' for ' . $method . ' processing' . "\n"; }
+			if($DEBUG)
+			{
+echo '<br>process->pass(): #' . $i . ' for ' . $method . ' processing' . "\n"; }
 
 			// Check current versions and dependencies
 			$setup_info = $GLOBALS['egw_setup']->detection->check_depends(
@@ -143,7 +145,10 @@ 
 					}
 					/* Create tables and insert new records for each app in this list */
 					$passing_c = $this->current($pass,$DEBUG);
-					if (isset($pass['api'])) $this->save_minimal_config($preset_config);
+					if (isset($pass['api']))
+					{
+						$this->save_minimal_config($preset_config);
+					}
 					$passing = $this->default_records($passing_c,$DEBUG);
 					break;
 				case 'upgrade':
@@ -162,29 +167,40 @@ 
 				if($value['status'] == 'C')
 				{
 					$passed[$value['name']] = $passing[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$passed[$value['name']]['name'] . ' install completed'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$passed[$value['name']]['name'] . ' install completed'."\n"; }
 				}
 				elseif($value['status'] == 'F')
 				{
 					$setup_info[$value['name']] = $passing[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$setup_info[$value['name']]['name'] . ' install failed'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$setup_info[$value['name']]['name'] . ' install failed'."\n"; }
 				}
 				elseif($value['status'] == 'D')
 				{
 					$pass[$value['name']] = $setup_info[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$pass[$value['name']]['name'] . ' fails dependency check on this pass'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$pass[$value['name']]['name'] . ' fails dependency check on this pass'."\n"; }
 				}
 				else
 				{
 					$tmp = $passing[$value['name']]['name'];
-					if($DEBUG) { echo '<br>process->pass(): '.$tmp . ' skipped on this pass'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$tmp . ' skipped on this pass'."\n"; }
 				}
 			}
 
 			$i++;
-			if($i == 20) /* Then oops it broke */
+			if($i == 20)
+			{
+				/* Then oops it broke */
 			{
 				echo '<br>Setup failure: excess looping in process->pass():'."\n";
+			}
 				echo '<br>Pass:<br>'."\n";
 				_debug_array($pass);
 				echo '<br>Passed:<br>'."\n";
@@ -376,7 +392,9 @@ 
 					//echo $table;
 					if(in_array($table,$tables))
 					{
-						if($DEBUG){ echo '<br>process->droptables(): Dropping :'. $app_name . ' table: ' . $table; }
+						if($DEBUG)
+						{
+echo '<br>process->droptables(): Dropping :'. $app_name . ' table: ' . $table; }
 						$GLOBALS['egw_setup']->oProc->DropTable($table);
 						// Update the array values for return below
 						$setup_info[$app_name]['status'] = 'U';
@@ -408,13 +426,17 @@ 
 			$enabled = False;
 			$apptitle = $appdata['title'];
 
-			if($DEBUG) { echo '<br>process->current(): Incoming status: ' . $appname . ',status: '. $appdata['status']; }
+			if($DEBUG)
+			{
+echo '<br>process->current(): Incoming status: ' . $appname . ',status: '. $appdata['status']; }
 
 			$appdir  = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
 
 			if($appdata['tables'] && file_exists($appdir.'tables_current.inc.php'))
 			{
-				if($DEBUG) { echo '<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
+				if($DEBUG)
+				{
+echo '<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
 				$phpgw_baseline = null;
 				include ($appdir.'tables_current.inc.php');
 				$ret = $this->post_process($phpgw_baseline,$DEBUG);
@@ -435,13 +457,17 @@ 
 				else
 				{
 					/* script processing failed */
-					if($DEBUG) { echo '<br>process->current(): Failed for ' . $appname . ',status: '. $appdata['status']; }
+					if($DEBUG)
+					{
+echo '<br>process->current(): Failed for ' . $appname . ',status: '. $appdata['status']; }
 					$appdata['status'] = 'F';
 				}
 			}
 			else
 			{
-				if($DEBUG) { echo '<br>process->current(): No current tables for ' . $apptitle . "\n"; }
+				if($DEBUG)
+				{
+echo '<br>process->current(): No current tables for ' . $apptitle . "\n"; }
 				/*
 				 Add the app, but disable it if it has tables defined.
 				 A manual sql script install is needed, but we do add the hooks
@@ -462,7 +488,9 @@ 
 				}
 				$appdata['status'] = 'C';
 			}
-			if($DEBUG) { echo '<br>process->current(): Outgoing status: ' . $appname . ',status: '. $appdata['status']; }
+			if($DEBUG)
+			{
+echo '<br>process->current(): Outgoing status: ' . $appname . ',status: '. $appdata['status']; }
 		}
 
 		// update hooks
@@ -638,9 +666,12 @@ 
 			{
 				echo '<div style="text-align: left; border: thin dashed black; margin-top: 5px;">'."process->upgrade(): Incoming : appname: $appname, version: $appdata[currentver], status: $appdata[status]\n";
 			}
-			if($appdata['status'] == 'U' || $appdata['status'] == 'D' ||$appdata['status'] == 'V' || $appdata['status'] == '') // TODO this is not getting set for api upgrade, sometimes ???
+			if($appdata['status'] == 'U' || $appdata['status'] == 'D' ||$appdata['status'] == 'V' || $appdata['status'] == '')
+			{
+				// TODO this is not getting set for api upgrade, sometimes ???
 			{
 				$currentver = $appdata['currentver'];
+			}
 				$targetver  = $appdata['version'];	// The version we need to match when done
 				$appdir     = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
 
@@ -674,11 +705,14 @@ 
 							}
 						}
 					}
-					if ($currentver == $targetver)	// upgrades succesful
+					if ($currentver == $targetver)
+					{
+						// upgrades succesful
 					{
 						if($DEBUG)
 						{
 							echo "<br>process->upgrade(): Upgrade of $appname to $targetver is completed.\n";
+					}
 						}
 						$appstatus = 'C';
 					}
@@ -700,9 +734,12 @@ 
 					}
 					$appstatus  = 'C';
 				}
-				if ($appstatus == 'C')	// update successful completed
+				if ($appstatus == 'C')
+				{
+					// update successful completed
 				{
 					$appdata['currentver'] = $targetver;
+				}
 
 					if($GLOBALS['egw_setup']->app_registered($appname))
 					{