adamjakab / SuiteCRM

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);

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";
 }

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);

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)) {

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();

modules/UpgradeWizard/UpgradeRemoval.php

Indentation +35 added lines, -35 removed lines

@@ -68,7 +68,7 @@ 
  */
 public function getFilesToRemove($version)
 {
-	return array();
+    return array();
 }
 
 /**
@@ -79,31 +79,31 @@ 
  */
 public function processFilesToRemove($files=array())
 {
-	if(empty($files) || !is_array($files))
-	{
-		return;
-	}	
+    if(empty($files) || !is_array($files))
+    {
+        return;
+    }	
 	
-	require_once('include/dir_inc.php');
+    require_once('include/dir_inc.php');
 	
-	if(!file_exists('custom/backup'))
-	{
-	   mkdir_recursive('custom/backup');
-	}
+    if(!file_exists('custom/backup'))
+    {
+        mkdir_recursive('custom/backup');
+    }
 	
-	foreach($files as $file)
-	{		
-		if(file_exists($file))
-		{
-			$this->backup($file);   
-			if(is_dir($file))
-			{
-			  rmdir_recursive($file);	
-			} else {
-			  unlink($file);
-			}
-	    }
-	}
+    foreach($files as $file)
+    {		
+        if(file_exists($file))
+        {
+            $this->backup($file);   
+            if(is_dir($file))
+            {
+                rmdir_recursive($file);	
+            } else {
+                unlink($file);
+            }
+        }
+    }
 }
 
 
@@ -115,20 +115,20 @@ 
  */
 protected function backup($file)
 {
-	$basename = basename($file);
-	$basepath = str_replace($basename, '', $file);
+    $basename = basename($file);
+    $basepath = str_replace($basename, '', $file);
 
-	if(!empty($basepath) && !file_exists('custom/backup/' . $basepath))
-	{
-	   mkdir_recursive('custom/backup/' . $basepath);
-	}
+    if(!empty($basepath) && !file_exists('custom/backup/' . $basepath))
+    {
+        mkdir_recursive('custom/backup/' . $basepath);
+    }
 	
-	if(is_dir($file))
-	{
-    	copy_recursive($file, 'custom/backup/' . $file);	
-	} else {
-		copy($file, 'custom/backup/' . $file);
-	}
+    if(is_dir($file))
+    {
+        copy_recursive($file, 'custom/backup/' . $file);	
+    } else {
+        copy($file, 'custom/backup/' . $file);
+    }
 }
 
 }

modules/UpgradeWizard/populateColumns.php

Indentation +21 added lines, -21 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/entryPoint.php');
@@ -52,25 +52,25 @@ 
 
 $json = getJSONobj();
 $selectedTable = $json->decode(html_entity_decode($_REQUEST['selectedTable']));
- if(isset($tagArticleIds['jsonObject']) && $tagArticleIds['jsonObject'] != null){
-	$selectedTable = $selectedTable['jsonObject'];
-  }
+    if(isset($tagArticleIds['jsonObject']) && $tagArticleIds['jsonObject'] != null){
+    $selectedTable = $selectedTable['jsonObject'];
+    }
 $GLOBALS['log']->fatal('************ comes here *********');
 //$GLOBALS['log']->fatal($_REQUEST['selectedTable']);
 function tableColumns($table_name){
-	$GLOBALS['log']->fatal('********TABLE PASSED******* '.$table_name);
-	global $sugar_config;
-	global $setup_db_database_name;
+    $GLOBALS['log']->fatal('********TABLE PASSED******* '.$table_name);
+    global $sugar_config;
+    global $setup_db_database_name;
     global $setup_db_host_name;
     global $setup_db_host_instance;
     global $setup_db_admin_user_name;
     global $setup_db_admin_password;
     
-	//$db = &DBManagerFactory::getInstance('information_schema');
+    //$db = &DBManagerFactory::getInstance('information_schema');
 
-	$db_name= $sugar_config['dbconfig']['db_name'];
-	$setup_db_host_name = $sugar_config['dbconfig']['db_host_name'];
-  	$setup_db_admin_user_name = $sugar_config['dbconfig']['db_user_name'];
+    $db_name= $sugar_config['dbconfig']['db_name'];
+    $setup_db_host_name = $sugar_config['dbconfig']['db_host_name'];
+        $setup_db_admin_user_name = $sugar_config['dbconfig']['db_user_name'];
     $setup_db_host_instance = $sugar_config['dbconfig']['db_host_instance'];
     $setup_db_admin_password = $sugar_config['dbconfig']['db_password'];
 
@@ -78,27 +78,27 @@ 
     mysql_select_db('information_schema');
 
     $qu="SELECT column_name FROM information_schema.columns WHERE table_schema = '".$db_name."' AND table_name = '".$table_name."'";
-	$ct =mysql_query($qu,$link);
+    $ct =mysql_query($qu,$link);
     //$cols= '';
     $colsDrop = array();
     while($row = mysql_fetch_assoc($ct)){
-    	 $colsDrop[] =$row['column_name'];
+            $colsDrop[] =$row['column_name'];
     }
     return $colsDrop;
 }
 
 $colsDrop = tableColumns($_REQUEST['selectedTable']);
 if($colsDrop != null){
-	$colsDropDown = "<option value=".$_REQUEST['selectedTable']." Columns>".$_REQUEST['selectedTable']." Columns</option>";
-	foreach($colsDrop as $col){
-		$colsDropDown .="<option value={$col}>{$col}</option>";
-	}
+    $colsDropDown = "<option value=".$_REQUEST['selectedTable']." Columns>".$_REQUEST['selectedTable']." Columns</option>";
+    foreach($colsDrop as $col){
+        $colsDropDown .="<option value={$col}>{$col}</option>";
+    }
 }
 //$response = "<script>document.getElementById('select_column').innerHTML=$colsDropDown</script>";
 $response = $colsDropDown;
 
 if (!empty($response)) {
-	echo $response;
+    echo $response;
 }
 sugar_cleanup();
 exit();

