adamjakab / SuiteCRM

modules/UpgradeWizard/silentUpgrade_dce_step1.php

Indentation +276 added lines, -276 removed lines

@@ -46,151 +46,151 @@ 
 ///////////////////////////////////////////////////////////////////////////////
 ////	UTILITIES THAT MUST BE LOCAL :(
 function prepSystemForUpgradeSilent() {
-	global $subdirs;
-	global $cwd;
-	global $sugar_config;
-
-	// make sure dirs exist
-	foreach($subdirs as $subdir) {
-		if(!is_dir("upload://upgrades/{$subdir}")) {
-	    	mkdir_recursive("upload://upgrades/{$subdir}");
-		}
-	}
+    global $subdirs;
+    global $cwd;
+    global $sugar_config;
+
+    // make sure dirs exist
+    foreach($subdirs as $subdir) {
+        if(!is_dir("upload://upgrades/{$subdir}")) {
+            mkdir_recursive("upload://upgrades/{$subdir}");
+        }
+    }
 }
 
 //local function for clearing cache
 function clearCacheSU($thedir, $extension) {
-	if ($current = @opendir($thedir)) {
-		while (false !== ($children = readdir($current))) {
-			if ($children != "." && $children != "..") {
-				if (is_dir($thedir . "/" . $children)) {
-					clearCacheSU($thedir . "/" . $children, $extension);
-				}
-				elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
-					unlink($thedir . "/" . $children);
-				}
-			}
-		}
-	}
- }
- //Bug 24890, 24892. default_permissions not written to config.php. Following function checks and if
- //no found then adds default_permissions to the config file.
- function checkConfigForPermissions(){
-     if(file_exists(getcwd().'/config.php')){
-         require(getcwd().'/config.php');
-     }
-     global $sugar_config;
-     if(!isset($sugar_config['default_permissions'])){
-             $sugar_config['default_permissions'] = array (
-                     'dir_mode' => 02770,
-                     'file_mode' => 0660,
-                     'user' => '',
-                     'group' => '',
-             );
-         ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
-        	//writing to the file
- 		}
-     }
+    if ($current = @opendir($thedir)) {
+        while (false !== ($children = readdir($current))) {
+            if ($children != "." && $children != "..") {
+                if (is_dir($thedir . "/" . $children)) {
+                    clearCacheSU($thedir . "/" . $children, $extension);
+                }
+                elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
+                    unlink($thedir . "/" . $children);
+                }
+            }
+        }
+    }
+    }
+    //Bug 24890, 24892. default_permissions not written to config.php. Following function checks and if
+    //no found then adds default_permissions to the config file.
+    function checkConfigForPermissions(){
+        if(file_exists(getcwd().'/config.php')){
+            require(getcwd().'/config.php');
+        }
+        global $sugar_config;
+        if(!isset($sugar_config['default_permissions'])){
+                $sugar_config['default_permissions'] = array (
+                        'dir_mode' => 02770,
+                        'file_mode' => 0660,
+                        'user' => '',
+                        'group' => '',
+                );
+            ksort($sugar_config);
+            if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+            //writing to the file
+            }
+        }
 }
 function checkLoggerSettings(){
-	if(file_exists(getcwd().'/config.php')){
-         require(getcwd().'/config.php');
-     }
+    if(file_exists(getcwd().'/config.php')){
+            require(getcwd().'/config.php');
+        }
     global $sugar_config;
-	if(!isset($sugar_config['logger'])){
-	    $sugar_config['logger'] =array (
-			'level'=>'fatal',
-		    'file' =>
-		     array (
-		      'ext' => '.log',
-		      'name' => 'sugarcrm',
-		      'dateFormat' => '%c',
-		      'maxSize' => '10MB',
-		      'maxLogs' => 10,
-		      'suffix' => '', // bug51583, change default suffix to blank for backwards comptability
-		    ),
-		  );
-		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
-        	//writing to the file
- 		}
-	 }
+    if(!isset($sugar_config['logger'])){
+        $sugar_config['logger'] =array (
+            'level'=>'fatal',
+            'file' =>
+                array (
+                'ext' => '.log',
+                'name' => 'sugarcrm',
+                'dateFormat' => '%c',
+                'maxSize' => '10MB',
+                'maxLogs' => 10,
+                'suffix' => '', // bug51583, change default suffix to blank for backwards comptability
+            ),
+            );
+            ksort($sugar_config);
+            if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+            //writing to the file
+            }
+        }
 }
 
 function checkResourceSettings(){
-	if(file_exists(getcwd().'/config.php')){
-         require(getcwd().'/config.php');
-     }
+    if(file_exists(getcwd().'/config.php')){
+            require(getcwd().'/config.php');
+        }
     global $sugar_config;
-	if(!isset($sugar_config['resource_management'])){
-	  $sugar_config['resource_management'] =
-		  array (
-		    'special_query_limit' => 50000,
-		    'special_query_modules' =>
-		    array (
-		      0 => 'Reports',
-		      1 => 'Export',
-		      2 => 'Import',
-		      3 => 'Administration',
-		      4 => 'Sync',
-		    ),
-		    'default_limit' => 1000,
-		  );
-		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
-        	//writing to the file
- 		}
-	}
+    if(!isset($sugar_config['resource_management'])){
+        $sugar_config['resource_management'] =
+            array (
+            'special_query_limit' => 50000,
+            'special_query_modules' =>
+            array (
+                0 => 'Reports',
+                1 => 'Export',
+                2 => 'Import',
+                3 => 'Administration',
+                4 => 'Sync',
+            ),
+            'default_limit' => 1000,
+            );
+            ksort($sugar_config);
+            if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+            //writing to the file
+            }
+    }
 }
 
 
 //rebuild all relationships...
 function rebuildRelations($pre_path = ''){
-	$_REQUEST['silent'] = true;
-	include($pre_path.'modules/Administration/RebuildRelationship.php');
-	 $_REQUEST['upgradeWizard'] = true;
-	 include($pre_path.'modules/ACL/install_actions.php');
+    $_REQUEST['silent'] = true;
+    include($pre_path.'modules/Administration/RebuildRelationship.php');
+        $_REQUEST['upgradeWizard'] = true;
+        include($pre_path.'modules/ACL/install_actions.php');
 }
 
 function createMissingRels(){
-	$relForObjects = array('leads'=>'Leads','campaigns'=>'Campaigns','prospects'=>'Prospects');
-	foreach($relForObjects as $relObjName=>$relModName){
-		//assigned_user
-		$guid = create_guid();
-		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_assigned_user'";
-		$result= $GLOBALS['db']->query($query, true);
-		$a = null;
-		$a = $GLOBALS['db']->fetchByAssoc($result);
-		if(!isset($a['id']) && empty($a['id']) ){
-			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
+    $relForObjects = array('leads'=>'Leads','campaigns'=>'Campaigns','prospects'=>'Prospects');
+    foreach($relForObjects as $relObjName=>$relModName){
+        //assigned_user
+        $guid = create_guid();
+        $query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_assigned_user'";
+        $result= $GLOBALS['db']->query($query, true);
+        $a = null;
+        $a = $GLOBALS['db']->fetchByAssoc($result);
+        if(!isset($a['id']) && empty($a['id']) ){
+            $qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_assigned_user','Users','users','id','{$relModName}','{$relObjName}','assigned_user_id',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
-			$GLOBALS['db']->query($qRel);
-		}
-		//modified_user
-		$guid = create_guid();
-		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_modified_user'";
-		$result= $GLOBALS['db']->query($query, true);
-		$a = null;
-		$a = $GLOBALS['db']->fetchByAssoc($result);
-		if(!isset($a['id']) && empty($a['id']) ){
-			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
+            $GLOBALS['db']->query($qRel);
+        }
+        //modified_user
+        $guid = create_guid();
+        $query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_modified_user'";
+        $result= $GLOBALS['db']->query($query, true);
+        $a = null;
+        $a = $GLOBALS['db']->fetchByAssoc($result);
+        if(!isset($a['id']) && empty($a['id']) ){
+            $qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_modified_user','Users','users','id','{$relModName}','{$relObjName}','modified_user_id',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
-			$GLOBALS['db']->query($qRel);
-		}
-		//created_by
-		$guid = create_guid();
-		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_created_by'";
-		$result= $GLOBALS['db']->query($query, true);
-		$a = null;
-		$a = $GLOBALS['db']->fetchByAssoc($result);
-    	if(!isset($a['id']) && empty($a['id']) ){
-			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
+            $GLOBALS['db']->query($qRel);
+        }
+        //created_by
+        $guid = create_guid();
+        $query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_created_by'";
+        $result= $GLOBALS['db']->query($query, true);
+        $a = null;
+        $a = $GLOBALS['db']->fetchByAssoc($result);
+        if(!isset($a['id']) && empty($a['id']) ){
+            $qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_created_by','Users','users','id','{$relModName}','{$relObjName}','created_by',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
-			$GLOBALS['db']->query($qRel);
-    	}
-	}
-	//Also add tracker perf relationship
+            $GLOBALS['db']->query($qRel);
+        }
+    }
+    //Also add tracker perf relationship
 }
 
 
@@ -234,22 +234,22 @@ 
 }
 
 function addDefaultModuleRoles($defaultRoles = array()) {
-	foreach($defaultRoles as $roleName=>$role){
+    foreach($defaultRoles as $roleName=>$role){
         foreach($role as $category=>$actions){
             foreach($actions as $name=>$access_override){
                     $query = "SELECT * FROM acl_actions WHERE name='$name' AND category = '$category' AND acltype='$roleName' AND deleted=0 ";
-					$result = $GLOBALS['db']->query($query);
-					//only add if an action with that name and category don't exist
-					$row=$GLOBALS['db']->fetchByAssoc($result);
-					if ($row == null) {
-	                	$guid = create_guid();
-	                	$currdate = gmdate($GLOBALS['timedate']->get_db_date_time_format());
-	                	$query= "INSERT INTO acl_actions (id,date_entered,date_modified,modified_user_id,name,category,acltype,aclaccess,deleted ) VALUES ('$guid','$currdate','$currdate','1','$name','$category','$roleName','$access_override','0')";
-						$GLOBALS['db']->query($query);
-	                }
+                    $result = $GLOBALS['db']->query($query);
+                    //only add if an action with that name and category don't exist
+                    $row=$GLOBALS['db']->fetchByAssoc($result);
+                    if ($row == null) {
+                        $guid = create_guid();
+                        $currdate = gmdate($GLOBALS['timedate']->get_db_date_time_format());
+                        $query= "INSERT INTO acl_actions (id,date_entered,date_modified,modified_user_id,name,category,acltype,aclaccess,deleted ) VALUES ('$guid','$currdate','$currdate','1','$name','$category','$roleName','$access_override','0')";
+                        $GLOBALS['db']->query($query);
+                    }
             }
         }
-	}
+    }
 }
 
 function verifyArguments($argv,$usage_dce,$usage_regular){
@@ -322,33 +322,33 @@ 
 }
 
 function upgradeDCEFiles($argv,$instanceUpgradePath){
-	//copy and update following files from upgrade package
-	$upgradeTheseFiles = array('cron.php','download.php','index.php','install.php','soap.php','sugar_version.php','vcal_server.php');
-	foreach($upgradeTheseFiles as $file){
-		$srcFile = clean_path("{$instanceUpgradePath}/$file");
-		$destFile = clean_path("{$argv[3]}/$file");
-		if(file_exists($srcFile)){
-			if(!is_dir(dirname($destFile))) {
-				mkdir_recursive(dirname($destFile)); // make sure the directory exists
-			}
-			copy_recursive($srcFile,$destFile);
-			$_GET['TEMPLATE_PATH'] = $destFile;
-			$_GET['CONVERT_FILE_ONLY'] = true;
-			if(!class_exists('TemplateConverter')){
-				include($argv[7].'templateConverter.php');
-			}else{
-				TemplateConverter::convertFile($_GET['TEMPLATE_PATH']);
-			}
-
-
-		}
-	}
+    //copy and update following files from upgrade package
+    $upgradeTheseFiles = array('cron.php','download.php','index.php','install.php','soap.php','sugar_version.php','vcal_server.php');
+    foreach($upgradeTheseFiles as $file){
+        $srcFile = clean_path("{$instanceUpgradePath}/$file");
+        $destFile = clean_path("{$argv[3]}/$file");
+        if(file_exists($srcFile)){
+            if(!is_dir(dirname($destFile))) {
+                mkdir_recursive(dirname($destFile)); // make sure the directory exists
+            }
+            copy_recursive($srcFile,$destFile);
+            $_GET['TEMPLATE_PATH'] = $destFile;
+            $_GET['CONVERT_FILE_ONLY'] = true;
+            if(!class_exists('TemplateConverter')){
+                include($argv[7].'templateConverter.php');
+            }else{
+                TemplateConverter::convertFile($_GET['TEMPLATE_PATH']);
+            }
+
+
+        }
+    }
 }
 
 
 
 function threeWayMerge(){
-	//using threeway merge apis
+    //using threeway merge apis
 }
 ////	END UTILITIES THAT MUST BE LOCAL :(
 ///////////////////////////////////////////////////////////////////////////////
@@ -362,8 +362,8 @@ 
 
 // only run from command line
 if(isset($_SERVER['HTTP_USER_AGENT'])) {
-	fwrite(STDERR, 'This utility may only be run from the command line or command prompt.');
-	exit(1);
+    fwrite(STDERR, 'This utility may only be run from the command line or command prompt.');
+    exit(1);
 }
 //Clean_string cleans out any file  passed in as a parameter
 $_SERVER['PHP_SELF'] = 'silentUpgrade.php';
@@ -471,144 +471,144 @@ 
 
 
 if($upgradeType == constant('DCE_INSTANCE')){
-   	//$instanceUpgradePath = "{$argv[1]}/DCEUpgrade/{$zip_from_dir}";
-   	//$instanceUpgradePath = "{$argv[1]}";
-	include ("ini_setup.php");
+        //$instanceUpgradePath = "{$argv[1]}/DCEUpgrade/{$zip_from_dir}";
+        //$instanceUpgradePath = "{$argv[1]}";
+    include ("ini_setup.php");
 
-	//get new template path for use in later processing
+    //get new template path for use in later processing
     $dceupgrade_pos = strpos($argv[1], '/DCEUpgrade');
     $newtemplate_path = substr($argv[1], 0, $dceupgrade_pos);
 
-	require("{$argv[4]}/sugar_version.php");
-	global $sugar_version;
-
-	//load up entrypoint from original template
-   	require_once("{$argv[4]}/include/entryPoint.php");
-	require_once("{$argv[4]}/include/utils/zip_utils.php");
-	require_once("{$argv[4]}/modules/Administration/UpgradeHistory.php");
-	// We need to run the silent upgrade as the admin user,
-	global $current_user;
-	$current_user = new User();
-	$current_user->retrieve('1');
-
-	//This is DCE instance
-      global $sugar_config;
-      global $sugar_version;
+    require("{$argv[4]}/sugar_version.php");
+    global $sugar_version;
+
+    //load up entrypoint from original template
+        require_once("{$argv[4]}/include/entryPoint.php");
+    require_once("{$argv[4]}/include/utils/zip_utils.php");
+    require_once("{$argv[4]}/modules/Administration/UpgradeHistory.php");
+    // We need to run the silent upgrade as the admin user,
+    global $current_user;
+    $current_user = new User();
+    $current_user->retrieve('1');
+
+    //This is DCE instance
+        global $sugar_config;
+        global $sugar_version;
 //    require_once("{$cwd}/sugar_version.php"); //provides instance version, flavor etc..
-     //provides instance version, flavor etc..
+        //provides instance version, flavor etc..
     $isDCEInstance = true;
-	prepSystemForUpgradeSilent();
-
-	/////retrieve admin user
-	$configOptions = $sugar_config['dbconfig'];
-
-	$GLOBALS['log']	= LoggerManager::getLogger('SugarCRM');
-	$db				= &DBManagerFactory::getInstance();
-       		///////////////////////////////////////////////////////////////////////////////
-	////	MAKE SURE PATCH IS COMPATIBLE
-
-	if(is_file("{$argv[1]}/manifest.php")) {
-		// provides $manifest array
-		include("{$argv[1]}/manifest.php");
-	}
-	//If Instance then the files will be accessed from Template/DCEUpgrade folder
-	$zip_from_dir = '';
+    prepSystemForUpgradeSilent();
+
+    /////retrieve admin user
+    $configOptions = $sugar_config['dbconfig'];
+
+    $GLOBALS['log']	= LoggerManager::getLogger('SugarCRM');
+    $db				= &DBManagerFactory::getInstance();
+                ///////////////////////////////////////////////////////////////////////////////
+    ////	MAKE SURE PATCH IS COMPATIBLE
+
+    if(is_file("{$argv[1]}/manifest.php")) {
+        // provides $manifest array
+        include("{$argv[1]}/manifest.php");
+    }
+    //If Instance then the files will be accessed from Template/DCEUpgrade folder
+    $zip_from_dir = '';
     if( isset( $manifest['copy_files']['from_dir'] ) && $manifest['copy_files']['from_dir'] != "" ){
-	    $zip_from_dir   = $manifest['copy_files']['from_dir'];
-	}
-	$instanceUpgradePath = "{$argv[1]}/{$zip_from_dir}";
-	global $instancePath;
-	$instancePath = $instanceUpgradePath;
-	$_SESSION['instancePath'] = $instancePath;
-	if(file_exists("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php")){
-		require_once("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php");
-	}
-	else{
-		require_once("{$argv[4]}/modules/UpgradeWizard/uw_utils.php");
-	}
+        $zip_from_dir   = $manifest['copy_files']['from_dir'];
+    }
+    $instanceUpgradePath = "{$argv[1]}/{$zip_from_dir}";
+    global $instancePath;
+    $instancePath = $instanceUpgradePath;
+    $_SESSION['instancePath'] = $instancePath;
+    if(file_exists("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php")){
+        require_once("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php");
+    }
+    else{
+        require_once("{$argv[4]}/modules/UpgradeWizard/uw_utils.php");
+    }
     if(function_exists('set_upgrade_vars')){
-		set_upgrade_vars();
+        set_upgrade_vars();
+    }
+    if(is_file("$argv[1]/manifest.php")) {
+        // provides $manifest array
+        //include("$instanceUpgradePath/manifest.php");
+        if(!isset($manifest)) {
+            fwrite(STDERR, "\nThe patch did not contain a proper manifest.php file.  Cannot continue.\n\n");
+            exit(1);
+        } else {
+            $error = validate_manifest($manifest);
+            if(!empty($error)) {
+                $error = strip_tags(br2nl($error));
+                fwrite(STDERR,"\n{$error}\n\nFAILURE\n");
+                exit(1);
+            }
+        }
+    } else {
+        fwrite(STDERR, "\nThe patch did not contain a proper manifest.php file.  Cannot continue.\n\n");
+        exit(1);
     }
-	if(is_file("$argv[1]/manifest.php")) {
-		// provides $manifest array
-		//include("$instanceUpgradePath/manifest.php");
-		if(!isset($manifest)) {
-		    fwrite(STDERR, "\nThe patch did not contain a proper manifest.php file.  Cannot continue.\n\n");
-		    exit(1);
-		} else {
-			$error = validate_manifest($manifest);
-			if(!empty($error)) {
-				$error = strip_tags(br2nl($error));
-				fwrite(STDERR,"\n{$error}\n\nFAILURE\n");
-				exit(1);
-			}
-		}
-	} else {
-		fwrite(STDERR, "\nThe patch did not contain a proper manifest.php file.  Cannot continue.\n\n");
-		exit(1);
-	}
 
     $ce_to_pro_ent = isset($manifest['name']) && ($manifest['name'] == 'SugarCE to SugarPro' || $manifest['name'] == 'SugarCE to SugarEnt' || $manifest['name'] == 'SugarCE to SugarCorp' || $manifest['name'] == 'SugarCE to SugarUlt');
-	$_SESSION['upgrade_from_flavor'] = $manifest['name'];
+    $_SESSION['upgrade_from_flavor'] = $manifest['name'];
 
-	//get the latest uw_utils.php
+    //get the latest uw_utils.php
 //	require_once("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php");
     logThis("*** SILENT DCE UPGRADE INITIATED.", $path);
-	logThis("*** UpgradeWizard Upgraded  ", $path);
-	$_SESSION['sugar_version_file'] = '';
-	$srcFile = clean_path("{$instanceUpgradePath}/sugar_version.php");
-	if(file_exists($srcFile)) {
-		logThis('Save the version file in session variable', $path);
-		$_SESSION['sugar_version_file'] = $srcFile;
-	}
+    logThis("*** UpgradeWizard Upgraded  ", $path);
+    $_SESSION['sugar_version_file'] = '';
+    $srcFile = clean_path("{$instanceUpgradePath}/sugar_version.php");
+    if(file_exists($srcFile)) {
+        logThis('Save the version file in session variable', $path);
+        $_SESSION['sugar_version_file'] = $srcFile;
+    }
 
 
 
     //check exit on conflicts
     $exitOnConflict = 'yes'; //default
     if($argv[5] != null && !empty($argv[5])){
-    	if(strtolower($argv[5]) == 'no'){
-    	  $exitOnConflict = 'no'; //override
-    	}
+        if(strtolower($argv[5]) == 'no'){
+            $exitOnConflict = 'no'; //override
+        }
     }
     if($exitOnConflict == 'yes'){
-    	$customFiles = array();
-    	$customFiles = findAllFiles(clean_path("{$argv[3]}/custom"), $customFiles);
-    	if($customFiles != null){
-    		logThis("*** ****************************  ****", $path);
-			logThis("*** START LOGGING CUSTOM FILES  ****", $path);
-			$existsCustomFile = false;
-			foreach($customFiles as $file) {
-			$srcFile = clean_path($file);
-			//$targetFile = clean_path(getcwd() . '/' . $srcFile);
-			    if (strpos($srcFile,".svn") !== false) {
-				  //do nothing
-			    }
-			    else{
-			     $existsCustomFile = true;
-			     //log the custom file in
-			     logThis($file, $path);
-			    }
-			}
-			logThis("*** END LOGGING CUSTOM FILES  ****", $path);
-			logThis("*** ****************************  ****", $path);
-			if($existsCustomFile){
-				echo 'Stop and Exit Upgrade. There are customized files. Take a look in the upgrade log';
-				logThis("Stop and Exit Upgrade. There are customized files. Take a look in the upgrade log", $path);
-				exit(1);
-			}
-			else{
-			    upgradeDCEFiles($argv,$instanceUpgradePath);
-			}
-    	}
-    	else{
-			   //copy and update following files from upgrade package
-				upgradeDCEFiles($argv,$instanceUpgradePath);
-		 }
+        $customFiles = array();
+        $customFiles = findAllFiles(clean_path("{$argv[3]}/custom"), $customFiles);
+        if($customFiles != null){
+            logThis("*** ****************************  ****", $path);
+            logThis("*** START LOGGING CUSTOM FILES  ****", $path);
+            $existsCustomFile = false;
+            foreach($customFiles as $file) {
+            $srcFile = clean_path($file);
+            //$targetFile = clean_path(getcwd() . '/' . $srcFile);
+                if (strpos($srcFile,".svn") !== false) {
+                    //do nothing
+                }
+                else{
+                    $existsCustomFile = true;
+                    //log the custom file in
+                    logThis($file, $path);
+                }
+            }
+            logThis("*** END LOGGING CUSTOM FILES  ****", $path);
+            logThis("*** ****************************  ****", $path);
+            if($existsCustomFile){
+                echo 'Stop and Exit Upgrade. There are customized files. Take a look in the upgrade log';
+                logThis("Stop and Exit Upgrade. There are customized files. Take a look in the upgrade log", $path);
+                exit(1);
+            }
+            else{
+                upgradeDCEFiles($argv,$instanceUpgradePath);
+            }
+        }
+        else{
+                //copy and update following files from upgrade package
+                upgradeDCEFiles($argv,$instanceUpgradePath);
+            }
     }
     else{
-	   //copy and update following files from upgrade package
-	   upgradeDCEFiles($argv,$instanceUpgradePath);
+        //copy and update following files from upgrade package
+        upgradeDCEFiles($argv,$instanceUpgradePath);
     }
 
     global $unzip_dir;
@@ -626,9 +626,9 @@ 
 logThis("**** Potential PHP generated error messages: {$phpErrors}", $path);
 
 if(count($errors) > 0) {
-	foreach($errors as $error) {
-		logThis("****** SilentUpgrade ERROR: {$error}", $path);
-	}
-	echo "FAILED\n";
+    foreach($errors as $error) {
+        logThis("****** SilentUpgrade ERROR: {$error}", $path);
+    }
+    echo "FAILED\n";
 }
 ?>
\ No newline at end of file

Spacing +100 added lines, -100 removed lines

@@ -42,7 +42,7 @@ 
 //// php.exe -f silentUpgrade.php [Path to Upgrade Package zip] [Path to Log file] [Path to Instance]
 //// See below the Usage for more details.
 /////////////////////////////////////////////////////////////////////////////////////////
