adamjakab / SuiteCRM

modules/UpgradeWizard/systemCheckJson.php

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 {

modules/UpgradeWizard/silentUpgrade_step2.php

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

modules/UpgradeWizard/preflightJson.php

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

modules/UpgradeWizard/UploadFileCheck.php

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

modules/UpgradeWizard/upgradeTimeCounter.php

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

modules/UpgradeWizard/UpgradeRemoval.php

Spacing +12 added lines, -12 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.
@@ -77,26 +77,26 @@ 
  * 
  * @param mixed $files 
  */
-public function processFilesToRemove($files=array())
+public function processFilesToRemove($files = array())
 {
-	if(empty($files) || !is_array($files))
+	if (empty($files) || !is_array($files))
 	{
 		return;
 	}	
 	
 	require_once('include/dir_inc.php');
 	
-	if(!file_exists('custom/backup'))
+	if (!file_exists('custom/backup'))
 	{
 	   mkdir_recursive('custom/backup');
 	}
 	
-	foreach($files as $file)
+	foreach ($files as $file)
 	{		
-		if(file_exists($file))
+		if (file_exists($file))
 		{
 			$this->backup($file);   
-			if(is_dir($file))
+			if (is_dir($file))
 			{
 			  rmdir_recursive($file);	
 			} else {
@@ -118,16 +118,16 @@ 
 	$basename = basename($file);
 	$basepath = str_replace($basename, '', $file);
 
-	if(!empty($basepath) && !file_exists('custom/backup/' . $basepath))
+	if (!empty($basepath) && !file_exists('custom/backup/'.$basepath))
 	{
-	   mkdir_recursive('custom/backup/' . $basepath);
+	   mkdir_recursive('custom/backup/'.$basepath);
 	}
 	
-	if(is_dir($file))
+	if (is_dir($file))
 	{
-    	copy_recursive($file, 'custom/backup/' . $file);	
+    	copy_recursive($file, 'custom/backup/'.$file);	
 	} else {
-		copy($file, 'custom/backup/' . $file);
+		copy($file, 'custom/backup/'.$file);
 	}
 }
 

modules/UpgradeWizard/silentUpgrade.php

Spacing +19 added lines, -19 removed lines

@@ -34,25 +34,25 @@ 
  * "Powered by SugarCRM".
  ********************************************************************************/
 
-function build_argument_string($arguments=array()) {
-   if(!is_array($arguments)) {
+function build_argument_string($arguments = array()) {
+   if (!is_array($arguments)) {
    	  return '';
    }
 
    $argument_string = '';
    $count = 0;
-   foreach($arguments as $arg) {
-   	   if($count != 0)
+   foreach ($arguments as $arg) {
+   	   if ($count != 0)
    	   {
    	   	  //If current directory or parent directory is specified, substitute with full path
-   	   	  if($arg == '.')
+   	   	  if ($arg == '.')
    	   	  {
    	   	  	 $arg = getcwd();
    	   	  } else if ($arg == '..') {
    	   	  	 $dir = getcwd();
 			 $arg = substr($dir, 0, strrpos($dir, DIRECTORY_SEPARATOR));
    	   	  }
-          $argument_string .= ' ' . escapeshellarg($arg);
+          $argument_string .= ' '.escapeshellarg($arg);
    	   }
    	   $count++;
    }
@@ -69,12 +69,12 @@ 
 
 $php_path = '';
 $run_dce_upgrade = false;
-if(isset($argv[3]) && is_dir($argv[3]) && file_exists($argv[3]."/ini_setup.php")) {
+if (isset($argv[3]) && is_dir($argv[3]) && file_exists($argv[3]."/ini_setup.php")) {
                 //this is a dce call, set the dce flag
                 chdir($argv[3]);
                 $run_dce_upgrade = true;
                 //set the php path if found
-                if(is_file($argv[7].'dce_config.php')){
+                if (is_file($argv[7].'dce_config.php')) {
                    include($argv[7].'dce_config.php');
                    $php_path = $dce_config['client_php_path'].'/';
                 }
@@ -82,34 +82,34 @@ 
 
 $php_file = $argv[0];
 $p_info = pathinfo($php_file);
-$php_dir = (isset($p_info['dirname']) && $p_info['dirname'] != '.') ?  $p_info['dirname'] . '/' : '';
+$php_dir = (isset($p_info['dirname']) && $p_info['dirname'] != '.') ? $p_info['dirname'].'/' : '';
 
-$step1 = $php_path."php -f {$php_dir}silentUpgrade_step1.php " . build_argument_string($argv);
+$step1 = $php_path."php -f {$php_dir}silentUpgrade_step1.php ".build_argument_string($argv);
 passthru($step1, $output);
-if($output != 0) {
+if ($output != 0) {
     echo "***************         step1 failed         ***************: $output\n";
 }
 $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);
+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);
+		$step2 = "php -f {$php_dir}silentUpgrade_step2.php ".build_argument_string($argv);
 		passthru($step2, $output);
 	}
 }
 
-if($run_dce_upgrade) {
+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);
+	if (!$has_error) {
+	   $step3 = $php_path."php -f {$php_dir}silentUpgrade_dce_step2.php ".build_argument_string($argv);
 	   passthru($step3, $output);
 	}
 }
 
-if($output != 0) {
+if ($output != 0) {
    echo "***************         silentupgrade failed         ***************: $output\n";
 }
 exit($output);

modules/AOR_Reports/vardefs.php

Spacing +15 added lines, -15 removed lines

@@ -41,9 +41,9 @@ 
 	'table'=>'aor_reports',
 	'audited'=>true,
 	'duplicate_merge'=>true,
-	'fields'=>array (
+	'fields'=>array(
 	  'report_module' => 
-	  array (
+	  array(
 		'required' => true,
 		'name' => 'report_module',
 		'vname' => 'LBL_REPORT_MODULE',
@@ -68,7 +68,7 @@ 
 	  ),
 
 	'graphs_per_row' =>
-	array (
+	array(
 		'required' => true,
 		'name' => 'graphs_per_row',
 		'vname' => 'LBL_GRAPHS_PER_ROW',
@@ -79,7 +79,7 @@ 
 	),
 
     'field_lines' =>
-    array (
+    array(
         'required' => false,
         'name' => 'field_lines',
         'vname' => 'LBL_FIELD_LINES',
@@ -92,14 +92,14 @@ 
         'audited' => false,
         'reportable' => false,
         'function' =>
-        array (
+        array(
             'name' => 'display_field_lines',
             'returns' => 'html',
             'include' => 'modules/AOR_Fields/fieldLines.php'
         ),
     ),
     'condition_lines' =>
-    array (
+    array(
         'required' => false,
         'name' => 'condition_lines',
         'vname' => 'LBL_CONDITION_LINES',
@@ -112,14 +112,14 @@ 
         'audited' => false,
         'reportable' => false,
         'function' =>
-        array (
+        array(
             'name' => 'display_condition_lines',
             'returns' => 'html',
             'include' => 'modules/AOR_Conditions/conditionLines.php'
         ),
     ),
   'aor_fields' =>
-  array (
+  array(
     'name' => 'aor_fields',
     'type' => 'link',
     'relationship' => 'aor_reports_aor_fields',
@@ -129,7 +129,7 @@ 
     'id_name' => 'aor_report_id',
   ),
   'aor_conditions' =>
-  array (
+  array(
      'name' => 'aor_conditions',
      'type' => 'link',
      'relationship' => 'aor_reports_aor_conditions',
@@ -138,7 +138,7 @@ 
      'source'=>'non-db',
   ),
   'aor_charts' =>
-      array (
+      array(
         'name' => 'aor_charts',
         'type' => 'link',
         'relationship' => 'aor_charts_aor_reports',
@@ -147,7 +147,7 @@ 
         'vname' => 'LBL_AOR_CHARTS',
       ),
   'aor_scheduled_reports' =>
-    array (
+    array(
         'name' => 'aor_scheduled_reports',
         'type' => 'link',
         'relationship' => 'aor_scheduled_reports_aor_reports',
@@ -157,7 +157,7 @@ 
     ),
 
 ),
-'relationships'=>array (
+'relationships'=>array(
     'aor_reports_aor_fields' =>
     array(
         'lhs_module'=> 'AOR_Reports',
@@ -178,7 +178,7 @@ 
         'rhs_key' => 'aor_report_id',
         'relationship_type'=>'one-to-many',
     ),
-    "aor_scheduled_reports_aor_reports" => array (
+    "aor_scheduled_reports_aor_reports" => array(
         'lhs_module'=> 'AOR_Reports',
         'lhs_table'=> 'aor_reports',
         'lhs_key' => 'id',
@@ -192,8 +192,8 @@ 
 	'unified_search'=>true,
 );
 
-if (!class_exists('VardefManager')){
+if (!class_exists('VardefManager')) {
         require_once('include/SugarObjects/VardefManager.php');
 }
-VardefManager::createVardef('AOR_Reports','AOR_Report', array('basic','assignable','security_groups'));
+VardefManager::createVardef('AOR_Reports', 'AOR_Report', array('basic', 'assignable', 'security_groups'));
 

modules/AOR_Reports/metadata/editviewdefs.php

Spacing +13 added lines, -13 removed lines

@@ -23,21 +23,21 @@ 
  */
 
 $viewdefs ['AOR_Reports'] =
-array (
+array(
   'EditView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
@@ -49,18 +49,18 @@ 
         ),
     ),
     'panels' => 
-    array (
+    array(
       'default' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 'name',
           1 => 'assigned_user_name',
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'report_module',
             'studio' => 'visible',
             'label' => 'LBL_REPORT_MODULE',
@@ -68,9 +68,9 @@ 
           1 => '',
         ),
           2 =>
-              array (
+              array(
                   0 =>
-                      array (
+                      array(
                           'name' => 'graphs_per_row',
                           'label' => 'LBL_GRAPHS_PER_ROW',
                       ),