modules/UpgradeWizard/silentUpgrade.php

Indentation +36 added lines, -36 removed lines

@@ -35,29 +35,29 @@ 
  ********************************************************************************/
 
 function build_argument_string($arguments=array()) {
-   if(!is_array($arguments)) {
-   	  return '';
-   }
+    if(!is_array($arguments)) {
+            return '';
+    }
 
-   $argument_string = '';
-   $count = 0;
-   foreach($arguments as $arg) {
-   	   if($count != 0)
-   	   {
-   	   	  //If current directory or parent directory is specified, substitute with full path
-   	   	  if($arg == '.')
-   	   	  {
-   	   	  	 $arg = getcwd();
-   	   	  } else if ($arg == '..') {
-   	   	  	 $dir = getcwd();
-			 $arg = substr($dir, 0, strrpos($dir, DIRECTORY_SEPARATOR));
-   	   	  }
-          $argument_string .= ' ' . escapeshellarg($arg);
-   	   }
-   	   $count++;
-   }
+    $argument_string = '';
+    $count = 0;
+    foreach($arguments as $arg) {
+            if($count != 0)
+            {
+                //If current directory or parent directory is specified, substitute with full path
+                if($arg == '.')
+                {
+                        $arg = getcwd();
+                } else if ($arg == '..') {
+                        $dir = getcwd();
+                $arg = substr($dir, 0, strrpos($dir, DIRECTORY_SEPARATOR));
+                }
+            $argument_string .= ' ' . escapeshellarg($arg);
+            }
+            $count++;
+    }
 
-   return $argument_string;
+    return $argument_string;
 }
 
 //Bug 52872. Dies if the request does not come from CLI.
@@ -75,8 +75,8 @@ 
                 $run_dce_upgrade = true;
                 //set the php path if found
                 if(is_file($argv[7].'dce_config.php')){
-                   include($argv[7].'dce_config.php');
-                   $php_path = $dce_config['client_php_path'].'/';
+                    include($argv[7].'dce_config.php');
+                    $php_path = $dce_config['client_php_path'].'/';
                 }
 }
 
@@ -92,25 +92,25 @@ 
 $has_error = $output == 0 ? false : true;
 
 if(!$has_error) {
-	if($run_dce_upgrade) {
-		$step2 = $php_path."php -f {$php_dir}silentUpgrade_dce_step1.php " . build_argument_string($argv);
-		passthru($step2, $output);
-	} else {
-		$step2 = "php -f {$php_dir}silentUpgrade_step2.php " . build_argument_string($argv);
-		passthru($step2, $output);
-	}
+    if($run_dce_upgrade) {
+        $step2 = $php_path."php -f {$php_dir}silentUpgrade_dce_step1.php " . build_argument_string($argv);
+        passthru($step2, $output);
+    } else {
+        $step2 = "php -f {$php_dir}silentUpgrade_step2.php " . build_argument_string($argv);
+        passthru($step2, $output);
+    }
 }
 
 if($run_dce_upgrade) {
-	$has_error = $output == 0 ? false : true;
-	if(!$has_error) {
-	   $step3 = $php_path."php -f {$php_dir}silentUpgrade_dce_step2.php " . build_argument_string($argv);
-	   passthru($step3, $output);
-	}
+    $has_error = $output == 0 ? false : true;
+    if(!$has_error) {
+        $step3 = $php_path."php -f {$php_dir}silentUpgrade_dce_step2.php " . build_argument_string($argv);
+        passthru($step3, $output);
+    }
 }
 
 if($output != 0) {
-   echo "***************         silentupgrade failed         ***************: $output\n";
+    echo "***************         silentupgrade failed         ***************: $output\n";
 }
 exit($output);
 ?>