-ini_set('memory_limit',-1);
+ini_set('memory_limit', -1);
 ///////////////////////////////////////////////////////////////////////////////
 ////	UTILITIES THAT MUST BE LOCAL :(
 function prepSystemForUpgradeSilent() {
@@ -51,8 +51,8 @@ 
 	global $sugar_config;
 
 	// make sure dirs exist
-	foreach($subdirs as $subdir) {
-		if(!is_dir("upload://upgrades/{$subdir}")) {
+	foreach ($subdirs as $subdir) {
+		if (!is_dir("upload://upgrades/{$subdir}")) {
 	    	mkdir_recursive("upload://upgrades/{$subdir}");
 		}
 	}
@@ -63,11 +63,11 @@ 
 	if ($current = @opendir($thedir)) {
 		while (false !== ($children = readdir($current))) {
 			if ($children != "." && $children != "..") {
-				if (is_dir($thedir . "/" . $children)) {
-					clearCacheSU($thedir . "/" . $children, $extension);
+				if (is_dir($thedir."/".$children)) {
+					clearCacheSU($thedir."/".$children, $extension);
 				}
-				elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
-					unlink($thedir . "/" . $children);
+				elseif (is_file($thedir."/".$children) && substr_count($children, $extension)) {
+					unlink($thedir."/".$children);
 				}
 			}
 		}
@@ -75,34 +75,34 @@ 
  }
  //Bug 24890, 24892. default_permissions not written to config.php. Following function checks and if
  //no found then adds default_permissions to the config file.
- function checkConfigForPermissions(){
-     if(file_exists(getcwd().'/config.php')){
+ function checkConfigForPermissions() {
+     if (file_exists(getcwd().'/config.php')) {
          require(getcwd().'/config.php');
      }
      global $sugar_config;
-     if(!isset($sugar_config['default_permissions'])){
-             $sugar_config['default_permissions'] = array (
+     if (!isset($sugar_config['default_permissions'])) {
+             $sugar_config['default_permissions'] = array(
                      'dir_mode' => 02770,
                      'file_mode' => 0660,
                      'user' => '',
                      'group' => '',
              );
          ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+         if (is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config, 'config.php')) {
         	//writing to the file
  		}
      }
 }
-function checkLoggerSettings(){
-	if(file_exists(getcwd().'/config.php')){
+function checkLoggerSettings() {
+	if (file_exists(getcwd().'/config.php')) {
          require(getcwd().'/config.php');
      }
     global $sugar_config;
-	if(!isset($sugar_config['logger'])){
-	    $sugar_config['logger'] =array (
+	if (!isset($sugar_config['logger'])) {
+	    $sugar_config['logger'] = array(
 			'level'=>'fatal',
 		    'file' =>
-		     array (
+		     array(
 		      'ext' => '.log',
 		      'name' => 'sugarcrm',
 		      'dateFormat' => '%c',
@@ -112,23 +112,23 @@ 
 		    ),
 		  );
 		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+         if (is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config, 'config.php')) {
         	//writing to the file
  		}
 	 }
 }
 
-function checkResourceSettings(){
-	if(file_exists(getcwd().'/config.php')){
+function checkResourceSettings() {
+	if (file_exists(getcwd().'/config.php')) {
          require(getcwd().'/config.php');
      }
     global $sugar_config;
-	if(!isset($sugar_config['resource_management'])){
+	if (!isset($sugar_config['resource_management'])) {
 	  $sugar_config['resource_management'] =
-		  array (
+		  array(
 		    'special_query_limit' => 50000,
 		    'special_query_modules' =>
-		    array (
+		    array(
 		      0 => 'Reports',
 		      1 => 'Export',
 		      2 => 'Import',
@@ -138,7 +138,7 @@ 
 		    'default_limit' => 1000,
 		  );
 		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+         if (is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config, 'config.php')) {
         	//writing to the file
  		}
 	}
@@ -146,23 +146,23 @@ 
 
 
 //rebuild all relationships...
-function rebuildRelations($pre_path = ''){
+function rebuildRelations($pre_path = '') {
 	$_REQUEST['silent'] = true;
 	include($pre_path.'modules/Administration/RebuildRelationship.php');
 	 $_REQUEST['upgradeWizard'] = true;
 	 include($pre_path.'modules/ACL/install_actions.php');
 }
 
-function createMissingRels(){
-	$relForObjects = array('leads'=>'Leads','campaigns'=>'Campaigns','prospects'=>'Prospects');
-	foreach($relForObjects as $relObjName=>$relModName){
+function createMissingRels() {
+	$relForObjects = array('leads'=>'Leads', 'campaigns'=>'Campaigns', 'prospects'=>'Prospects');
+	foreach ($relForObjects as $relObjName=>$relModName) {
 		//assigned_user
 		$guid = create_guid();
 		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_assigned_user'";
-		$result= $GLOBALS['db']->query($query, true);
+		$result = $GLOBALS['db']->query($query, true);
 		$a = null;
 		$a = $GLOBALS['db']->fetchByAssoc($result);
-		if(!isset($a['id']) && empty($a['id']) ){
+		if (!isset($a['id']) && empty($a['id'])) {
 			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_assigned_user','Users','users','id','{$relModName}','{$relObjName}','assigned_user_id',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
 			$GLOBALS['db']->query($qRel);
@@ -170,10 +170,10 @@ 
 		//modified_user
 		$guid = create_guid();
 		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_modified_user'";
-		$result= $GLOBALS['db']->query($query, true);
+		$result = $GLOBALS['db']->query($query, true);
 		$a = null;
 		$a = $GLOBALS['db']->fetchByAssoc($result);
-		if(!isset($a['id']) && empty($a['id']) ){
+		if (!isset($a['id']) && empty($a['id'])) {
 			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_modified_user','Users','users','id','{$relModName}','{$relObjName}','modified_user_id',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
 			$GLOBALS['db']->query($qRel);
@@ -181,10 +181,10 @@ 
 		//created_by
 		$guid = create_guid();
 		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_created_by'";
-		$result= $GLOBALS['db']->query($query, true);
+		$result = $GLOBALS['db']->query($query, true);
 		$a = null;
 		$a = $GLOBALS['db']->fetchByAssoc($result);
-    	if(!isset($a['id']) && empty($a['id']) ){
+    	if (!isset($a['id']) && empty($a['id'])) {
 			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_created_by','Users','users','id','{$relModName}','{$relObjName}','created_by',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
 			$GLOBALS['db']->query($qRel);
@@ -202,7 +202,7 @@ 
  */
 function merge_passwordsetting($sugar_config, $sugar_version) {
     $passwordsetting_defaults = array(
-    'passwordsetting' => array (
+    'passwordsetting' => array(
         'SystemGeneratedPasswordON' => '',
         'generatepasswordtmpl' => '',
         'lostpasswordtmpl' => '',
@@ -214,18 +214,18 @@ 
         'systexpirationtime' => '',
         'systexpirationtype' => '0',
         'systexpirationlogin' => '',
-        ) ,
+        ),
     );
 
 
-    $sugar_config = sugarArrayMerge($passwordsetting_defaults, $sugar_config );
+    $sugar_config = sugarArrayMerge($passwordsetting_defaults, $sugar_config);
 
     // need to override version with default no matter what
     $sugar_config['sugar_version'] = $sugar_version;
 
-    ksort( $sugar_config );
+    ksort($sugar_config);
 
-    if( write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
+    if (write_array_to_file("sugar_config", $sugar_config, "config.php")) {
         return true;
     }
     else {
@@ -234,17 +234,17 @@ 
 }
 
 function addDefaultModuleRoles($defaultRoles = array()) {
-	foreach($defaultRoles as $roleName=>$role){
-        foreach($role as $category=>$actions){
-            foreach($actions as $name=>$access_override){
+	foreach ($defaultRoles as $roleName=>$role) {
+        foreach ($role as $category=>$actions) {
+            foreach ($actions as $name=>$access_override) {
                     $query = "SELECT * FROM acl_actions WHERE name='$name' AND category = '$category' AND acltype='$roleName' AND deleted=0 ";
 					$result = $GLOBALS['db']->query($query);
 					//only add if an action with that name and category don't exist
-					$row=$GLOBALS['db']->fetchByAssoc($result);
+					$row = $GLOBALS['db']->fetchByAssoc($result);
 					if ($row == null) {
 	                	$guid = create_guid();
 	                	$currdate = gmdate($GLOBALS['timedate']->get_db_date_time_format());
-	                	$query= "INSERT INTO acl_actions (id,date_entered,date_modified,modified_user_id,name,category,acltype,aclaccess,deleted ) VALUES ('$guid','$currdate','$currdate','1','$name','$category','$roleName','$access_override','0')";
+	                	$query = "INSERT INTO acl_actions (id,date_entered,date_modified,modified_user_id,name,category,acltype,aclaccess,deleted ) VALUES ('$guid','$currdate','$currdate','1','$name','$category','$roleName','$access_override','0')";
 						$GLOBALS['db']->query($query);
 	                }
             }
@@ -252,11 +252,11 @@ 
 	}
 }
 
-function verifyArguments($argv,$usage_dce,$usage_regular){
+function verifyArguments($argv, $usage_dce, $usage_regular) {
     $upgradeType = '';
     $cwd = getcwd(); // default to current, assumed to be in a valid SugarCRM root dir.
-    if(isset($argv[3])) {
-        if(is_dir($argv[3])) {
+    if (isset($argv[3])) {
+        if (is_dir($argv[3])) {
             $cwd = $argv[3];
             chdir($cwd);
         } else {
@@ -267,12 +267,12 @@ 
     }
 
     //check if this is an instance
-    if(is_file("{$cwd}/ini_setup.php")){
+    if (is_file("{$cwd}/ini_setup.php")) {
         // this is an instance
         $upgradeType = constant('DCE_INSTANCE');
         //now that this is dce instance we want to make sure that there are
         // 7 arguments
-        if(count($argv) < 7) {
+        if (count($argv) < 7) {
             echo "*******************************************************************************\n";
             echo "*** ERROR: Missing required parameters.  Received ".count($argv)." argument(s), require 7.\n";
             echo $usage_dce;
@@ -280,7 +280,7 @@ 
             exit(1);
         }
         // this is an instance
-        if(!is_dir($argv[1])) { // valid directory . template path?
+        if (!is_dir($argv[1])) { // valid directory . template path?
             echo "*******************************************************************************\n";
             echo "*** ERROR: First argument must be a full path to the template. Got [ {$argv[1]} ].\n";
             echo $usage_dce;
@@ -288,18 +288,18 @@ 
             exit(1);
         }
     }
-    else if(is_file("{$cwd}/include/entryPoint.php")) {
+    else if (is_file("{$cwd}/include/entryPoint.php")) {
         //this should be a regular sugar install
         $upgradeType = constant('SUGARCRM_INSTALL');
         //check if this is a valid zip file
-        if(!is_file($argv[1])) { // valid zip?
+        if (!is_file($argv[1])) { // valid zip?
             echo "*******************************************************************************\n";
             echo "*** ERROR: First argument must be a full path to the patch file. Got [ {$argv[1]} ].\n";
             echo $usage_regular;
             echo "FAILURE\n";
             exit(1);
         }
-        if(count($argv) < 5) {
+        if (count($argv) < 5) {
             echo "*******************************************************************************\n";
             echo "*** ERROR: Missing required parameters.  Received ".count($argv)." argument(s), require 5.\n";
             echo $usage_regular;
@@ -314,29 +314,29 @@ 
         exit(1);
     }
 
-    if(isset($argv[7]) && file_exists($argv[7].'SugarTemplateUtilties.php')){
+    if (isset($argv[7]) && file_exists($argv[7].'SugarTemplateUtilties.php')) {
         require_once($argv[7].'SugarTemplateUtilties.php');
     }
 
     return $upgradeType;
 }
 
-function upgradeDCEFiles($argv,$instanceUpgradePath){
+function upgradeDCEFiles($argv, $instanceUpgradePath) {
 	//copy and update following files from upgrade package
-	$upgradeTheseFiles = array('cron.php','download.php','index.php','install.php','soap.php','sugar_version.php','vcal_server.php');
-	foreach($upgradeTheseFiles as $file){
+	$upgradeTheseFiles = array('cron.php', 'download.php', 'index.php', 'install.php', 'soap.php', 'sugar_version.php', 'vcal_server.php');
+	foreach ($upgradeTheseFiles as $file) {
 		$srcFile = clean_path("{$instanceUpgradePath}/$file");
 		$destFile = clean_path("{$argv[3]}/$file");
-		if(file_exists($srcFile)){
-			if(!is_dir(dirname($destFile))) {
+		if (file_exists($srcFile)) {
+			if (!is_dir(dirname($destFile))) {
 				mkdir_recursive(dirname($destFile)); // make sure the directory exists
 			}
-			copy_recursive($srcFile,$destFile);
+			copy_recursive($srcFile, $destFile);
 			$_GET['TEMPLATE_PATH'] = $destFile;
 			$_GET['CONVERT_FILE_ONLY'] = true;
-			if(!class_exists('TemplateConverter')){
+			if (!class_exists('TemplateConverter')) {
 				include($argv[7].'templateConverter.php');
-			}else{
+			} else {
 				TemplateConverter::convertFile($_GET['TEMPLATE_PATH']);
 			}
 
@@ -347,7 +347,7 @@ 
 
 
 
-function threeWayMerge(){
+function threeWayMerge() {
 	//using threeway merge apis
 }
 ////	END UTILITIES THAT MUST BE LOCAL :(
@@ -361,7 +361,7 @@ 
 //End of #52872
 
 // only run from command line
-if(isset($_SERVER['HTTP_USER_AGENT'])) {
+if (isset($_SERVER['HTTP_USER_AGENT'])) {
 	fwrite(STDERR, 'This utility may only be run from the command line or command prompt.');
 	exit(1);
 }
@@ -371,7 +371,7 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	USAGE
-$usage_dce =<<<eoq1
+$usage_dce = <<<eoq1
 Usage: php.exe -f silentUpgrade.php [upgradeZipFile] [logFile] [pathToSugarInstance]
 
 On Command Prompt Change directory to where silentUpgrade.php resides. Then type path to
@@ -392,7 +392,7 @@ 
 
 eoq1;
 
-$usage_regular =<<<eoq2
+$usage_regular = <<<eoq2
 Usage: php.exe -f silentUpgrade.php [upgradeZipFile] [logFile] [pathToSugarInstance] [admin-user]
 
 On Command Prompt Change directory to where silentUpgrade.php resides. Then type path to
@@ -414,7 +414,7 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	STANDARD REQUIRED SUGAR INCLUDES AND PRESETS
-if(!defined('sugarEntry')) define('sugarEntry', true);
+if (!defined('sugarEntry')) define('sugarEntry', true);
 
 $_SESSION = array();
 $_SESSION['schema_change'] = 'sugar'; // we force-run all SQL
@@ -431,7 +431,7 @@ 
 global $cwd;
 $cwd = getcwd(); // default to current, assumed to be in a valid SugarCRM root dir.
 
-$upgradeType = verifyArguments($argv,$usage_dce,$usage_regular);
+$upgradeType = verifyArguments($argv, $usage_dce, $usage_regular);
 
 ///////////////////////////////////////////////////////////////////////////////
 //////  Verify that all the arguments are appropriately placed////////////////
@@ -441,14 +441,14 @@ 
 //$GLOBALS['log']	= LoggerManager::getLogger('SugarCRM');
 //require_once('/var/www/html/eddy/sugarnode/SugarTemplateUtilities.php');
 
-$path			= $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
+$path = $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
 //$db				= &DBManagerFactory::getInstance();  //<---------
 
 
 //$UWstrings		= return_module_language('en_us', 'UpgradeWizard');
 //$adminStrings	= return_module_language('en_us', 'Administration');
 //$mod_strings	= array_merge($adminStrings, $UWstrings);
-$subdirs		= array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
+$subdirs = array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
 
 //$_REQUEST['zip_from_dir'] = $zip_from_dir;
 
@@ -470,7 +470,7 @@ 
 $errors = array();
 
 
-if($upgradeType == constant('DCE_INSTANCE')){
+if ($upgradeType == constant('DCE_INSTANCE')) {
    	//$instanceUpgradePath = "{$argv[1]}/DCEUpgrade/{$zip_from_dir}";
    	//$instanceUpgradePath = "{$argv[1]}";
 	include ("ini_setup.php");
@@ -502,44 +502,44 @@ 
 	/////retrieve admin user
 	$configOptions = $sugar_config['dbconfig'];
 
-	$GLOBALS['log']	= LoggerManager::getLogger('SugarCRM');
-	$db				= &DBManagerFactory::getInstance();
+	$GLOBALS['log'] = LoggerManager::getLogger('SugarCRM');
+	$db = &DBManagerFactory::getInstance();
        		///////////////////////////////////////////////////////////////////////////////
 	////	MAKE SURE PATCH IS COMPATIBLE
 
-	if(is_file("{$argv[1]}/manifest.php")) {
+	if (is_file("{$argv[1]}/manifest.php")) {
 		// provides $manifest array
 		include("{$argv[1]}/manifest.php");
 	}
 	//If Instance then the files will be accessed from Template/DCEUpgrade folder
 	$zip_from_dir = '';
-    if( isset( $manifest['copy_files']['from_dir'] ) && $manifest['copy_files']['from_dir'] != "" ){
-	    $zip_from_dir   = $manifest['copy_files']['from_dir'];
+    if (isset($manifest['copy_files']['from_dir']) && $manifest['copy_files']['from_dir'] != "") {
+	    $zip_from_dir = $manifest['copy_files']['from_dir'];
 	}
 	$instanceUpgradePath = "{$argv[1]}/{$zip_from_dir}";
 	global $instancePath;
 	$instancePath = $instanceUpgradePath;
 	$_SESSION['instancePath'] = $instancePath;
-	if(file_exists("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php")){
+	if (file_exists("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php")) {
 		require_once("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php");
 	}
-	else{
+	else {
 		require_once("{$argv[4]}/modules/UpgradeWizard/uw_utils.php");
 	}
-    if(function_exists('set_upgrade_vars')){
+    if (function_exists('set_upgrade_vars')) {
 		set_upgrade_vars();
     }
-	if(is_file("$argv[1]/manifest.php")) {
+	if (is_file("$argv[1]/manifest.php")) {
 		// provides $manifest array
 		//include("$instanceUpgradePath/manifest.php");
-		if(!isset($manifest)) {
+		if (!isset($manifest)) {
 		    fwrite(STDERR, "\nThe patch did not contain a proper manifest.php file.  Cannot continue.\n\n");
 		    exit(1);
 		} else {
 			$error = validate_manifest($manifest);
-			if(!empty($error)) {
+			if (!empty($error)) {
 				$error = strip_tags(br2nl($error));
-				fwrite(STDERR,"\n{$error}\n\nFAILURE\n");
+				fwrite(STDERR, "\n{$error}\n\nFAILURE\n");
 				exit(1);
 			}
 		}
@@ -557,7 +557,7 @@ 
 	logThis("*** UpgradeWizard Upgraded  ", $path);
 	$_SESSION['sugar_version_file'] = '';
 	$srcFile = clean_path("{$instanceUpgradePath}/sugar_version.php");
-	if(file_exists($srcFile)) {
+	if (file_exists($srcFile)) {
 		logThis('Save the version file in session variable', $path);
 		$_SESSION['sugar_version_file'] = $srcFile;
 	}
@@ -566,25 +566,25 @@ 
 
     //check exit on conflicts
     $exitOnConflict = 'yes'; //default
-    if($argv[5] != null && !empty($argv[5])){
-    	if(strtolower($argv[5]) == 'no'){
+    if ($argv[5] != null && !empty($argv[5])) {
+    	if (strtolower($argv[5]) == 'no') {
     	  $exitOnConflict = 'no'; //override
     	}
     }
-    if($exitOnConflict == 'yes'){
+    if ($exitOnConflict == 'yes') {
     	$customFiles = array();
     	$customFiles = findAllFiles(clean_path("{$argv[3]}/custom"), $customFiles);
-    	if($customFiles != null){
+    	if ($customFiles != null) {
     		logThis("*** ****************************  ****", $path);
 			logThis("*** START LOGGING CUSTOM FILES  ****", $path);
 			$existsCustomFile = false;
-			foreach($customFiles as $file) {
+			foreach ($customFiles as $file) {
 			$srcFile = clean_path($file);
 			//$targetFile = clean_path(getcwd() . '/' . $srcFile);
-			    if (strpos($srcFile,".svn") !== false) {
+			    if (strpos($srcFile, ".svn") !== false) {
 				  //do nothing
 			    }
-			    else{
+			    else {
 			     $existsCustomFile = true;
 			     //log the custom file in
 			     logThis($file, $path);
@@ -592,23 +592,23 @@ 
 			}
 			logThis("*** END LOGGING CUSTOM FILES  ****", $path);
 			logThis("*** ****************************  ****", $path);
-			if($existsCustomFile){
+			if ($existsCustomFile) {
 				echo 'Stop and Exit Upgrade. There are customized files. Take a look in the upgrade log';
 				logThis("Stop and Exit Upgrade. There are customized files. Take a look in the upgrade log", $path);
 				exit(1);
 			}
-			else{
-			    upgradeDCEFiles($argv,$instanceUpgradePath);
+			else {
+			    upgradeDCEFiles($argv, $instanceUpgradePath);
 			}
     	}
-    	else{
+    	else {
 			   //copy and update following files from upgrade package
-				upgradeDCEFiles($argv,$instanceUpgradePath);
+				upgradeDCEFiles($argv, $instanceUpgradePath);
 		 }
     }
-    else{
+    else {
 	   //copy and update following files from upgrade package
-	   upgradeDCEFiles($argv,$instanceUpgradePath);
+	   upgradeDCEFiles($argv, $instanceUpgradePath);
     }
 
     global $unzip_dir;
@@ -625,8 +625,8 @@ 
 ob_end_clean();
 logThis("**** Potential PHP generated error messages: {$phpErrors}", $path);
 
-if(count($errors) > 0) {
-	foreach($errors as $error) {
+if (count($errors) > 0) {
+	foreach ($errors as $error) {
 		logThis("****** SilentUpgrade ERROR: {$error}", $path);
 	}
 	echo "FAILED\n";

Braces +13 added lines, -20 removed lines

@@ -65,8 +65,7 @@ 
 			if ($children != "." && $children != "..") {
 				if (is_dir($thedir . "/" . $children)) {
 					clearCacheSU($thedir . "/" . $children, $extension);
-				}
-				elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
+				} elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
 					unlink($thedir . "/" . $children);
 				}
 			}
@@ -227,8 +226,7 @@ 
 
     if( write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
         return true;
-    }
-    else {
+    } else {
         return false;
     }
 }
@@ -287,8 +285,7 @@ 
             echo "FAILURE\n";
             exit(1);
         }
-    }
-    else if(is_file("{$cwd}/include/entryPoint.php")) {
+    } else if(is_file("{$cwd}/include/entryPoint.php")) {
         //this should be a regular sugar install
         $upgradeType = constant('SUGARCRM_INSTALL');
         //check if this is a valid zip file
@@ -306,8 +303,7 @@ 
             echo "FAILURE\n";
             exit(1);
         }
-    }
-    else {
+    } else {
         //this should be a regular sugar install
         echo "*******************************************************************************\n";
         echo "*** ERROR: Tried to execute in a non-SugarCRM root directory.\n";
@@ -336,7 +332,7 @@ 
 			$_GET['CONVERT_FILE_ONLY'] = true;
 			if(!class_exists('TemplateConverter')){
 				include($argv[7].'templateConverter.php');
-			}else{
+			} else{
 				TemplateConverter::convertFile($_GET['TEMPLATE_PATH']);
 			}
 
@@ -414,7 +410,9 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	STANDARD REQUIRED SUGAR INCLUDES AND PRESETS
-if(!defined('sugarEntry')) define('sugarEntry', true);
+if(!defined('sugarEntry')) {
+    define('sugarEntry', true);
+}
 
 $_SESSION = array();
 $_SESSION['schema_change'] = 'sugar'; // we force-run all SQL
@@ -522,8 +520,7 @@ 
 	$_SESSION['instancePath'] = $instancePath;
 	if(file_exists("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php")){
 		require_once("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php");
-	}
-	else{
+	} else{
 		require_once("{$argv[4]}/modules/UpgradeWizard/uw_utils.php");
 	}
     if(function_exists('set_upgrade_vars')){
@@ -583,8 +580,7 @@ 
 			//$targetFile = clean_path(getcwd() . '/' . $srcFile);
 			    if (strpos($srcFile,".svn") !== false) {
 				  //do nothing
-			    }
-			    else{
+			    } else{
 			     $existsCustomFile = true;
 			     //log the custom file in
 			     logThis($file, $path);
@@ -596,17 +592,14 @@ 
 				echo 'Stop and Exit Upgrade. There are customized files. Take a look in the upgrade log';
 				logThis("Stop and Exit Upgrade. There are customized files. Take a look in the upgrade log", $path);
 				exit(1);
-			}
-			else{
+			} else{
 			    upgradeDCEFiles($argv,$instanceUpgradePath);
 			}
-    	}
-    	else{
+    	} else{
 			   //copy and update following files from upgrade package
 				upgradeDCEFiles($argv,$instanceUpgradePath);
 		 }
-    }
-    else{
+    } else{
 	   //copy and update following files from upgrade package
 	   upgradeDCEFiles($argv,$instanceUpgradePath);
     }

modules/UpgradeWizard/silentUpgrade_step1.php

Indentation +575 added lines, -575 removed lines

@@ -46,81 +46,81 @@ 
 ///////////////////////////////////////////////////////////////////////////////
 ////	UTILITIES THAT MUST BE LOCAL :(
 function prepSystemForUpgradeSilent() {
-	global $subdirs;
-	global $cwd;
-	global $sugar_config;
-
-	// make sure dirs exist
-	foreach($subdirs as $subdir) {
-		if(!is_dir($sugar_config['upload_dir']."/upgrades/{$subdir}")) {
-	    	mkdir_recursive($sugar_config['upload_dir']."/upgrades/{$subdir}");
-		}
-	}
+    global $subdirs;
+    global $cwd;
+    global $sugar_config;
+
+    // make sure dirs exist
+    foreach($subdirs as $subdir) {
+        if(!is_dir($sugar_config['upload_dir']."/upgrades/{$subdir}")) {
+            mkdir_recursive($sugar_config['upload_dir']."/upgrades/{$subdir}");
+        }
+    }
 }
 
 //local function for clearing cache
 function clearCacheSU($thedir, $extension) {
-	if ($current = @opendir($thedir)) {
-		while (false !== ($children = readdir($current))) {
-			if ($children != "." && $children != "..") {
-				if (is_dir($thedir . "/" . $children)) {
-					clearCacheSU($thedir . "/" . $children, $extension);
-				}
-				elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
-					unlink($thedir . "/" . $children);
-				}
-			}
-		}
-	}
- }
- //Bug 24890, 24892. default_permissions not written to config.php. Following function checks and if
- //no found then adds default_permissions to the config file.
- function checkConfigForPermissions(){
-     if(file_exists(getcwd().'/config.php')){
-         require(getcwd().'/config.php');
-     }
-     global $sugar_config;
-     if(!isset($sugar_config['default_permissions'])){
-             $sugar_config['default_permissions'] = array (
-                     'dir_mode' => 02770,
-                     'file_mode' => 0660,
-                     'user' => '',
-                     'group' => '',
-             );
-         ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
-        	//writing to the file
- 		}
-     }
+    if ($current = @opendir($thedir)) {
+        while (false !== ($children = readdir($current))) {
+            if ($children != "." && $children != "..") {
+                if (is_dir($thedir . "/" . $children)) {
+                    clearCacheSU($thedir . "/" . $children, $extension);
+                }
+                elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
+                    unlink($thedir . "/" . $children);
+                }
+            }
+        }
+    }
+    }
+    //Bug 24890, 24892. default_permissions not written to config.php. Following function checks and if
+    //no found then adds default_permissions to the config file.
+    function checkConfigForPermissions(){
+        if(file_exists(getcwd().'/config.php')){
+            require(getcwd().'/config.php');
+        }
+        global $sugar_config;
+        if(!isset($sugar_config['default_permissions'])){
+                $sugar_config['default_permissions'] = array (
+                        'dir_mode' => 02770,
+                        'file_mode' => 0660,
+                        'user' => '',
+                        'group' => '',
+                );
+            ksort($sugar_config);
+            if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+            //writing to the file
+            }
+        }
 }
 function checkLoggerSettings(){
-	if(file_exists(getcwd().'/config.php')){
-         require(getcwd().'/config.php');
-     }
+    if(file_exists(getcwd().'/config.php')){
+            require(getcwd().'/config.php');
+        }
     global $sugar_config;
-	if(!isset($sugar_config['logger'])){
-	    $sugar_config['logger'] =array (
-			'level'=>'fatal',
-		    'file' =>
-		     array (
-		      'ext' => '.log',
-		      'name' => 'sugarcrm',
-		      'dateFormat' => '%c',
-		      'maxSize' => '10MB',
-		      'maxLogs' => 10,
-		      'suffix' => '', // bug51583, change default suffix to blank for backwards comptability
-		    ),
-		  );
-		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
-        	//writing to the file
- 		}
-	 }
+    if(!isset($sugar_config['logger'])){
+        $sugar_config['logger'] =array (
+            'level'=>'fatal',
+            'file' =>
+                array (
+                'ext' => '.log',
+                'name' => 'sugarcrm',
+                'dateFormat' => '%c',
+                'maxSize' => '10MB',
+                'maxLogs' => 10,
+                'suffix' => '', // bug51583, change default suffix to blank for backwards comptability
+            ),
+            );
+            ksort($sugar_config);
+            if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+            //writing to the file
+            }
+        }
 }
 
 function checkLeadConversionSettings() {
     if (file_exists(getcwd().'/config.php')) {
-         require(getcwd().'/config.php');
+            require(getcwd().'/config.php');
     }
     global $sugar_config;
     if (!isset($sugar_config['lead_conv_activity_opt'])) {
@@ -133,90 +133,90 @@ 
 }
 
 function checkResourceSettings(){
-	if(file_exists(getcwd().'/config.php')){
-         require(getcwd().'/config.php');
-     }
+    if(file_exists(getcwd().'/config.php')){
+            require(getcwd().'/config.php');
+        }
     global $sugar_config;
-	if(!isset($sugar_config['resource_management'])){
-	  $sugar_config['resource_management'] =
-		  array (
-		    'special_query_limit' => 50000,
-		    'special_query_modules' =>
-		    array (
-		      0 => 'Reports',
-		      1 => 'Export',
-		      2 => 'Import',
-		      3 => 'Administration',
-		      4 => 'Sync',
-		    ),
-		    'default_limit' => 1000,
-		  );
-		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
-        	//writing to the file
- 		}
-	}
+    if(!isset($sugar_config['resource_management'])){
+        $sugar_config['resource_management'] =
+            array (
+            'special_query_limit' => 50000,
+            'special_query_modules' =>
+            array (
+                0 => 'Reports',
+                1 => 'Export',
+                2 => 'Import',
+                3 => 'Administration',
+                4 => 'Sync',
+            ),
+            'default_limit' => 1000,
+            );
+            ksort($sugar_config);
+            if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+            //writing to the file
+            }
+    }
 }
 
 
 function createMissingRels(){
-	$relForObjects = array('leads'=>'Leads','campaigns'=>'Campaigns','prospects'=>'Prospects');
-	foreach($relForObjects as $relObjName=>$relModName){
-		//assigned_user
-		$guid = create_guid();
-		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_assigned_user'";
-		$result= $GLOBALS['db']->query($query, true);
-		$a = null;
-		$a = $GLOBALS['db']->fetchByAssoc($result);
-		if(!isset($a['id']) && empty($a['id']) ){
-			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
+    $relForObjects = array('leads'=>'Leads','campaigns'=>'Campaigns','prospects'=>'Prospects');
+    foreach($relForObjects as $relObjName=>$relModName){
+        //assigned_user
+        $guid = create_guid();
+        $query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_assigned_user'";
+        $result= $GLOBALS['db']->query($query, true);
+        $a = null;
+        $a = $GLOBALS['db']->fetchByAssoc($result);
+        if(!isset($a['id']) && empty($a['id']) ){
+            $qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_assigned_user','Users','users','id','{$relModName}','{$relObjName}','assigned_user_id',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
-			$GLOBALS['db']->query($qRel);
-		}
-		//modified_user
-		$guid = create_guid();
-		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_modified_user'";
-		$result= $GLOBALS['db']->query($query, true);
-		$a = null;
-		$a = $GLOBALS['db']->fetchByAssoc($result);
-		if(!isset($a['id']) && empty($a['id']) ){
-			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
+            $GLOBALS['db']->query($qRel);
+        }
+        //modified_user
+        $guid = create_guid();
+        $query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_modified_user'";
+        $result= $GLOBALS['db']->query($query, true);
+        $a = null;
+        $a = $GLOBALS['db']->fetchByAssoc($result);
+        if(!isset($a['id']) && empty($a['id']) ){
+            $qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_modified_user','Users','users','id','{$relModName}','{$relObjName}','modified_user_id',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
-			$GLOBALS['db']->query($qRel);
-		}
-		//created_by
-		$guid = create_guid();
-		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_created_by'";
-		$result= $GLOBALS['db']->query($query, true);
-		$a = null;
-		$a = $GLOBALS['db']->fetchByAssoc($result);
-    	if(!isset($a['id']) && empty($a['id']) ){
-			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
+            $GLOBALS['db']->query($qRel);
+        }
+        //created_by
+        $guid = create_guid();
+        $query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_created_by'";
+        $result= $GLOBALS['db']->query($query, true);
+        $a = null;
+        $a = $GLOBALS['db']->fetchByAssoc($result);
+        if(!isset($a['id']) && empty($a['id']) ){
+            $qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_created_by','Users','users','id','{$relModName}','{$relObjName}','created_by',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
-			$GLOBALS['db']->query($qRel);
-    	}
-		$guid = create_guid();
-		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_team'";
-		$result= $GLOBALS['db']->query($query, true);
-		$a = null;
-		$a = $GLOBALS['db']->fetchByAssoc($result);
-		if(!isset($a['id']) && empty($a['id']) ){
-			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
+            $GLOBALS['db']->query($qRel);
+        }
+        $guid = create_guid();
+        $query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_team'";
+        $result= $GLOBALS['db']->query($query, true);
+        $a = null;
+        $a = $GLOBALS['db']->fetchByAssoc($result);
+        if(!isset($a['id']) && empty($a['id']) ){
+            $qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 							VALUES ('{$guid}', '{$relObjName}_team','Teams','teams','id','{$relModName}','{$relObjName}','team_id',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
-			$GLOBALS['db']->query($qRel);
-		}
-	}
-	//Also add tracker perf relationship
-	$guid = create_guid();
-	$query = "SELECT id FROM relationships WHERE relationship_name = 'tracker_monitor_id'";
-	$result= $GLOBALS['db']->query($query, true);
-	$a = null;
-	$a = $GLOBALS['db']->fetchByAssoc($result);
-	if(!isset($a['id']) && empty($a['id']) ){
-		$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
+            $GLOBALS['db']->query($qRel);
+        }
+    }
+    //Also add tracker perf relationship
+    $guid = create_guid();
+    $query = "SELECT id FROM relationships WHERE relationship_name = 'tracker_monitor_id'";
+    $result= $GLOBALS['db']->query($query, true);
+    $a = null;
+    $a = $GLOBALS['db']->fetchByAssoc($result);
+    if(!isset($a['id']) && empty($a['id']) ){
+        $qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 					VALUES ('{$guid}', 'tracker_monitor_id','TrackerPerfs','tracker_perf','monitor_id','Trackers','tracker','monitor_id',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
-		$GLOBALS['db']->query($qRel);
-	}
+        $GLOBALS['db']->query($qRel);
+    }
 }
 
 
@@ -228,7 +228,7 @@ 
  */
 function merge_passwordsetting($sugar_config, $sugar_version) {
 
-     $passwordsetting_defaults = array (
+        $passwordsetting_defaults = array (
         'passwordsetting' => array (
             'minpwdlength' => '',
             'maxpwdlength' => '',
@@ -276,22 +276,22 @@ 
 }
 
 function addDefaultModuleRoles($defaultRoles = array()) {
-	foreach($defaultRoles as $roleName=>$role){
+    foreach($defaultRoles as $roleName=>$role){
         foreach($role as $category=>$actions){
             foreach($actions as $name=>$access_override){
                     $query = "SELECT * FROM acl_actions WHERE name='$name' AND category = '$category' AND acltype='$roleName' AND deleted=0 ";
-					$result = $GLOBALS['db']->query($query);
-					//only add if an action with that name and category don't exist
-					$row=$GLOBALS['db']->fetchByAssoc($result);
-					if ($row == null) {
-	                	$guid = create_guid();
-	                	$currdate = gmdate('Y-m-d H:i:s');
-	                	$query= "INSERT INTO acl_actions (id,date_entered,date_modified,modified_user_id,name,category,acltype,aclaccess,deleted ) VALUES ('$guid','$currdate','$currdate','1','$name','$category','$roleName','$access_override','0')";
-						$GLOBALS['db']->query($query);
-	                }
+                    $result = $GLOBALS['db']->query($query);
+                    //only add if an action with that name and category don't exist
+                    $row=$GLOBALS['db']->fetchByAssoc($result);
+                    if ($row == null) {
+                        $guid = create_guid();
+                        $currdate = gmdate('Y-m-d H:i:s');
+                        $query= "INSERT INTO acl_actions (id,date_entered,date_modified,modified_user_id,name,category,acltype,aclaccess,deleted ) VALUES ('$guid','$currdate','$currdate','1','$name','$category','$roleName','$access_override','0')";
+                        $GLOBALS['db']->query($query);
+                    }
             }
         }
-	}
+    }
 }
 
 function verifyArguments($argv,$usage_regular){
@@ -343,7 +343,7 @@ 
 
 
 function threeWayMerge(){
-	//using threeway merge apis
+    //using threeway merge apis
 }
 
 ////	END UTILITIES THAT MUST BE LOCAL :(
@@ -358,8 +358,8 @@ 
 
 // only run from command line
 if(isset($_SERVER['HTTP_USER_AGENT'])) {
-	fwrite(STDERR,'This utility may only be run from the command line or command prompt.');
-	exit(1);
+    fwrite(STDERR,'This utility may only be run from the command line or command prompt.');
+    exit(1);
 }
 //Clean_string cleans out any file  passed in as a parameter
 $_SERVER['PHP_SELF'] = 'silentUpgrade.php';
@@ -433,10 +433,10 @@ 
 
 if($upgradeType != constant('DCE_INSTANCE')) {
 
-	ini_set('error_reporting',1);
-	require_once('include/entryPoint.php');
-	require_once('include/SugarLogger/SugarLogger.php');
-	require_once('include/utils/zip_utils.php');
+    ini_set('error_reporting',1);
+    require_once('include/entryPoint.php');
+    require_once('include/SugarLogger/SugarLogger.php');
+    require_once('include/utils/zip_utils.php');
 
 
 if(!function_exists('sugar_cached'))
@@ -460,64 +460,64 @@ 
     }
 }
 
-	require('config.php');
-	//require_once('modules/UpgradeWizard/uw_utils.php'); // must upgrade UW first
-	if(isset($argv[3])) {
-		if(is_dir($argv[3])) {
-			$cwd = $argv[3];
-			chdir($cwd);
-		}
-	}
+    require('config.php');
+    //require_once('modules/UpgradeWizard/uw_utils.php'); // must upgrade UW first
+    if(isset($argv[3])) {
+        if(is_dir($argv[3])) {
+            $cwd = $argv[3];
+            chdir($cwd);
+        }
+    }
 
-	require_once("{$cwd}/sugar_version.php"); // provides $sugar_version & $sugar_flavor
+    require_once("{$cwd}/sugar_version.php"); // provides $sugar_version & $sugar_flavor
 
     $GLOBALS['log']	= LoggerManager::getLogger('SugarCRM');
-	$patchName		= basename($argv[1]);
-	$zip_from_dir	= substr($patchName, 0, strlen($patchName) - 4); // patch folder name (minus ".zip")
-	$path			= $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
+    $patchName		= basename($argv[1]);
+    $zip_from_dir	= substr($patchName, 0, strlen($patchName) - 4); // patch folder name (minus ".zip")
+    $path			= $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
 
     $db				= &DBManagerFactory::getInstance();
-	$UWstrings		= return_module_language('en_us', 'UpgradeWizard');
-	$adminStrings	= return_module_language('en_us', 'Administration');
+    $UWstrings		= return_module_language('en_us', 'UpgradeWizard');
+    $adminStrings	= return_module_language('en_us', 'Administration');
     $app_list_strings = return_app_list_strings_language('en_us');
-	$mod_strings	= array_merge($adminStrings, $UWstrings);
-	$subdirs		= array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
-	global $unzip_dir;
+    $mod_strings	= array_merge($adminStrings, $UWstrings);
+    $subdirs		= array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
+    global $unzip_dir;
     $license_accepted = false;
     if(isset($argv[5]) && (strtolower($argv[5])=='yes' || strtolower($argv[5])=='y')){
-    	$license_accepted = true;
-	 }
-	//////////////////////////////////////////////////////////////////////////////
-	//Adding admin user to the silent upgrade
-
-	$current_user = new User();
-	if(isset($argv[4])) {
-	   //if being used for internal upgrades avoid admin user verification
-	   $user_name = $argv[4];
-	   $q = "select id from users where user_name = '" . $user_name . "' and is_admin=1";
-	   $result = $GLOBALS['db']->query($q, false);
-	   $logged_user = $GLOBALS['db']->fetchByAssoc($result);
-	   if(isset($logged_user['id']) && $logged_user['id'] != null){
-		//do nothing
-	    $current_user->retrieve($logged_user['id']);
-	   }
-	   else{
-	   	echo "FAILURE: Not an admin user in users table. Please provide an admin user\n";
-		exit(1);
-	   }
-	}
-	else {
-		echo "*******************************************************************************\n";
-		echo "*** ERROR: 4th parameter must be a valid admin user.\n";
-		echo $usage;
-		echo "FAILURE\n";
-		exit(1);
-	}
-
-
-		/////retrieve admin user
-	global $sugar_config;
-	$configOptions = $sugar_config['dbconfig'];
+        $license_accepted = true;
+        }
+    //////////////////////////////////////////////////////////////////////////////
+    //Adding admin user to the silent upgrade
+
+    $current_user = new User();
+    if(isset($argv[4])) {
+        //if being used for internal upgrades avoid admin user verification
+        $user_name = $argv[4];
+        $q = "select id from users where user_name = '" . $user_name . "' and is_admin=1";
+        $result = $GLOBALS['db']->query($q, false);
+        $logged_user = $GLOBALS['db']->fetchByAssoc($result);
+        if(isset($logged_user['id']) && $logged_user['id'] != null){
+        //do nothing
+        $current_user->retrieve($logged_user['id']);
+        }
+        else{
+            echo "FAILURE: Not an admin user in users table. Please provide an admin user\n";
+        exit(1);
+        }
+    }
+    else {
+        echo "*******************************************************************************\n";
+        echo "*** ERROR: 4th parameter must be a valid admin user.\n";
+        echo $usage;
+        echo "FAILURE\n";
+        exit(1);
+    }
+
+
+        /////retrieve admin user
+    global $sugar_config;
+    $configOptions = $sugar_config['dbconfig'];
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -535,17 +535,17 @@ 
 $_SESSION['zip_from_dir'] = $zip_from_dir;
 if(is_dir($unzip_dir.'/scripts'))
 {
-	rmdir_recursive($unzip_dir.'/scripts');
+    rmdir_recursive($unzip_dir.'/scripts');
 }
 if(is_file($unzip_dir.'/manifest.php'))
 {
-	rmdir_recursive($unzip_dir.'/manifest.php');
+    rmdir_recursive($unzip_dir.'/manifest.php');
 }
 mkdir_recursive($unzip_dir);
 if(!is_dir($unzip_dir)) {
-	echo "\n{$unzip_dir} is not an available directory\nFAILURE\n";
-	fwrite(STDERR,"\n{$unzip_dir} is not an available directory\nFAILURE\n");
-	exit(1);
+    echo "\n{$unzip_dir} is not an available directory\nFAILURE\n";
+    fwrite(STDERR,"\n{$unzip_dir} is not an available directory\nFAILURE\n");
+    exit(1);
 }
 
 unzip($argv[1], $unzip_dir);
@@ -562,8 +562,8 @@ 
 $destFiles = array();
 
 foreach($uwFiles as $uwFile) {
-	$destFile = str_replace($zipBasePath."/", '', $uwFile);
-	copy($uwFile, $destFile);
+    $destFile = str_replace($zipBasePath."/", '', $uwFile);
+    copy($uwFile, $destFile);
 }
 require_once('modules/UpgradeWizard/uw_utils.php'); // must upgrade UW first
 removeSilentUpgradeVarsCache(); // Clear the silent upgrade vars - Note: Any calls to these functions within this file are removed here
@@ -571,16 +571,16 @@ 
 logThis("*** UpgradeWizard Upgraded  ", $path);
 
 if(function_exists('set_upgrade_vars')){
-	set_upgrade_vars();
+    set_upgrade_vars();
 }
 
 if($configOptions['db_type'] == 'mysql'){
-	//Change the db wait_timeout for this session
-	$now_timeout = $db->getOne("select @@wait_timeout");
-	logThis('Wait Timeout before change ***** '.$now_timeout , $path);
-	$db->query("set wait_timeout=28800");	
-	$now_timeout = $db->getOne("select @@wait_timeout");	
-	logThis('Wait Timeout after change ***** '.$now_timeout , $path);
+    //Change the db wait_timeout for this session
+    $now_timeout = $db->getOne("select @@wait_timeout");
+    logThis('Wait Timeout before change ***** '.$now_timeout , $path);
+    $db->query("set wait_timeout=28800");	
+    $now_timeout = $db->getOne("select @@wait_timeout");	
+    logThis('Wait Timeout after change ***** '.$now_timeout , $path);
 }
 
 ////	END UPGRADE UPGRADEWIZARD
@@ -589,24 +589,24 @@ 
 ///////////////////////////////////////////////////////////////////////////////
 ////	MAKE SURE PATCH IS COMPATIBLE
 if(is_file("$unzip_dir/manifest.php")) {
-	// provides $manifest array
-	include("$unzip_dir/manifest.php");
-	if(!isset($manifest)) {
-		fwrite(STDERR,"\nThe patch did not contain a proper manifest.php file.  Cannot continue.\n\n");
-	    exit(1);
-	} else {
-		copy("$unzip_dir/manifest.php", $sugar_config['upload_dir']."/upgrades/patch/{$zip_from_dir}-manifest.php");
-
-		$error = validate_manifest($manifest);
-		if(!empty($error)) {
-			$error = strip_tags(br2nl($error));
-			fwrite(STDERR,"\n{$error}\n\nFAILURE\n");
-			exit(1);
-		}
-	}
+    // provides $manifest array
+    include("$unzip_dir/manifest.php");
+    if(!isset($manifest)) {
+        fwrite(STDERR,"\nThe patch did not contain a proper manifest.php file.  Cannot continue.\n\n");
+        exit(1);
+    } else {
+        copy("$unzip_dir/manifest.php", $sugar_config['upload_dir']."/upgrades/patch/{$zip_from_dir}-manifest.php");
+
+        $error = validate_manifest($manifest);
+        if(!empty($error)) {
+            $error = strip_tags(br2nl($error));
+            fwrite(STDERR,"\n{$error}\n\nFAILURE\n");
+            exit(1);
+        }
+    }
 } else {
-	fwrite(STDERR,"\nThe patch did not contain a proper manifest.php file.  Cannot continue.\n\n");
-	exit(1);
+    fwrite(STDERR,"\nThe patch did not contain a proper manifest.php file.  Cannot continue.\n\n");
+    exit(1);
 }
 
 $ce_to_pro_ent = isset($manifest['name']) && ($manifest['name'] == 'SugarCE to SugarPro' || $manifest['name'] == 'SugarCE to SugarEnt' || $manifest['name'] == 'SugarCE to SugarCorp' || $manifest['name'] == 'SugarCE to SugarUlt');
@@ -624,17 +624,17 @@ 
 ob_start();
 set_time_limit(0);
 if(file_exists('ModuleInstall/PackageManager/PackageManagerDisplay.php')) {
-	require_once('ModuleInstall/PackageManager/PackageManagerDisplay.php');
+    require_once('ModuleInstall/PackageManager/PackageManagerDisplay.php');
 }
 
 
-	//copy minimum required files including sugar_file_utils.php
-	if(file_exists("{$zipBasePath}/include/utils/sugar_file_utils.php")){
-		$destFile = clean_path(str_replace($zipBasePath, $cwd, "{$zipBasePath}/include/utils/sugar_file_utils.php"));
-		copy("{$zipBasePath}/include/utils/sugar_file_utils.php", $destFile);
-	}
-	if(file_exists('include/utils/sugar_file_utils.php')){
-    	require_once('include/utils/sugar_file_utils.php');
+    //copy minimum required files including sugar_file_utils.php
+    if(file_exists("{$zipBasePath}/include/utils/sugar_file_utils.php")){
+        $destFile = clean_path(str_replace($zipBasePath, $cwd, "{$zipBasePath}/include/utils/sugar_file_utils.php"));
+        copy("{$zipBasePath}/include/utils/sugar_file_utils.php", $destFile);
+    }
+    if(file_exists('include/utils/sugar_file_utils.php')){
+        require_once('include/utils/sugar_file_utils.php');
     }
 
 /*
@@ -649,101 +649,101 @@ 
 */
 //If version less than 500 then look for modules to be upgraded
 if(function_exists('set_upgrade_vars')){
-	set_upgrade_vars();
+    set_upgrade_vars();
 }
 //Initialize the session variables. If upgrade_progress.php is already created
 //look for session vars there and restore them
 if(function_exists('initialize_session_vars')){
-	initialize_session_vars();
+    initialize_session_vars();
 }
 
 if(!didThisStepRunBefore('preflight')){
-	set_upgrade_progress('preflight','in_progress');
-	//Quickcreatedefs on the basis of editviewdefs
+    set_upgrade_progress('preflight','in_progress');
+    //Quickcreatedefs on the basis of editviewdefs
     updateQuickCreateDefs();
-	set_upgrade_progress('preflight','done');
+    set_upgrade_progress('preflight','done');
 }
 ////////////////COMMIT PROCESS BEGINS///////////////////////////////////////////////////////////////
 ////	MAKE BACKUPS OF TARGET FILES
 
 if(!didThisStepRunBefore('commit')){
-	set_upgrade_progress('commit','in_progress','commit','in_progress');
-	if(!didThisStepRunBefore('commit','commitMakeBackupFiles')){
-		set_upgrade_progress('commit','in_progress','commitMakeBackupFiles','in_progress');
-		$errors = commitMakeBackupFiles($rest_dir, $install_file, $unzip_dir, $zip_from_dir, array());
-		set_upgrade_progress('commit','in_progress','commitMakeBackupFiles','done');
-	}
-
-	//Need to make sure we have the matching copy of SetValueAction for static/instance method matching
+    set_upgrade_progress('commit','in_progress','commit','in_progress');
+    if(!didThisStepRunBefore('commit','commitMakeBackupFiles')){
+        set_upgrade_progress('commit','in_progress','commitMakeBackupFiles','in_progress');
+        $errors = commitMakeBackupFiles($rest_dir, $install_file, $unzip_dir, $zip_from_dir, array());
+        set_upgrade_progress('commit','in_progress','commitMakeBackupFiles','done');
+    }
+
+    //Need to make sure we have the matching copy of SetValueAction for static/instance method matching
     if(file_exists("include/Expressions/Actions/SetValueAction.php")){
         require_once("include/Expressions/Actions/SetValueAction.php");
     }
 
-	///////////////////////////////////////////////////////////////////////////////
-	////	HANDLE PREINSTALL SCRIPTS
-	if(empty($errors)) {
-		$file = "{$unzip_dir}/".constant('SUGARCRM_PRE_INSTALL_FILE');
-
-		if(is_file($file)) {
-			include($file);
-			if(!didThisStepRunBefore('commit','pre_install')){
-				set_upgrade_progress('commit','in_progress','pre_install','in_progress');
-				pre_install();
-				set_upgrade_progress('commit','in_progress','pre_install','done');
-			}
-		}
-	}
-
-	//Clean smarty from cache
-	$cachedir = sugar_cached('smarty');
-	if(is_dir($cachedir)){
-		$allModFiles = array();
-		$allModFiles = findAllFiles($cachedir,$allModFiles);
-	   foreach($allModFiles as $file){
-	       	//$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-	       	if(file_exists($file)){
-				unlink($file);
-	       	}
-	   }
-	}
-
-		//Also add the three-way merge here. The idea is after the 451 html files have
-		//been converted run the 3-way merge. If 500 then just run the 3-way merge
-		if(file_exists('modules/UpgradeWizard/SugarMerge/SugarMerge.php')){
-		    set_upgrade_progress('end','in_progress','threewaymerge','in_progress');
-		    require_once('modules/UpgradeWizard/SugarMerge/SugarMerge.php');
-		    $merger = new SugarMerge($zipBasePath);
-		    $merger->mergeAll();
-		    set_upgrade_progress('end','in_progress','threewaymerge','done');
-		}
-	///////////////////////////////////////////////////////////////////////////////
-	////	COPY NEW FILES INTO TARGET INSTANCE
-
-     if(!didThisStepRunBefore('commit','commitCopyNewFiles')){
-			set_upgrade_progress('commit','in_progress','commitCopyNewFiles','in_progress');
-			$split = commitCopyNewFiles($unzip_dir, $zip_from_dir);
-	 		$copiedFiles = $split['copiedFiles'];
-	 		$skippedFiles = $split['skippedFiles'];
-			set_upgrade_progress('commit','in_progress','commitCopyNewFiles','done');
-	 }
-	require_once(clean_path($unzip_dir.'/scripts/upgrade_utils.php'));
-	$new_sugar_version = getUpgradeVersion();
+    ///////////////////////////////////////////////////////////////////////////////
+    ////	HANDLE PREINSTALL SCRIPTS
+    if(empty($errors)) {
+        $file = "{$unzip_dir}/".constant('SUGARCRM_PRE_INSTALL_FILE');
+
+        if(is_file($file)) {
+            include($file);
+            if(!didThisStepRunBefore('commit','pre_install')){
+                set_upgrade_progress('commit','in_progress','pre_install','in_progress');
+                pre_install();
+                set_upgrade_progress('commit','in_progress','pre_install','done');
+            }
+        }
+    }
+
+    //Clean smarty from cache
+    $cachedir = sugar_cached('smarty');
+    if(is_dir($cachedir)){
+        $allModFiles = array();
+        $allModFiles = findAllFiles($cachedir,$allModFiles);
+        foreach($allModFiles as $file){
+                //$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
+                if(file_exists($file)){
+                unlink($file);
+                }
+        }
+    }
+
+        //Also add the three-way merge here. The idea is after the 451 html files have
+        //been converted run the 3-way merge. If 500 then just run the 3-way merge
+        if(file_exists('modules/UpgradeWizard/SugarMerge/SugarMerge.php')){
+            set_upgrade_progress('end','in_progress','threewaymerge','in_progress');
+            require_once('modules/UpgradeWizard/SugarMerge/SugarMerge.php');
+            $merger = new SugarMerge($zipBasePath);
+            $merger->mergeAll();
+            set_upgrade_progress('end','in_progress','threewaymerge','done');
+        }
+    ///////////////////////////////////////////////////////////////////////////////
+    ////	COPY NEW FILES INTO TARGET INSTANCE
+
+        if(!didThisStepRunBefore('commit','commitCopyNewFiles')){
+            set_upgrade_progress('commit','in_progress','commitCopyNewFiles','in_progress');
+            $split = commitCopyNewFiles($unzip_dir, $zip_from_dir);
+                $copiedFiles = $split['copiedFiles'];
+                $skippedFiles = $split['skippedFiles'];
+            set_upgrade_progress('commit','in_progress','commitCopyNewFiles','done');
+        }
+    require_once(clean_path($unzip_dir.'/scripts/upgrade_utils.php'));
+    $new_sugar_version = getUpgradeVersion();
     $siv_varset_1 = setSilentUpgradeVar('origVersion', $sugar_version);
     $siv_varset_2 = setSilentUpgradeVar('destVersion', $new_sugar_version);
     $siv_write    = writeSilentUpgradeVars();
     if(!$siv_varset_1 || !$siv_varset_2 || !$siv_write){
         logThis("Error with silent upgrade variables: origVersion write success is ({$siv_varset_1}) ".
-        		"-- destVersion write success is ({$siv_varset_2}) -- ".
-        		"writeSilentUpgradeVars success is ({$siv_write}) -- ".
-        		"path to cache dir is ({$GLOBALS['sugar_config']['cache_dir']})", $path);
+                "-- destVersion write success is ({$siv_varset_2}) -- ".
+                "writeSilentUpgradeVars success is ({$siv_write}) -- ".
+                "path to cache dir is ({$GLOBALS['sugar_config']['cache_dir']})", $path);
     }
-     require_once('modules/DynamicFields/templates/Fields/TemplateText.php');
-	///////////////////////////////////////////////////////////////////////////////
+        require_once('modules/DynamicFields/templates/Fields/TemplateText.php');
+    ///////////////////////////////////////////////////////////////////////////////
     ///    RELOAD NEW DEFINITIONS
     global $ACLActions, $beanList, $beanFiles;
     include('modules/ACLActions/actiondefs.php');
     include('include/modules.php');
-	/////////////////////////////////////////////
+    /////////////////////////////////////////////
 
     if (!function_exists("inDeveloperMode")) {
         //this function was introduced from tokyo in the file include/utils.php, so when upgrading from 5.1x and 5.2x we should declare the this function
@@ -752,92 +752,92 @@ 
             return isset($GLOBALS['sugar_config']['developerMode']) && $GLOBALS['sugar_config']['developerMode'];
         }
     }
-	///////////////////////////////////////////////////////////////////////////////
-	////	HANDLE POSTINSTALL SCRIPTS
-	if(empty($errors)) {
-		logThis('Starting post_install()...', $path);
+    ///////////////////////////////////////////////////////////////////////////////
+    ////	HANDLE POSTINSTALL SCRIPTS
+    if(empty($errors)) {
+        logThis('Starting post_install()...', $path);
 
-		$trackerManager = TrackerManager::getInstance();
+        $trackerManager = TrackerManager::getInstance();
         $trackerManager->pause();
         $trackerManager->unsetMonitors();
 
-		if(!didThisStepRunBefore('commit','post_install')){
-			$file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
-			if(is_file($file)) {
-				//set_upgrade_progress('commit','in_progress','post_install','in_progress');
-				$progArray['post_install']='in_progress';
-				post_install_progress($progArray,'set');
-				    global $moduleList;
-					include($file);
-					post_install();
-				// cn: only run conversion if admin selects "Sugar runs SQL"
-				if(!empty($_SESSION['allTables']) && $_SESSION['schema_change'] == 'sugar')
-					executeConvertTablesSql($_SESSION['allTables']);
-				//set process to done
-				$progArray['post_install']='done';
-				//set_upgrade_progress('commit','in_progress','post_install','done');
-				post_install_progress($progArray,'set');
-			}
-		}
-	    //clean vardefs
-		logThis('Performing UWrebuild()...', $path);
-		ob_start();
-			@UWrebuild();
-		ob_end_clean();
-		logThis('UWrebuild() done.', $path);
-
-		logThis('begin check default permissions .', $path);
-	    	checkConfigForPermissions();
-	    logThis('end check default permissions .', $path);
-
-	    logThis('begin check logger settings .', $path);
-	    	checkLoggerSettings();
-	    logThis('begin check logger settings .', $path);
+        if(!didThisStepRunBefore('commit','post_install')){
+            $file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
+            if(is_file($file)) {
+                //set_upgrade_progress('commit','in_progress','post_install','in_progress');
+                $progArray['post_install']='in_progress';
+                post_install_progress($progArray,'set');
+                    global $moduleList;
+                    include($file);
+                    post_install();
+                // cn: only run conversion if admin selects "Sugar runs SQL"
+                if(!empty($_SESSION['allTables']) && $_SESSION['schema_change'] == 'sugar')
+                    executeConvertTablesSql($_SESSION['allTables']);
+                //set process to done
+                $progArray['post_install']='done';
+                //set_upgrade_progress('commit','in_progress','post_install','done');
+                post_install_progress($progArray,'set');
+            }
+        }
+        //clean vardefs
+        logThis('Performing UWrebuild()...', $path);
+        ob_start();
+            @UWrebuild();
+        ob_end_clean();
+        logThis('UWrebuild() done.', $path);
+
+        logThis('begin check default permissions .', $path);
+            checkConfigForPermissions();
+        logThis('end check default permissions .', $path);
+
+        logThis('begin check logger settings .', $path);
+            checkLoggerSettings();
+        logThis('begin check logger settings .', $path);
 
             logThis('begin check lead conversion settings .', $path);
             checkLeadConversionSettings();
-	    logThis('end check lead conversion settings .', $path);
-
-	    logThis('begin check resource settings .', $path);
-			checkResourceSettings();
-		logThis('begin check resource settings .', $path);
-
-
-		require("sugar_version.php");
-		require('config.php');
-		global $sugar_config;
-
-		if($ce_to_pro_ent){
-			if(isset($sugar_config['sugarbeet']))
-			{
-			    //$sugar_config['sugarbeet'] is only set in COMM
-			    unset($sugar_config['sugarbeet']);
-			}
-		    if(isset($sugar_config['disable_team_access_check']))
-			{
-			    //$sugar_config['disable_team_access_check'] is a runtime configration,
-			    //no need to write to config.php
-			    unset($sugar_config['disable_team_access_check']);
-			}
-			if(!merge_passwordsetting($sugar_config, $sugar_version)) {
-				logThis('*** ERROR: could not write config.php! - upgrade will fail!', $path);
-				$errors[] = 'Could not write config.php!';
-			}
-
-		}
-
-		logThis('Set default_theme to Sugar', $path);
-		$sugar_config['default_theme'] = 'Sugar';
-
-		if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ) {
+        logThis('end check lead conversion settings .', $path);
+
+        logThis('begin check resource settings .', $path);
+            checkResourceSettings();
+        logThis('begin check resource settings .', $path);
+
+
+        require("sugar_version.php");
+        require('config.php');
+        global $sugar_config;
+
+        if($ce_to_pro_ent){
+            if(isset($sugar_config['sugarbeet']))
+            {
+                //$sugar_config['sugarbeet'] is only set in COMM
+                unset($sugar_config['sugarbeet']);
+            }
+            if(isset($sugar_config['disable_team_access_check']))
+            {
+                //$sugar_config['disable_team_access_check'] is a runtime configration,
+                //no need to write to config.php
+                unset($sugar_config['disable_team_access_check']);
+            }
+            if(!merge_passwordsetting($sugar_config, $sugar_version)) {
+                logThis('*** ERROR: could not write config.php! - upgrade will fail!', $path);
+                $errors[] = 'Could not write config.php!';
+            }
+
+        }
+
+        logThis('Set default_theme to Sugar', $path);
+        $sugar_config['default_theme'] = 'Sugar';
+
+        if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ) {
             logThis('*** ERROR: could not write config.php! - upgrade will fail!', $path);
             $errors[] = 'Could not write config.php!';
         }
 
         logThis('Set default_max_tabs to 7', $path);
-		$sugar_config['default_max_tabs'] = '7';
+        $sugar_config['default_max_tabs'] = '7';
 
-		if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ) {
+        if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ) {
             logThis('*** ERROR: could not write config.php! - upgrade will fail!', $path);
             $errors[] = 'Could not write config.php!';
         }
@@ -855,90 +855,90 @@ 
             $errors[] = 'Could not write config.php!';
         }
 
-		logThis('post_install() done.', $path);
-	}
-
-	///////////////////////////////////////////////////////////////////////////////
-	////	REGISTER UPGRADE
-	if(empty($errors)) {
-		logThis('Registering upgrade with UpgradeHistory', $path);
-		if(!didThisStepRunBefore('commit','upgradeHistory')){
-			set_upgrade_progress('commit','in_progress','upgradeHistory','in_progress');
-			$file_action = "copied";
-			// if error was encountered, script should have died before now
-			$new_upgrade = new UpgradeHistory();
-			$new_upgrade->filename = $install_file;
-			$new_upgrade->md5sum = md5_file($install_file);
-			$new_upgrade->name = $zip_from_dir;
-			$new_upgrade->description = $manifest['description'];
-			$new_upgrade->type = 'patch';
-			$new_upgrade->version = $sugar_version;
-			$new_upgrade->status = "installed";
-			$new_upgrade->manifest = (!empty($_SESSION['install_manifest']) ? $_SESSION['install_manifest'] : '');
-
-			if($new_upgrade->description == null){
-				$new_upgrade->description = "Silent Upgrade was used to upgrade the instance";
-			}
-			else{
-				$new_upgrade->description = $new_upgrade->description." Silent Upgrade was used to upgrade the instance.";
-			}
-		   $new_upgrade->save();
-		   set_upgrade_progress('commit','in_progress','upgradeHistory','done');
-		   set_upgrade_progress('commit','done','commit','done');
-		}
-	  }
-
-	//Clean modules from cache
-	    $cachedir = sugar_cached('smarty');
-		if(is_dir($cachedir)){
-			$allModFiles = array();
-			$allModFiles = findAllFiles($cachedir,$allModFiles);
-		   foreach($allModFiles as $file){
-		       	//$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-		       	if(file_exists($file)){
-					unlink($file);
-		       	}
-		   }
-		}
-   //delete cache/modules before rebuilding the relations
-   	//Clean modules from cache
-   	    $cachedir = sugar_cached('modules');
-		if(is_dir($cachedir)){
-			$allModFiles = array();
-			$allModFiles = findAllFiles($cachedir,$allModFiles);
-		   foreach($allModFiles as $file){
-		       	//$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-		       	if(file_exists($file)){
-					unlink($file);
-		       	}
-		   }
-		}
-
-		//delete cache/themes
-		$cachedir = sugar_cached('themes');
-		if(is_dir($cachedir)){
-			$allModFiles = array();
-			$allModFiles = findAllFiles($cachedir,$allModFiles);
-		   foreach($allModFiles as $file){
-		       	//$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-		       	if(file_exists($file)){
-					unlink($file);
-		       	}
-		   }
-		}
-	ob_start();
-	if(!isset($_REQUEST['silent'])){
-		$_REQUEST['silent'] = true;
-	}
-	else if(isset($_REQUEST['silent']) && $_REQUEST['silent'] != true){
-		$_REQUEST['silent'] = true;
-	}
-
-	 //logThis('Checking for leads_assigned_user relationship and if not found then create.', $path);
-	@createMissingRels();
-	 //logThis('Checked for leads_assigned_user relationship.', $path);
-	ob_end_clean();
-	//// run fix on dropdown lists that may have been incorrectly named
+        logThis('post_install() done.', $path);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    ////	REGISTER UPGRADE
+    if(empty($errors)) {
+        logThis('Registering upgrade with UpgradeHistory', $path);
+        if(!didThisStepRunBefore('commit','upgradeHistory')){
+            set_upgrade_progress('commit','in_progress','upgradeHistory','in_progress');
+            $file_action = "copied";
+            // if error was encountered, script should have died before now
+            $new_upgrade = new UpgradeHistory();
+            $new_upgrade->filename = $install_file;
+            $new_upgrade->md5sum = md5_file($install_file);
+            $new_upgrade->name = $zip_from_dir;
+            $new_upgrade->description = $manifest['description'];
+            $new_upgrade->type = 'patch';
+            $new_upgrade->version = $sugar_version;
+            $new_upgrade->status = "installed";
+            $new_upgrade->manifest = (!empty($_SESSION['install_manifest']) ? $_SESSION['install_manifest'] : '');
+
+            if($new_upgrade->description == null){
+                $new_upgrade->description = "Silent Upgrade was used to upgrade the instance";
+            }
+            else{
+                $new_upgrade->description = $new_upgrade->description." Silent Upgrade was used to upgrade the instance.";
+            }
+            $new_upgrade->save();
+            set_upgrade_progress('commit','in_progress','upgradeHistory','done');
+            set_upgrade_progress('commit','done','commit','done');
+        }
+        }
+
+    //Clean modules from cache
+        $cachedir = sugar_cached('smarty');
+        if(is_dir($cachedir)){
+            $allModFiles = array();
+            $allModFiles = findAllFiles($cachedir,$allModFiles);
+            foreach($allModFiles as $file){
+                    //$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
+                    if(file_exists($file)){
+                    unlink($file);
+                    }
+            }
+        }
+    //delete cache/modules before rebuilding the relations
+        //Clean modules from cache
+            $cachedir = sugar_cached('modules');
+        if(is_dir($cachedir)){
+            $allModFiles = array();
+            $allModFiles = findAllFiles($cachedir,$allModFiles);
+            foreach($allModFiles as $file){
+                    //$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
+                    if(file_exists($file)){
+                    unlink($file);
+                    }
+            }
+        }
+
+        //delete cache/themes
+        $cachedir = sugar_cached('themes');
+        if(is_dir($cachedir)){
+            $allModFiles = array();
+            $allModFiles = findAllFiles($cachedir,$allModFiles);
+            foreach($allModFiles as $file){
+                    //$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
+                    if(file_exists($file)){
+                    unlink($file);
+                    }
+            }
+        }
+    ob_start();
+    if(!isset($_REQUEST['silent'])){
+        $_REQUEST['silent'] = true;
+    }
+    else if(isset($_REQUEST['silent']) && $_REQUEST['silent'] != true){
+        $_REQUEST['silent'] = true;
+    }
+
+        //logThis('Checking for leads_assigned_user relationship and if not found then create.', $path);
+    @createMissingRels();
+        //logThis('Checked for leads_assigned_user relationship.', $path);
+    ob_end_clean();
+    //// run fix on dropdown lists that may have been incorrectly named
     //fix_dropdown_list();
 }
 
@@ -947,19 +947,19 @@ 
 ///////////////////////////////////////////////////////////////////////////////
 
 if(function_exists('deleteCache')){
-	set_upgrade_progress('end','in_progress','deleteCache','in_progress');
-	@deleteCache();
-	set_upgrade_progress('end','in_progress','deleteCache','done');
+    set_upgrade_progress('end','in_progress','deleteCache','in_progress');
+    @deleteCache();
+    set_upgrade_progress('end','in_progress','deleteCache','done');
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	HANDLE REMINDERS
 if(empty($errors)) {
-	commitHandleReminders($skippedFiles, $path);
+    commitHandleReminders($skippedFiles, $path);
 }
 
 if(file_exists(clean_path(getcwd()).'/original451files')){
-	rmdir_recursive(clean_path(getcwd()).'/original451files');
+    rmdir_recursive(clean_path(getcwd()).'/original451files');
 }
 
 require_once('modules/Administration/Administration.php');
@@ -995,14 +995,14 @@ 
         }
 
         $must_have_modules= array(
-			  'Activities'=>'Activities',
-        	  'Calendar'=>'Calendar',
-        	  'Reports' => 'Reports',
-			  'Quotes' => 'Quotes',
-			  'Products' => 'Products',
-			  'Forecasts' => 'Forecasts',
-			  'Contracts' => 'Contracts',
-			  'KBDocuments' => 'KBDocuments'
+                'Activities'=>'Activities',
+                'Calendar'=>'Calendar',
+                'Reports' => 'Reports',
+                'Quotes' => 'Quotes',
+                'Products' => 'Products',
+                'Forecasts' => 'Forecasts',
+                'Contracts' => 'Contracts',
+                'KBDocuments' => 'KBDocuments'
         );
         $newModuleList = array_merge($newModuleList,$must_have_modules);
 
@@ -1014,7 +1014,7 @@ 
 
         //add the new tabs to the array
         foreach($newModuleList as $nm ){
-          $tabs[$nm] = $nm;
+            $tabs[$nm] = $nm;
         }
 
         //now assign the modules to system tabs
@@ -1026,36 +1026,36 @@ 
 if(isset($_SESSION['current_db_version']) && isset($_SESSION['target_db_version'])){
     if (version_compare($_SESSION['current_db_version'], $_SESSION['target_db_version'], '='))
     {
-	    $_REQUEST['upgradeWizard'] = true;
-	    ob_start();
-			include('include/Smarty/internals/core.write_file.php');
-		ob_end_clean();
-	 	$db =& DBManagerFactory::getInstance();
-		if($ce_to_pro_ent){
-	        //Also set license information
-	        $admin = new Administration();
-			$category = 'license';
-			$value = 0;
-			$admin->saveSetting($category, 'users', $value);
-			$key = array('num_lic_oc','key','expire_date');
-			$value = '';
-			foreach($key as $k){
-				$admin->saveSetting($category, $k, $value);
-			}
-		}
-	}
+        $_REQUEST['upgradeWizard'] = true;
+        ob_start();
+            include('include/Smarty/internals/core.write_file.php');
+        ob_end_clean();
+            $db =& DBManagerFactory::getInstance();
+        if($ce_to_pro_ent){
+            //Also set license information
+            $admin = new Administration();
+            $category = 'license';
+            $value = 0;
+            $admin->saveSetting($category, 'users', $value);
+            $key = array('num_lic_oc','key','expire_date');
+            $value = '';
+            foreach($key as $k){
+                $admin->saveSetting($category, $k, $value);
+            }
+        }
+    }
 }
 
-	$phpErrors = ob_get_contents();
-	ob_end_clean();
-	logThis("**** Potential PHP generated error messages: {$phpErrors}", $path);
+    $phpErrors = ob_get_contents();
+    ob_end_clean();
+    logThis("**** Potential PHP generated error messages: {$phpErrors}", $path);
 
-	if(count($errors) > 0) {
-		foreach($errors as $error) {
-			logThis("****** SilentUpgrade ERROR: {$error}", $path);
-		}
-		echo "FAILED\n";
-	}
+    if(count($errors) > 0) {
+        foreach($errors as $error) {
+            logThis("****** SilentUpgrade ERROR: {$error}", $path);
+        }
+        echo "FAILED\n";
+    }
 
 
 }
@@ -1070,67 +1070,67 @@ 
  */
 function repairTableDictionaryExtFile()
 {
-	$tableDictionaryExtDirs = array('custom/Extension/application/Ext/TableDictionary', 'custom/application/Ext/TableDictionary');
-
-	foreach($tableDictionaryExtDirs as $tableDictionaryExt)
-	{
-
-		if(is_dir($tableDictionaryExt) && is_writable($tableDictionaryExt)){
-			$dir = dir($tableDictionaryExt);
-			while(($entry = $dir->read()) !== false)
-			{
-				$entry = $tableDictionaryExt . '/' . $entry;
-				if(is_file($entry) && preg_match('/\.php$/i', $entry) && is_writeable($entry))
-				{
-
-						if(function_exists('sugar_fopen'))
-						{
-							$fp = @sugar_fopen($entry, 'r');
-						} else {
-							$fp = fopen($entry, 'r');
-						}
-
-
-					    if($fp)
-				        {
-				             $altered = false;
-				             $contents = '';
-
-				             while($line = fgets($fp))
-						     {
-						    	if(preg_match('/\s*include\s*\(\s*[\'|\"](.*?)[\"|\']\s*\)\s*;/', $line, $match))
-						    	{
-						    	   if(!file_exists($match[1]))
-						    	   {
-						    	      $altered = true;
-						    	   } else {
-						    	   	  $contents .= $line;
-						    	   }
-						    	} else {
-						    	   $contents .= $line;
-						    	}
-						     }
-
-						     fclose($fp);
-				        }
-
-
-					    if($altered)
-					    {
-							if(function_exists('sugar_fopen'))
-							{
-								$fp = @sugar_fopen($entry, 'w');
-							} else {
-								$fp = fopen($entry, 'w');
-							}
-
-							if($fp && fwrite($fp, $contents))
-							{
-								fclose($fp);
-							}
-					    }
-				} //if
-			} //while
-		} //if
-	}
+    $tableDictionaryExtDirs = array('custom/Extension/application/Ext/TableDictionary', 'custom/application/Ext/TableDictionary');
+
+    foreach($tableDictionaryExtDirs as $tableDictionaryExt)
+    {
+
+        if(is_dir($tableDictionaryExt) && is_writable($tableDictionaryExt)){
+            $dir = dir($tableDictionaryExt);
+            while(($entry = $dir->read()) !== false)
+            {
+                $entry = $tableDictionaryExt . '/' . $entry;
+                if(is_file($entry) && preg_match('/\.php$/i', $entry) && is_writeable($entry))
+                {
+
+                        if(function_exists('sugar_fopen'))
+                        {
+                            $fp = @sugar_fopen($entry, 'r');
+                        } else {
+                            $fp = fopen($entry, 'r');
+                        }
+
+
+                        if($fp)
+                        {
+                                $altered = false;
+                                $contents = '';
+
+                                while($line = fgets($fp))
+                                {
+                                if(preg_match('/\s*include\s*\(\s*[\'|\"](.*?)[\"|\']\s*\)\s*;/', $line, $match))
+                                {
+                                    if(!file_exists($match[1]))
+                                    {
+                                        $altered = true;
+                                    } else {
+                                            $contents .= $line;
+                                    }
+                                } else {
+                                    $contents .= $line;
+                                }
+                                }
+
+                                fclose($fp);
+                        }
+
+
+                        if($altered)
+                        {
+                            if(function_exists('sugar_fopen'))
+                            {
+                                $fp = @sugar_fopen($entry, 'w');
+                            } else {
+                                $fp = fopen($entry, 'w');
+                            }
+
+                            if($fp && fwrite($fp, $contents))
+                            {
+                                fclose($fp);
+                            }
+                        }
+                } //if
+            } //while
+        } //if
+    }
 }

Spacing +202 added lines, -202 removed lines

@@ -42,7 +42,7 @@ 
 //// php.exe -f silentUpgrade.php [Path to Upgrade Package zip] [Path to Log file] [Path to Instance]
 //// See below the Usage for more details.
 /////////////////////////////////////////////////////////////////////////////////////////
-ini_set('memory_limit',-1);
+ini_set('memory_limit', -1);
 ///////////////////////////////////////////////////////////////////////////////
 ////	UTILITIES THAT MUST BE LOCAL :(
 function prepSystemForUpgradeSilent() {
@@ -51,8 +51,8 @@ 
 	global $sugar_config;
 
 	// make sure dirs exist
-	foreach($subdirs as $subdir) {
-		if(!is_dir($sugar_config['upload_dir']."/upgrades/{$subdir}")) {
+	foreach ($subdirs as $subdir) {
+		if (!is_dir($sugar_config['upload_dir']."/upgrades/{$subdir}")) {
 	    	mkdir_recursive($sugar_config['upload_dir']."/upgrades/{$subdir}");
 		}
 	}
@@ -63,11 +63,11 @@ 
 	if ($current = @opendir($thedir)) {
 		while (false !== ($children = readdir($current))) {
 			if ($children != "." && $children != "..") {
-				if (is_dir($thedir . "/" . $children)) {
-					clearCacheSU($thedir . "/" . $children, $extension);
+				if (is_dir($thedir."/".$children)) {
+					clearCacheSU($thedir."/".$children, $extension);
 				}
-				elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
-					unlink($thedir . "/" . $children);
+				elseif (is_file($thedir."/".$children) && substr_count($children, $extension)) {
+					unlink($thedir."/".$children);
 				}
 			}
 		}
@@ -75,34 +75,34 @@ 
  }
  //Bug 24890, 24892. default_permissions not written to config.php. Following function checks and if
  //no found then adds default_permissions to the config file.
- function checkConfigForPermissions(){
-     if(file_exists(getcwd().'/config.php')){
+ function checkConfigForPermissions() {
+     if (file_exists(getcwd().'/config.php')) {
          require(getcwd().'/config.php');
      }
      global $sugar_config;
-     if(!isset($sugar_config['default_permissions'])){
-             $sugar_config['default_permissions'] = array (
+     if (!isset($sugar_config['default_permissions'])) {
+             $sugar_config['default_permissions'] = array(
                      'dir_mode' => 02770,
                      'file_mode' => 0660,
                      'user' => '',
                      'group' => '',
              );
          ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+         if (is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config, 'config.php')) {
         	//writing to the file
  		}
      }
 }
-function checkLoggerSettings(){
-	if(file_exists(getcwd().'/config.php')){
+function checkLoggerSettings() {
+	if (file_exists(getcwd().'/config.php')) {
          require(getcwd().'/config.php');
      }
     global $sugar_config;
-	if(!isset($sugar_config['logger'])){
-	    $sugar_config['logger'] =array (
+	if (!isset($sugar_config['logger'])) {
+	    $sugar_config['logger'] = array(
 			'level'=>'fatal',
 		    'file' =>
-		     array (
+		     array(
 		      'ext' => '.log',
 		      'name' => 'sugarcrm',
 		      'dateFormat' => '%c',
@@ -112,7 +112,7 @@ 
 		    ),
 		  );
 		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+         if (is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config, 'config.php')) {
         	//writing to the file
  		}
 	 }
@@ -126,23 +126,23 @@ 
     if (!isset($sugar_config['lead_conv_activity_opt'])) {
         $sugar_config['lead_conv_activity_opt'] = 'copy';
         ksort($sugar_config);
-        if (is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+        if (is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config, 'config.php')) {
             //writing to the file
         }
     }
 }
 
-function checkResourceSettings(){
-	if(file_exists(getcwd().'/config.php')){
+function checkResourceSettings() {
+	if (file_exists(getcwd().'/config.php')) {
          require(getcwd().'/config.php');
      }
     global $sugar_config;
-	if(!isset($sugar_config['resource_management'])){
+	if (!isset($sugar_config['resource_management'])) {
 	  $sugar_config['resource_management'] =
-		  array (
+		  array(
 		    'special_query_limit' => 50000,
 		    'special_query_modules' =>
-		    array (
+		    array(
 		      0 => 'Reports',
 		      1 => 'Export',
 		      2 => 'Import',
@@ -152,23 +152,23 @@ 
 		    'default_limit' => 1000,
 		  );
 		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+         if (is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config, 'config.php')) {
         	//writing to the file
  		}
 	}
 }
 
 
-function createMissingRels(){
-	$relForObjects = array('leads'=>'Leads','campaigns'=>'Campaigns','prospects'=>'Prospects');
-	foreach($relForObjects as $relObjName=>$relModName){
+function createMissingRels() {
+	$relForObjects = array('leads'=>'Leads', 'campaigns'=>'Campaigns', 'prospects'=>'Prospects');
+	foreach ($relForObjects as $relObjName=>$relModName) {
 		//assigned_user
 		$guid = create_guid();
 		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_assigned_user'";
-		$result= $GLOBALS['db']->query($query, true);
+		$result = $GLOBALS['db']->query($query, true);
 		$a = null;
 		$a = $GLOBALS['db']->fetchByAssoc($result);
-		if(!isset($a['id']) && empty($a['id']) ){
+		if (!isset($a['id']) && empty($a['id'])) {
 			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_assigned_user','Users','users','id','{$relModName}','{$relObjName}','assigned_user_id',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
 			$GLOBALS['db']->query($qRel);
@@ -176,10 +176,10 @@ 
 		//modified_user
 		$guid = create_guid();
 		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_modified_user'";
-		$result= $GLOBALS['db']->query($query, true);
+		$result = $GLOBALS['db']->query($query, true);
 		$a = null;
 		$a = $GLOBALS['db']->fetchByAssoc($result);
-		if(!isset($a['id']) && empty($a['id']) ){
+		if (!isset($a['id']) && empty($a['id'])) {
 			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_modified_user','Users','users','id','{$relModName}','{$relObjName}','modified_user_id',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
 			$GLOBALS['db']->query($qRel);
@@ -187,20 +187,20 @@ 
 		//created_by
 		$guid = create_guid();
 		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_created_by'";
-		$result= $GLOBALS['db']->query($query, true);
+		$result = $GLOBALS['db']->query($query, true);
 		$a = null;
 		$a = $GLOBALS['db']->fetchByAssoc($result);
-    	if(!isset($a['id']) && empty($a['id']) ){
+    	if (!isset($a['id']) && empty($a['id'])) {
 			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_created_by','Users','users','id','{$relModName}','{$relObjName}','created_by',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
 			$GLOBALS['db']->query($qRel);
     	}
 		$guid = create_guid();
 		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_team'";
-		$result= $GLOBALS['db']->query($query, true);
+		$result = $GLOBALS['db']->query($query, true);
 		$a = null;
 		$a = $GLOBALS['db']->fetchByAssoc($result);
-		if(!isset($a['id']) && empty($a['id']) ){
+		if (!isset($a['id']) && empty($a['id'])) {
 			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 							VALUES ('{$guid}', '{$relObjName}_team','Teams','teams','id','{$relModName}','{$relObjName}','team_id',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
 			$GLOBALS['db']->query($qRel);
@@ -209,10 +209,10 @@ 
 	//Also add tracker perf relationship
 	$guid = create_guid();
 	$query = "SELECT id FROM relationships WHERE relationship_name = 'tracker_monitor_id'";
-	$result= $GLOBALS['db']->query($query, true);
+	$result = $GLOBALS['db']->query($query, true);
 	$a = null;
 	$a = $GLOBALS['db']->fetchByAssoc($result);
-	if(!isset($a['id']) && empty($a['id']) ){
+	if (!isset($a['id']) && empty($a['id'])) {
 		$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 					VALUES ('{$guid}', 'tracker_monitor_id','TrackerPerfs','tracker_perf','monitor_id','Trackers','tracker','monitor_id',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
 		$GLOBALS['db']->query($qRel);
@@ -228,8 +228,8 @@ 
  */
 function merge_passwordsetting($sugar_config, $sugar_version) {
 
-     $passwordsetting_defaults = array (
-        'passwordsetting' => array (
+     $passwordsetting_defaults = array(
+        'passwordsetting' => array(
             'minpwdlength' => '',
             'maxpwdlength' => '',
             'oneupper' => '',
@@ -260,14 +260,14 @@ 
         ),
     );
 
-    $sugar_config = sugarArrayMerge($passwordsetting_defaults, $sugar_config );
+    $sugar_config = sugarArrayMerge($passwordsetting_defaults, $sugar_config);
 
     // need to override version with default no matter what
     $sugar_config['sugar_version'] = $sugar_version;
 
-    ksort( $sugar_config );
+    ksort($sugar_config);
 
-    if( write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
+    if (write_array_to_file("sugar_config", $sugar_config, "config.php")) {
         return true;
     }
     else {
@@ -276,17 +276,17 @@ 
 }
 
 function addDefaultModuleRoles($defaultRoles = array()) {
-	foreach($defaultRoles as $roleName=>$role){
-        foreach($role as $category=>$actions){
-            foreach($actions as $name=>$access_override){
+	foreach ($defaultRoles as $roleName=>$role) {
+        foreach ($role as $category=>$actions) {
+            foreach ($actions as $name=>$access_override) {
                     $query = "SELECT * FROM acl_actions WHERE name='$name' AND category = '$category' AND acltype='$roleName' AND deleted=0 ";
 					$result = $GLOBALS['db']->query($query);
 					//only add if an action with that name and category don't exist
-					$row=$GLOBALS['db']->fetchByAssoc($result);
+					$row = $GLOBALS['db']->fetchByAssoc($result);
 					if ($row == null) {
 	                	$guid = create_guid();
 	                	$currdate = gmdate('Y-m-d H:i:s');
-	                	$query= "INSERT INTO acl_actions (id,date_entered,date_modified,modified_user_id,name,category,acltype,aclaccess,deleted ) VALUES ('$guid','$currdate','$currdate','1','$name','$category','$roleName','$access_override','0')";
+	                	$query = "INSERT INTO acl_actions (id,date_entered,date_modified,modified_user_id,name,category,acltype,aclaccess,deleted ) VALUES ('$guid','$currdate','$currdate','1','$name','$category','$roleName','$access_override','0')";
 						$GLOBALS['db']->query($query);
 	                }
             }
@@ -294,11 +294,11 @@ 
 	}
 }
 
-function verifyArguments($argv,$usage_regular){
+function verifyArguments($argv, $usage_regular) {
     $upgradeType = '';
     $cwd = getcwd(); // default to current, assumed to be in a valid SugarCRM root dir.
-    if(isset($argv[3])) {
-        if(is_dir($argv[3])) {
+    if (isset($argv[3])) {
+        if (is_dir($argv[3])) {
             $cwd = $argv[3];
             chdir($cwd);
         } else {
@@ -308,18 +308,18 @@ 
         }
     }
 
-    if(is_file("{$cwd}/include/entryPoint.php")) {
+    if (is_file("{$cwd}/include/entryPoint.php")) {
         //this should be a regular sugar install
         $upgradeType = constant('SUGARCRM_INSTALL');
         //check if this is a valid zip file
-        if(!is_file($argv[1])) { // valid zip?
+        if (!is_file($argv[1])) { // valid zip?
             echo "*******************************************************************************\n";
             echo "*** ERROR: First argument must be a full path to the patch file. Got [ {$argv[1]} ].\n";
             echo $usage_regular;
             echo "FAILURE\n";
             exit(1);
         }
-        if(count($argv) < 5) {
+        if (count($argv) < 5) {
             echo "*******************************************************************************\n";
             echo "*** ERROR: Missing required parameters.  Received ".count($argv)." argument(s), require 5.\n";
             echo $usage_regular;
@@ -333,7 +333,7 @@ 
         exit(1);
     }
 
-    if(isset($argv[7]) && file_exists($argv[7].'SugarTemplateUtilties.php')){
+    if (isset($argv[7]) && file_exists($argv[7].'SugarTemplateUtilties.php')) {
         require_once($argv[7].'SugarTemplateUtilties.php');
     }
 
@@ -342,7 +342,7 @@ 
 
 
 
-function threeWayMerge(){
+function threeWayMerge() {
 	//using threeway merge apis
 }
 
@@ -357,14 +357,14 @@ 
 //End of #52872
 
 // only run from command line
-if(isset($_SERVER['HTTP_USER_AGENT'])) {
-	fwrite(STDERR,'This utility may only be run from the command line or command prompt.');
+if (isset($_SERVER['HTTP_USER_AGENT'])) {
+	fwrite(STDERR, 'This utility may only be run from the command line or command prompt.');
 	exit(1);
 }
 //Clean_string cleans out any file  passed in as a parameter
 $_SERVER['PHP_SELF'] = 'silentUpgrade.php';
 
-$usage_regular =<<<eoq2
+$usage_regular = <<<eoq2
 Usage: php.exe -f silentUpgrade.php [upgradeZipFile] [logFile] [pathToSugarInstance] [admin-user]
 
 On Command Prompt Change directory to where silentUpgrade.php resides. Then type path to
@@ -386,7 +386,7 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	STANDARD REQUIRED SUGAR INCLUDES AND PRESETS
-if(!defined('sugarEntry')) define('sugarEntry', true);
+if (!defined('sugarEntry')) define('sugarEntry', true);
 
 $_SESSION = array();
 $_SESSION['schema_change'] = 'sugar'; // we force-run all SQL
@@ -403,13 +403,13 @@ 
 global $cwd;
 $cwd = getcwd(); // default to current, assumed to be in a valid SugarCRM root dir.
 
-$upgradeType = verifyArguments($argv,$usage_regular);
+$upgradeType = verifyArguments($argv, $usage_regular);
 
 ///////////////////////////////////////////////////////////////////////////////
 //////  Verify that all the arguments are appropriately placed////////////////
 
-$path			= $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
-$subdirs		= array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
+$path = $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
+$subdirs = array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
 
 //$_REQUEST['zip_from_dir'] = $zip_from_dir;
 
@@ -431,15 +431,15 @@ 
 $errors = array();
 
 
-if($upgradeType != constant('DCE_INSTANCE')) {
+if ($upgradeType != constant('DCE_INSTANCE')) {
 
-	ini_set('error_reporting',1);
+	ini_set('error_reporting', 1);
 	require_once('include/entryPoint.php');
 	require_once('include/SugarLogger/SugarLogger.php');
 	require_once('include/utils/zip_utils.php');
 
 
-if(!function_exists('sugar_cached'))
+if (!function_exists('sugar_cached'))
 {
     /**
      * sugar_cached
@@ -450,10 +450,10 @@ 
     function sugar_cached($file)
     {
         static $cdir = null;
-        if(empty($cdir) && !empty($GLOBALS['sugar_config']['cache_dir'])) {
+        if (empty($cdir) && !empty($GLOBALS['sugar_config']['cache_dir'])) {
             $cdir = rtrim($GLOBALS['sugar_config']['cache_dir'], '/\\');
         }
-        if(empty($cdir)) {
+        if (empty($cdir)) {
             $cdir = "cache";
         }
         return "$cdir/$file";
@@ -462,8 +462,8 @@ 
 
 	require('config.php');
 	//require_once('modules/UpgradeWizard/uw_utils.php'); // must upgrade UW first
-	if(isset($argv[3])) {
-		if(is_dir($argv[3])) {
+	if (isset($argv[3])) {
+		if (is_dir($argv[3])) {
 			$cwd = $argv[3];
 			chdir($cwd);
 		}
@@ -471,37 +471,37 @@ 
 
 	require_once("{$cwd}/sugar_version.php"); // provides $sugar_version & $sugar_flavor
 
-    $GLOBALS['log']	= LoggerManager::getLogger('SugarCRM');
-	$patchName		= basename($argv[1]);
-	$zip_from_dir	= substr($patchName, 0, strlen($patchName) - 4); // patch folder name (minus ".zip")
-	$path			= $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
+    $GLOBALS['log'] = LoggerManager::getLogger('SugarCRM');
+	$patchName = basename($argv[1]);
+	$zip_from_dir = substr($patchName, 0, strlen($patchName) - 4); // patch folder name (minus ".zip")
+	$path = $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
 
-    $db				= &DBManagerFactory::getInstance();
-	$UWstrings		= return_module_language('en_us', 'UpgradeWizard');
-	$adminStrings	= return_module_language('en_us', 'Administration');
+    $db = &DBManagerFactory::getInstance();
+	$UWstrings = return_module_language('en_us', 'UpgradeWizard');
+	$adminStrings = return_module_language('en_us', 'Administration');
     $app_list_strings = return_app_list_strings_language('en_us');
-	$mod_strings	= array_merge($adminStrings, $UWstrings);
-	$subdirs		= array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
+	$mod_strings = array_merge($adminStrings, $UWstrings);
+	$subdirs = array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
 	global $unzip_dir;
     $license_accepted = false;
-    if(isset($argv[5]) && (strtolower($argv[5])=='yes' || strtolower($argv[5])=='y')){
+    if (isset($argv[5]) && (strtolower($argv[5]) == 'yes' || strtolower($argv[5]) == 'y')) {
     	$license_accepted = true;
 	 }
 	//////////////////////////////////////////////////////////////////////////////
 	//Adding admin user to the silent upgrade
 
 	$current_user = new User();
-	if(isset($argv[4])) {
+	if (isset($argv[4])) {
 	   //if being used for internal upgrades avoid admin user verification
 	   $user_name = $argv[4];
-	   $q = "select id from users where user_name = '" . $user_name . "' and is_admin=1";
+	   $q = "select id from users where user_name = '".$user_name."' and is_admin=1";
 	   $result = $GLOBALS['db']->query($q, false);
 	   $logged_user = $GLOBALS['db']->fetchByAssoc($result);
-	   if(isset($logged_user['id']) && $logged_user['id'] != null){
+	   if (isset($logged_user['id']) && $logged_user['id'] != null) {
 		//do nothing
 	    $current_user->retrieve($logged_user['id']);
 	   }
-	   else{
+	   else {
 	   	echo "FAILURE: Not an admin user in users table. Please provide an admin user\n";
 		exit(1);
 	   }
@@ -533,18 +533,18 @@ 
 $_SESSION['unzip_dir'] = $unzip_dir;
 $_SESSION['install_file'] = $install_file;
 $_SESSION['zip_from_dir'] = $zip_from_dir;
-if(is_dir($unzip_dir.'/scripts'))
+if (is_dir($unzip_dir.'/scripts'))
 {
 	rmdir_recursive($unzip_dir.'/scripts');
 }
-if(is_file($unzip_dir.'/manifest.php'))
+if (is_file($unzip_dir.'/manifest.php'))
 {
 	rmdir_recursive($unzip_dir.'/manifest.php');
 }
 mkdir_recursive($unzip_dir);
-if(!is_dir($unzip_dir)) {
+if (!is_dir($unzip_dir)) {
 	echo "\n{$unzip_dir} is not an available directory\nFAILURE\n";
-	fwrite(STDERR,"\n{$unzip_dir} is not an available directory\nFAILURE\n");
+	fwrite(STDERR, "\n{$unzip_dir} is not an available directory\nFAILURE\n");
 	exit(1);
 }
 
@@ -561,7 +561,7 @@ 
 $uwFiles = findAllFiles("{$zipBasePath}/modules/UpgradeWizard", array());
 $destFiles = array();
 
-foreach($uwFiles as $uwFile) {
+foreach ($uwFiles as $uwFile) {
 	$destFile = str_replace($zipBasePath."/", '', $uwFile);
 	copy($uwFile, $destFile);
 }
@@ -570,17 +570,17 @@ 
 logThis("*** SILENT UPGRADE INITIATED.", $path);
 logThis("*** UpgradeWizard Upgraded  ", $path);
 
-if(function_exists('set_upgrade_vars')){
+if (function_exists('set_upgrade_vars')) {
 	set_upgrade_vars();
 }
 
-if($configOptions['db_type'] == 'mysql'){
+if ($configOptions['db_type'] == 'mysql') {
 	//Change the db wait_timeout for this session
 	$now_timeout = $db->getOne("select @@wait_timeout");
-	logThis('Wait Timeout before change ***** '.$now_timeout , $path);
+	logThis('Wait Timeout before change ***** '.$now_timeout, $path);
 	$db->query("set wait_timeout=28800");	
 	$now_timeout = $db->getOne("select @@wait_timeout");	
-	logThis('Wait Timeout after change ***** '.$now_timeout , $path);
+	logThis('Wait Timeout after change ***** '.$now_timeout, $path);
 }
 
 ////	END UPGRADE UPGRADEWIZARD
@@ -588,24 +588,24 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	MAKE SURE PATCH IS COMPATIBLE
-if(is_file("$unzip_dir/manifest.php")) {
+if (is_file("$unzip_dir/manifest.php")) {
 	// provides $manifest array
 	include("$unzip_dir/manifest.php");
-	if(!isset($manifest)) {
-		fwrite(STDERR,"\nThe patch did not contain a proper manifest.php file.  Cannot continue.\n\n");
+	if (!isset($manifest)) {
+		fwrite(STDERR, "\nThe patch did not contain a proper manifest.php file.  Cannot continue.\n\n");
 	    exit(1);
 	} else {
 		copy("$unzip_dir/manifest.php", $sugar_config['upload_dir']."/upgrades/patch/{$zip_from_dir}-manifest.php");
 
 		$error = validate_manifest($manifest);
-		if(!empty($error)) {
+		if (!empty($error)) {
 			$error = strip_tags(br2nl($error));
-			fwrite(STDERR,"\n{$error}\n\nFAILURE\n");
+			fwrite(STDERR, "\n{$error}\n\nFAILURE\n");
 			exit(1);
 		}
 	}
 } else {
-	fwrite(STDERR,"\nThe patch did not contain a proper manifest.php file.  Cannot continue.\n\n");
+	fwrite(STDERR, "\nThe patch did not contain a proper manifest.php file.  Cannot continue.\n\n");
 	exit(1);
 }
 
@@ -623,17 +623,17 @@ 
 ////	RUN SILENT UPGRADE
 ob_start();
 set_time_limit(0);
-if(file_exists('ModuleInstall/PackageManager/PackageManagerDisplay.php')) {
+if (file_exists('ModuleInstall/PackageManager/PackageManagerDisplay.php')) {
 	require_once('ModuleInstall/PackageManager/PackageManagerDisplay.php');
 }
 
 
 	//copy minimum required files including sugar_file_utils.php
-	if(file_exists("{$zipBasePath}/include/utils/sugar_file_utils.php")){
+	if (file_exists("{$zipBasePath}/include/utils/sugar_file_utils.php")) {
 		$destFile = clean_path(str_replace($zipBasePath, $cwd, "{$zipBasePath}/include/utils/sugar_file_utils.php"));
 		copy("{$zipBasePath}/include/utils/sugar_file_utils.php", $destFile);
 	}
-	if(file_exists('include/utils/sugar_file_utils.php')){
+	if (file_exists('include/utils/sugar_file_utils.php')) {
     	require_once('include/utils/sugar_file_utils.php');
     }
 
@@ -648,60 +648,60 @@ 
 }
 */
 //If version less than 500 then look for modules to be upgraded
-if(function_exists('set_upgrade_vars')){
+if (function_exists('set_upgrade_vars')) {
 	set_upgrade_vars();
 }
 //Initialize the session variables. If upgrade_progress.php is already created
 //look for session vars there and restore them
-if(function_exists('initialize_session_vars')){
+if (function_exists('initialize_session_vars')) {
 	initialize_session_vars();
 }
 
-if(!didThisStepRunBefore('preflight')){
-	set_upgrade_progress('preflight','in_progress');
+if (!didThisStepRunBefore('preflight')) {
+	set_upgrade_progress('preflight', 'in_progress');
 	//Quickcreatedefs on the basis of editviewdefs
     updateQuickCreateDefs();
-	set_upgrade_progress('preflight','done');
+	set_upgrade_progress('preflight', 'done');
 }
 ////////////////COMMIT PROCESS BEGINS///////////////////////////////////////////////////////////////
 ////	MAKE BACKUPS OF TARGET FILES
 
-if(!didThisStepRunBefore('commit')){
-	set_upgrade_progress('commit','in_progress','commit','in_progress');
-	if(!didThisStepRunBefore('commit','commitMakeBackupFiles')){
-		set_upgrade_progress('commit','in_progress','commitMakeBackupFiles','in_progress');
+if (!didThisStepRunBefore('commit')) {
+	set_upgrade_progress('commit', 'in_progress', 'commit', 'in_progress');
+	if (!didThisStepRunBefore('commit', 'commitMakeBackupFiles')) {
+		set_upgrade_progress('commit', 'in_progress', 'commitMakeBackupFiles', 'in_progress');
 		$errors = commitMakeBackupFiles($rest_dir, $install_file, $unzip_dir, $zip_from_dir, array());
-		set_upgrade_progress('commit','in_progress','commitMakeBackupFiles','done');
+		set_upgrade_progress('commit', 'in_progress', 'commitMakeBackupFiles', 'done');
 	}
 
 	//Need to make sure we have the matching copy of SetValueAction for static/instance method matching
-    if(file_exists("include/Expressions/Actions/SetValueAction.php")){
+    if (file_exists("include/Expressions/Actions/SetValueAction.php")) {
         require_once("include/Expressions/Actions/SetValueAction.php");
     }
 
 	///////////////////////////////////////////////////////////////////////////////
 	////	HANDLE PREINSTALL SCRIPTS
-	if(empty($errors)) {
+	if (empty($errors)) {
 		$file = "{$unzip_dir}/".constant('SUGARCRM_PRE_INSTALL_FILE');
 
-		if(is_file($file)) {
+		if (is_file($file)) {
 			include($file);
-			if(!didThisStepRunBefore('commit','pre_install')){
-				set_upgrade_progress('commit','in_progress','pre_install','in_progress');
+			if (!didThisStepRunBefore('commit', 'pre_install')) {
+				set_upgrade_progress('commit', 'in_progress', 'pre_install', 'in_progress');
 				pre_install();
-				set_upgrade_progress('commit','in_progress','pre_install','done');
+				set_upgrade_progress('commit', 'in_progress', 'pre_install', 'done');
 			}
 		}
 	}
 
 	//Clean smarty from cache
 	$cachedir = sugar_cached('smarty');
-	if(is_dir($cachedir)){
+	if (is_dir($cachedir)) {
 		$allModFiles = array();
-		$allModFiles = findAllFiles($cachedir,$allModFiles);
-	   foreach($allModFiles as $file){
+		$allModFiles = findAllFiles($cachedir, $allModFiles);
+	   foreach ($allModFiles as $file) {
 	       	//$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-	       	if(file_exists($file)){
+	       	if (file_exists($file)) {
 				unlink($file);
 	       	}
 	   }
@@ -709,29 +709,29 @@ 
 
 		//Also add the three-way merge here. The idea is after the 451 html files have
 		//been converted run the 3-way merge. If 500 then just run the 3-way merge
-		if(file_exists('modules/UpgradeWizard/SugarMerge/SugarMerge.php')){
-		    set_upgrade_progress('end','in_progress','threewaymerge','in_progress');
+		if (file_exists('modules/UpgradeWizard/SugarMerge/SugarMerge.php')) {
+		    set_upgrade_progress('end', 'in_progress', 'threewaymerge', 'in_progress');
 		    require_once('modules/UpgradeWizard/SugarMerge/SugarMerge.php');
 		    $merger = new SugarMerge($zipBasePath);
 		    $merger->mergeAll();
-		    set_upgrade_progress('end','in_progress','threewaymerge','done');
+		    set_upgrade_progress('end', 'in_progress', 'threewaymerge', 'done');
 		}
 	///////////////////////////////////////////////////////////////////////////////
 	////	COPY NEW FILES INTO TARGET INSTANCE
 
-     if(!didThisStepRunBefore('commit','commitCopyNewFiles')){
-			set_upgrade_progress('commit','in_progress','commitCopyNewFiles','in_progress');
+     if (!didThisStepRunBefore('commit', 'commitCopyNewFiles')) {
+			set_upgrade_progress('commit', 'in_progress', 'commitCopyNewFiles', 'in_progress');
 			$split = commitCopyNewFiles($unzip_dir, $zip_from_dir);
 	 		$copiedFiles = $split['copiedFiles'];
 	 		$skippedFiles = $split['skippedFiles'];
-			set_upgrade_progress('commit','in_progress','commitCopyNewFiles','done');
+			set_upgrade_progress('commit', 'in_progress', 'commitCopyNewFiles', 'done');
 	 }
 	require_once(clean_path($unzip_dir.'/scripts/upgrade_utils.php'));
 	$new_sugar_version = getUpgradeVersion();
     $siv_varset_1 = setSilentUpgradeVar('origVersion', $sugar_version);
     $siv_varset_2 = setSilentUpgradeVar('destVersion', $new_sugar_version);
     $siv_write    = writeSilentUpgradeVars();
-    if(!$siv_varset_1 || !$siv_varset_2 || !$siv_write){
+    if (!$siv_varset_1 || !$siv_varset_2 || !$siv_write) {
         logThis("Error with silent upgrade variables: origVersion write success is ({$siv_varset_1}) ".
         		"-- destVersion write success is ({$siv_varset_2}) -- ".
         		"writeSilentUpgradeVars success is ({$siv_write}) -- ".
@@ -754,29 +754,29 @@ 
     }
 	///////////////////////////////////////////////////////////////////////////////
 	////	HANDLE POSTINSTALL SCRIPTS
-	if(empty($errors)) {
+	if (empty($errors)) {
 		logThis('Starting post_install()...', $path);
 
 		$trackerManager = TrackerManager::getInstance();
         $trackerManager->pause();
         $trackerManager->unsetMonitors();
 
-		if(!didThisStepRunBefore('commit','post_install')){
-			$file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
-			if(is_file($file)) {
+		if (!didThisStepRunBefore('commit', 'post_install')) {
+			$file = "$unzip_dir/".constant('SUGARCRM_POST_INSTALL_FILE');
+			if (is_file($file)) {
 				//set_upgrade_progress('commit','in_progress','post_install','in_progress');
-				$progArray['post_install']='in_progress';
-				post_install_progress($progArray,'set');
+				$progArray['post_install'] = 'in_progress';
+				post_install_progress($progArray, 'set');
 				    global $moduleList;
 					include($file);
 					post_install();
 				// cn: only run conversion if admin selects "Sugar runs SQL"
-				if(!empty($_SESSION['allTables']) && $_SESSION['schema_change'] == 'sugar')
+				if (!empty($_SESSION['allTables']) && $_SESSION['schema_change'] == 'sugar')
 					executeConvertTablesSql($_SESSION['allTables']);
 				//set process to done
-				$progArray['post_install']='done';
+				$progArray['post_install'] = 'done';
 				//set_upgrade_progress('commit','in_progress','post_install','done');
-				post_install_progress($progArray,'set');
+				post_install_progress($progArray, 'set');
 			}
 		}
 	    //clean vardefs
@@ -807,19 +807,19 @@ 
 		require('config.php');
 		global $sugar_config;
 
-		if($ce_to_pro_ent){
-			if(isset($sugar_config['sugarbeet']))
+		if ($ce_to_pro_ent) {
+			if (isset($sugar_config['sugarbeet']))
 			{
 			    //$sugar_config['sugarbeet'] is only set in COMM
 			    unset($sugar_config['sugarbeet']);
 			}
-		    if(isset($sugar_config['disable_team_access_check']))
+		    if (isset($sugar_config['disable_team_access_check']))
 			{
 			    //$sugar_config['disable_team_access_check'] is a runtime configration,
 			    //no need to write to config.php
 			    unset($sugar_config['disable_team_access_check']);
 			}
-			if(!merge_passwordsetting($sugar_config, $sugar_version)) {
+			if (!merge_passwordsetting($sugar_config, $sugar_version)) {
 				logThis('*** ERROR: could not write config.php! - upgrade will fail!', $path);
 				$errors[] = 'Could not write config.php!';
 			}
@@ -829,7 +829,7 @@ 
 		logThis('Set default_theme to Sugar', $path);
 		$sugar_config['default_theme'] = 'Sugar';
 
-		if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ) {
+		if (!write_array_to_file("sugar_config", $sugar_config, "config.php")) {
             logThis('*** ERROR: could not write config.php! - upgrade will fail!', $path);
             $errors[] = 'Could not write config.php!';
         }
@@ -837,7 +837,7 @@ 
         logThis('Set default_max_tabs to 7', $path);
 		$sugar_config['default_max_tabs'] = '7';
 
-		if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ) {
+		if (!write_array_to_file("sugar_config", $sugar_config, "config.php")) {
             logThis('*** ERROR: could not write config.php! - upgrade will fail!', $path);
             $errors[] = 'Could not write config.php!';
         }
@@ -850,7 +850,7 @@ 
         logThis('Upgrade the sugar_version', $path);
         $sugar_config['sugar_version'] = $sugar_version;
 
-        if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ) {
+        if (!write_array_to_file("sugar_config", $sugar_config, "config.php")) {
             logThis('*** ERROR: could not write config.php! - upgrade will fail!', $path);
             $errors[] = 'Could not write config.php!';
         }
@@ -860,10 +860,10 @@ 
 
 	///////////////////////////////////////////////////////////////////////////////
 	////	REGISTER UPGRADE
-	if(empty($errors)) {
+	if (empty($errors)) {
 		logThis('Registering upgrade with UpgradeHistory', $path);
-		if(!didThisStepRunBefore('commit','upgradeHistory')){
-			set_upgrade_progress('commit','in_progress','upgradeHistory','in_progress');
+		if (!didThisStepRunBefore('commit', 'upgradeHistory')) {
+			set_upgrade_progress('commit', 'in_progress', 'upgradeHistory', 'in_progress');
 			$file_action = "copied";
 			// if error was encountered, script should have died before now
 			$new_upgrade = new UpgradeHistory();
@@ -876,26 +876,26 @@ 
 			$new_upgrade->status = "installed";
 			$new_upgrade->manifest = (!empty($_SESSION['install_manifest']) ? $_SESSION['install_manifest'] : '');
 
-			if($new_upgrade->description == null){
+			if ($new_upgrade->description == null) {
 				$new_upgrade->description = "Silent Upgrade was used to upgrade the instance";
 			}
-			else{
+			else {
 				$new_upgrade->description = $new_upgrade->description." Silent Upgrade was used to upgrade the instance.";
 			}
 		   $new_upgrade->save();
-		   set_upgrade_progress('commit','in_progress','upgradeHistory','done');
-		   set_upgrade_progress('commit','done','commit','done');
+		   set_upgrade_progress('commit', 'in_progress', 'upgradeHistory', 'done');
+		   set_upgrade_progress('commit', 'done', 'commit', 'done');
 		}
 	  }
 
 	//Clean modules from cache
 	    $cachedir = sugar_cached('smarty');
-		if(is_dir($cachedir)){
+		if (is_dir($cachedir)) {
 			$allModFiles = array();
-			$allModFiles = findAllFiles($cachedir,$allModFiles);
-		   foreach($allModFiles as $file){
+			$allModFiles = findAllFiles($cachedir, $allModFiles);
+		   foreach ($allModFiles as $file) {
 		       	//$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-		       	if(file_exists($file)){
+		       	if (file_exists($file)) {
 					unlink($file);
 		       	}
 		   }
@@ -903,12 +903,12 @@ 
    //delete cache/modules before rebuilding the relations
    	//Clean modules from cache
    	    $cachedir = sugar_cached('modules');
-		if(is_dir($cachedir)){
+		if (is_dir($cachedir)) {
 			$allModFiles = array();
-			$allModFiles = findAllFiles($cachedir,$allModFiles);
-		   foreach($allModFiles as $file){
+			$allModFiles = findAllFiles($cachedir, $allModFiles);
+		   foreach ($allModFiles as $file) {
 		       	//$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-		       	if(file_exists($file)){
+		       	if (file_exists($file)) {
 					unlink($file);
 		       	}
 		   }
@@ -916,21 +916,21 @@ 
 
 		//delete cache/themes
 		$cachedir = sugar_cached('themes');
-		if(is_dir($cachedir)){
+		if (is_dir($cachedir)) {
 			$allModFiles = array();
-			$allModFiles = findAllFiles($cachedir,$allModFiles);
-		   foreach($allModFiles as $file){
+			$allModFiles = findAllFiles($cachedir, $allModFiles);
+		   foreach ($allModFiles as $file) {
 		       	//$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-		       	if(file_exists($file)){
+		       	if (file_exists($file)) {
 					unlink($file);
 		       	}
 		   }
 		}
 	ob_start();
-	if(!isset($_REQUEST['silent'])){
+	if (!isset($_REQUEST['silent'])) {
 		$_REQUEST['silent'] = true;
 	}
-	else if(isset($_REQUEST['silent']) && $_REQUEST['silent'] != true){
+	else if (isset($_REQUEST['silent']) && $_REQUEST['silent'] != true) {
 		$_REQUEST['silent'] = true;
 	}
 
@@ -942,36 +942,36 @@ 
     //fix_dropdown_list();
 }
 
-set_upgrade_progress('end','in_progress','end','in_progress');
+set_upgrade_progress('end', 'in_progress', 'end', 'in_progress');
 /////////////////////////Old Logger settings///////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-if(function_exists('deleteCache')){
-	set_upgrade_progress('end','in_progress','deleteCache','in_progress');
+if (function_exists('deleteCache')) {
+	set_upgrade_progress('end', 'in_progress', 'deleteCache', 'in_progress');
 	@deleteCache();
-	set_upgrade_progress('end','in_progress','deleteCache','done');
+	set_upgrade_progress('end', 'in_progress', 'deleteCache', 'done');
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	HANDLE REMINDERS
-if(empty($errors)) {
+if (empty($errors)) {
 	commitHandleReminders($skippedFiles, $path);
 }
 
-if(file_exists(clean_path(getcwd()).'/original451files')){
+if (file_exists(clean_path(getcwd()).'/original451files')) {
 	rmdir_recursive(clean_path(getcwd()).'/original451files');
 }
 
 require_once('modules/Administration/Administration.php');
 $admin = new Administration();
-$admin->saveSetting('system','adminwizard',1);
+$admin->saveSetting('system', 'adminwizard', 1);
 
 
-if($ce_to_pro_ent)
+if ($ce_to_pro_ent)
 {
         //check to see if there are any new files that need to be added to systems tab
         //retrieve old modules list
-        logThis('check to see if new modules exist',$path);
+        logThis('check to see if new modules exist', $path);
         $oldModuleList = array();
         $newModuleList = array();
         include($argv[3].'/include/modules.php');
@@ -988,13 +988,13 @@ 
         $oldModuleList = $newTB->get_key_array($oldModuleList);
 
         //iterate through list and remove commonalities to get new modules
-        foreach ($newModuleList as $remove_mod){
-            if(in_array($remove_mod, $oldModuleList)){
+        foreach ($newModuleList as $remove_mod) {
+            if (in_array($remove_mod, $oldModuleList)) {
                 unset($newModuleList[$remove_mod]);
             }
         }
 
-        $must_have_modules= array(
+        $must_have_modules = array(
 			  'Activities'=>'Activities',
         	  'Calendar'=>'Calendar',
         	  'Reports' => 'Reports',
@@ -1004,42 +1004,42 @@ 
 			  'Contracts' => 'Contracts',
 			  'KBDocuments' => 'KBDocuments'
         );
-        $newModuleList = array_merge($newModuleList,$must_have_modules);
+        $newModuleList = array_merge($newModuleList, $must_have_modules);
 
         //new modules list now has left over modules which are new to this install, so lets add them to the system tabs
-        logThis('new modules to add are '.var_export($newModuleList,true),$path);
+        logThis('new modules to add are '.var_export($newModuleList, true), $path);
 
         //grab the existing system tabs
         $tabs = $newTB->get_system_tabs();
 
         //add the new tabs to the array
-        foreach($newModuleList as $nm ){
+        foreach ($newModuleList as $nm) {
           $tabs[$nm] = $nm;
         }
 
         //now assign the modules to system tabs
         $newTB->set_system_tabs($tabs);
-        logThis('module tabs updated',$path);
+        logThis('module tabs updated', $path);
 }
 
 //Also set the tracker settings if  flavor conversion ce->pro or ce->ent
-if(isset($_SESSION['current_db_version']) && isset($_SESSION['target_db_version'])){
+if (isset($_SESSION['current_db_version']) && isset($_SESSION['target_db_version'])) {
     if (version_compare($_SESSION['current_db_version'], $_SESSION['target_db_version'], '='))
     {
 	    $_REQUEST['upgradeWizard'] = true;
 	    ob_start();
 			include('include/Smarty/internals/core.write_file.php');
 		ob_end_clean();
-	 	$db =& DBManagerFactory::getInstance();
-		if($ce_to_pro_ent){
+	 	$db = & DBManagerFactory::getInstance();
+		if ($ce_to_pro_ent) {
 	        //Also set license information
 	        $admin = new Administration();
 			$category = 'license';
 			$value = 0;
 			$admin->saveSetting($category, 'users', $value);
-			$key = array('num_lic_oc','key','expire_date');
+			$key = array('num_lic_oc', 'key', 'expire_date');
 			$value = '';
-			foreach($key as $k){
+			foreach ($key as $k) {
 				$admin->saveSetting($category, $k, $value);
 			}
 		}
@@ -1050,8 +1050,8 @@ 
 	ob_end_clean();
 	logThis("**** Potential PHP generated error messages: {$phpErrors}", $path);
 
-	if(count($errors) > 0) {
-		foreach($errors as $error) {
+	if (count($errors) > 0) {
+		foreach ($errors as $error) {
 			logThis("****** SilentUpgrade ERROR: {$error}", $path);
 		}
 		echo "FAILED\n";
@@ -1072,18 +1072,18 @@ 
 {
 	$tableDictionaryExtDirs = array('custom/Extension/application/Ext/TableDictionary', 'custom/application/Ext/TableDictionary');
 
-	foreach($tableDictionaryExtDirs as $tableDictionaryExt)
+	foreach ($tableDictionaryExtDirs as $tableDictionaryExt)
 	{
 
-		if(is_dir($tableDictionaryExt) && is_writable($tableDictionaryExt)){
+		if (is_dir($tableDictionaryExt) && is_writable($tableDictionaryExt)) {
 			$dir = dir($tableDictionaryExt);
-			while(($entry = $dir->read()) !== false)
+			while (($entry = $dir->read()) !== false)
 			{
-				$entry = $tableDictionaryExt . '/' . $entry;
-				if(is_file($entry) && preg_match('/\.php$/i', $entry) && is_writeable($entry))
+				$entry = $tableDictionaryExt.'/'.$entry;
+				if (is_file($entry) && preg_match('/\.php$/i', $entry) && is_writeable($entry))
 				{
 
-						if(function_exists('sugar_fopen'))
+						if (function_exists('sugar_fopen'))
 						{
 							$fp = @sugar_fopen($entry, 'r');
 						} else {
@@ -1091,16 +1091,16 @@ 
 						}
 
 
-					    if($fp)
+					    if ($fp)
 				        {
 				             $altered = false;
 				             $contents = '';
 
-				             while($line = fgets($fp))
+				             while ($line = fgets($fp))
 						     {
-						    	if(preg_match('/\s*include\s*\(\s*[\'|\"](.*?)[\"|\']\s*\)\s*;/', $line, $match))
+						    	if (preg_match('/\s*include\s*\(\s*[\'|\"](.*?)[\"|\']\s*\)\s*;/', $line, $match))
 						    	{
-						    	   if(!file_exists($match[1]))
+						    	   if (!file_exists($match[1]))
 						    	   {
 						    	      $altered = true;
 						    	   } else {
@@ -1115,16 +1115,16 @@ 
 				        }
 
 
-					    if($altered)
+					    if ($altered)
 					    {
-							if(function_exists('sugar_fopen'))
+							if (function_exists('sugar_fopen'))
 							{
 								$fp = @sugar_fopen($entry, 'w');
 							} else {
 								$fp = fopen($entry, 'w');
 							}
 
-							if($fp && fwrite($fp, $contents))
+							if ($fp && fwrite($fp, $contents))
 							{
 								fclose($fp);
 							}

Braces +12 added lines, -15 removed lines

@@ -65,8 +65,7 @@ 
 			if ($children != "." && $children != "..") {
 				if (is_dir($thedir . "/" . $children)) {
 					clearCacheSU($thedir . "/" . $children, $extension);
-				}
-				elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
+				} elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
 					unlink($thedir . "/" . $children);
 				}
 			}
@@ -269,8 +268,7 @@ 
 
     if( write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
         return true;
-    }
-    else {
+    } else {
         return false;
     }
 }
@@ -386,7 +384,9 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	STANDARD REQUIRED SUGAR INCLUDES AND PRESETS
-if(!defined('sugarEntry')) define('sugarEntry', true);
+if(!defined('sugarEntry')) {
+    define('sugarEntry', true);
+}
 
 $_SESSION = array();
 $_SESSION['schema_change'] = 'sugar'; // we force-run all SQL
@@ -500,13 +500,11 @@ 
 	   if(isset($logged_user['id']) && $logged_user['id'] != null){
 		//do nothing
 	    $current_user->retrieve($logged_user['id']);
-	   }
-	   else{
+	   } else{
 	   	echo "FAILURE: Not an admin user in users table. Please provide an admin user\n";
 		exit(1);
 	   }
-	}
-	else {
+	} else {
 		echo "*******************************************************************************\n";
 		echo "*** ERROR: 4th parameter must be a valid admin user.\n";
 		echo $usage;
@@ -771,8 +769,9 @@ 
 					include($file);
 					post_install();
 				// cn: only run conversion if admin selects "Sugar runs SQL"
-				if(!empty($_SESSION['allTables']) && $_SESSION['schema_change'] == 'sugar')
-					executeConvertTablesSql($_SESSION['allTables']);
+				if(!empty($_SESSION['allTables']) && $_SESSION['schema_change'] == 'sugar') {
+									executeConvertTablesSql($_SESSION['allTables']);
+				}
 				//set process to done
 				$progArray['post_install']='done';
 				//set_upgrade_progress('commit','in_progress','post_install','done');
@@ -878,8 +877,7 @@ 
 
 			if($new_upgrade->description == null){
 				$new_upgrade->description = "Silent Upgrade was used to upgrade the instance";
-			}
-			else{
+			} else{
 				$new_upgrade->description = $new_upgrade->description." Silent Upgrade was used to upgrade the instance.";
 			}
 		   $new_upgrade->save();
@@ -929,8 +927,7 @@ 
 	ob_start();
 	if(!isset($_REQUEST['silent'])){
 		$_REQUEST['silent'] = true;
-	}
-	else if(isset($_REQUEST['silent']) && $_REQUEST['silent'] != true){
+	} else if(isset($_REQUEST['silent']) && $_REQUEST['silent'] != true){
 		$_REQUEST['silent'] = true;
 	}
 

modules/UpgradeWizard/uw_emptyFunctions.php

Indentation +1 added lines, -1 removed lines

@@ -45,6 +45,6 @@
 //empty function getJSPath().. there is some dependency in meta upgrade
 
 function getJSPath($file=''){
-	//nothing here fake function
+    //nothing here fake function
 }
 ?>
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -44,7 +44,7 @@ 
 
 //empty function getJSPath().. there is some dependency in meta upgrade
 
-function getJSPath($file=''){
+function getJSPath($file = '') {
 	//nothing here fake function
 }
 ?>
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/UpgradeWizard/upgradeMetaHelper.php

Braces +13 added lines, -11 removed lines

@@ -132,12 +132,10 @@ 
 	$file_queries_file = $upgrade_progress_dir.'/files_queries.php';
 	if(file_exists($file_queries_file)){
 		include($file_queries_file);
-	}
-	else{
+	} else{
 		if(function_exists('sugar_fopen')){
 			sugar_fopen($file_queries_file, 'w+');
-		}
-		else{
+		} else{
 			fopen($file_queries_file, 'w+');
 		}
 	}
@@ -163,7 +161,9 @@ 
     $modulesAll = getAllModules(); //keep all modules as well
     $allOtherModules = array_diff($modulesAll,$modules);
     foreach($modules as $mod) {
-	  if(!is_dir('modules/'.$mod)) continue;
+	  if(!is_dir('modules/'.$mod)) {
+	      continue;
+	  }
 	  $editView = "modules/$mod/EditView.html";
 	  $detailView ="modules/$mod/DetailView.html";
 	  $exclude_files[]=$editView;
@@ -177,8 +177,7 @@ 
 		       	  $fileContents = file_get_contents($file);
 		       	  if(md5($fileContents) != $md5_string['./'.$file]) {
 		       	  	$return_array[$mod][] = $file;
-		       	  }
-		       	  else{
+		       	  } else{
 		       	  	//keep in the array to be deleted later
 		       	  	$_SESSION['removeMd5MatchingFiles'][] = $file;
 		               	  }
@@ -189,7 +188,9 @@ 
     //also check out other non-studio modules by taking the difference between
     //allMOdules and
   foreach($allOtherModules as $mod) {
-	  if(!is_dir('modules/'.$mod)) continue;
+	  if(!is_dir('modules/'.$mod)) {
+	      continue;
+	  }
 	  $allModFiles = array();
       $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
       foreach($allModFiles as $file){
@@ -238,8 +239,7 @@ 
 	               	  	  $return_array[$mod];
 	               	  	  break;
 	               	  }
-               	  }
-               	  else{
+               	  } else{
                	  	// This is a new file in user's version and indicates that module has been
                	  	//customized. Put the module in the customized array.
                        echo 'New File'.$file;
@@ -262,7 +262,9 @@ 
 		$modules = array();
 		$d = dir('modules');
 		while($e = $d->read()){
-			if(substr($e, 0, 1) == '.' || !is_dir('modules/' . $e))continue;
+			if(substr($e, 0, 1) == '.' || !is_dir('modules/' . $e)) {
+			    continue;
+			}
 			if(file_exists('modules/' . $e . '/metadata/studio.php')){
 			   $modules[] = $e;
 			}

Indentation +305 added lines, -305 removed lines

@@ -41,172 +41,172 @@ 
 
 class UpgradeMetaHelper{
 
-	var $upgrade_dir;
-	var $debug_mode;
-	var $upgrade_modules;
-	var $customized_modules;
-	var $source_dir;
-	var $dest_dir ;
-	var $evparser;
-	var $dvparser;
-	var $path_to_master_copy;
-	/**
-	 * UpgradeMetaHelper
-	 * This is the constructor for the UpgradeMetaHelper class
-	 * @param $dir The root upgrade directory (where to copy working files)
-	 * @param $masterCopyDirectory The root master directory (where SugarCRM 5.x files reside)
-	 * @param $debugMode Debug mode, default is false
-	 *
-	 */
-	function __construct($dir='upgrade', $masterCopyDirecotry='modules_50', $debugMode = false) {
-		$this->upgrade_dir = $dir;
-		$this->debug_mode = $debugMode;
-		$this->upgrade_modules = $this->getModifiedModules();
-
-		if(count($this->upgrade_modules) > 0) {
-			$_SESSION['Upgraded_Modules'] = $this->upgrade_modules;
-			$this->create_upgrade_directory();
-			$this->path_to_master_copy = $masterCopyDirecotry;
-		    $this->runParser();
-		}
-
-		$this->customized_modules = $this->getAllCustomizedModulesBeyondStudio();
-		if(count($this->customized_modules) > 0) {
-			$_SESSION['Customized_Modules'] = $this->customized_modules;
-		}
-	}
-
-
-	/**
-	 * getModifiedModules
-	 * This method returns a two-dimensional Array of Studio enabled
-	 * modules that have been modified.  The second Array index is an
-	 * Array of files that do not match the md5 checksum for the module
-	 * @return $return_array Two-dimensional Array of [module][modified file(s) Array]
-	 */
-		function getModifiedModules() {
-
-		$md5_string = array();
-		if(file_exists(clean_path(getcwd().'/files.md5'))){
-			require(clean_path(getcwd().'/files.md5'));
-		}
-
-	    $return_array = array();
-	    $modules = $this->loadStudioModules();
-	    foreach($modules as $mod) {
-
-	    	   $editView = "modules/$mod/EditView.html";
-	    	   $detailView = "modules/$mod/DetailView.html";
-	    	   $searchForm = "modules/$mod/SearchForm.html";
-               if(file_exists($editView) && isset($md5_string['./' . $editView])) {
-               	  $fileContents = file_get_contents($editView);
-               	  if(md5($fileContents) != $md5_string['./' . $editView]) {
-               	  	 $return_array[$mod][] = $editView;
-               	  }
-               }
-
-               if(file_exists($detailView) && isset($md5_string['./' . $detailView])) {
-               	  $fileContents = file_get_contents($detailView);
-               	  if(md5($fileContents) != $md5_string['./' . $detailView]) {
-               	  	 $return_array[$mod][] = $detailView;
-               	  }
-               }
-
-               if(file_exists($searchForm) && isset($md5_string['./' . $searchForm])) {
-               	  $fileContents = file_get_contents($searchForm);
-               	  if(md5($fileContents) != $md5_string['./' . $searchForm]) {
-               	  	 $return_array[$mod][] = $searchForm;
-               	  }
-               }
-
-	    } //foreach
-
-		return $return_array;
-	}
+    var $upgrade_dir;
+    var $debug_mode;
+    var $upgrade_modules;
+    var $customized_modules;
+    var $source_dir;
+    var $dest_dir ;
+    var $evparser;
+    var $dvparser;
+    var $path_to_master_copy;
+    /**
+     * UpgradeMetaHelper
+     * This is the constructor for the UpgradeMetaHelper class
+     * @param $dir The root upgrade directory (where to copy working files)
+     * @param $masterCopyDirectory The root master directory (where SugarCRM 5.x files reside)
+     * @param $debugMode Debug mode, default is false
+     *
+     */
+    function __construct($dir='upgrade', $masterCopyDirecotry='modules_50', $debugMode = false) {
+        $this->upgrade_dir = $dir;
+        $this->debug_mode = $debugMode;
+        $this->upgrade_modules = $this->getModifiedModules();
+
+        if(count($this->upgrade_modules) > 0) {
+            $_SESSION['Upgraded_Modules'] = $this->upgrade_modules;
+            $this->create_upgrade_directory();
+            $this->path_to_master_copy = $masterCopyDirecotry;
+            $this->runParser();
+        }
+
+        $this->customized_modules = $this->getAllCustomizedModulesBeyondStudio();
+        if(count($this->customized_modules) > 0) {
+            $_SESSION['Customized_Modules'] = $this->customized_modules;
+        }
+    }
+
+
+    /**
+     * getModifiedModules
+     * This method returns a two-dimensional Array of Studio enabled
+     * modules that have been modified.  The second Array index is an
+     * Array of files that do not match the md5 checksum for the module
+     * @return $return_array Two-dimensional Array of [module][modified file(s) Array]
+     */
+        function getModifiedModules() {
+
+        $md5_string = array();
+        if(file_exists(clean_path(getcwd().'/files.md5'))){
+            require(clean_path(getcwd().'/files.md5'));
+        }
+
+        $return_array = array();
+        $modules = $this->loadStudioModules();
+        foreach($modules as $mod) {
+
+                $editView = "modules/$mod/EditView.html";
+                $detailView = "modules/$mod/DetailView.html";
+                $searchForm = "modules/$mod/SearchForm.html";
+                if(file_exists($editView) && isset($md5_string['./' . $editView])) {
+                        $fileContents = file_get_contents($editView);
+                        if(md5($fileContents) != $md5_string['./' . $editView]) {
+                            $return_array[$mod][] = $editView;
+                        }
+                }
+
+                if(file_exists($detailView) && isset($md5_string['./' . $detailView])) {
+                        $fileContents = file_get_contents($detailView);
+                        if(md5($fileContents) != $md5_string['./' . $detailView]) {
+                            $return_array[$mod][] = $detailView;
+                        }
+                }
+
+                if(file_exists($searchForm) && isset($md5_string['./' . $searchForm])) {
+                        $fileContents = file_get_contents($searchForm);
+                        if(md5($fileContents) != $md5_string['./' . $searchForm]) {
+                            $return_array[$mod][] = $searchForm;
+                        }
+                }
+
+        } //foreach
+
+        return $return_array;
+    }
 
 function saveMatchingFilesQueries($currStep,$value){
-	$upgrade_progress_dir = sugar_cached('upgrades/temp');
-	if(!is_dir($upgrade_progress_dir)){
-		mkdir($upgrade_progress_dir);
-	}
-	$file_queries_file = $upgrade_progress_dir.'/files_queries.php';
-	if(file_exists($file_queries_file)){
-		include($file_queries_file);
-	}
-	else{
-		if(function_exists('sugar_fopen')){
-			sugar_fopen($file_queries_file, 'w+');
-		}
-		else{
-			fopen($file_queries_file, 'w+');
-		}
-	}
-	if(!isset($files_queries) || $files_queries == NULL){
-		$files_queries = array();
-	}
-	$files_queries[$currStep]=$value;
-	if(is_writable($file_queries_file) && write_array_to_file( "file_queries", $file_queries,
-		$file_queries_file)) {
-	       //writing to the file
-	}
+    $upgrade_progress_dir = sugar_cached('upgrades/temp');
+    if(!is_dir($upgrade_progress_dir)){
+        mkdir($upgrade_progress_dir);
+    }
+    $file_queries_file = $upgrade_progress_dir.'/files_queries.php';
+    if(file_exists($file_queries_file)){
+        include($file_queries_file);
+    }
+    else{
+        if(function_exists('sugar_fopen')){
+            sugar_fopen($file_queries_file, 'w+');
+        }
+        else{
+            fopen($file_queries_file, 'w+');
+        }
+    }
+    if(!isset($files_queries) || $files_queries == NULL){
+        $files_queries = array();
+    }
+    $files_queries[$currStep]=$value;
+    if(is_writable($file_queries_file) && write_array_to_file( "file_queries", $file_queries,
+        $file_queries_file)) {
+            //writing to the file
+    }
 }
 
 function getAllCustomizedModulesBeyondStudio() {
 
-	require_once('modules/UpgradeWizard/uw_utils.php');
-	$md5_string = array();
-	if(file_exists(clean_path(getcwd().'/files.md5'))){
-		require(clean_path(getcwd().'/files.md5'));
-	}
+    require_once('modules/UpgradeWizard/uw_utils.php');
+    $md5_string = array();
+    if(file_exists(clean_path(getcwd().'/files.md5'))){
+        require(clean_path(getcwd().'/files.md5'));
+    }
     $return_array = array();
     $modules = $this->loadStudioModules();
     $modulesAll = getAllModules(); //keep all modules as well
     $allOtherModules = array_diff($modulesAll,$modules);
     foreach($modules as $mod) {
-	  if(!is_dir('modules/'.$mod)) continue;
-	  $editView = "modules/$mod/EditView.html";
-	  $detailView ="modules/$mod/DetailView.html";
-	  $exclude_files[]=$editView;
-	  $exclude_files[]=$detailView;
-	  $allModFiles = array();
-	  $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
-	   foreach($allModFiles as $file){
-	       //$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-		  if(file_exists($file) && !in_array($file,$exclude_files)){
-			if(isset($md5_string['./'.$file])) {
-		       	  $fileContents = file_get_contents($file);
-		       	  if(md5($fileContents) != $md5_string['./'.$file]) {
-		       	  	$return_array[$mod][] = $file;
-		       	  }
-		       	  else{
-		       	  	//keep in the array to be deleted later
-		       	  	$_SESSION['removeMd5MatchingFiles'][] = $file;
-		               	  }
-		           }
-		      }
-		  }
+        if(!is_dir('modules/'.$mod)) continue;
+        $editView = "modules/$mod/EditView.html";
+        $detailView ="modules/$mod/DetailView.html";
+        $exclude_files[]=$editView;
+        $exclude_files[]=$detailView;
+        $allModFiles = array();
+        $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
+        foreach($allModFiles as $file){
+            //$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
+            if(file_exists($file) && !in_array($file,$exclude_files)){
+            if(isset($md5_string['./'.$file])) {
+                        $fileContents = file_get_contents($file);
+                        if(md5($fileContents) != $md5_string['./'.$file]) {
+                            $return_array[$mod][] = $file;
+                        }
+                        else{
+                            //keep in the array to be deleted later
+                            $_SESSION['removeMd5MatchingFiles'][] = $file;
+                                }
+                    }
+                }
+            }
     } //foreach
     //also check out other non-studio modules by taking the difference between
     //allMOdules and
-  foreach($allOtherModules as $mod) {
-	  if(!is_dir('modules/'.$mod)) continue;
-	  $allModFiles = array();
-      $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
-      foreach($allModFiles as $file){
-           	//$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-           	if(file_exists($file)){
-           		if(isset($md5_string['./'.$file])) {
-	               	  $fileContents = file_get_contents($file);
-	               	  if(md5($fileContents) == $md5_string['./'.$file]) {
-	               	  	$_SESSION['removeMd5MatchingFiles'][] = $file;
-	               	  }
-               }
-          }
-      }
-  }
-   //Also store in a file
-   //saveMatchingFilesQueries('removeMd5MatchingFiles',$_SESSION['removeMd5MatchingFiles']);
-	return $return_array;
+    foreach($allOtherModules as $mod) {
+        if(!is_dir('modules/'.$mod)) continue;
+        $allModFiles = array();
+        $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
+        foreach($allModFiles as $file){
+                //$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
+                if(file_exists($file)){
+                    if(isset($md5_string['./'.$file])) {
+                            $fileContents = file_get_contents($file);
+                            if(md5($fileContents) == $md5_string['./'.$file]) {
+                                $_SESSION['removeMd5MatchingFiles'][] = $file;
+                            }
+                }
+            }
+        }
+    }
+    //Also store in a file
+    //saveMatchingFilesQueries('removeMd5MatchingFiles',$_SESSION['removeMd5MatchingFiles']);
+    return $return_array;
 }
 
 
@@ -218,39 +218,39 @@ 
  */
 function getAllCustomizedModules() {
 
-		require_once('files.md5');
-
-	    $return_array = array();
-	    $modules = getAllModules();
-	    foreach($modules as $mod) {
-	    	   //find all files in each module if the files have been modified
-	    	   //as compared to the base version then add the module to the
-	    	   //customized modules array
-	    	   $modFiles = findAllFiles(clean_path(getcwd())."/modules/$mod", array());
-               foreach($modFiles as $file){
-             	  $fileContents = file_get_contents($file);
-             	   $file = str_replace(clean_path(getcwd()),'',$file);
-               	  if($md5_string['./' . $file]){
-	               	  if(md5($fileContents) != $md5_string['./' . $file]) {
-	               	     //A file has been customized in the module. Put the module into the
-	               	     // customized modules array.
-	               	     echo 'Changed File'.$file;
-	               	  	  $return_array[$mod];
-	               	  	  break;
-	               	  }
-               	  }
-               	  else{
-               	  	// This is a new file in user's version and indicates that module has been
-               	  	//customized. Put the module in the customized array.
-                       echo 'New File'.$file;
-                       $return_array[$mod];
-                       break;
-               	  }
-               }
-	    } //foreach
-
-		return $return_array;
-	}
+        require_once('files.md5');
+
+        $return_array = array();
+        $modules = getAllModules();
+        foreach($modules as $mod) {
+                //find all files in each module if the files have been modified
+                //as compared to the base version then add the module to the
+                //customized modules array
+                $modFiles = findAllFiles(clean_path(getcwd())."/modules/$mod", array());
+                foreach($modFiles as $file){
+                    $fileContents = file_get_contents($file);
+                    $file = str_replace(clean_path(getcwd()),'',$file);
+                        if($md5_string['./' . $file]){
+                            if(md5($fileContents) != $md5_string['./' . $file]) {
+                            //A file has been customized in the module. Put the module into the
+                            // customized modules array.
+                            echo 'Changed File'.$file;
+                                $return_array[$mod];
+                                break;
+                            }
+                        }
+                        else{
+                            // This is a new file in user's version and indicates that module has been
+                            //customized. Put the module in the customized array.
+                        echo 'New File'.$file;
+                        $return_array[$mod];
+                        break;
+                        }
+                }
+        } //foreach
+
+        return $return_array;
+    }
 
     /**
      * loadStudioModules
@@ -258,139 +258,139 @@ 
      * present in the metadata directory of the module
      * @return $modules Array of modules that are studio enabled
      */
-	function loadStudioModules() {
-		$modules = array();
-		$d = dir('modules');
-		while($e = $d->read()){
-			if(substr($e, 0, 1) == '.' || !is_dir('modules/' . $e))continue;
-			if(file_exists('modules/' . $e . '/metadata/studio.php')){
-			   $modules[] = $e;
-			}
-		}
-		return $modules;
-	}
-
-
-	/**
-	 * runParser
-	 * This method creates the EditView and DetailView parser intances
-	 * and runs the parsing for the modules to upgrade
-	 *
-	 */
-	function runParser() {
-		require_once('include/SugarFields/Parsers/EditViewMetaParser.php');
-		require_once('include/SugarFields/Parsers/DetailViewMetaParser.php');
-		require_once('include/SugarFields/Parsers/SearchFormMetaParser.php');
-
-		$this->evparser = new EditViewMetaParser();
-		$this->dvparser = new DetailViewMetaParser();
-		$this->svparser = new SearchFormMetaParser();
-
-		foreach($this->upgrade_modules as $module_name=>$files) {
-			$this->parseFile($module_name, $files);
-		} //foreach
-	}
-
-
-	/**
-	 * parseFile
-	 * Hanldes parsing the files for given module where Studio or manual
-	 * changes have been detected.
-	 * @param $module_name The module to parse
-	 * @param $files Array of files found to parse
-	 *
-	 */
-	function parseFile($module_name, $files) {
-		global $beanList, $dictionary;
-		foreach($files as $file) {
+    function loadStudioModules() {
+        $modules = array();
+        $d = dir('modules');
+        while($e = $d->read()){
+            if(substr($e, 0, 1) == '.' || !is_dir('modules/' . $e))continue;
+            if(file_exists('modules/' . $e . '/metadata/studio.php')){
+                $modules[] = $e;
+            }
+        }
+        return $modules;
+    }
+
+
+    /**
+     * runParser
+     * This method creates the EditView and DetailView parser intances
+     * and runs the parsing for the modules to upgrade
+     *
+     */
+    function runParser() {
+        require_once('include/SugarFields/Parsers/EditViewMetaParser.php');
+        require_once('include/SugarFields/Parsers/DetailViewMetaParser.php');
+        require_once('include/SugarFields/Parsers/SearchFormMetaParser.php');
+
+        $this->evparser = new EditViewMetaParser();
+        $this->dvparser = new DetailViewMetaParser();
+        $this->svparser = new SearchFormMetaParser();
+
+        foreach($this->upgrade_modules as $module_name=>$files) {
+            $this->parseFile($module_name, $files);
+        } //foreach
+    }
+
+
+    /**
+     * parseFile
+     * Hanldes parsing the files for given module where Studio or manual
+     * changes have been detected.
+     * @param $module_name The module to parse
+     * @param $files Array of files found to parse
+     *
+     */
+    function parseFile($module_name, $files) {
+        global $beanList, $dictionary;
+        foreach($files as $file) {
                 if(preg_match('/(EditView|DetailView|SearchForm|QuickCreate)(\.html|\.tpl)$/s', $file, $matches)) {
                     $view = $matches[1];
 
                     switch($view) {
-                       case 'EditView' : $parser = $this->evparser; break;
-                       case 'DetailView' : $parser = $this->dvparser; break;
-                       case 'SearchForm' : $parser = $this->svparser; break;
+                        case 'EditView' : $parser = $this->evparser; break;
+                        case 'DetailView' : $parser = $this->dvparser; break;
+                        case 'SearchForm' : $parser = $this->svparser; break;
                     }
 
                     $lowerCaseView = $view == 'SearchForm' ? 'search' : strtolower($view);
 
-					include('modules/'.$module_name.'/vardefs.php');
-					$bean_name = $beanList[$module_name];
-					$newFile = $this->upgrade_dir.'/modules/'.$module_name.'/metadata/'.$lowerCaseView.'defs.php';
-					$evfp = fopen($newFile,'w');
-
-					$bean_name = $bean_name == 'aCase' ? 'Case' : $bean_name;
-					fwrite($evfp, $parser->parse($file,
-											$dictionary[$bean_name]['fields'],
-											$module_name,
-											true,
-											$this->path_to_master_copy.'/modules/'.$module_name.'/metadata/'.$lowerCaseView.'defs.php'));
-					fclose($evfp);
+                    include('modules/'.$module_name.'/vardefs.php');
+                    $bean_name = $beanList[$module_name];
+                    $newFile = $this->upgrade_dir.'/modules/'.$module_name.'/metadata/'.$lowerCaseView.'defs.php';
+                    $evfp = fopen($newFile,'w');
+
+                    $bean_name = $bean_name == 'aCase' ? 'Case' : $bean_name;
+                    fwrite($evfp, $parser->parse($file,
+                                            $dictionary[$bean_name]['fields'],
+                                            $module_name,
+                                            true,
+                                            $this->path_to_master_copy.'/modules/'.$module_name.'/metadata/'.$lowerCaseView.'defs.php'));
+                    fclose($evfp);
+                } //if
+        } //foreach
+    }
+
+
+    /**
+     * create_upgrade_directory
+     * Creates a directory called upgrade to house all the modules that are studio enabled.
+     * Also creates subdirectories for all studio enabled modules.
+     *
+     */
+    function create_upgrade_directory() {
+
+        $dir = $this->upgrade_dir.'/modules';
+        if(!file_exists($this->upgrade_dir)) {
+            mkdir($this->upgrade_dir, 0755);
+        }
+        if(!file_exists($dir)) {
+            mkdir($dir, 0755);
+        }
+
+        foreach($this->upgrade_modules as $module=>$files){
+            if(!file_exists($dir.'/'.$module)) {
+                mkdir($dir.'/'.$module, 0755);
+            }
+            if(!file_exists($dir.'/'.$module.'/metadata')) {
+                mkdir($dir.'/'.$module.'/metadata', 0755);
+            }
+
+            foreach($files as $file) {
+                if(file_exists($file) && is_file($file)) {
+                    copy($file, $this->upgrade_dir.'/'.$file);
                 } //if
-		} //foreach
-	}
-
-
-	/**
-	 * create_upgrade_directory
-	 * Creates a directory called upgrade to house all the modules that are studio enabled.
-	 * Also creates subdirectories for all studio enabled modules.
-	 *
-	 */
-	function create_upgrade_directory() {
-
-		$dir = $this->upgrade_dir.'/modules';
-		if(!file_exists($this->upgrade_dir)) {
-			mkdir($this->upgrade_dir, 0755);
-		}
-		if(!file_exists($dir)) {
-			mkdir($dir, 0755);
-		}
-
-		foreach($this->upgrade_modules as $module=>$files){
-			if(!file_exists($dir.'/'.$module)) {
-				mkdir($dir.'/'.$module, 0755);
-			}
-			if(!file_exists($dir.'/'.$module.'/metadata')) {
-				mkdir($dir.'/'.$module.'/metadata', 0755);
-			}
-
-			foreach($files as $file) {
-				if(file_exists($file) && is_file($file)) {
-				   copy($file, $this->upgrade_dir.'/'.$file);
-				} //if
-			} //foreach
-		}
-	}
-
-
-	/**
-	 * verifyMetaData
-	 * This function does some quick checks to make sure the metadataFile at
-	 * least has an Array panel
-	 *
-	 * @param $metadataFile The path to the metadata file to verify
-	 * @param $module The module to verify
-	 * @param $view The view (EditView or DetailView)
-	 * @return boolean true if verification check is okay; false otherwise
-	 */
-	function verifyMetaData($metadataFile, $module, $view) {
-	    if(!file_exists($metadataFile) || !is_file($metadataFile)) {
-	       return false;
-	    }
-
-	    include($metadataFile);
-
-	    if(isset($viewdefs) && isset($viewdefs[$module][$view]['panels']) && is_array($viewdefs[$module][$view]['panels'])) {
-	       return true;
-	    }
+            } //foreach
+        }
+    }
+
+
+    /**
+     * verifyMetaData
+     * This function does some quick checks to make sure the metadataFile at
+     * least has an Array panel
+     *
+     * @param $metadataFile The path to the metadata file to verify
+     * @param $module The module to verify
+     * @param $view The view (EditView or DetailView)
+     * @return boolean true if verification check is okay; false otherwise
+     */
+    function verifyMetaData($metadataFile, $module, $view) {
+        if(!file_exists($metadataFile) || !is_file($metadataFile)) {
+            return false;
+        }
+
+        include($metadataFile);
+
+        if(isset($viewdefs) && isset($viewdefs[$module][$view]['panels']) && is_array($viewdefs[$module][$view]['panels'])) {
+            return true;
+        }
 
         if(isset($searchdefs) && isset($searchdefs[$module]) &&  is_array($searchdefs[$module])) {
-           return true;
+            return true;
         }
 
-	    return false;
-	}
+        return false;
+    }
 }
 
 ?>
\ No newline at end of file

Spacing +66 added lines, -66 removed lines

@@ -39,14 +39,14 @@ 
 
 
 
-class UpgradeMetaHelper{
+class UpgradeMetaHelper {
 
 	var $upgrade_dir;
 	var $debug_mode;
 	var $upgrade_modules;
 	var $customized_modules;
 	var $source_dir;
-	var $dest_dir ;
+	var $dest_dir;
 	var $evparser;
 	var $dvparser;
 	var $path_to_master_copy;
@@ -58,12 +58,12 @@ 
 	 * @param $debugMode Debug mode, default is false
 	 *
 	 */
-	function __construct($dir='upgrade', $masterCopyDirecotry='modules_50', $debugMode = false) {
+	function __construct($dir = 'upgrade', $masterCopyDirecotry = 'modules_50', $debugMode = false) {
 		$this->upgrade_dir = $dir;
 		$this->debug_mode = $debugMode;
 		$this->upgrade_modules = $this->getModifiedModules();
 
-		if(count($this->upgrade_modules) > 0) {
+		if (count($this->upgrade_modules) > 0) {
 			$_SESSION['Upgraded_Modules'] = $this->upgrade_modules;
 			$this->create_upgrade_directory();
 			$this->path_to_master_copy = $masterCopyDirecotry;
@@ -71,7 +71,7 @@ 
 		}
 
 		$this->customized_modules = $this->getAllCustomizedModulesBeyondStudio();
-		if(count($this->customized_modules) > 0) {
+		if (count($this->customized_modules) > 0) {
 			$_SESSION['Customized_Modules'] = $this->customized_modules;
 		}
 	}
@@ -87,34 +87,34 @@ 
 		function getModifiedModules() {
 
 		$md5_string = array();
-		if(file_exists(clean_path(getcwd().'/files.md5'))){
+		if (file_exists(clean_path(getcwd().'/files.md5'))) {
 			require(clean_path(getcwd().'/files.md5'));
 		}
 
 	    $return_array = array();
 	    $modules = $this->loadStudioModules();
-	    foreach($modules as $mod) {
+	    foreach ($modules as $mod) {
 
 	    	   $editView = "modules/$mod/EditView.html";
 	    	   $detailView = "modules/$mod/DetailView.html";
 	    	   $searchForm = "modules/$mod/SearchForm.html";
-               if(file_exists($editView) && isset($md5_string['./' . $editView])) {
+               if (file_exists($editView) && isset($md5_string['./'.$editView])) {
                	  $fileContents = file_get_contents($editView);
-               	  if(md5($fileContents) != $md5_string['./' . $editView]) {
+               	  if (md5($fileContents) != $md5_string['./'.$editView]) {
                	  	 $return_array[$mod][] = $editView;
                	  }
                }
 
-               if(file_exists($detailView) && isset($md5_string['./' . $detailView])) {
+               if (file_exists($detailView) && isset($md5_string['./'.$detailView])) {
                	  $fileContents = file_get_contents($detailView);
-               	  if(md5($fileContents) != $md5_string['./' . $detailView]) {
+               	  if (md5($fileContents) != $md5_string['./'.$detailView]) {
                	  	 $return_array[$mod][] = $detailView;
                	  }
                }
 
-               if(file_exists($searchForm) && isset($md5_string['./' . $searchForm])) {
+               if (file_exists($searchForm) && isset($md5_string['./'.$searchForm])) {
                	  $fileContents = file_get_contents($searchForm);
-               	  if(md5($fileContents) != $md5_string['./' . $searchForm]) {
+               	  if (md5($fileContents) != $md5_string['./'.$searchForm]) {
                	  	 $return_array[$mod][] = $searchForm;
                	  }
                }
@@ -124,28 +124,28 @@ 
 		return $return_array;
 	}
 
-function saveMatchingFilesQueries($currStep,$value){
+function saveMatchingFilesQueries($currStep, $value) {
 	$upgrade_progress_dir = sugar_cached('upgrades/temp');
-	if(!is_dir($upgrade_progress_dir)){
+	if (!is_dir($upgrade_progress_dir)) {
 		mkdir($upgrade_progress_dir);
 	}
 	$file_queries_file = $upgrade_progress_dir.'/files_queries.php';
-	if(file_exists($file_queries_file)){
+	if (file_exists($file_queries_file)) {
 		include($file_queries_file);
 	}
-	else{
-		if(function_exists('sugar_fopen')){
+	else {
+		if (function_exists('sugar_fopen')) {
 			sugar_fopen($file_queries_file, 'w+');
 		}
-		else{
+		else {
 			fopen($file_queries_file, 'w+');
 		}
 	}
-	if(!isset($files_queries) || $files_queries == NULL){
+	if (!isset($files_queries) || $files_queries == NULL) {
 		$files_queries = array();
 	}
-	$files_queries[$currStep]=$value;
-	if(is_writable($file_queries_file) && write_array_to_file( "file_queries", $file_queries,
+	$files_queries[$currStep] = $value;
+	if (is_writable($file_queries_file) && write_array_to_file("file_queries", $file_queries,
 		$file_queries_file)) {
 	       //writing to the file
 	}
@@ -155,30 +155,30 @@ 
 
 	require_once('modules/UpgradeWizard/uw_utils.php');
 	$md5_string = array();
-	if(file_exists(clean_path(getcwd().'/files.md5'))){
+	if (file_exists(clean_path(getcwd().'/files.md5'))) {
 		require(clean_path(getcwd().'/files.md5'));
 	}
     $return_array = array();
     $modules = $this->loadStudioModules();
     $modulesAll = getAllModules(); //keep all modules as well
-    $allOtherModules = array_diff($modulesAll,$modules);
-    foreach($modules as $mod) {
-	  if(!is_dir('modules/'.$mod)) continue;
+    $allOtherModules = array_diff($modulesAll, $modules);
+    foreach ($modules as $mod) {
+	  if (!is_dir('modules/'.$mod)) continue;
 	  $editView = "modules/$mod/EditView.html";
-	  $detailView ="modules/$mod/DetailView.html";
-	  $exclude_files[]=$editView;
-	  $exclude_files[]=$detailView;
+	  $detailView = "modules/$mod/DetailView.html";
+	  $exclude_files[] = $editView;
+	  $exclude_files[] = $detailView;
 	  $allModFiles = array();
-	  $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
-	   foreach($allModFiles as $file){
+	  $allModFiles = findAllFiles('modules/'.$mod, $allModFiles);
+	   foreach ($allModFiles as $file) {
 	       //$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-		  if(file_exists($file) && !in_array($file,$exclude_files)){
-			if(isset($md5_string['./'.$file])) {
+		  if (file_exists($file) && !in_array($file, $exclude_files)) {
+			if (isset($md5_string['./'.$file])) {
 		       	  $fileContents = file_get_contents($file);
-		       	  if(md5($fileContents) != $md5_string['./'.$file]) {
+		       	  if (md5($fileContents) != $md5_string['./'.$file]) {
 		       	  	$return_array[$mod][] = $file;
 		       	  }
-		       	  else{
+		       	  else {
 		       	  	//keep in the array to be deleted later
 		       	  	$_SESSION['removeMd5MatchingFiles'][] = $file;
 		               	  }
@@ -188,16 +188,16 @@ 
     } //foreach
     //also check out other non-studio modules by taking the difference between
     //allMOdules and
-  foreach($allOtherModules as $mod) {
-	  if(!is_dir('modules/'.$mod)) continue;
+  foreach ($allOtherModules as $mod) {
+	  if (!is_dir('modules/'.$mod)) continue;
 	  $allModFiles = array();
-      $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
-      foreach($allModFiles as $file){
+      $allModFiles = findAllFiles('modules/'.$mod, $allModFiles);
+      foreach ($allModFiles as $file) {
            	//$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-           	if(file_exists($file)){
-           		if(isset($md5_string['./'.$file])) {
+           	if (file_exists($file)) {
+           		if (isset($md5_string['./'.$file])) {
 	               	  $fileContents = file_get_contents($file);
-	               	  if(md5($fileContents) == $md5_string['./'.$file]) {
+	               	  if (md5($fileContents) == $md5_string['./'.$file]) {
 	               	  	$_SESSION['removeMd5MatchingFiles'][] = $file;
 	               	  }
                }
@@ -222,16 +222,16 @@ 
 
 	    $return_array = array();
 	    $modules = getAllModules();
-	    foreach($modules as $mod) {
+	    foreach ($modules as $mod) {
 	    	   //find all files in each module if the files have been modified
 	    	   //as compared to the base version then add the module to the
 	    	   //customized modules array
 	    	   $modFiles = findAllFiles(clean_path(getcwd())."/modules/$mod", array());
-               foreach($modFiles as $file){
+               foreach ($modFiles as $file) {
              	  $fileContents = file_get_contents($file);
-             	   $file = str_replace(clean_path(getcwd()),'',$file);
-               	  if($md5_string['./' . $file]){
-	               	  if(md5($fileContents) != $md5_string['./' . $file]) {
+             	   $file = str_replace(clean_path(getcwd()), '', $file);
+               	  if ($md5_string['./'.$file]) {
+	               	  if (md5($fileContents) != $md5_string['./'.$file]) {
 	               	     //A file has been customized in the module. Put the module into the
 	               	     // customized modules array.
 	               	     echo 'Changed File'.$file;
@@ -239,7 +239,7 @@ 
 	               	  	  break;
 	               	  }
                	  }
-               	  else{
+               	  else {
                	  	// This is a new file in user's version and indicates that module has been
                	  	//customized. Put the module in the customized array.
                        echo 'New File'.$file;
@@ -261,9 +261,9 @@ 
 	function loadStudioModules() {
 		$modules = array();
 		$d = dir('modules');
-		while($e = $d->read()){
-			if(substr($e, 0, 1) == '.' || !is_dir('modules/' . $e))continue;
-			if(file_exists('modules/' . $e . '/metadata/studio.php')){
+		while ($e = $d->read()) {
+			if (substr($e, 0, 1) == '.' || !is_dir('modules/'.$e))continue;
+			if (file_exists('modules/'.$e.'/metadata/studio.php')) {
 			   $modules[] = $e;
 			}
 		}
@@ -286,7 +286,7 @@ 
 		$this->dvparser = new DetailViewMetaParser();
 		$this->svparser = new SearchFormMetaParser();
 
-		foreach($this->upgrade_modules as $module_name=>$files) {
+		foreach ($this->upgrade_modules as $module_name=>$files) {
 			$this->parseFile($module_name, $files);
 		} //foreach
 	}
@@ -302,11 +302,11 @@ 
 	 */
 	function parseFile($module_name, $files) {
 		global $beanList, $dictionary;
-		foreach($files as $file) {
-                if(preg_match('/(EditView|DetailView|SearchForm|QuickCreate)(\.html|\.tpl)$/s', $file, $matches)) {
+		foreach ($files as $file) {
+                if (preg_match('/(EditView|DetailView|SearchForm|QuickCreate)(\.html|\.tpl)$/s', $file, $matches)) {
                     $view = $matches[1];
 
-                    switch($view) {
+                    switch ($view) {
                        case 'EditView' : $parser = $this->evparser; break;
                        case 'DetailView' : $parser = $this->dvparser; break;
                        case 'SearchForm' : $parser = $this->svparser; break;
@@ -317,7 +317,7 @@ 
 					include('modules/'.$module_name.'/vardefs.php');
 					$bean_name = $beanList[$module_name];
 					$newFile = $this->upgrade_dir.'/modules/'.$module_name.'/metadata/'.$lowerCaseView.'defs.php';
-					$evfp = fopen($newFile,'w');
+					$evfp = fopen($newFile, 'w');
 
 					$bean_name = $bean_name == 'aCase' ? 'Case' : $bean_name;
 					fwrite($evfp, $parser->parse($file,
@@ -340,23 +340,23 @@ 
 	function create_upgrade_directory() {
 
 		$dir = $this->upgrade_dir.'/modules';
-		if(!file_exists($this->upgrade_dir)) {
+		if (!file_exists($this->upgrade_dir)) {
 			mkdir($this->upgrade_dir, 0755);
 		}
-		if(!file_exists($dir)) {
+		if (!file_exists($dir)) {
 			mkdir($dir, 0755);
 		}
 
-		foreach($this->upgrade_modules as $module=>$files){
-			if(!file_exists($dir.'/'.$module)) {
+		foreach ($this->upgrade_modules as $module=>$files) {
+			if (!file_exists($dir.'/'.$module)) {
 				mkdir($dir.'/'.$module, 0755);
 			}
-			if(!file_exists($dir.'/'.$module.'/metadata')) {
+			if (!file_exists($dir.'/'.$module.'/metadata')) {
 				mkdir($dir.'/'.$module.'/metadata', 0755);
 			}
 
-			foreach($files as $file) {
-				if(file_exists($file) && is_file($file)) {
+			foreach ($files as $file) {
+				if (file_exists($file) && is_file($file)) {
 				   copy($file, $this->upgrade_dir.'/'.$file);
 				} //if
 			} //foreach
@@ -375,17 +375,17 @@ 
 	 * @return boolean true if verification check is okay; false otherwise
 	 */
 	function verifyMetaData($metadataFile, $module, $view) {
-	    if(!file_exists($metadataFile) || !is_file($metadataFile)) {
+	    if (!file_exists($metadataFile) || !is_file($metadataFile)) {
 	       return false;
 	    }
 
 	    include($metadataFile);
 
-	    if(isset($viewdefs) && isset($viewdefs[$module][$view]['panels']) && is_array($viewdefs[$module][$view]['panels'])) {
+	    if (isset($viewdefs) && isset($viewdefs[$module][$view]['panels']) && is_array($viewdefs[$module][$view]['panels'])) {
 	       return true;
 	    }
 
-        if(isset($searchdefs) && isset($searchdefs[$module]) &&  is_array($searchdefs[$module])) {
+        if (isset($searchdefs) && isset($searchdefs[$module]) && is_array($searchdefs[$module])) {
            return true;
         }
 

modules/UpgradeWizard/systemCheckJson.php

Indentation +18 added lines, -18 removed lines

@@ -46,36 +46,36 @@
  * *******************************************************************************/
 
 if(ob_get_level() < 1)
-	ob_start();
+    ob_start();
 ob_implicit_flush(1);
 
 // load the generated persistence file if found
 $persistence = array();
 if(file_exists($persist = sugar_cached('/modules/UpgradeWizard/_persistence.php'))) {
-	require_once $persist;
+    require_once $persist;
 }
 require_once('modules/UpgradeWizard/uw_utils.php');
 
 switch($_REQUEST['systemCheckStep']) {
-	case 'find_all_files':
-		ob_end_flush();
-		$persistence['files_to_check'] = getFilesForPermsCheck();
+    case 'find_all_files':
+        ob_end_flush();
+        $persistence['files_to_check'] = getFilesForPermsCheck();
         break;
 
-	case 'check_found_files':
-		if(empty($persistence['files_to_check'])) {
-			logThis('*** ERROR: could not find persistent array of files to check');
-			echo $mod_strings['ERR_UW_NO_FILES'];
-		} else {
-			ob_end_flush();
-			$persistence = checkFiles($persistence['files_to_check'], true);
-		}
-	break;
+    case 'check_found_files':
+        if(empty($persistence['files_to_check'])) {
+            logThis('*** ERROR: could not find persistent array of files to check');
+            echo $mod_strings['ERR_UW_NO_FILES'];
+        } else {
+            ob_end_flush();
+            $persistence = checkFiles($persistence['files_to_check'], true);
+        }
+    break;
 
-	case 'check_files_status':
-		$ret = ($persistence['filesNotWritable']) ? 'true' : 'false';
-		echo $ret;
-	break;
+    case 'check_files_status':
+        $ret = ($persistence['filesNotWritable']) ? 'true' : 'false';
+        echo $ret;
+    break;
 }
 
 write_array_to_file('persistence', $persistence, $persist);

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -45,25 +45,25 @@ 
  * Reserved. Contributor(s): ______________________________________..
  * *******************************************************************************/
 
-if(ob_get_level() < 1)
+if (ob_get_level() < 1)
 	ob_start();
 ob_implicit_flush(1);
 
 // load the generated persistence file if found
 $persistence = array();
-if(file_exists($persist = sugar_cached('/modules/UpgradeWizard/_persistence.php'))) {
+if (file_exists($persist = sugar_cached('/modules/UpgradeWizard/_persistence.php'))) {
 	require_once $persist;
 }
 require_once('modules/UpgradeWizard/uw_utils.php');
 
-switch($_REQUEST['systemCheckStep']) {
+switch ($_REQUEST['systemCheckStep']) {
 	case 'find_all_files':
 		ob_end_flush();
 		$persistence['files_to_check'] = getFilesForPermsCheck();
         break;
 
 	case 'check_found_files':
-		if(empty($persistence['files_to_check'])) {
+		if (empty($persistence['files_to_check'])) {
 			logThis('*** ERROR: could not find persistent array of files to check');
 			echo $mod_strings['ERR_UW_NO_FILES'];
 		} else {

Braces +5 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -45,8 +47,9 @@ 
  * Reserved. Contributor(s): ______________________________________..
  * *******************************************************************************/
 
-if(ob_get_level() < 1)
+if(ob_get_level() < 1) {
 	ob_start();
+}
 ob_implicit_flush(1);
 
 // load the generated persistence file if found

modules/UpgradeWizard/silentUpgrade_step2.php

Indentation +186 added lines, -186 removed lines

@@ -45,76 +45,76 @@ 
 ini_set('memory_limit',-1);
 ///////////////////////////////////////////////////////////////////////////////
 ////	UTILITIES THAT MUST BE LOCAL :(
- //Bug 24890, 24892. default_permissions not written to config.php. Following function checks and if
- //no found then adds default_permissions to the config file.
- function checkConfigForPermissions(){
-     if(file_exists(getcwd().'/config.php')){
-         require(getcwd().'/config.php');
-     }
-     global $sugar_config;
-     if(!isset($sugar_config['default_permissions'])){
-             $sugar_config['default_permissions'] = array (
-                     'dir_mode' => 02770,
-                     'file_mode' => 0660,
-                     'user' => '',
-                     'group' => '',
-             );
-         ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
-        	//writing to the file
- 		}
-     }
+    //Bug 24890, 24892. default_permissions not written to config.php. Following function checks and if
+    //no found then adds default_permissions to the config file.
+    function checkConfigForPermissions(){
+        if(file_exists(getcwd().'/config.php')){
+            require(getcwd().'/config.php');
+        }
+        global $sugar_config;
+        if(!isset($sugar_config['default_permissions'])){
+                $sugar_config['default_permissions'] = array (
+                        'dir_mode' => 02770,
+                        'file_mode' => 0660,
+                        'user' => '',
+                        'group' => '',
+                );
+            ksort($sugar_config);
+            if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+            //writing to the file
+            }
+        }
 }
 
 function checkLoggerSettings(){
-	if(file_exists(getcwd().'/config.php')){
-         require(getcwd().'/config.php');
-     }
+    if(file_exists(getcwd().'/config.php')){
+            require(getcwd().'/config.php');
+        }
     global $sugar_config;
-	if(!isset($sugar_config['logger'])){
-	    $sugar_config['logger'] =array (
-			'level'=>'fatal',
-		    'file' =>
-		     array (
-		      'ext' => '.log',
-		      'name' => 'sugarcrm',
-		      'dateFormat' => '%c',
-		      'maxSize' => '10MB',
-		      'maxLogs' => 10,
-		      'suffix' => '', // bug51583, change default suffix to blank for backwards comptability
-		    ),
-		  );
-		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
-        	//writing to the file
- 		}
-	 }
+    if(!isset($sugar_config['logger'])){
+        $sugar_config['logger'] =array (
+            'level'=>'fatal',
+            'file' =>
+                array (
+                'ext' => '.log',
+                'name' => 'sugarcrm',
+                'dateFormat' => '%c',
+                'maxSize' => '10MB',
+                'maxLogs' => 10,
+                'suffix' => '', // bug51583, change default suffix to blank for backwards comptability
+            ),
+            );
+            ksort($sugar_config);
+            if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+            //writing to the file
+            }
+        }
 }
 
 function checkResourceSettings(){
-	if(file_exists(getcwd().'/config.php')){
-         require(getcwd().'/config.php');
-     }
+    if(file_exists(getcwd().'/config.php')){
+            require(getcwd().'/config.php');
+        }
     global $sugar_config;
-	if(!isset($sugar_config['resource_management'])){
-	  $sugar_config['resource_management'] =
-		  array (
-		    'special_query_limit' => 50000,
-		    'special_query_modules' =>
-		    array (
-		      0 => 'Reports',
-		      1 => 'Export',
-		      2 => 'Import',
-		      3 => 'Administration',
-		      4 => 'Sync',
-		    ),
-		    'default_limit' => 1000,
-		  );
-		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
-        	//writing to the file
- 		}
-	}
+    if(!isset($sugar_config['resource_management'])){
+        $sugar_config['resource_management'] =
+            array (
+            'special_query_limit' => 50000,
+            'special_query_modules' =>
+            array (
+                0 => 'Reports',
+                1 => 'Export',
+                2 => 'Import',
+                3 => 'Administration',
+                4 => 'Sync',
+            ),
+            'default_limit' => 1000,
+            );
+            ksort($sugar_config);
+            if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+            //writing to the file
+            }
+    }
 }
 
 
@@ -171,10 +171,10 @@ 
 
 function rebuildRelations($pre_path = '')
 {
-	$_REQUEST['silent'] = true;
-	include($pre_path.'modules/Administration/RebuildRelationship.php');
-	$_REQUEST['upgradeWizard'] = true;
-	include($pre_path.'modules/ACL/install_actions.php');
+    $_REQUEST['silent'] = true;
+    include($pre_path.'modules/Administration/RebuildRelationship.php');
+    $_REQUEST['upgradeWizard'] = true;
+    include($pre_path.'modules/ACL/install_actions.php');
 }
 
 //Bug 52872. Dies if the request does not come from CLI.
@@ -186,8 +186,8 @@ 
 
 // only run from command line
 if(isset($_SERVER['HTTP_USER_AGENT'])) {
-	fwrite(STDERR,'This utility may only be run from the command line or command prompt.');
-	exit(1);
+    fwrite(STDERR,'This utility may only be run from the command line or command prompt.');
+    exit(1);
 }
 //Clean_string cleans out any file  passed in as a parameter
 $_SERVER['PHP_SELF'] = 'silentUpgrade.php';
@@ -248,60 +248,60 @@ 
 $isDCEInstance = false;
 $errors = array();
 
-	require('config.php');
-	if(isset($argv[3])) {
-		if(is_dir($argv[3])) {
-			$cwd = $argv[3];
-			chdir($cwd);
-		}
-	}
+    require('config.php');
+    if(isset($argv[3])) {
+        if(is_dir($argv[3])) {
+            $cwd = $argv[3];
+            chdir($cwd);
+        }
+    }
 
-	require_once("{$cwd}/sugar_version.php"); // provides $sugar_version & $sugar_flavor
+    require_once("{$cwd}/sugar_version.php"); // provides $sugar_version & $sugar_flavor
 
-	global $sugar_config;
-	$configOptions = $sugar_config['dbconfig'];
+    global $sugar_config;
+    $configOptions = $sugar_config['dbconfig'];
 
     $GLOBALS['log']	= LoggerManager::getLogger('SugarCRM');
-	$patchName		= basename($argv[1]);
-	$zip_from_dir	= substr($patchName, 0, strlen($patchName) - 4); // patch folder name (minus ".zip")
-	$path			= $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
+    $patchName		= basename($argv[1]);
+    $zip_from_dir	= substr($patchName, 0, strlen($patchName) - 4); // patch folder name (minus ".zip")
+    $path			= $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
     $db				= &DBManagerFactory::getInstance();
-	$UWstrings		= return_module_language('en_us', 'UpgradeWizard', true);
-	$adminStrings	= return_module_language('en_us', 'Administration', true);
+    $UWstrings		= return_module_language('en_us', 'UpgradeWizard', true);
+    $adminStrings	= return_module_language('en_us', 'Administration', true);
     $app_list_strings = return_app_list_strings_language('en_us');
-	$mod_strings	= array_merge($adminStrings, $UWstrings);
-	$subdirs		= array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
-	global $unzip_dir;
+    $mod_strings	= array_merge($adminStrings, $UWstrings);
+    $subdirs		= array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
+    global $unzip_dir;
     $license_accepted = false;
     if(isset($argv[5]) && (strtolower($argv[5])=='yes' || strtolower($argv[5])=='y')){
-    	$license_accepted = true;
-	 }
-	//////////////////////////////////////////////////////////////////////////////
-	//Adding admin user to the silent upgrade
-
-	$current_user = new User();
-	if(isset($argv[4])) {
-	   //if being used for internal upgrades avoid admin user verification
-	   $user_name = $argv[4];
-	   $q = "select id from users where user_name = '" . $user_name . "' and is_admin=1";
-	   $result = $GLOBALS['db']->query($q, false);
-	   $logged_user = $GLOBALS['db']->fetchByAssoc($result);
-	   if(isset($logged_user['id']) && $logged_user['id'] != null){
-		//do nothing
-	    $current_user->retrieve($logged_user['id']);
-	   }
-	   else{
-	   	echo "Not an admin user in users table. Please provide an admin user\n";
-		exit(1);
-	   }
-	}
-	else {
-		echo "*******************************************************************************\n";
-		echo "*** ERROR: 4th parameter must be a valid admin user.\n";
-		echo $usage;
-		echo "FAILURE\n";
-		exit(1);
-	}
+        $license_accepted = true;
+        }
+    //////////////////////////////////////////////////////////////////////////////
+    //Adding admin user to the silent upgrade
+
+    $current_user = new User();
+    if(isset($argv[4])) {
+        //if being used for internal upgrades avoid admin user verification
+        $user_name = $argv[4];
+        $q = "select id from users where user_name = '" . $user_name . "' and is_admin=1";
+        $result = $GLOBALS['db']->query($q, false);
+        $logged_user = $GLOBALS['db']->fetchByAssoc($result);
+        if(isset($logged_user['id']) && $logged_user['id'] != null){
+        //do nothing
+        $current_user->retrieve($logged_user['id']);
+        }
+        else{
+            echo "Not an admin user in users table. Please provide an admin user\n";
+        exit(1);
+        }
+    }
+    else {
+        echo "*******************************************************************************\n";
+        echo "*** ERROR: 4th parameter must be a valid admin user.\n";
+        echo $usage;
+        echo "FAILURE\n";
+        exit(1);
+    }
 
 /////retrieve admin user
 
@@ -315,7 +315,7 @@ 
 
 mkdir_recursive($unzip_dir);
 if(!is_dir($unzip_dir)) {
-	fwrite(STDERR,"\n{$unzip_dir} is not an available directory\nFAILURE\n");
+    fwrite(STDERR,"\n{$unzip_dir} is not an available directory\nFAILURE\n");
     exit(1);
 }
 unzip($argv[1], $unzip_dir);
@@ -326,7 +326,7 @@ 
 
 
 if(function_exists('set_upgrade_vars')){
-	set_upgrade_vars();
+    set_upgrade_vars();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -350,7 +350,7 @@ 
 
 logThis('Upgrading user preferences start .', $path);
 if(function_exists('upgradeUserPreferences')){
-   upgradeUserPreferences();
+    upgradeUserPreferences();
 }
 logThis('Upgrading user preferences finish .', $path);
 
@@ -374,8 +374,8 @@ 
 //Add the cache cleaning here.
 if(function_exists('deleteCache'))
 {
-	logThis('Call deleteCache', $path);
-	@deleteCache();
+    logThis('Call deleteCache', $path);
+    @deleteCache();
 }
 /*
 // creating full text search logic hooks
@@ -418,50 +418,50 @@ 
 
 $repairedTables = array();
 foreach ($beanFiles as $bean => $file) {
-	if(file_exists($file)){
-		unset($GLOBALS['dictionary'][$bean]);
-		require_once($file);
-		$focus = new $bean ();
-		if(empty($focus->table_name) || isset($repairedTables[$focus->table_name])) {
-		   continue;
-		}
-
-		if (($focus instanceOf SugarBean)) {
-			if(!isset($repairedTables[$focus->table_name]))
-			{
-				$sql = $GLOBALS['db']->repairTable($focus, true);
+    if(file_exists($file)){
+        unset($GLOBALS['dictionary'][$bean]);
+        require_once($file);
+        $focus = new $bean ();
+        if(empty($focus->table_name) || isset($repairedTables[$focus->table_name])) {
+            continue;
+        }
+
+        if (($focus instanceOf SugarBean)) {
+            if(!isset($repairedTables[$focus->table_name]))
+            {
+                $sql = $GLOBALS['db']->repairTable($focus, true);
                 if(trim($sql) != '')
                 {
-				    logThis('Running sql:' . $sql, $path);
+                    logThis('Running sql:' . $sql, $path);
                 }
-				$repairedTables[$focus->table_name] = true;
-			}
+                $repairedTables[$focus->table_name] = true;
+            }
 
-			//Check to see if we need to create the audit table
-		    if($focus->is_AuditEnabled() && !$focus->db->tableExists($focus->get_audit_table_name())){
-               logThis('Creating audit table:' . $focus->get_audit_table_name(), $path);
-		       $focus->create_audit_table();
+            //Check to see if we need to create the audit table
+            if($focus->is_AuditEnabled() && !$focus->db->tableExists($focus->get_audit_table_name())){
+                logThis('Creating audit table:' . $focus->get_audit_table_name(), $path);
+                $focus->create_audit_table();
             }
-		}
-	}
+        }
+    }
 }
 
 unset ($dictionary);
 include ("{$argv[3]}/modules/TableDictionary.php");
 foreach ($dictionary as $meta) {
-	$tablename = $meta['table'];
+    $tablename = $meta['table'];
 
-	if(isset($repairedTables[$tablename])) {
-	   continue;
-	}
+    if(isset($repairedTables[$tablename])) {
+        continue;
+    }
 
-	$fielddefs = $meta['fields'];
-	$indices = $meta['indices'];
-	$sql = $GLOBALS['db']->repairTableParams($tablename, $fielddefs, $indices, true);
-	if(!empty($sql)) {
-	    logThis($sql, $path);
-	    $repairedTables[$tablename] = true;
-	}
+    $fielddefs = $meta['fields'];
+    $indices = $meta['indices'];
+    $sql = $GLOBALS['db']->repairTableParams($tablename, $fielddefs, $indices, true);
+    if(!empty($sql)) {
+        logThis($sql, $path);
+        $repairedTables[$tablename] = true;
+    }
 
 }
 
@@ -482,18 +482,18 @@ 
 
 
 if($ce_to_pro_ent) {
-	//add the global team if it does not exist
-	$globalteam = new Team();
-	$globalteam->retrieve('1');
-	require_once($unzip_dir.'/'.$zip_from_dir.'/modules/Administration/language/en_us.lang.php');
-	if(isset($globalteam->name)){
-		echo 'Global '.$mod_strings['LBL_UPGRADE_TEAM_EXISTS'].'<br>';
-		logThis(" Finish Building Global Team", $path);
-	}else{
-		$globalteam->create_team("Global", $mod_strings['LBL_GLOBAL_TEAM_DESC'], $globalteam->global_team);
-	}
-
-	logThis(" Start Building private teams", $path);
+    //add the global team if it does not exist
+    $globalteam = new Team();
+    $globalteam->retrieve('1');
+    require_once($unzip_dir.'/'.$zip_from_dir.'/modules/Administration/language/en_us.lang.php');
+    if(isset($globalteam->name)){
+        echo 'Global '.$mod_strings['LBL_UPGRADE_TEAM_EXISTS'].'<br>';
+        logThis(" Finish Building Global Team", $path);
+    }else{
+        $globalteam->create_team("Global", $mod_strings['LBL_GLOBAL_TEAM_DESC'], $globalteam->global_team);
+    }
+
+    logThis(" Start Building private teams", $path);
 
     upgradeModulesForTeam();
     logThis(" Finish Building private teams", $path);
@@ -502,12 +502,12 @@ 
     upgradeModulesForTeamsets();
     logThis(" Finish Building the team_set and team_sets_teams", $path);
 
-	logThis(" Start modules/Administration/upgradeTeams.php", $path);
+    logThis(" Start modules/Administration/upgradeTeams.php", $path);
         include('modules/Administration/upgradeTeams.php');
         logThis(" Finish modules/Administration/upgradeTeams.php", $path);
 
     if(check_FTS()){
-    	$GLOBALS['db']->full_text_indexing_setup();
+        $GLOBALS['db']->full_text_indexing_setup();
     }
 }
 
@@ -525,7 +525,7 @@ 
 //Unlink files that have been removed
 if(function_exists('unlinkUpgradeFiles'))
 {
-	unlinkUpgradeFiles($sugar_version);
+    unlinkUpgradeFiles($sugar_version);
 }
 
 if(function_exists('rebuildSprites') && function_exists('imagecreatetruecolor'))
@@ -542,11 +542,11 @@ 
 ///////////////////////////////////////////////////////////////////////////////
 ////	TAKE OUT TRASH
 if(empty($errors)) {
-	set_upgrade_progress('end','in_progress','unlinkingfiles','in_progress');
-	logThis('Taking out the trash, unlinking temp files.', $path);
-	unlinkUWTempFiles();
-	removeSilentUpgradeVarsCache();
-	logThis('Taking out the trash, done.', $path);
+    set_upgrade_progress('end','in_progress','unlinkingfiles','in_progress');
+    logThis('Taking out the trash, unlinking temp files.', $path);
+    unlinkUWTempFiles();
+    removeSilentUpgradeVarsCache();
+    logThis('Taking out the trash, done.', $path);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -557,20 +557,20 @@ 
 logThis("**** Potential PHP generated error messages: {$phpErrors}", $path);
 
 if(count($errors) > 0) {
-	foreach($errors as $error) {
-		logThis("****** SilentUpgrade ERROR: {$error}", $path);
-	}
-	echo "FAILED\n";
+    foreach($errors as $error) {
+        logThis("****** SilentUpgrade ERROR: {$error}", $path);
+    }
+    echo "FAILED\n";
 } else {
-	logThis("***** SilentUpgrade completed successfully.", $path);
-	echo "********************************************************************\n";
-	echo "*************************** SUCCESS*********************************\n";
-	echo "********************************************************************\n";
-	echo "******** If your pre-upgrade Leads data is not showing  ************\n";
-	echo "******** Or you see errors in detailview subpanels  ****************\n";
-	echo "************* In order to resolve them  ****************************\n";
-	echo "******** Log into application as Administrator  ********************\n";
-	echo "******** Go to Admin panel  ****************************************\n";
-	echo "******** Run Repair -> Rebuild Relationships  **********************\n";
-	echo "********************************************************************\n";
+    logThis("***** SilentUpgrade completed successfully.", $path);
+    echo "********************************************************************\n";
+    echo "*************************** SUCCESS*********************************\n";
+    echo "********************************************************************\n";
+    echo "******** If your pre-upgrade Leads data is not showing  ************\n";
+    echo "******** Or you see errors in detailview subpanels  ****************\n";
+    echo "************* In order to resolve them  ****************************\n";
+    echo "******** Log into application as Administrator  ********************\n";
+    echo "******** Go to Admin panel  ****************************************\n";
+    echo "******** Run Repair -> Rebuild Relationships  **********************\n";
+    echo "********************************************************************\n";
 }

Spacing +79 added lines, -79 removed lines

@@ -42,40 +42,40 @@ 
 //// php.exe -f silentUpgrade.php [Path to Upgrade Package zip] [Path to Log file] [Path to Instance]
 //// See below the Usage for more details.
 /////////////////////////////////////////////////////////////////////////////////////////
-ini_set('memory_limit',-1);
+ini_set('memory_limit', -1);
 ///////////////////////////////////////////////////////////////////////////////
 ////	UTILITIES THAT MUST BE LOCAL :(
  //Bug 24890, 24892. default_permissions not written to config.php. Following function checks and if
  //no found then adds default_permissions to the config file.
- function checkConfigForPermissions(){
-     if(file_exists(getcwd().'/config.php')){
+ function checkConfigForPermissions() {
+     if (file_exists(getcwd().'/config.php')) {
          require(getcwd().'/config.php');
      }
      global $sugar_config;
-     if(!isset($sugar_config['default_permissions'])){
-             $sugar_config['default_permissions'] = array (
+     if (!isset($sugar_config['default_permissions'])) {
+             $sugar_config['default_permissions'] = array(
                      'dir_mode' => 02770,
                      'file_mode' => 0660,
                      'user' => '',
                      'group' => '',
              );
          ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+         if (is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config, 'config.php')) {
         	//writing to the file
  		}
      }
 }
 
-function checkLoggerSettings(){
-	if(file_exists(getcwd().'/config.php')){
+function checkLoggerSettings() {
+	if (file_exists(getcwd().'/config.php')) {
          require(getcwd().'/config.php');
      }
     global $sugar_config;
-	if(!isset($sugar_config['logger'])){
-	    $sugar_config['logger'] =array (
+	if (!isset($sugar_config['logger'])) {
+	    $sugar_config['logger'] = array(
 			'level'=>'fatal',
 		    'file' =>
-		     array (
+		     array(
 		      'ext' => '.log',
 		      'name' => 'sugarcrm',
 		      'dateFormat' => '%c',
@@ -85,23 +85,23 @@ 
 		    ),
 		  );
 		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+         if (is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config, 'config.php')) {
         	//writing to the file
  		}
 	 }
 }
 
-function checkResourceSettings(){
-	if(file_exists(getcwd().'/config.php')){
+function checkResourceSettings() {
+	if (file_exists(getcwd().'/config.php')) {
          require(getcwd().'/config.php');
      }
     global $sugar_config;
-	if(!isset($sugar_config['resource_management'])){
+	if (!isset($sugar_config['resource_management'])) {
 	  $sugar_config['resource_management'] =
-		  array (
+		  array(
 		    'special_query_limit' => 50000,
 		    'special_query_modules' =>
-		    array (
+		    array(
 		      0 => 'Reports',
 		      1 => 'Export',
 		      2 => 'Import',
@@ -111,18 +111,18 @@ 
 		    'default_limit' => 1000,
 		  );
 		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+         if (is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config, 'config.php')) {
         	//writing to the file
  		}
 	}
 }
 
 
-function verifyArguments($argv,$usage_regular){
+function verifyArguments($argv, $usage_regular) {
     $upgradeType = '';
     $cwd = getcwd(); // default to current, assumed to be in a valid SugarCRM root dir.
-    if(isset($argv[3])) {
-        if(is_dir($argv[3])) {
+    if (isset($argv[3])) {
+        if (is_dir($argv[3])) {
             $cwd = $argv[3];
             chdir($cwd);
         } else {
@@ -133,18 +133,18 @@ 
     }
 
     //check if this is an instance
-    if(is_file("{$cwd}/include/entryPoint.php")) {
+    if (is_file("{$cwd}/include/entryPoint.php")) {
         //this should be a regular sugar install
         $upgradeType = constant('SUGARCRM_INSTALL');
         //check if this is a valid zip file
-        if(!is_file($argv[1])) { // valid zip?
+        if (!is_file($argv[1])) { // valid zip?
             echo "*******************************************************************************\n";
             echo "*** ERROR: First argument must be a full path to the patch file. Got [ {$argv[1]} ].\n";
             echo $usage_regular;
             echo "FAILURE\n";
             exit(1);
         }
-        if(count($argv) < 5) {
+        if (count($argv) < 5) {
             echo "*******************************************************************************\n";
             echo "*** ERROR: Missing required parameters.  Received ".count($argv)." argument(s), require 5.\n";
             echo $usage_regular;
@@ -159,7 +159,7 @@ 
         exit(1);
     }
 
-    if(isset($argv[7]) && file_exists($argv[7].'SugarTemplateUtilties.php')){
+    if (isset($argv[7]) && file_exists($argv[7].'SugarTemplateUtilties.php')) {
         require_once($argv[7].'SugarTemplateUtilties.php');
     }
 
@@ -185,8 +185,8 @@ 
 //End of #52872
 
 // only run from command line
-if(isset($_SERVER['HTTP_USER_AGENT'])) {
-	fwrite(STDERR,'This utility may only be run from the command line or command prompt.');
+if (isset($_SERVER['HTTP_USER_AGENT'])) {
+	fwrite(STDERR, 'This utility may only be run from the command line or command prompt.');
 	exit(1);
 }
 //Clean_string cleans out any file  passed in as a parameter
@@ -195,7 +195,7 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	USAGE
-$usage_regular =<<<eoq2
+$usage_regular = <<<eoq2
 Usage: php.exe -f silentUpgrade.php [upgradeZipFile] [logFile] [pathToSugarInstance] [admin-user]
 
 On Command Prompt Change directory to where silentUpgrade.php resides. Then type path to
@@ -217,7 +217,7 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	STANDARD REQUIRED SUGAR INCLUDES AND PRESETS
-if(!defined('sugarEntry')) define('sugarEntry', true);
+if (!defined('sugarEntry')) define('sugarEntry', true);
 
 $_SESSION = array();
 $_SESSION['schema_change'] = 'sugar'; // we force-run all SQL
@@ -234,10 +234,10 @@ 
 global $cwd;
 $cwd = getcwd(); // default to current, assumed to be in a valid SugarCRM root dir.
 
-$upgradeType = verifyArguments($argv,$usage_regular);
+$upgradeType = verifyArguments($argv, $usage_regular);
 
-$path			= $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
-$subdirs		= array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
+$path = $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
+$subdirs = array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
 
 require_once('include/entryPoint.php');
 require_once('modules/UpgradeWizard/uw_utils.php');
@@ -249,8 +249,8 @@ 
 $errors = array();
 
 	require('config.php');
-	if(isset($argv[3])) {
-		if(is_dir($argv[3])) {
+	if (isset($argv[3])) {
+		if (is_dir($argv[3])) {
 			$cwd = $argv[3];
 			chdir($cwd);
 		}
@@ -261,36 +261,36 @@ 
 	global $sugar_config;
 	$configOptions = $sugar_config['dbconfig'];
 
-    $GLOBALS['log']	= LoggerManager::getLogger('SugarCRM');
-	$patchName		= basename($argv[1]);
-	$zip_from_dir	= substr($patchName, 0, strlen($patchName) - 4); // patch folder name (minus ".zip")
-	$path			= $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
-    $db				= &DBManagerFactory::getInstance();
-	$UWstrings		= return_module_language('en_us', 'UpgradeWizard', true);
-	$adminStrings	= return_module_language('en_us', 'Administration', true);
+    $GLOBALS['log'] = LoggerManager::getLogger('SugarCRM');
+	$patchName = basename($argv[1]);
+	$zip_from_dir = substr($patchName, 0, strlen($patchName) - 4); // patch folder name (minus ".zip")
+	$path = $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
+    $db = &DBManagerFactory::getInstance();
+	$UWstrings = return_module_language('en_us', 'UpgradeWizard', true);
+	$adminStrings = return_module_language('en_us', 'Administration', true);
     $app_list_strings = return_app_list_strings_language('en_us');
-	$mod_strings	= array_merge($adminStrings, $UWstrings);
-	$subdirs		= array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
+	$mod_strings = array_merge($adminStrings, $UWstrings);
+	$subdirs = array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
 	global $unzip_dir;
     $license_accepted = false;
-    if(isset($argv[5]) && (strtolower($argv[5])=='yes' || strtolower($argv[5])=='y')){
+    if (isset($argv[5]) && (strtolower($argv[5]) == 'yes' || strtolower($argv[5]) == 'y')) {
     	$license_accepted = true;
 	 }
 	//////////////////////////////////////////////////////////////////////////////
 	//Adding admin user to the silent upgrade
 
 	$current_user = new User();
-	if(isset($argv[4])) {
+	if (isset($argv[4])) {
 	   //if being used for internal upgrades avoid admin user verification
 	   $user_name = $argv[4];
-	   $q = "select id from users where user_name = '" . $user_name . "' and is_admin=1";
+	   $q = "select id from users where user_name = '".$user_name."' and is_admin=1";
 	   $result = $GLOBALS['db']->query($q, false);
 	   $logged_user = $GLOBALS['db']->fetchByAssoc($result);
-	   if(isset($logged_user['id']) && $logged_user['id'] != null){
+	   if (isset($logged_user['id']) && $logged_user['id'] != null) {
 		//do nothing
 	    $current_user->retrieve($logged_user['id']);
 	   }
-	   else{
+	   else {
 	   	echo "Not an admin user in users table. Please provide an admin user\n";
 		exit(1);
 	   }
@@ -314,8 +314,8 @@ 
 $_SESSION['zip_from_dir'] = $zip_from_dir;
 
 mkdir_recursive($unzip_dir);
-if(!is_dir($unzip_dir)) {
-	fwrite(STDERR,"\n{$unzip_dir} is not an available directory\nFAILURE\n");
+if (!is_dir($unzip_dir)) {
+	fwrite(STDERR, "\n{$unzip_dir} is not an available directory\nFAILURE\n");
     exit(1);
 }
 unzip($argv[1], $unzip_dir);
@@ -325,7 +325,7 @@ 
 ///////////////////////////////////////////////////////////////////////////////
 
 
-if(function_exists('set_upgrade_vars')){
+if (function_exists('set_upgrade_vars')) {
 	set_upgrade_vars();
 }
 
@@ -349,18 +349,18 @@ 
 upgrade_custom_relationships();
 
 logThis('Upgrading user preferences start .', $path);
-if(function_exists('upgradeUserPreferences')){
+if (function_exists('upgradeUserPreferences')) {
    upgradeUserPreferences();
 }
 logThis('Upgrading user preferences finish .', $path);
 
 // clear out the theme cache
-if(is_dir($GLOBALS['sugar_config']['cache_dir'].'themes')){
+if (is_dir($GLOBALS['sugar_config']['cache_dir'].'themes')) {
     $allModFiles = array();
-    $allModFiles = findAllFiles($GLOBALS['sugar_config']['cache_dir'].'themes',$allModFiles);
-    foreach($allModFiles as $file){
+    $allModFiles = findAllFiles($GLOBALS['sugar_config']['cache_dir'].'themes', $allModFiles);
+    foreach ($allModFiles as $file) {
         //$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-        if(file_exists($file)){
+        if (file_exists($file)) {
             unlink($file);
         }
     }
@@ -372,7 +372,7 @@ 
 require_once('jssource/minify.php');
 
 //Add the cache cleaning here.
-if(function_exists('deleteCache'))
+if (function_exists('deleteCache'))
 {
 	logThis('Call deleteCache', $path);
 	@deleteCache();
@@ -411,35 +411,35 @@ 
 $rac->clearVardefs();
 $rac->rebuildExtensions();
 //bug: 44431 - defensive check to ensure the method exists since upgrades to 6.2.0 may not have this method define yet.
-if(method_exists($rac, 'clearExternalAPICache'))
+if (method_exists($rac, 'clearExternalAPICache'))
 {
     $rac->clearExternalAPICache();
 }
 
 $repairedTables = array();
 foreach ($beanFiles as $bean => $file) {
-	if(file_exists($file)){
+	if (file_exists($file)) {
 		unset($GLOBALS['dictionary'][$bean]);
 		require_once($file);
-		$focus = new $bean ();
-		if(empty($focus->table_name) || isset($repairedTables[$focus->table_name])) {
+		$focus = new $bean();
+		if (empty($focus->table_name) || isset($repairedTables[$focus->table_name])) {
 		   continue;
 		}
 
 		if (($focus instanceOf SugarBean)) {
-			if(!isset($repairedTables[$focus->table_name]))
+			if (!isset($repairedTables[$focus->table_name]))
 			{
 				$sql = $GLOBALS['db']->repairTable($focus, true);
-                if(trim($sql) != '')
+                if (trim($sql) != '')
                 {
-				    logThis('Running sql:' . $sql, $path);
+				    logThis('Running sql:'.$sql, $path);
                 }
 				$repairedTables[$focus->table_name] = true;
 			}
 
 			//Check to see if we need to create the audit table
-		    if($focus->is_AuditEnabled() && !$focus->db->tableExists($focus->get_audit_table_name())){
-               logThis('Creating audit table:' . $focus->get_audit_table_name(), $path);
+		    if ($focus->is_AuditEnabled() && !$focus->db->tableExists($focus->get_audit_table_name())) {
+               logThis('Creating audit table:'.$focus->get_audit_table_name(), $path);
 		       $focus->create_audit_table();
             }
 		}
@@ -451,14 +451,14 @@ 
 foreach ($dictionary as $meta) {
 	$tablename = $meta['table'];
 
-	if(isset($repairedTables[$tablename])) {
+	if (isset($repairedTables[$tablename])) {
 	   continue;
 	}
 
 	$fielddefs = $meta['fields'];
 	$indices = $meta['indices'];
 	$sql = $GLOBALS['db']->repairTableParams($tablename, $fielddefs, $indices, true);
-	if(!empty($sql)) {
+	if (!empty($sql)) {
 	    logThis($sql, $path);
 	    $repairedTables[$tablename] = true;
 	}
@@ -472,7 +472,7 @@ 
 logThis('End rebuild relationships.', $path);
 
 include("$unzip_dir/manifest.php");
-$ce_to_pro_ent = isset($manifest['name']) && ($manifest['name'] == 'SugarCE to SugarPro' || $manifest['name'] == 'SugarCE to SugarEnt'  || $manifest['name'] == 'SugarCE to SugarCorp' || $manifest['name'] == 'SugarCE to SugarUlt');
+$ce_to_pro_ent = isset($manifest['name']) && ($manifest['name'] == 'SugarCE to SugarPro' || $manifest['name'] == 'SugarCE to SugarEnt' || $manifest['name'] == 'SugarCE to SugarCorp' || $manifest['name'] == 'SugarCE to SugarUlt');
 $sugar_version = getSilentUpgradeVar('origVersion');
 if (!$sugar_version)
 {
@@ -481,15 +481,15 @@ 
 }
 
 
-if($ce_to_pro_ent) {
+if ($ce_to_pro_ent) {
 	//add the global team if it does not exist
 	$globalteam = new Team();
 	$globalteam->retrieve('1');
 	require_once($unzip_dir.'/'.$zip_from_dir.'/modules/Administration/language/en_us.lang.php');
-	if(isset($globalteam->name)){
+	if (isset($globalteam->name)) {
 		echo 'Global '.$mod_strings['LBL_UPGRADE_TEAM_EXISTS'].'<br>';
 		logThis(" Finish Building Global Team", $path);
-	}else{
+	} else {
 		$globalteam->create_team("Global", $mod_strings['LBL_GLOBAL_TEAM_DESC'], $globalteam->global_team);
 	}
 
@@ -506,7 +506,7 @@ 
         include('modules/Administration/upgradeTeams.php');
         logThis(" Finish modules/Administration/upgradeTeams.php", $path);
 
-    if(check_FTS()){
+    if (check_FTS()) {
     	$GLOBALS['db']->full_text_indexing_setup();
     }
 }
@@ -523,12 +523,12 @@ 
 
 
 //Unlink files that have been removed
-if(function_exists('unlinkUpgradeFiles'))
+if (function_exists('unlinkUpgradeFiles'))
 {
 	unlinkUpgradeFiles($sugar_version);
 }
 
-if(function_exists('rebuildSprites') && function_exists('imagecreatetruecolor'))
+if (function_exists('rebuildSprites') && function_exists('imagecreatetruecolor'))
 {
     rebuildSprites(true);
 }
@@ -541,8 +541,8 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	TAKE OUT TRASH
-if(empty($errors)) {
-	set_upgrade_progress('end','in_progress','unlinkingfiles','in_progress');
+if (empty($errors)) {
+	set_upgrade_progress('end', 'in_progress', 'unlinkingfiles', 'in_progress');
 	logThis('Taking out the trash, unlinking temp files.', $path);
 	unlinkUWTempFiles();
 	removeSilentUpgradeVarsCache();
@@ -556,8 +556,8 @@ 
 ob_end_clean();
 logThis("**** Potential PHP generated error messages: {$phpErrors}", $path);
 
-if(count($errors) > 0) {
-	foreach($errors as $error) {
+if (count($errors) > 0) {
+	foreach ($errors as $error) {
 		logThis("****** SilentUpgrade ERROR: {$error}", $path);
 	}
 	echo "FAILED\n";

Braces +7 added lines, -8 removed lines

@@ -151,8 +151,7 @@ 
             echo "FAILURE\n";
             exit(1);
         }
-    }
-    else {
+    } else {
         //this should be a regular sugar install
         echo "*******************************************************************************\n";
         echo "*** ERROR: Tried to execute in a non-SugarCRM root directory.\n";
@@ -217,7 +216,9 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	STANDARD REQUIRED SUGAR INCLUDES AND PRESETS
-if(!defined('sugarEntry')) define('sugarEntry', true);
+if(!defined('sugarEntry')) {
+    define('sugarEntry', true);
+}
 
 $_SESSION = array();
 $_SESSION['schema_change'] = 'sugar'; // we force-run all SQL
@@ -289,13 +290,11 @@ 
 	   if(isset($logged_user['id']) && $logged_user['id'] != null){
 		//do nothing
 	    $current_user->retrieve($logged_user['id']);
-	   }
-	   else{
+	   } else{
 	   	echo "Not an admin user in users table. Please provide an admin user\n";
 		exit(1);
 	   }
-	}
-	else {
+	} else {
 		echo "*******************************************************************************\n";
 		echo "*** ERROR: 4th parameter must be a valid admin user.\n";
 		echo $usage;
@@ -489,7 +488,7 @@ 
 	if(isset($globalteam->name)){
 		echo 'Global '.$mod_strings['LBL_UPGRADE_TEAM_EXISTS'].'<br>';
 		logThis(" Finish Building Global Team", $path);
-	}else{
+	} else{
 		$globalteam->create_team("Global", $mod_strings['LBL_GLOBAL_TEAM_DESC'], $globalteam->global_team);
 	}
 

modules/UpgradeWizard/preflightJson.php

Indentation +21 added lines, -21 removed lines

@@ -46,40 +46,40 @@
  * *******************************************************************************/
 
 if(ob_get_level() < 1)
-	ob_start();
+    ob_start();
 ob_implicit_flush(1);
 
 // load the generated persistence file if found
 $persistence = array();
 if(file_exists($persist = sugar_cached('/modules/UpgradeWizard/_persistence.php'))) {
-	require_once $persist;
+    require_once $persist;
 }
 require_once('modules/UpgradeWizard/uw_utils.php');
 require_once('include/utils/zip_utils.php');
 
 switch($_REQUEST['preflightStep']) {
-	case 'find_upgrade_files':
-		logThis('preflightJson finding upgrade files');
-		ob_end_flush();
-		$persistence['upgrade_files'] = preflightCheckJsonFindUpgradeFiles();
-	break;
+    case 'find_upgrade_files':
+        logThis('preflightJson finding upgrade files');
+        ob_end_flush();
+        $persistence['upgrade_files'] = preflightCheckJsonFindUpgradeFiles();
+    break;
 
-	case 'diff_upgrade_files':
-		logThis('preflightJson diffing upgrade files');
-		ob_end_flush();
-		$persistence = preflightCheckJsonDiffFiles();
-	break;
+    case 'diff_upgrade_files':
+        logThis('preflightJson diffing upgrade files');
+        ob_end_flush();
+        $persistence = preflightCheckJsonDiffFiles();
+    break;
 
-	case 'get_diff_results':
-		logThis('preflightJson getting diff results for display');
-		ob_end_flush();
-		$persistence = preflightCheckJsonGetDiff();
-	break;
+    case 'get_diff_results':
+        logThis('preflightJson getting diff results for display');
+        ob_end_flush();
+        $persistence = preflightCheckJsonGetDiff();
+    break;
 
-	case 'get_diff_errors':
-		logThis('preflightJson getting diff errors (if any)');
-		preflightCheckJsonGetDiffErrors();
-	break;
+    case 'get_diff_errors':
+        logThis('preflightJson getting diff errors (if any)');
+        preflightCheckJsonGetDiffErrors();
+    break;
 }
 
 write_array_to_file('persistence', $persistence, $persist);

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -45,19 +45,19 @@ 
  * Reserved. Contributor(s): ______________________________________..
  * *******************************************************************************/
 
-if(ob_get_level() < 1)
+if (ob_get_level() < 1)
 	ob_start();
 ob_implicit_flush(1);
 
 // load the generated persistence file if found
 $persistence = array();
-if(file_exists($persist = sugar_cached('/modules/UpgradeWizard/_persistence.php'))) {
+if (file_exists($persist = sugar_cached('/modules/UpgradeWizard/_persistence.php'))) {
 	require_once $persist;
 }
 require_once('modules/UpgradeWizard/uw_utils.php');
 require_once('include/utils/zip_utils.php');
 
-switch($_REQUEST['preflightStep']) {
+switch ($_REQUEST['preflightStep']) {
 	case 'find_upgrade_files':
 		logThis('preflightJson finding upgrade files');
 		ob_end_flush();

Braces +5 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -45,8 +47,9 @@ 
  * Reserved. Contributor(s): ______________________________________..
  * *******************************************************************************/
 
-if(ob_get_level() < 1)
+if(ob_get_level() < 1) {
 	ob_start();
+}
 ob_implicit_flush(1);
 
 // load the generated persistence file if found

modules/UpgradeWizard/UploadFileCheck.php

Indentation +11 added lines, -11 removed lines

@@ -38,10 +38,10 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
- //Request object must have these property values:
- //		Module: module name, this module should have a file called TreeData.php
- //		Function: name of the function to be called in TreeData.php, the function will be called statically.
- //		PARAM prefixed properties: array of these property/values will be passed to the function as parameter.
+    //Request object must have these property values:
+    //		Module: module name, this module should have a file called TreeData.php
+    //		Function: name of the function to be called in TreeData.php, the function will be called statically.
+    //		PARAM prefixed properties: array of these property/values will be passed to the function as parameter.
 
 require_once('include/JSON.php');
 require_once('include/upload_file.php');
@@ -50,9 +50,9 @@ 
 
 $json = getJSONobj();
 $file_name = $json->decode(html_entity_decode($_REQUEST['file_name']));
- if(isset($file_name['jsonObject']) && $file_name['jsonObject'] != null){
-	$file_name = $file_name['jsonObject'];
-  }
+    if(isset($file_name['jsonObject']) && $file_name['jsonObject'] != null){
+    $file_name = $file_name['jsonObject'];
+    }
 
 $filesize = '';
 if(file_exists($file_name)){
@@ -73,10 +73,10 @@ 
 //$uploadSizeIni = substr(ini_get("upload_max_filesize"), 0, strlen( ini_get("upload_max_filesize")) - 1);
 //$GLOBALS['log']->fatal('Upload php setting Size '.return_bytes(ini_get("upload_max_filesize")));
 if($filesize != null){
-	if(($filesize > return_bytes(ini_get("upload_max_filesize"))) || ($filesize > return_bytes(ini_get("post_max_size")))){
-		$response=$filesize;
-		//$response= "<script>alert('File size is bigger than the max_upload-size setting in php.ini. Upgrade attempt will fail. Increase the upload_max_size in php.ini to greater than ')</script>";
-	}
+    if(($filesize > return_bytes(ini_get("upload_max_filesize"))) || ($filesize > return_bytes(ini_get("post_max_size")))){
+        $response=$filesize;
+        //$response= "<script>alert('File size is bigger than the max_upload-size setting in php.ini. Upgrade attempt will fail. Increase the upload_max_size in php.ini to greater than ')</script>";
+    }
 }
 
 if (!empty($response)) {

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -50,13 +50,13 @@ 
 
 $json = getJSONobj();
 $file_name = $json->decode(html_entity_decode($_REQUEST['file_name']));
- if(isset($file_name['jsonObject']) && $file_name['jsonObject'] != null){
+ if (isset($file_name['jsonObject']) && $file_name['jsonObject'] != null) {
 	$file_name = $file_name['jsonObject'];
   }
 
 $filesize = '';
-if(file_exists($file_name)){
-    $filesize =filesize($file_name);
+if (file_exists($file_name)) {
+    $filesize = filesize($file_name);
 }
 
 
@@ -72,9 +72,9 @@ 
 //get the file size defined in php.ini
 //$uploadSizeIni = substr(ini_get("upload_max_filesize"), 0, strlen( ini_get("upload_max_filesize")) - 1);
 //$GLOBALS['log']->fatal('Upload php setting Size '.return_bytes(ini_get("upload_max_filesize")));
-if($filesize != null){
-	if(($filesize > return_bytes(ini_get("upload_max_filesize"))) || ($filesize > return_bytes(ini_get("post_max_size")))){
-		$response=$filesize;
+if ($filesize != null) {
+	if (($filesize > return_bytes(ini_get("upload_max_filesize"))) || ($filesize > return_bytes(ini_get("post_max_size")))) {
+		$response = $filesize;
 		//$response= "<script>alert('File size is bigger than the max_upload-size setting in php.ini. Upgrade attempt will fail. Increase the upload_max_size in php.ini to greater than ')</script>";
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/UpgradeWizard/upgradeTimeCounter.php

Indentation +7 added lines, -7 removed lines

@@ -72,18 +72,18 @@
  }
 */
 
- $_SESSION['totalUpgradeTime'] = $_SESSION['totalUpgradeTime']+$_REQUEST['upgradeStepTime'];
- $response = $_SESSION['totalUpgradeTime'];
+    $_SESSION['totalUpgradeTime'] = $_SESSION['totalUpgradeTime']+$_REQUEST['upgradeStepTime'];
+    $response = $_SESSION['totalUpgradeTime'];
 
 $GLOBALS['log']->fatal('TOTAL TIME .....'.$_SESSION['totalUpgradeTime']);
- //$uptime = $uptime+$_REQUEST['upgradeStepTime'];
- $GLOBALS['log']->fatal($response);
+    //$uptime = $uptime+$_REQUEST['upgradeStepTime'];
+    $GLOBALS['log']->fatal($response);
 
 
- if (!empty($response)) {
+    if (!empty($response)) {
     $json = getJSONobj();
-	print $json->encode($response);
- }
+    print $json->encode($response);
+    }
 
 sugar_cleanup();
 exit();

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -72,7 +72,7 @@ 
  }
 */
 
- $_SESSION['totalUpgradeTime'] = $_SESSION['totalUpgradeTime']+$_REQUEST['upgradeStepTime'];
+ $_SESSION['totalUpgradeTime'] = $_SESSION['totalUpgradeTime'] + $_REQUEST['upgradeStepTime'];
  $response = $_SESSION['totalUpgradeTime'];
 
 $GLOBALS['log']->fatal('TOTAL TIME .....'.$_SESSION['totalUpgradeTime']);

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.