modules/AOR_Reports/vardefs.php

Indentation +56 added lines, -56 removed lines

@@ -38,45 +38,45 @@ 
  ********************************************************************************/
 
 $dictionary['AOR_Report'] = array(
-	'table'=>'aor_reports',
-	'audited'=>true,
-	'duplicate_merge'=>true,
-	'fields'=>array (
-	  'report_module' => 
-	  array (
-		'required' => true,
-		'name' => 'report_module',
-		'vname' => 'LBL_REPORT_MODULE',
-		'type' => 'enum',
-		'massupdate' => 0,
-		'default' => '',
-		'no_default' => false,
-		'comments' => '',
-		'help' => '',
-		'importable' => 'true',
-		'duplicate_merge' => 'disabled',
-		'duplicate_merge_dom_value' => '0',
-		'audited' => true,
-		'reportable' => true,
-		'unified_search' => false,
-		'merge_filter' => 'disabled',
-		'len' => 100,
-		'size' => '20',
-		'options' => 'aor_moduleList',
-		'studio' => 'visible',
-		'dependency' => false,
-	  ),
+    'table'=>'aor_reports',
+    'audited'=>true,
+    'duplicate_merge'=>true,
+    'fields'=>array (
+        'report_module' => 
+        array (
+        'required' => true,
+        'name' => 'report_module',
+        'vname' => 'LBL_REPORT_MODULE',
+        'type' => 'enum',
+        'massupdate' => 0,
+        'default' => '',
+        'no_default' => false,
+        'comments' => '',
+        'help' => '',
+        'importable' => 'true',
+        'duplicate_merge' => 'disabled',
+        'duplicate_merge_dom_value' => '0',
+        'audited' => true,
+        'reportable' => true,
+        'unified_search' => false,
+        'merge_filter' => 'disabled',
+        'len' => 100,
+        'size' => '20',
+        'options' => 'aor_moduleList',
+        'studio' => 'visible',
+        'dependency' => false,
+        ),
 
-	'graphs_per_row' =>
-	array (
-		'required' => true,
-		'name' => 'graphs_per_row',
-		'vname' => 'LBL_GRAPHS_PER_ROW',
-		'type' => 'int',
-		'massupdate' => 0,
-		'default' => 2,
-		'no_default' => false,
-	),
+    'graphs_per_row' =>
+    array (
+        'required' => true,
+        'name' => 'graphs_per_row',
+        'vname' => 'LBL_GRAPHS_PER_ROW',
+        'type' => 'int',
+        'massupdate' => 0,
+        'default' => 2,
+        'no_default' => false,
+    ),
 
     'field_lines' =>
     array (
@@ -118,8 +118,8 @@ 
             'include' => 'modules/AOR_Conditions/conditionLines.php'
         ),
     ),
-  'aor_fields' =>
-  array (
+    'aor_fields' =>
+    array (
     'name' => 'aor_fields',
     'type' => 'link',
     'relationship' => 'aor_reports_aor_fields',
@@ -127,26 +127,26 @@ 
     'bean_name'=>'AOR_Field',
     'source'=>'non-db',
     'id_name' => 'aor_report_id',
-  ),
-  'aor_conditions' =>
-  array (
-     'name' => 'aor_conditions',
-     'type' => 'link',
-     'relationship' => 'aor_reports_aor_conditions',
-     'module'=>'AOR_Conditions',
-     'bean_name'=>'AOR_Condition',
-     'source'=>'non-db',
-  ),
-  'aor_charts' =>
-      array (
+    ),
+    'aor_conditions' =>
+    array (
+        'name' => 'aor_conditions',
+        'type' => 'link',
+        'relationship' => 'aor_reports_aor_conditions',
+        'module'=>'AOR_Conditions',
+        'bean_name'=>'AOR_Condition',
+        'source'=>'non-db',
+    ),
+    'aor_charts' =>
+        array (
         'name' => 'aor_charts',
         'type' => 'link',
         'relationship' => 'aor_charts_aor_reports',
         'source' => 'non-db',
         'id_name' => 'aor_report_id',
         'vname' => 'LBL_AOR_CHARTS',
-      ),
-  'aor_scheduled_reports' =>
+        ),
+    'aor_scheduled_reports' =>
     array (
         'name' => 'aor_scheduled_reports',
         'type' => 'link',
@@ -188,8 +188,8 @@ 
         'relationship_type'=>'one-to-many',
     ),
 ),
-	'optimistic_locking'=>true,
-	'unified_search'=>true,
+    'optimistic_locking'=>true,
+    'unified_search'=>true,
 );
 
 if (!class_exists('VardefManager')){