adamjakab / SuiteCRM

modules/Administration/RepairSeedUsers.php

Indentation +23 added lines, -23 removed lines

@@ -42,27 +42,27 @@ 
 
 if(is_admin($current_user)){
     if(count($_POST)){
-    	if(!empty($_POST['activate'])){
+        if(!empty($_POST['activate'])){
 
-    		$status = '';
-    		if($_POST['activate'] == 'false'){
-    			$status = 'Inactive';
-    		}else{
-    			$status = 'Active';
-    		}
-    	}
-    	$query = "UPDATE users SET status = '$status' WHERE id LIKE 'seed%'";
-   		$GLOBALS['db']->query($query);
+            $status = '';
+            if($_POST['activate'] == 'false'){
+                $status = 'Inactive';
+            }else{
+                $status = 'Active';
+            }
+        }
+        $query = "UPDATE users SET status = '$status' WHERE id LIKE 'seed%'";
+            $GLOBALS['db']->query($query);
     }
-    	$query = "SELECT status FROM users WHERE id LIKE 'seed%'";
-    	$result = $GLOBALS['db']->query($query);
-		$row = $GLOBALS['db']->fetchByAssoc($result);
-		if(!empty($row['status'])){
-			$activate = 'false';
-			if($row['status'] == 'Inactive'){
-				$activate = 'true';
-			}
-			?>
+        $query = "SELECT status FROM users WHERE id LIKE 'seed%'";
+        $result = $GLOBALS['db']->query($query);
+        $row = $GLOBALS['db']->fetchByAssoc($result);
+        if(!empty($row['status'])){
+            $activate = 'false';
+            if($row['status'] == 'Inactive'){
+                $activate = 'true';
+            }
+            ?>
 				<p>
 				<form name="RepairSeedUsers" method="post" action="index.php">
 				<input type="hidden" name="module" value="Administration">
@@ -80,11 +80,11 @@ 
 				</p>
 			<?php
 
-		}else{
-			echo 'No seed Users';
-		}
+        }else{
+            echo 'No seed Users';
+        }
 }
 else{
-	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
+    sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>
\ No newline at end of file

Spacing +11 added lines, -11 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.
@@ -40,14 +40,14 @@ 
 
 global $current_user;
 
-if(is_admin($current_user)){
-    if(count($_POST)){
-    	if(!empty($_POST['activate'])){
+if (is_admin($current_user)) {
+    if (count($_POST)) {
+    	if (!empty($_POST['activate'])) {
 
     		$status = '';
-    		if($_POST['activate'] == 'false'){
+    		if ($_POST['activate'] == 'false') {
     			$status = 'Inactive';
-    		}else{
+    		} else {
     			$status = 'Active';
     		}
     	}
@@ -57,9 +57,9 @@ 
     	$query = "SELECT status FROM users WHERE id LIKE 'seed%'";
     	$result = $GLOBALS['db']->query($query);
 		$row = $GLOBALS['db']->fetchByAssoc($result);
-		if(!empty($row['status'])){
+		if (!empty($row['status'])) {
 			$activate = 'false';
-			if($row['status'] == 'Inactive'){
+			if ($row['status'] == 'Inactive') {
 				$activate = 'true';
 			}
 			?>
@@ -73,18 +73,18 @@ 
 				<table cellspacing="{CELLSPACING}" class="otherview">
 					<tr>
 					    <td scope="row" width="30%"><?php echo $mod_strings['LBL_REPAIR_SEED_USERS_TITLE']; ?></td>
-					    <td><input type="submit" name="button" value="<?php if($row['status'] == 'Inactive'){echo $mod_strings['LBL_REPAIR_SEED_USERS_ACTIVATE'];}else{echo $mod_strings['LBL_REPAIR_SEED_USERS_DECACTIVATE'];} ?>"></td>
+					    <td><input type="submit" name="button" value="<?php if ($row['status'] == 'Inactive') {echo $mod_strings['LBL_REPAIR_SEED_USERS_ACTIVATE']; } else {echo $mod_strings['LBL_REPAIR_SEED_USERS_DECACTIVATE']; } ?>"></td>
 					</tr>
 				</table>
 				</form>
 				</p>
 			<?php
 
-		}else{
+		} else {
 			echo 'No seed Users';
 		}
 }
-else{
+else {
 	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>
\ No newline at end of file

Braces +7 added lines, -6 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.
@@ -47,7 +49,7 @@ 
     		$status = '';
     		if($_POST['activate'] == 'false'){
     			$status = 'Inactive';
-    		}else{
+    		} else{
     			$status = 'Active';
     		}
     	}
@@ -73,18 +75,17 @@ 
 				<table cellspacing="{CELLSPACING}" class="otherview">
 					<tr>
 					    <td scope="row" width="30%"><?php echo $mod_strings['LBL_REPAIR_SEED_USERS_TITLE']; ?></td>
-					    <td><input type="submit" name="button" value="<?php if($row['status'] == 'Inactive'){echo $mod_strings['LBL_REPAIR_SEED_USERS_ACTIVATE'];}else{echo $mod_strings['LBL_REPAIR_SEED_USERS_DECACTIVATE'];} ?>"></td>
+					    <td><input type="submit" name="button" value="<?php if($row['status'] == 'Inactive'){echo $mod_strings['LBL_REPAIR_SEED_USERS_ACTIVATE'];} else{echo $mod_strings['LBL_REPAIR_SEED_USERS_DECACTIVATE'];} ?>"></td>
 					</tr>
 				</table>
 				</form>
 				</p>
 			<?php
 
-		}else{
+		} else{
 			echo 'No seed Users';
 		}
-}
-else{
+} else{
 	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>
\ No newline at end of file

modules/Administration/RebuildSchedulers.php

Indentation +3 added lines, -3 removed lines

@@ -42,9 +42,9 @@
 
 if(isset($_REQUEST['perform_rebuild']) && $_REQUEST['perform_rebuild'] == 'true') {
 	
-	require_once('install/install_utils.php');
-	$focus = new Scheduler();
-	$focus->rebuildDefaultSchedulers();
+    require_once('install/install_utils.php');
+    $focus = new Scheduler();
+    $focus->rebuildDefaultSchedulers();
 	
 $admin_mod_strings = return_module_language($current_language, 'Administration');	
 ?>

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.
@@ -40,7 +40,7 @@ 
 
 echo getClassicModuleTitle('Administration', array($mod_strings['LBL_REBUILD_SCHEDULERS_TITLE']), false);
 
-if(isset($_REQUEST['perform_rebuild']) && $_REQUEST['perform_rebuild'] == 'true') {
+if (isset($_REQUEST['perform_rebuild']) && $_REQUEST['perform_rebuild'] == 'true') {
 	
 	require_once('install/install_utils.php');
 	$focus = new Scheduler();

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/Administration/updater_utils.php

Indentation +211 added lines, -211 removed lines

@@ -44,18 +44,18 @@ 
 require_once('include/utils/encryption_utils.php');
 
 function getSystemInfo($send_usage_info=true){
-	global $sugar_config;
-	global $db, $administration, $timedate;
-	$info=array();
-	$info = getBaseSystemInfo($send_usage_info);
+    global $sugar_config;
+    global $db, $administration, $timedate;
+    $info=array();
+    $info = getBaseSystemInfo($send_usage_info);
     if($send_usage_info){
-		$info['application_key']=$sugar_config['unique_key'];
-		$info['php_version']=phpversion();
-		if(isset($_SERVER['SERVER_SOFTWARE'])) {
-			$info['server_software'] = $_SERVER['SERVER_SOFTWARE'];
-		} // if
+        $info['application_key']=$sugar_config['unique_key'];
+        $info['php_version']=phpversion();
+        if(isset($_SERVER['SERVER_SOFTWARE'])) {
+            $info['server_software'] = $_SERVER['SERVER_SOFTWARE'];
+        } // if
 
-		//get user count.
+        //get user count.
 
                 $query = "SELECT count(*) as total from users WHERE " . User::getLicensedUsersWhere();
                 $result = $db->getOne($query, false, 'fetching active users count');
@@ -63,58 +63,58 @@ 
                     $info['users'] = $result;
                 }
 
-		if(empty($administration)){
+        if(empty($administration)){
 
-			$administration = new Administration();
-		}
-		$administration->retrieveSettings('system');
-		$info['system_name'] = (!empty($administration->settings['system_name']))?substr($administration->settings['system_name'], 0 ,255):'';
+            $administration = new Administration();
+        }
+        $administration->retrieveSettings('system');
+        $info['system_name'] = (!empty($administration->settings['system_name']))?substr($administration->settings['system_name'], 0 ,255):'';
 
 
-		$result=$db->getOne("select count(*) count from users where status='Active' and deleted=0 and is_admin='1'", false, 'fetching admin count');
-		if($result !== false) {
-			$info['admin_users'] = $result;
-		}
+        $result=$db->getOne("select count(*) count from users where status='Active' and deleted=0 and is_admin='1'", false, 'fetching admin count');
+        if($result !== false) {
+            $info['admin_users'] = $result;
+        }
 
 
-		$result=$db->getOne("select count(*) count from users", false, 'fetching all users count');
-		if($result !== false) {
-			$info['registered_users'] = $result;
-		}
+        $result=$db->getOne("select count(*) count from users", false, 'fetching all users count');
+        if($result !== false) {
+            $info['registered_users'] = $result;
+        }
 
-		$lastMonth = $db->convert("'". $timedate->getNow()->modify("-30 days")->asDb(false) . "'", 'datetime');
-		if( !$send_usage_info) {
-			$info['users_active_30_days'] = -1;
-		} else {
-			$info['users_active_30_days'] = $db->getOne("SELECT count( DISTINCT users.id ) user_count FROM tracker, users WHERE users.id = tracker.user_id AND  tracker.date_modified >= $lastMonth", false, 'fetching last 30 users count');
-		}
+        $lastMonth = $db->convert("'". $timedate->getNow()->modify("-30 days")->asDb(false) . "'", 'datetime');
+        if( !$send_usage_info) {
+            $info['users_active_30_days'] = -1;
+        } else {
+            $info['users_active_30_days'] = $db->getOne("SELECT count( DISTINCT users.id ) user_count FROM tracker, users WHERE users.id = tracker.user_id AND  tracker.date_modified >= $lastMonth", false, 'fetching last 30 users count');
+        }
 
 
 
 
-		if(!$send_usage_info){
-			$info['latest_tracker_id'] = -1;
-		}else{
-			$id=$db->getOne("select id from tracker order by date_modified desc", false, 'fetching most recent tracker entry');
-			if ( $id !== false )
-			    $info['latest_tracker_id'] = $id;
-		}
+        if(!$send_usage_info){
+            $info['latest_tracker_id'] = -1;
+        }else{
+            $id=$db->getOne("select id from tracker order by date_modified desc", false, 'fetching most recent tracker entry');
+            if ( $id !== false )
+                $info['latest_tracker_id'] = $id;
+        }
 
-		$info['db_type']=$sugar_config['dbconfig']['db_type'];
-		$info['db_version']=$db->version();
-	}
-	if(file_exists('distro.php')){
-		include('distro.php');
-		if(!empty($distro_name))$info['distro_name'] = $distro_name;
-	}
-	$info['os'] = php_uname('s');
-	$info['os_version'] = php_uname('r');
-	$info['timezone_u'] = $GLOBALS['current_user']->getPreference('timezone');
-	$info['timezone'] = date('e');
-	if($info['timezone'] == 'e'){
-		$info['timezone'] = date('T');
-	}
-	return $info;
+        $info['db_type']=$sugar_config['dbconfig']['db_type'];
+        $info['db_version']=$db->version();
+    }
+    if(file_exists('distro.php')){
+        include('distro.php');
+        if(!empty($distro_name))$info['distro_name'] = $distro_name;
+    }
+    $info['os'] = php_uname('s');
+    $info['os_version'] = php_uname('r');
+    $info['timezone_u'] = $GLOBALS['current_user']->getPreference('timezone');
+    $info['timezone'] = date('e');
+    if($info['timezone'] == 'e'){
+        $info['timezone'] = date('T');
+    }
+    return $info;
 
 }
 
@@ -137,28 +137,28 @@ 
 }
 
 function check_now($send_usage_info=true, $get_request_data=false, $response_data = false, $from_install=false ) {
-	global $sugar_config, $timedate;
-	global $db, $license;
+    global $sugar_config, $timedate;
+    global $db, $license;
     include('sugar_version.php');
 
 
-	$return_array=array();
+    $return_array=array();
     if(!$from_install && empty($license))loadLicense(true);
 
-	if(!$response_data){
+    if(!$response_data){
 
         if($from_install){
-    		$info = getBaseSystemInfo(false);
+            $info = getBaseSystemInfo(false);
 
         }else{
             $info = getSystemInfo($send_usage_info);
         }
 
-		require_once('include/nusoap/nusoap.php');
+        require_once('include/nusoap/nusoap.php');
 
-		$GLOBALS['log']->debug('USING HTTPS TO CONNECT TO HEARTBEAT');
-		$sclient = new nusoapclient('https://updates.sugarcrm.com/heartbeat/soap.php', false, false, false, false, false, 15, 15);
-		$ping = $sclient->call('sugarPing', array());
+        $GLOBALS['log']->debug('USING HTTPS TO CONNECT TO HEARTBEAT');
+        $sclient = new nusoapclient('https://updates.sugarcrm.com/heartbeat/soap.php', false, false, false, false, false, 15, 15);
+        $ping = $sclient->call('sugarPing', array());
         if (empty($ping) || $sclient->getError()) {
             if (!$get_request_data) {
                 return array(
@@ -171,92 +171,92 @@ 
         }
 
 
-			$key = '4829482749329';
-
-
-
-		$encoded = sugarEncode($key, serialize($info));
-
-		if($get_request_data){
-			$request_data = array('key'=>$key, 'data'=>$encoded);
-			return serialize($request_data);
-		}
-		$encodedResult = $sclient->call('sugarHome', array('key'=>$key, 'data'=>$encoded));
-
-	}else{
-		$encodedResult = 	$response_data['data'];
-		$key = $response_data['key'];
-
-	}
-
-	if($response_data || !$sclient->getError()){
-		$serializedResultData = sugarDecode($key,$encodedResult);
-		$resultData = unserialize($serializedResultData);
-		if($response_data && empty($resultData))
-		{
-			$resultData = array();
-			$resultData['validation'] = 'invalid validation key';
-		}
-	}else
-	{
-		$resultData = array();
-		$resultData['versions'] = array();
-
-	}
-
-	if($response_data || !$sclient->getError() )
-	{
-		if(!empty($resultData['msg'])){
-			if(!empty($resultData['msg']['admin'])){
-				$license->saveSetting('license', 'msg_admin', base64_encode($resultData['msg']['admin']));
-			}else{
-				$license->saveSetting('license', 'msg_admin','');
-			}
-			if(!empty($resultData['msg']['all'])){
-				$license->saveSetting('license', 'msg_all', base64_encode($resultData['msg']['all']));
-			}else{
-				$license->saveSetting('license', 'msg_all','');
-			}
-		}else{
-			$license->saveSetting('license', 'msg_admin','');
-			$license->saveSetting('license', 'msg_all','');
-		}
-		$license->saveSetting('license', 'last_validation', 'success');
-		unset($_SESSION['COULD_NOT_CONNECT']);
-	}
-	else
-	{
-		$resultData = array();
-		$resultData['versions'] = array();
-
-		$license->saveSetting('license', 'last_connection_fail', TimeDate::getInstance()->nowDb());
-		$license->saveSetting('license', 'last_validation', 'no_connection');
-
-		if( empty($license->settings['license_last_validation_success']) && empty($license->settings['license_last_validation_fail']) && empty($license->settings['license_vk_end_date'])){
-			$license->saveSetting('license', 'vk_end_date', TimeDate::getInstance()->nowDb());
-
-			$license->saveSetting('license', 'validation_key', base64_encode(serialize(array('verified'=>false))));
-		}
-		$_SESSION['COULD_NOT_CONNECT'] =TimeDate::getInstance()->nowDb();
-
-	}
-	if(!empty($resultData['versions'])){
-
-		$license->saveSetting('license', 'latest_versions',base64_encode(serialize($resultData['versions'])));
-	}else{
-		$resultData['versions'] = array();
-		$license->saveSetting('license', 'latest_versions','')	;
-	}
-
-	if(sizeof($resultData) == 1 && !empty($resultData['versions'][0]['version'])
+            $key = '4829482749329';
+
+
+
+        $encoded = sugarEncode($key, serialize($info));
+
+        if($get_request_data){
+            $request_data = array('key'=>$key, 'data'=>$encoded);
+            return serialize($request_data);
+        }
+        $encodedResult = $sclient->call('sugarHome', array('key'=>$key, 'data'=>$encoded));
+
+    }else{
+        $encodedResult = 	$response_data['data'];
+        $key = $response_data['key'];
+
+    }
+
+    if($response_data || !$sclient->getError()){
+        $serializedResultData = sugarDecode($key,$encodedResult);
+        $resultData = unserialize($serializedResultData);
+        if($response_data && empty($resultData))
+        {
+            $resultData = array();
+            $resultData['validation'] = 'invalid validation key';
+        }
+    }else
+    {
+        $resultData = array();
+        $resultData['versions'] = array();
+
+    }
+
+    if($response_data || !$sclient->getError() )
+    {
+        if(!empty($resultData['msg'])){
+            if(!empty($resultData['msg']['admin'])){
+                $license->saveSetting('license', 'msg_admin', base64_encode($resultData['msg']['admin']));
+            }else{
+                $license->saveSetting('license', 'msg_admin','');
+            }
+            if(!empty($resultData['msg']['all'])){
+                $license->saveSetting('license', 'msg_all', base64_encode($resultData['msg']['all']));
+            }else{
+                $license->saveSetting('license', 'msg_all','');
+            }
+        }else{
+            $license->saveSetting('license', 'msg_admin','');
+            $license->saveSetting('license', 'msg_all','');
+        }
+        $license->saveSetting('license', 'last_validation', 'success');
+        unset($_SESSION['COULD_NOT_CONNECT']);
+    }
+    else
+    {
+        $resultData = array();
+        $resultData['versions'] = array();
+
+        $license->saveSetting('license', 'last_connection_fail', TimeDate::getInstance()->nowDb());
+        $license->saveSetting('license', 'last_validation', 'no_connection');
+
+        if( empty($license->settings['license_last_validation_success']) && empty($license->settings['license_last_validation_fail']) && empty($license->settings['license_vk_end_date'])){
+            $license->saveSetting('license', 'vk_end_date', TimeDate::getInstance()->nowDb());
+
+            $license->saveSetting('license', 'validation_key', base64_encode(serialize(array('verified'=>false))));
+        }
+        $_SESSION['COULD_NOT_CONNECT'] =TimeDate::getInstance()->nowDb();
+
+    }
+    if(!empty($resultData['versions'])){
+
+        $license->saveSetting('license', 'latest_versions',base64_encode(serialize($resultData['versions'])));
+    }else{
+        $resultData['versions'] = array();
+        $license->saveSetting('license', 'latest_versions','')	;
+    }
+
+    if(sizeof($resultData) == 1 && !empty($resultData['versions'][0]['version'])
         && compareVersions($sugar_version, $resultData['versions'][0]['version']))
-	{
-		$resultData['versions'][0]['version'] = $sugar_version;
-		$resultData['versions'][0]['description'] = "You have the latest version.";
-	}
+    {
+        $resultData['versions'][0]['version'] = $sugar_version;
+        $resultData['versions'][0]['description'] = "You have the latest version.";
+    }
 
 
-	return $resultData['versions'];
+    return $resultData['versions'];
 }
 /*
  * returns true if $ver1 > $ver2
@@ -268,126 +268,126 @@ 
 function set_CheckUpdates_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','CheckUpdates',$value);
+    $admin=new Administration();
+    $admin->saveSetting('Update','CheckUpdates',$value);
 }
 /* return's value for the 'CheckUpdates' config setting
 * if the setting does not exist one gets created with a default value of automatic.
 */
 function get_CheckUpdates_config_setting() {
 
-	$checkupdates='automatic';
+    $checkupdates='automatic';
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update',true);
-	if (empty($admin->settings) or empty($admin->settings['Update_CheckUpdates'])) {
-		$admin->saveSetting('Update','CheckUpdates','automatic');
-	} else {
-		$checkupdates=$admin->settings['Update_CheckUpdates'];
-	}
-	return $checkupdates;
+    $admin=new Administration();
+    $admin=$admin->retrieveSettings('Update',true);
+    if (empty($admin->settings) or empty($admin->settings['Update_CheckUpdates'])) {
+        $admin->saveSetting('Update','CheckUpdates','automatic');
+    } else {
+        $checkupdates=$admin->settings['Update_CheckUpdates'];
+    }
+    return $checkupdates;
 }
 
 function set_last_check_version_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','last_check_version',$value);
+    $admin=new Administration();
+    $admin->saveSetting('Update','last_check_version',$value);
 }
 function get_last_check_version_config_setting() {
 
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update');
-	if (empty($admin->settings) or empty($admin->settings['Update_last_check_version'])) {
-		return null;
-	} else {
-		return $admin->settings['Update_last_check_version'];
-	}
+    $admin=new Administration();
+    $admin=$admin->retrieveSettings('Update');
+    if (empty($admin->settings) or empty($admin->settings['Update_last_check_version'])) {
+        return null;
+    } else {
+        return $admin->settings['Update_last_check_version'];
+    }
 }
 
 
 function set_last_check_date_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','last_check_date',$value);
+    $admin=new Administration();
+    $admin->saveSetting('Update','last_check_date',$value);
 }
 function get_last_check_date_config_setting() {
 
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update');
-	if (empty($admin->settings) or empty($admin->settings['Update_last_check_date'])) {
-		return 0;
-	} else {
-		return $admin->settings['Update_last_check_date'];
-	}
+    $admin=new Administration();
+    $admin=$admin->retrieveSettings('Update');
+    if (empty($admin->settings) or empty($admin->settings['Update_last_check_date'])) {
+        return 0;
+    } else {
+        return $admin->settings['Update_last_check_date'];
+    }
 }
 
 function set_sugarbeat($value) {
-	global $sugar_config;
-	$_SUGARBEAT="sugarbeet";
-	$sugar_config[$_SUGARBEAT] = $value;
-	write_array_to_file( "sugar_config", $sugar_config, "config.php" );
+    global $sugar_config;
+    $_SUGARBEAT="sugarbeet";
+    $sugar_config[$_SUGARBEAT] = $value;
+    write_array_to_file( "sugar_config", $sugar_config, "config.php" );
 }
 function get_sugarbeat() {
 
 
-	global $sugar_config;
-	$_SUGARBEAT="sugarbeet";
+    global $sugar_config;
+    $_SUGARBEAT="sugarbeet";
 
-	if (isset($sugar_config[$_SUGARBEAT]) && $sugar_config[$_SUGARBEAT] == false) {
-	return false;
-	}
-	return true;
+    if (isset($sugar_config[$_SUGARBEAT]) && $sugar_config[$_SUGARBEAT] == false) {
+    return false;
+    }
+    return true;
 
 }
 
 
 
 function shouldCheckSugar(){
-	global $license, $timedate;
-	if(
+    global $license, $timedate;
+    if(
 
-	get_CheckUpdates_config_setting() == 'automatic' ){
-		return true;
-	}
+    get_CheckUpdates_config_setting() == 'automatic' ){
+        return true;
+    }
 
-	return false;
+    return false;
 }
 
 
 
 function loadLicense($firstLogin=false){
 
-	$GLOBALS['license']=new Administration();
-	$GLOBALS['license']=$GLOBALS['license']->retrieveSettings('license', $firstLogin);
+    $GLOBALS['license']=new Administration();
+    $GLOBALS['license']=$GLOBALS['license']->retrieveSettings('license', $firstLogin);
 
 }
 
 function loginLicense(){
-	global $current_user, $license;
-	loadLicense(true);
+    global $current_user, $license;
+    loadLicense(true);
 
 
-	if (shouldCheckSugar()) {
+    if (shouldCheckSugar()) {
 
 
-		$last_check_date=get_last_check_date_config_setting();
-		$current_date_time=time();
-		$time_period=3*23*3600 ;
-		if (($current_date_time - $last_check_date) > $time_period
-		) {
-			$version = check_now(get_sugarbeat());
+        $last_check_date=get_last_check_date_config_setting();
+        $current_date_time=time();
+        $time_period=3*23*3600 ;
+        if (($current_date_time - $last_check_date) > $time_period
+        ) {
+            $version = check_now(get_sugarbeat());
 
-			unset($_SESSION['license_seats_needed']);
-			loadLicense();
-			set_last_check_date_config_setting("$current_date_time");
-			include('sugar_version.php');
+            unset($_SESSION['license_seats_needed']);
+            loadLicense();
+            set_last_check_date_config_setting("$current_date_time");
+            include('sugar_version.php');
 
             $newVersion = '';
             if (!empty($version) && count($version) == 1)
@@ -396,14 +396,14 @@ 
             }
 
             if (version_compare($newVersion, $sugar_version, '>') && is_admin($current_user))
-			{
-				//set session variables.
-				$_SESSION['available_version']=$version[0]['version'];
-				$_SESSION['available_version_description']=$version[0]['description'];
-				set_last_check_version_config_setting($version[0]['version']);
-			}
-		}
-	}
+            {
+                //set session variables.
+                $_SESSION['available_version']=$version[0]['version'];
+                $_SESSION['available_version_description']=$version[0]['description'];
+                set_last_check_version_config_setting($version[0]['version']);
+            }
+        }
+    }
 
 
 }

Braces +21 added lines, -15 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.
@@ -94,10 +96,11 @@ 
 
 		if(!$send_usage_info){
 			$info['latest_tracker_id'] = -1;
-		}else{
+		} else{
 			$id=$db->getOne("select id from tracker order by date_modified desc", false, 'fetching most recent tracker entry');
-			if ( $id !== false )
-			    $info['latest_tracker_id'] = $id;
+			if ( $id !== false ) {
+						    $info['latest_tracker_id'] = $id;
+			}
 		}
 
 		$info['db_type']=$sugar_config['dbconfig']['db_type'];
@@ -105,7 +108,9 @@ 
 	}
 	if(file_exists('distro.php')){
 		include('distro.php');
-		if(!empty($distro_name))$info['distro_name'] = $distro_name;
+		if(!empty($distro_name)) {
+		    $info['distro_name'] = $distro_name;
+		}
 	}
 	$info['os'] = php_uname('s');
 	$info['os_version'] = php_uname('r');
@@ -143,14 +148,16 @@ 
 
 
 	$return_array=array();
-    if(!$from_install && empty($license))loadLicense(true);
+    if(!$from_install && empty($license)) {
+        loadLicense(true);
+    }
 
 	if(!$response_data){
 
         if($from_install){
     		$info = getBaseSystemInfo(false);
 
-        }else{
+        } else{
             $info = getSystemInfo($send_usage_info);
         }
 
@@ -183,7 +190,7 @@ 
 		}
 		$encodedResult = $sclient->call('sugarHome', array('key'=>$key, 'data'=>$encoded));
 
-	}else{
+	} else{
 		$encodedResult = 	$response_data['data'];
 		$key = $response_data['key'];
 
@@ -197,7 +204,7 @@ 
 			$resultData = array();
 			$resultData['validation'] = 'invalid validation key';
 		}
-	}else
+	} else
 	{
 		$resultData = array();
 		$resultData['versions'] = array();
@@ -209,22 +216,21 @@ 
 		if(!empty($resultData['msg'])){
 			if(!empty($resultData['msg']['admin'])){
 				$license->saveSetting('license', 'msg_admin', base64_encode($resultData['msg']['admin']));
-			}else{
+			} else{
 				$license->saveSetting('license', 'msg_admin','');
 			}
 			if(!empty($resultData['msg']['all'])){
 				$license->saveSetting('license', 'msg_all', base64_encode($resultData['msg']['all']));
-			}else{
+			} else{
 				$license->saveSetting('license', 'msg_all','');
 			}
-		}else{
+		} else{
 			$license->saveSetting('license', 'msg_admin','');
 			$license->saveSetting('license', 'msg_all','');
 		}
 		$license->saveSetting('license', 'last_validation', 'success');
 		unset($_SESSION['COULD_NOT_CONNECT']);
-	}
-	else
+	} else
 	{
 		$resultData = array();
 		$resultData['versions'] = array();
@@ -243,7 +249,7 @@ 
 	if(!empty($resultData['versions'])){
 
 		$license->saveSetting('license', 'latest_versions',base64_encode(serialize($resultData['versions'])));
-	}else{
+	} else{
 		$resultData['versions'] = array();
 		$license->saveSetting('license', 'latest_versions','')	;
 	}

Spacing +92 added lines, -92 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.
@@ -43,47 +43,47 @@ 
 ********************************************************************************/
 require_once('include/utils/encryption_utils.php');
 
-function getSystemInfo($send_usage_info=true){
+function getSystemInfo($send_usage_info = true) {
 	global $sugar_config;
 	global $db, $administration, $timedate;
-	$info=array();
+	$info = array();
 	$info = getBaseSystemInfo($send_usage_info);
-    if($send_usage_info){
-		$info['application_key']=$sugar_config['unique_key'];
-		$info['php_version']=phpversion();
-		if(isset($_SERVER['SERVER_SOFTWARE'])) {
+    if ($send_usage_info) {
+		$info['application_key'] = $sugar_config['unique_key'];
+		$info['php_version'] = phpversion();
+		if (isset($_SERVER['SERVER_SOFTWARE'])) {
 			$info['server_software'] = $_SERVER['SERVER_SOFTWARE'];
 		} // if
 
 		//get user count.
 
-                $query = "SELECT count(*) as total from users WHERE " . User::getLicensedUsersWhere();
+                $query = "SELECT count(*) as total from users WHERE ".User::getLicensedUsersWhere();
                 $result = $db->getOne($query, false, 'fetching active users count');
                 if ($result !== false) {
                     $info['users'] = $result;
                 }
 
-		if(empty($administration)){
+		if (empty($administration)) {
 
 			$administration = new Administration();
 		}
 		$administration->retrieveSettings('system');
-		$info['system_name'] = (!empty($administration->settings['system_name']))?substr($administration->settings['system_name'], 0 ,255):'';
+		$info['system_name'] = (!empty($administration->settings['system_name'])) ?substr($administration->settings['system_name'], 0, 255) : '';
 
 
-		$result=$db->getOne("select count(*) count from users where status='Active' and deleted=0 and is_admin='1'", false, 'fetching admin count');
-		if($result !== false) {
+		$result = $db->getOne("select count(*) count from users where status='Active' and deleted=0 and is_admin='1'", false, 'fetching admin count');
+		if ($result !== false) {
 			$info['admin_users'] = $result;
 		}
 
 
-		$result=$db->getOne("select count(*) count from users", false, 'fetching all users count');
-		if($result !== false) {
+		$result = $db->getOne("select count(*) count from users", false, 'fetching all users count');
+		if ($result !== false) {
 			$info['registered_users'] = $result;
 		}
 
-		$lastMonth = $db->convert("'". $timedate->getNow()->modify("-30 days")->asDb(false) . "'", 'datetime');
-		if( !$send_usage_info) {
+		$lastMonth = $db->convert("'".$timedate->getNow()->modify("-30 days")->asDb(false)."'", 'datetime');
+		if (!$send_usage_info) {
 			$info['users_active_30_days'] = -1;
 		} else {
 			$info['users_active_30_days'] = $db->getOne("SELECT count( DISTINCT users.id ) user_count FROM tracker, users WHERE users.id = tracker.user_id AND  tracker.date_modified >= $lastMonth", false, 'fetching last 30 users count');
@@ -92,41 +92,41 @@ 
 
 
 
-		if(!$send_usage_info){
+		if (!$send_usage_info) {
 			$info['latest_tracker_id'] = -1;
-		}else{
-			$id=$db->getOne("select id from tracker order by date_modified desc", false, 'fetching most recent tracker entry');
-			if ( $id !== false )
+		} else {
+			$id = $db->getOne("select id from tracker order by date_modified desc", false, 'fetching most recent tracker entry');
+			if ($id !== false)
 			    $info['latest_tracker_id'] = $id;
 		}
 
-		$info['db_type']=$sugar_config['dbconfig']['db_type'];
-		$info['db_version']=$db->version();
+		$info['db_type'] = $sugar_config['dbconfig']['db_type'];
+		$info['db_version'] = $db->version();
 	}
-	if(file_exists('distro.php')){
+	if (file_exists('distro.php')) {
 		include('distro.php');
-		if(!empty($distro_name))$info['distro_name'] = $distro_name;
+		if (!empty($distro_name))$info['distro_name'] = $distro_name;
 	}
 	$info['os'] = php_uname('s');
 	$info['os_version'] = php_uname('r');
 	$info['timezone_u'] = $GLOBALS['current_user']->getPreference('timezone');
 	$info['timezone'] = date('e');
-	if($info['timezone'] == 'e'){
+	if ($info['timezone'] == 'e') {
 		$info['timezone'] = date('T');
 	}
 	return $info;
 
 }
 
-function getBaseSystemInfo($send_usage_info=true){
+function getBaseSystemInfo($send_usage_info = true) {
     include('sugar_version.php');
-    $info=array();
+    $info = array();
 
-    if($send_usage_info){
-        $info['sugar_db_version']=$sugar_db_version;
+    if ($send_usage_info) {
+        $info['sugar_db_version'] = $sugar_db_version;
     }
-    $info['sugar_version']=$sugar_version;
-    $info['sugar_flavor']=$sugar_flavor;
+    $info['sugar_version'] = $sugar_version;
+    $info['sugar_flavor'] = $sugar_flavor;
     $info['auth_level'] = 0;
 
 
@@ -136,21 +136,21 @@ 
 
 }
 
-function check_now($send_usage_info=true, $get_request_data=false, $response_data = false, $from_install=false ) {
+function check_now($send_usage_info = true, $get_request_data = false, $response_data = false, $from_install = false) {
 	global $sugar_config, $timedate;
 	global $db, $license;
     include('sugar_version.php');
 
 
-	$return_array=array();
-    if(!$from_install && empty($license))loadLicense(true);
+	$return_array = array();
+    if (!$from_install && empty($license))loadLicense(true);
 
-	if(!$response_data){
+	if (!$response_data) {
 
-        if($from_install){
+        if ($from_install) {
     		$info = getBaseSystemInfo(false);
 
-        }else{
+        } else {
             $info = getSystemInfo($send_usage_info);
         }
 
@@ -177,49 +177,49 @@ 
 
 		$encoded = sugarEncode($key, serialize($info));
 
-		if($get_request_data){
+		if ($get_request_data) {
 			$request_data = array('key'=>$key, 'data'=>$encoded);
 			return serialize($request_data);
 		}
 		$encodedResult = $sclient->call('sugarHome', array('key'=>$key, 'data'=>$encoded));
 
-	}else{
-		$encodedResult = 	$response_data['data'];
+	} else {
+		$encodedResult = $response_data['data'];
 		$key = $response_data['key'];
 
 	}
 
-	if($response_data || !$sclient->getError()){
-		$serializedResultData = sugarDecode($key,$encodedResult);
+	if ($response_data || !$sclient->getError()) {
+		$serializedResultData = sugarDecode($key, $encodedResult);
 		$resultData = unserialize($serializedResultData);
-		if($response_data && empty($resultData))
+		if ($response_data && empty($resultData))
 		{
 			$resultData = array();
 			$resultData['validation'] = 'invalid validation key';
 		}
-	}else
+	} else
 	{
 		$resultData = array();
 		$resultData['versions'] = array();
 
 	}
 
-	if($response_data || !$sclient->getError() )
+	if ($response_data || !$sclient->getError())
 	{
-		if(!empty($resultData['msg'])){
-			if(!empty($resultData['msg']['admin'])){
+		if (!empty($resultData['msg'])) {
+			if (!empty($resultData['msg']['admin'])) {
 				$license->saveSetting('license', 'msg_admin', base64_encode($resultData['msg']['admin']));
-			}else{
-				$license->saveSetting('license', 'msg_admin','');
+			} else {
+				$license->saveSetting('license', 'msg_admin', '');
 			}
-			if(!empty($resultData['msg']['all'])){
+			if (!empty($resultData['msg']['all'])) {
 				$license->saveSetting('license', 'msg_all', base64_encode($resultData['msg']['all']));
-			}else{
-				$license->saveSetting('license', 'msg_all','');
+			} else {
+				$license->saveSetting('license', 'msg_all', '');
 			}
-		}else{
-			$license->saveSetting('license', 'msg_admin','');
-			$license->saveSetting('license', 'msg_all','');
+		} else {
+			$license->saveSetting('license', 'msg_admin', '');
+			$license->saveSetting('license', 'msg_all', '');
 		}
 		$license->saveSetting('license', 'last_validation', 'success');
 		unset($_SESSION['COULD_NOT_CONNECT']);
@@ -232,23 +232,23 @@ 
 		$license->saveSetting('license', 'last_connection_fail', TimeDate::getInstance()->nowDb());
 		$license->saveSetting('license', 'last_validation', 'no_connection');
 
-		if( empty($license->settings['license_last_validation_success']) && empty($license->settings['license_last_validation_fail']) && empty($license->settings['license_vk_end_date'])){
+		if (empty($license->settings['license_last_validation_success']) && empty($license->settings['license_last_validation_fail']) && empty($license->settings['license_vk_end_date'])) {
 			$license->saveSetting('license', 'vk_end_date', TimeDate::getInstance()->nowDb());
 
 			$license->saveSetting('license', 'validation_key', base64_encode(serialize(array('verified'=>false))));
 		}
-		$_SESSION['COULD_NOT_CONNECT'] =TimeDate::getInstance()->nowDb();
+		$_SESSION['COULD_NOT_CONNECT'] = TimeDate::getInstance()->nowDb();
 
 	}
-	if(!empty($resultData['versions'])){
+	if (!empty($resultData['versions'])) {
 
-		$license->saveSetting('license', 'latest_versions',base64_encode(serialize($resultData['versions'])));
-	}else{
+		$license->saveSetting('license', 'latest_versions', base64_encode(serialize($resultData['versions'])));
+	} else {
 		$resultData['versions'] = array();
-		$license->saveSetting('license', 'latest_versions','')	;
+		$license->saveSetting('license', 'latest_versions', '');
 	}
 
-	if(sizeof($resultData) == 1 && !empty($resultData['versions'][0]['version'])
+	if (sizeof($resultData) == 1 && !empty($resultData['versions'][0]['version'])
         && compareVersions($sugar_version, $resultData['versions'][0]['version']))
 	{
 		$resultData['versions'][0]['version'] = $sugar_version;
@@ -268,23 +268,23 @@ 
 function set_CheckUpdates_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','CheckUpdates',$value);
+	$admin = new Administration();
+	$admin->saveSetting('Update', 'CheckUpdates', $value);
 }
 /* return's value for the 'CheckUpdates' config setting
 * if the setting does not exist one gets created with a default value of automatic.
 */
 function get_CheckUpdates_config_setting() {
 
-	$checkupdates='automatic';
+	$checkupdates = 'automatic';
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update',true);
+	$admin = new Administration();
+	$admin = $admin->retrieveSettings('Update', true);
 	if (empty($admin->settings) or empty($admin->settings['Update_CheckUpdates'])) {
-		$admin->saveSetting('Update','CheckUpdates','automatic');
+		$admin->saveSetting('Update', 'CheckUpdates', 'automatic');
 	} else {
-		$checkupdates=$admin->settings['Update_CheckUpdates'];
+		$checkupdates = $admin->settings['Update_CheckUpdates'];
 	}
 	return $checkupdates;
 }
@@ -292,15 +292,15 @@ 
 function set_last_check_version_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','last_check_version',$value);
+	$admin = new Administration();
+	$admin->saveSetting('Update', 'last_check_version', $value);
 }
 function get_last_check_version_config_setting() {
 
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update');
+	$admin = new Administration();
+	$admin = $admin->retrieveSettings('Update');
 	if (empty($admin->settings) or empty($admin->settings['Update_last_check_version'])) {
 		return null;
 	} else {
@@ -312,15 +312,15 @@ 
 function set_last_check_date_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','last_check_date',$value);
+	$admin = new Administration();
+	$admin->saveSetting('Update', 'last_check_date', $value);
 }
 function get_last_check_date_config_setting() {
 
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update');
+	$admin = new Administration();
+	$admin = $admin->retrieveSettings('Update');
 	if (empty($admin->settings) or empty($admin->settings['Update_last_check_date'])) {
 		return 0;
 	} else {
@@ -330,15 +330,15 @@ 
 
 function set_sugarbeat($value) {
 	global $sugar_config;
-	$_SUGARBEAT="sugarbeet";
+	$_SUGARBEAT = "sugarbeet";
 	$sugar_config[$_SUGARBEAT] = $value;
-	write_array_to_file( "sugar_config", $sugar_config, "config.php" );
+	write_array_to_file("sugar_config", $sugar_config, "config.php");
 }
 function get_sugarbeat() {
 
 
 	global $sugar_config;
-	$_SUGARBEAT="sugarbeet";
+	$_SUGARBEAT = "sugarbeet";
 
 	if (isset($sugar_config[$_SUGARBEAT]) && $sugar_config[$_SUGARBEAT] == false) {
 	return false;
@@ -349,11 +349,11 @@ 
 
 
 
-function shouldCheckSugar(){
+function shouldCheckSugar() {
 	global $license, $timedate;
-	if(
+	if (
 
-	get_CheckUpdates_config_setting() == 'automatic' ){
+	get_CheckUpdates_config_setting() == 'automatic' ) {
 		return true;
 	}
 
@@ -362,14 +362,14 @@ 
 
 
 
-function loadLicense($firstLogin=false){
+function loadLicense($firstLogin = false) {
 
-	$GLOBALS['license']=new Administration();
-	$GLOBALS['license']=$GLOBALS['license']->retrieveSettings('license', $firstLogin);
+	$GLOBALS['license'] = new Administration();
+	$GLOBALS['license'] = $GLOBALS['license']->retrieveSettings('license', $firstLogin);
 
 }
 
-function loginLicense(){
+function loginLicense() {
 	global $current_user, $license;
 	loadLicense(true);
 
@@ -377,9 +377,9 @@ 
 	if (shouldCheckSugar()) {
 
 
-		$last_check_date=get_last_check_date_config_setting();
-		$current_date_time=time();
-		$time_period=3*23*3600 ;
+		$last_check_date = get_last_check_date_config_setting();
+		$current_date_time = time();
+		$time_period = 3 * 23 * 3600;
 		if (($current_date_time - $last_check_date) > $time_period
 		) {
 			$version = check_now(get_sugarbeat());
@@ -398,8 +398,8 @@ 
             if (version_compare($newVersion, $sugar_version, '>') && is_admin($current_user))
 			{
 				//set session variables.
-				$_SESSION['available_version']=$version[0]['version'];
-				$_SESSION['available_version_description']=$version[0]['description'];
+				$_SESSION['available_version'] = $version[0]['version'];
+				$_SESSION['available_version_description'] = $version[0]['description'];
 				set_last_check_version_config_setting($version[0]['version']);
 			}
 		}

modules/Administration/DiagnosticDownload.php

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 
 if(!isset($_REQUEST['guid']) || !isset($_REQUEST['time']))
 {
-	die('Did not receive a filename to download');
+    die('Did not receive a filename to download');
 }
 $time = str_replace(array('.', '/', '\\'), '', $_REQUEST['time']);
 $guid = str_replace(array('.', '/', '\\'), '', $_REQUEST['guid']);

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.
@@ -48,7 +48,7 @@ 
     sugar_die("Unauthorized access to diagnostic tool.");
 }
 
-if(!isset($_REQUEST['guid']) || !isset($_REQUEST['time']))
+if (!isset($_REQUEST['guid']) || !isset($_REQUEST['time']))
 {
 	die('Did not receive a filename to download');
 }

Braces +6 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.
@@ -42,7 +44,9 @@ 
 global $current_user;
 
 
-if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+if (!is_admin($current_user)) {
+    sugar_die("Unauthorized access to administration.");
+}
 if (isset($GLOBALS['sugar_config']['hide_admin_diagnostics']) && $GLOBALS['sugar_config']['hide_admin_diagnostics'])
 {
     sugar_die("Unauthorized access to diagnostic tool.");

modules/Administration/expandDatabase.php

Indentation +76 added lines, -76 removed lines

@@ -40,38 +40,38 @@ 
 
 $db = DBManagerFactory::getInstance();
 if(!$db->supports('fix:expandDatabase')) {
-	echo "<BR>";
-	echo "<p>".$mod_strings['ERR_NOT_IMPLEMENTED']."</p>";
-	echo "<BR>";
-	sugar_die('');
+    echo "<BR>";
+    echo "<p>".$mod_strings['ERR_NOT_IMPLEMENTED']."</p>";
+    echo "<BR>";
+    sugar_die('');
 }
 global $current_user,$beanFiles;
 
 set_time_limit(3600);
 if(is_admin($current_user) || isset($from_sync_client)){
 
-	$execute = false;
-	$export = false;
-
-
-	if(isset($_REQUEST['do_action'])){
-		switch($_REQUEST['do_action']){
-			case 'display':
-				break;
-			case 'execute':
-				$execute = true;
-				break;
-			case 'export':
-				header('Location: index.php?module=Administration&action=expandDatabase&do_action=do_export&to_pdf=true');
-				die();
-			case 'do_export':
-				$export = true;
-				break;
-		}
-
-		if(!$export && empty($_REQUEST['repair_silent'])){
-			echo getClassicModuleTitle($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'], array($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'],$_REQUEST['do_action']), true);
-		}
+    $execute = false;
+    $export = false;
+
+
+    if(isset($_REQUEST['do_action'])){
+        switch($_REQUEST['do_action']){
+            case 'display':
+                break;
+            case 'execute':
+                $execute = true;
+                break;
+            case 'export':
+                header('Location: index.php?module=Administration&action=expandDatabase&do_action=do_export&to_pdf=true');
+                die();
+            case 'do_export':
+                $export = true;
+                break;
+        }
+
+        if(!$export && empty($_REQUEST['repair_silent'])){
+            echo getClassicModuleTitle($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'], array($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'],$_REQUEST['do_action']), true);
+        }
 
         $alter_queries = array();
         $restore_quries = array();
@@ -88,60 +88,60 @@ 
         $theRestoreQueries = '';
         $alter_queries = array();
         while ($row = $db->fetchByAssoc($result)) {
-   	      $length = (int)$row['length'];
-   	      if($length < 255) {
-   	         $newLength = ($length * 3 < 255) ? $length * 3 : 255;
-   	         $sql = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $newLength . ')';
-             $theAlterQueries .= $sql . "\n";
-             $alter_queries[] = $sql;
-
-             $sql2 = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $length . ')';
-             $theRestoreQueries .= $sql2 . "\n";
-          }
+                $length = (int)$row['length'];
+                if($length < 255) {
+                $newLength = ($length * 3 < 255) ? $length * 3 : 255;
+                $sql = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $newLength . ')';
+                $theAlterQueries .= $sql . "\n";
+                $alter_queries[] = $sql;
+
+                $sql2 = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $length . ')';
+                $theRestoreQueries .= $sql2 . "\n";
+            }
         } //while
 
         //If there are no ALTER queries to run, echo message
         if(count($alter_queries) == 0) {
-           echo $mod_strings['ERR_NO_COLUMNS_TO_EXPAND'];
+            echo $mod_strings['ERR_NO_COLUMNS_TO_EXPAND'];
         } else {
 
-	        // Create a backup file to restore columns to original length
-	        if($execute) {
-	           $fh = sugar_fopen('restoreExpand.sql', 'w');
-	           if(-1 == fwrite($fh, $theRestoreQueries)) {
-	           	  $GLOBALS['log']->error($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
-	           	  echo($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
-	           } else {
-	           	  $GLOBALS['log']->info($mod_strings['LBL_CREATE_RESOTRE_FILE']);
-	           	  echo($mod_strings['LBL_CREATE_RESOTRE_FILE']);
-	           }
-
-	           foreach($alter_queries as $key=>$value) {
-	           	       $db->query($value);
-	           }
-	        }
-
-			if($export) {
-		   		header("Content-Disposition: attachment; filename=expandSugarDB.sql");
-				header("Content-Type: text/sql; charset={$app_strings['LBL_CHARSET']}");
-				header( "Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
-				header( "Last-Modified: " . TimeDate::httpTime() );
-				header( "Cache-Control: post-check=0, pre-check=0", false );
-				header("Content-Length: ".strlen($theAlterQueries));
-		   		echo $theAlterQueries;
-		   		die();
-			} else {
-				if(empty($_REQUEST['repair_silent'])) {
-					echo nl2br($theAlterQueries);
-				}
-			}
+            // Create a backup file to restore columns to original length
+            if($execute) {
+                $fh = sugar_fopen('restoreExpand.sql', 'w');
+                if(-1 == fwrite($fh, $theRestoreQueries)) {
+                        $GLOBALS['log']->error($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
+                        echo($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
+                } else {
+                        $GLOBALS['log']->info($mod_strings['LBL_CREATE_RESOTRE_FILE']);
+                        echo($mod_strings['LBL_CREATE_RESOTRE_FILE']);
+                }
+
+                foreach($alter_queries as $key=>$value) {
+                            $db->query($value);
+                }
+            }
+
+            if($export) {
+                    header("Content-Disposition: attachment; filename=expandSugarDB.sql");
+                header("Content-Type: text/sql; charset={$app_strings['LBL_CHARSET']}");
+                header( "Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
+                header( "Last-Modified: " . TimeDate::httpTime() );
+                header( "Cache-Control: post-check=0, pre-check=0", false );
+                header("Content-Length: ".strlen($theAlterQueries));
+                    echo $theAlterQueries;
+                    die();
+            } else {
+                if(empty($_REQUEST['repair_silent'])) {
+                    echo nl2br($theAlterQueries);
+                }
+            }
 
         } //if-else
-	} // end do_action
+    } // end do_action
 
-	if(empty($_REQUEST['repair_silent']) && empty($_REQUEST['do_action'])) {
-		if(!file_exists('restoreExpand.sql')) {
-		        echo "	<b>{$mod_strings['LBL_REPAIR_ACTION']}</b><br>
+    if(empty($_REQUEST['repair_silent']) && empty($_REQUEST['do_action'])) {
+        if(!file_exists('restoreExpand.sql')) {
+                echo "	<b>{$mod_strings['LBL_REPAIR_ACTION']}</b><br>
 				<form name='repairdb'>
 					<input type='hidden' name='action' value='expandDatabase'>
 					<input type='hidden' name='module' value='Administration'>
@@ -153,12 +153,12 @@ 
 					</select><input type='submit' class='button' value='".$mod_strings['LBL_GO']."'>
 				</form><br><br>
 				".$mod_strings['LBL_EXPAND_DATABASE_TEXT'];
-		} else {
-			    echo "<b>{$mod_strings['LBL_EXPAND_DATABASE_FINISHED_ERROR']}</b><br>";
-		} //if-else
-	} //if
+        } else {
+                echo "<b>{$mod_strings['LBL_EXPAND_DATABASE_FINISHED_ERROR']}</b><br>";
+        } //if-else
+    } //if
 }else{
-	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
+    sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 
 

Spacing +25 added lines, -25 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.
@@ -39,23 +39,23 @@ 
  ********************************************************************************/
 
 $db = DBManagerFactory::getInstance();
-if(!$db->supports('fix:expandDatabase')) {
+if (!$db->supports('fix:expandDatabase')) {
 	echo "<BR>";
 	echo "<p>".$mod_strings['ERR_NOT_IMPLEMENTED']."</p>";
 	echo "<BR>";
 	sugar_die('');
 }
-global $current_user,$beanFiles;
+global $current_user, $beanFiles;
 
 set_time_limit(3600);
-if(is_admin($current_user) || isset($from_sync_client)){
+if (is_admin($current_user) || isset($from_sync_client)) {
 
 	$execute = false;
 	$export = false;
 
 
-	if(isset($_REQUEST['do_action'])){
-		switch($_REQUEST['do_action']){
+	if (isset($_REQUEST['do_action'])) {
+		switch ($_REQUEST['do_action']) {
 			case 'display':
 				break;
 			case 'execute':
@@ -69,8 +69,8 @@ 
 				break;
 		}
 
-		if(!$export && empty($_REQUEST['repair_silent'])){
-			echo getClassicModuleTitle($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'], array($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'],$_REQUEST['do_action']), true);
+		if (!$export && empty($_REQUEST['repair_silent'])) {
+			echo getClassicModuleTitle($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'], array($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'], $_REQUEST['do_action']), true);
 		}
 
         $alter_queries = array();
@@ -89,26 +89,26 @@ 
         $alter_queries = array();
         while ($row = $db->fetchByAssoc($result)) {
    	      $length = (int)$row['length'];
-   	      if($length < 255) {
+   	      if ($length < 255) {
    	         $newLength = ($length * 3 < 255) ? $length * 3 : 255;
-   	         $sql = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $newLength . ')';
-             $theAlterQueries .= $sql . "\n";
+   	         $sql = 'ALTER TABLE '.$row['table_name'].' ALTER COLUMN '.$row['column_name'].' '.$row['type'].' ('.$newLength.')';
+             $theAlterQueries .= $sql."\n";
              $alter_queries[] = $sql;
 
-             $sql2 = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $length . ')';
-             $theRestoreQueries .= $sql2 . "\n";
+             $sql2 = 'ALTER TABLE '.$row['table_name'].' ALTER COLUMN '.$row['column_name'].' '.$row['type'].' ('.$length.')';
+             $theRestoreQueries .= $sql2."\n";
           }
         } //while
 
         //If there are no ALTER queries to run, echo message
-        if(count($alter_queries) == 0) {
+        if (count($alter_queries) == 0) {
            echo $mod_strings['ERR_NO_COLUMNS_TO_EXPAND'];
         } else {
 
 	        // Create a backup file to restore columns to original length
-	        if($execute) {
+	        if ($execute) {
 	           $fh = sugar_fopen('restoreExpand.sql', 'w');
-	           if(-1 == fwrite($fh, $theRestoreQueries)) {
+	           if (-1 == fwrite($fh, $theRestoreQueries)) {
 	           	  $GLOBALS['log']->error($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
 	           	  echo($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
 	           } else {
@@ -116,22 +116,22 @@ 
 	           	  echo($mod_strings['LBL_CREATE_RESOTRE_FILE']);
 	           }
 
-	           foreach($alter_queries as $key=>$value) {
+	           foreach ($alter_queries as $key=>$value) {
 	           	       $db->query($value);
 	           }
 	        }
 
-			if($export) {
+			if ($export) {
 		   		header("Content-Disposition: attachment; filename=expandSugarDB.sql");
 				header("Content-Type: text/sql; charset={$app_strings['LBL_CHARSET']}");
-				header( "Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
-				header( "Last-Modified: " . TimeDate::httpTime() );
-				header( "Cache-Control: post-check=0, pre-check=0", false );
+				header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+				header("Last-Modified: ".TimeDate::httpTime());
+				header("Cache-Control: post-check=0, pre-check=0", false);
 				header("Content-Length: ".strlen($theAlterQueries));
 		   		echo $theAlterQueries;
 		   		die();
 			} else {
-				if(empty($_REQUEST['repair_silent'])) {
+				if (empty($_REQUEST['repair_silent'])) {
 					echo nl2br($theAlterQueries);
 				}
 			}
@@ -139,8 +139,8 @@ 
         } //if-else
 	} // end do_action
 
-	if(empty($_REQUEST['repair_silent']) && empty($_REQUEST['do_action'])) {
-		if(!file_exists('restoreExpand.sql')) {
+	if (empty($_REQUEST['repair_silent']) && empty($_REQUEST['do_action'])) {
+		if (!file_exists('restoreExpand.sql')) {
 		        echo "	<b>{$mod_strings['LBL_REPAIR_ACTION']}</b><br>
 				<form name='repairdb'>
 					<input type='hidden' name='action' value='expandDatabase'>
@@ -157,7 +157,7 @@ 
 			    echo "<b>{$mod_strings['LBL_EXPAND_DATABASE_FINISHED_ERROR']}</b><br>";
 		} //if-else
 	} //if
-}else{
+} else {
 	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 

Braces +4 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.
@@ -157,7 +159,7 @@ 
 			    echo "<b>{$mod_strings['LBL_EXPAND_DATABASE_FINISHED_ERROR']}</b><br>";
 		} //if-else
 	} //if
-}else{
+} else{
 	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 

modules/Administration/RebuildAudit.php

Indentation +12 added lines, -12 removed lines

@@ -44,18 +44,18 @@
 echo $mod_strings['LBL_REBUILD_AUDIT_SEARCH'] . ' <BR>';
 foreach ($beanFiles as $bean => $file)
 {
-	if(strlen($file) > 0 && file_exists($file)) {
-		require_once($file);
-	    $focus = new $bean();
-		if ($focus->is_AuditEnabled()) {
-			if (!$focus->db->tableExists($focus->get_audit_table_name())) {
-				printf($mod_strings['LBL_REBUILD_AUDIT_SEARCH'],$focus->get_audit_table_name(), $focus->object_name);
-				$focus->create_audit_table();
-			} else {
-				printf($mod_strings['LBL_REBUILD_AUDIT_SKIP'],$focus->object_name);	
-			}
-		}
-	}
+    if(strlen($file) > 0 && file_exists($file)) {
+        require_once($file);
+        $focus = new $bean();
+        if ($focus->is_AuditEnabled()) {
+            if (!$focus->db->tableExists($focus->get_audit_table_name())) {
+                printf($mod_strings['LBL_REBUILD_AUDIT_SEARCH'],$focus->get_audit_table_name(), $focus->object_name);
+                $focus->create_audit_table();
+            } else {
+                printf($mod_strings['LBL_REBUILD_AUDIT_SKIP'],$focus->object_name);	
+            }
+        }
+    }
 }
 echo $mod_strings['LBL_DONE'];
 ?>
\ No newline at end of file

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.
@@ -41,18 +41,18 @@ 
 include('include/modules.php');
 
 global $beanFiles, $mod_strings;
-echo $mod_strings['LBL_REBUILD_AUDIT_SEARCH'] . ' <BR>';
+echo $mod_strings['LBL_REBUILD_AUDIT_SEARCH'].' <BR>';
 foreach ($beanFiles as $bean => $file)
 {
-	if(strlen($file) > 0 && file_exists($file)) {
+	if (strlen($file) > 0 && file_exists($file)) {
 		require_once($file);
 	    $focus = new $bean();
 		if ($focus->is_AuditEnabled()) {
 			if (!$focus->db->tableExists($focus->get_audit_table_name())) {
-				printf($mod_strings['LBL_REBUILD_AUDIT_SEARCH'],$focus->get_audit_table_name(), $focus->object_name);
+				printf($mod_strings['LBL_REBUILD_AUDIT_SEARCH'], $focus->get_audit_table_name(), $focus->object_name);
 				$focus->create_audit_table();
 			} else {
-				printf($mod_strings['LBL_REBUILD_AUDIT_SKIP'],$focus->object_name);	
+				printf($mod_strings['LBL_REBUILD_AUDIT_SKIP'], $focus->object_name);	
 			}
 		}
 	}

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/Administration/upgrade_custom_relationships.php

Indentation +73 added lines, -73 removed lines

@@ -44,82 +44,82 @@
  */
 function upgrade_custom_relationships($modules = array())
 {
-	global $current_user, $moduleList;
-	if (!is_admin($current_user)) sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']); 
+    global $current_user, $moduleList;
+    if (!is_admin($current_user)) sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']); 
 	
-	require_once("modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php");
-	require_once("modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php");
+    require_once("modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php");
+    require_once("modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php");
 	
-	if (empty($modules))
-		$modules = $moduleList;
+    if (empty($modules))
+        $modules = $moduleList;
 	
-	foreach($modules as $module)
-	{
-		$depRels = new DeployedRelationships($module);
-		$relList = $depRels->getRelationshipList();
-		foreach($relList as $relName)
-		{
-			$relObject = $depRels->get($relName);
-			$def = $relObject->getDefinition();
-			//We only need to fix self referencing one to many relationships
-			if ($def['lhs_module'] == $def['rhs_module'] && $def['is_custom'] && $def['relationship_type'] == "one-to-many")
-			{
-				$layout_defs = array();
-				if (!is_dir("custom/Extension/modules/$module/Ext/Layoutdefs") || !is_dir("custom/Extension/modules/$module/Ext/Vardefs"))
-					continue;
-				//Find the extension file containing the vardefs for this relationship
-				foreach(scandir("custom/Extension/modules/$module/Ext/Vardefs") as $file)
-				{
-					if (substr($file,0,1) != "." && strtolower(substr($file, -4)) == ".php")
-					{
-						$dictionary = array($module => array("fields" => array()));
-						$filePath = "custom/Extension/modules/$module/Ext/Vardefs/$file";
-						include($filePath);
-						if(isset($dictionary[$module]["fields"][$relName]))
-						{
-							$rhsDef = $dictionary[$module]["fields"][$relName];
-							//Update the vardef for the left side link field
-							if (!isset($rhsDef['side']) || $rhsDef['side'] != 'left')
-							{
-								$rhsDef['side'] = 'left';
-								$fileContents = file_get_contents($filePath);
-								$out = preg_replace(
-									'/\$dictionary[\w"\'\[\]]*?' . $relName . '["\'\[\]]*?\s*?=\s*?array\s*?\(.*?\);/s',
-									'$dictionary["' . $module . '"]["fields"]["' . $relName . '"]=' . var_export_helper($rhsDef) . ";",
-									$fileContents
-								);
-								file_put_contents($filePath, $out);
-							}
-						}
-					}
-				}
-				//Find the extension file containing the subpanel definition for this relationship
-				foreach(scandir("custom/Extension/modules/$module/Ext/Layoutdefs") as $file)
-				{
-					if (substr($file,0,1) != "." && strtolower(substr($file, -4)) == ".php")
-					{
-						$layout_defs = array($module => array("subpanel_setup" => array()));
-						$filePath = "custom/Extension/modules/$module/Ext/Layoutdefs/$file";
-						include($filePath);
-						foreach($layout_defs[$module]["subpanel_setup"] as $key => $subDef)
-						{
-							if ($layout_defs[$module]["subpanel_setup"][$key]['get_subpanel_data'] == $relName)
-							{
-								$fileContents = file_get_contents($filePath);
-								$out = preg_replace(
-									'/[\'"]get_subpanel_data[\'"]\s*=>\s*[\'"]' . $relName . '[\'"],/s',
-									"'get_subpanel_data' => '{$def["join_key_lhs"]}',",
-									$fileContents
-								);
-								file_put_contents($filePath, $out);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+    foreach($modules as $module)
+    {
+        $depRels = new DeployedRelationships($module);
+        $relList = $depRels->getRelationshipList();
+        foreach($relList as $relName)
+        {
+            $relObject = $depRels->get($relName);
+            $def = $relObject->getDefinition();
+            //We only need to fix self referencing one to many relationships
+            if ($def['lhs_module'] == $def['rhs_module'] && $def['is_custom'] && $def['relationship_type'] == "one-to-many")
+            {
+                $layout_defs = array();
+                if (!is_dir("custom/Extension/modules/$module/Ext/Layoutdefs") || !is_dir("custom/Extension/modules/$module/Ext/Vardefs"))
+                    continue;
+                //Find the extension file containing the vardefs for this relationship
+                foreach(scandir("custom/Extension/modules/$module/Ext/Vardefs") as $file)
+                {
+                    if (substr($file,0,1) != "." && strtolower(substr($file, -4)) == ".php")
+                    {
+                        $dictionary = array($module => array("fields" => array()));
+                        $filePath = "custom/Extension/modules/$module/Ext/Vardefs/$file";
+                        include($filePath);
+                        if(isset($dictionary[$module]["fields"][$relName]))
+                        {
+                            $rhsDef = $dictionary[$module]["fields"][$relName];
+                            //Update the vardef for the left side link field
+                            if (!isset($rhsDef['side']) || $rhsDef['side'] != 'left')
+                            {
+                                $rhsDef['side'] = 'left';
+                                $fileContents = file_get_contents($filePath);
+                                $out = preg_replace(
+                                    '/\$dictionary[\w"\'\[\]]*?' . $relName . '["\'\[\]]*?\s*?=\s*?array\s*?\(.*?\);/s',
+                                    '$dictionary["' . $module . '"]["fields"]["' . $relName . '"]=' . var_export_helper($rhsDef) . ";",
+                                    $fileContents
+                                );
+                                file_put_contents($filePath, $out);
+                            }
+                        }
+                    }
+                }
+                //Find the extension file containing the subpanel definition for this relationship
+                foreach(scandir("custom/Extension/modules/$module/Ext/Layoutdefs") as $file)
+                {
+                    if (substr($file,0,1) != "." && strtolower(substr($file, -4)) == ".php")
+                    {
+                        $layout_defs = array($module => array("subpanel_setup" => array()));
+                        $filePath = "custom/Extension/modules/$module/Ext/Layoutdefs/$file";
+                        include($filePath);
+                        foreach($layout_defs[$module]["subpanel_setup"] as $key => $subDef)
+                        {
+                            if ($layout_defs[$module]["subpanel_setup"][$key]['get_subpanel_data'] == $relName)
+                            {
+                                $fileContents = file_get_contents($filePath);
+                                $out = preg_replace(
+                                    '/[\'"]get_subpanel_data[\'"]\s*=>\s*[\'"]' . $relName . '[\'"],/s',
+                                    "'get_subpanel_data' => '{$def["join_key_lhs"]}',",
+                                    $fileContents
+                                );
+                                file_put_contents($filePath, $out);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 
 if (isset($_REQUEST['execute']) && $_REQUEST['execute'])
-	upgrade_custom_relationships();
\ No newline at end of file
+    upgrade_custom_relationships();
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -53,11 +53,11 @@ 
 	if (empty($modules))
 		$modules = $moduleList;
 	
-	foreach($modules as $module)
+	foreach ($modules as $module)
 	{
 		$depRels = new DeployedRelationships($module);
 		$relList = $depRels->getRelationshipList();
-		foreach($relList as $relName)
+		foreach ($relList as $relName)
 		{
 			$relObject = $depRels->get($relName);
 			$def = $relObject->getDefinition();
@@ -68,14 +68,14 @@ 
 				if (!is_dir("custom/Extension/modules/$module/Ext/Layoutdefs") || !is_dir("custom/Extension/modules/$module/Ext/Vardefs"))
 					continue;
 				//Find the extension file containing the vardefs for this relationship
-				foreach(scandir("custom/Extension/modules/$module/Ext/Vardefs") as $file)
+				foreach (scandir("custom/Extension/modules/$module/Ext/Vardefs") as $file)
 				{
-					if (substr($file,0,1) != "." && strtolower(substr($file, -4)) == ".php")
+					if (substr($file, 0, 1) != "." && strtolower(substr($file, -4)) == ".php")
 					{
 						$dictionary = array($module => array("fields" => array()));
 						$filePath = "custom/Extension/modules/$module/Ext/Vardefs/$file";
 						include($filePath);
-						if(isset($dictionary[$module]["fields"][$relName]))
+						if (isset($dictionary[$module]["fields"][$relName]))
 						{
 							$rhsDef = $dictionary[$module]["fields"][$relName];
 							//Update the vardef for the left side link field
@@ -84,8 +84,8 @@ 
 								$rhsDef['side'] = 'left';
 								$fileContents = file_get_contents($filePath);
 								$out = preg_replace(
-									'/\$dictionary[\w"\'\[\]]*?' . $relName . '["\'\[\]]*?\s*?=\s*?array\s*?\(.*?\);/s',
-									'$dictionary["' . $module . '"]["fields"]["' . $relName . '"]=' . var_export_helper($rhsDef) . ";",
+									'/\$dictionary[\w"\'\[\]]*?'.$relName.'["\'\[\]]*?\s*?=\s*?array\s*?\(.*?\);/s',
+									'$dictionary["'.$module.'"]["fields"]["'.$relName.'"]='.var_export_helper($rhsDef).";",
 									$fileContents
 								);
 								file_put_contents($filePath, $out);
@@ -94,20 +94,20 @@ 
 					}
 				}
 				//Find the extension file containing the subpanel definition for this relationship
-				foreach(scandir("custom/Extension/modules/$module/Ext/Layoutdefs") as $file)
+				foreach (scandir("custom/Extension/modules/$module/Ext/Layoutdefs") as $file)
 				{
-					if (substr($file,0,1) != "." && strtolower(substr($file, -4)) == ".php")
+					if (substr($file, 0, 1) != "." && strtolower(substr($file, -4)) == ".php")
 					{
 						$layout_defs = array($module => array("subpanel_setup" => array()));
 						$filePath = "custom/Extension/modules/$module/Ext/Layoutdefs/$file";
 						include($filePath);
-						foreach($layout_defs[$module]["subpanel_setup"] as $key => $subDef)
+						foreach ($layout_defs[$module]["subpanel_setup"] as $key => $subDef)
 						{
 							if ($layout_defs[$module]["subpanel_setup"][$key]['get_subpanel_data'] == $relName)
 							{
 								$fileContents = file_get_contents($filePath);
 								$out = preg_replace(
-									'/[\'"]get_subpanel_data[\'"]\s*=>\s*[\'"]' . $relName . '[\'"],/s',
+									'/[\'"]get_subpanel_data[\'"]\s*=>\s*[\'"]'.$relName.'[\'"],/s',
 									"'get_subpanel_data' => '{$def["join_key_lhs"]}',",
 									$fileContents
 								);

Braces +12 added lines, -7 removed lines

@@ -45,13 +45,16 @@ 
 function upgrade_custom_relationships($modules = array())
 {
 	global $current_user, $moduleList;
-	if (!is_admin($current_user)) sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']); 
+	if (!is_admin($current_user)) {
+	    sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
+	}
 	
 	require_once("modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php");
 	require_once("modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php");
 	
-	if (empty($modules))
-		$modules = $moduleList;
+	if (empty($modules)) {
+			$modules = $moduleList;
+	}
 	
 	foreach($modules as $module)
 	{
@@ -65,8 +68,9 @@ 
 			if ($def['lhs_module'] == $def['rhs_module'] && $def['is_custom'] && $def['relationship_type'] == "one-to-many")
 			{
 				$layout_defs = array();
-				if (!is_dir("custom/Extension/modules/$module/Ext/Layoutdefs") || !is_dir("custom/Extension/modules/$module/Ext/Vardefs"))
-					continue;
+				if (!is_dir("custom/Extension/modules/$module/Ext/Layoutdefs") || !is_dir("custom/Extension/modules/$module/Ext/Vardefs")) {
+									continue;
+				}
 				//Find the extension file containing the vardefs for this relationship
 				foreach(scandir("custom/Extension/modules/$module/Ext/Vardefs") as $file)
 				{
@@ -121,5 +125,6 @@ 
 	}
 }
 
-if (isset($_REQUEST['execute']) && $_REQUEST['execute'])
-	upgrade_custom_relationships();
\ No newline at end of file
+if (isset($_REQUEST['execute']) && $_REQUEST['execute']) {
+	upgrade_custom_relationships();
+}

modules/Administration/DiagnosticDelete.php

Indentation +17 added lines, -17 removed lines

@@ -51,15 +51,15 @@ 
         "Administration",
         array(
             "<a href='index.php?module=Administration&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>",
-           translate('LBL_DIAGNOSTIC_TITLE')
-           ),
+            translate('LBL_DIAGNOSTIC_TITLE')
+            ),
         true
         );
 
 
 if(empty($_REQUEST['file']) || empty($_REQUEST['guid']))
 {
-	echo $mod_strings['LBL_DIAGNOSTIC_DELETE_ERROR'];
+    echo $mod_strings['LBL_DIAGNOSTIC_DELETE_ERROR'];
 }
 else
 {
@@ -67,21 +67,21 @@ 
     clean_string($_REQUEST['guid'], "ALPHANUM");
     clean_string($_REQUEST['file'], "FILE");
 
-	//Making sure someone doesn't pass a variable name as a false reference
-	//  to delete a file
-	if(strcmp(substr($_REQUEST['file'], 0, 10), "diagnostic") != 0)
-	{
-		die($mod_strings['LBL_DIAGNOSTIC_DELETE_DIE']);
-	}
+    //Making sure someone doesn't pass a variable name as a false reference
+    //  to delete a file
+    if(strcmp(substr($_REQUEST['file'], 0, 10), "diagnostic") != 0)
+    {
+        die($mod_strings['LBL_DIAGNOSTIC_DELETE_DIE']);
+    }
 
-	if(file_exists($cachedfile = sugar_cached("diagnostic/".$_REQUEST['guid']."/".$_REQUEST['file'].".zip")))
-	{
-  	  unlink($cachedfile);
-  	  rmdir(dirname($cachedfile));
-	  echo $mod_strings['LBL_DIAGNOSTIC_DELETED']."<br><br>";
-	}
-	else
-	  echo $mod_strings['LBL_DIAGNOSTIC_FILE'] . $_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
+    if(file_exists($cachedfile = sugar_cached("diagnostic/".$_REQUEST['guid']."/".$_REQUEST['file'].".zip")))
+    {
+        unlink($cachedfile);
+        rmdir(dirname($cachedfile));
+        echo $mod_strings['LBL_DIAGNOSTIC_DELETED']."<br><br>";
+    }
+    else
+        echo $mod_strings['LBL_DIAGNOSTIC_FILE'] . $_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
 }
 
 print "<a href=\"index.php?module=Administration&action=index\">" . $mod_strings['LBL_DIAGNOSTIC_DELETE_RETURN'] . "</a><br>";

Spacing +6 added lines, -6 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.
@@ -57,7 +57,7 @@ 
         );
 
 
-if(empty($_REQUEST['file']) || empty($_REQUEST['guid']))
+if (empty($_REQUEST['file']) || empty($_REQUEST['guid']))
 {
 	echo $mod_strings['LBL_DIAGNOSTIC_DELETE_ERROR'];
 }
@@ -69,21 +69,21 @@ 
 
 	//Making sure someone doesn't pass a variable name as a false reference
 	//  to delete a file
-	if(strcmp(substr($_REQUEST['file'], 0, 10), "diagnostic") != 0)
+	if (strcmp(substr($_REQUEST['file'], 0, 10), "diagnostic") != 0)
 	{
 		die($mod_strings['LBL_DIAGNOSTIC_DELETE_DIE']);
 	}
 
-	if(file_exists($cachedfile = sugar_cached("diagnostic/".$_REQUEST['guid']."/".$_REQUEST['file'].".zip")))
+	if (file_exists($cachedfile = sugar_cached("diagnostic/".$_REQUEST['guid']."/".$_REQUEST['file'].".zip")))
 	{
   	  unlink($cachedfile);
   	  rmdir(dirname($cachedfile));
 	  echo $mod_strings['LBL_DIAGNOSTIC_DELETED']."<br><br>";
 	}
 	else
-	  echo $mod_strings['LBL_DIAGNOSTIC_FILE'] . $_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
+	  echo $mod_strings['LBL_DIAGNOSTIC_FILE'].$_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
 }
 
-print "<a href=\"index.php?module=Administration&action=index\">" . $mod_strings['LBL_DIAGNOSTIC_DELETE_RETURN'] . "</a><br>";
+print "<a href=\"index.php?module=Administration&action=index\">".$mod_strings['LBL_DIAGNOSTIC_DELETE_RETURN']."</a><br>";
 
 ?>

Braces +7 added lines, -6 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.
@@ -60,8 +62,7 @@ 
 if(empty($_REQUEST['file']) || empty($_REQUEST['guid']))
 {
 	echo $mod_strings['LBL_DIAGNOSTIC_DELETE_ERROR'];
-}
-else
+} else
 {
     // Make sure the guid and file are valid file names for security purposes
     clean_string($_REQUEST['guid'], "ALPHANUM");
@@ -79,10 +80,10 @@ 
   	  unlink($cachedfile);
   	  rmdir(dirname($cachedfile));
 	  echo $mod_strings['LBL_DIAGNOSTIC_DELETED']."<br><br>";
+	} else {
+		  echo $mod_strings['LBL_DIAGNOSTIC_FILE'] . $_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
+	}
 	}
-	else
-	  echo $mod_strings['LBL_DIAGNOSTIC_FILE'] . $_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
-}
 
 print "<a href=\"index.php?module=Administration&action=index\">" . $mod_strings['LBL_DIAGNOSTIC_DELETE_RETURN'] . "</a><br>";
 

modules/Administration/RebuildRelationship.php

Indentation +3 added lines, -3 removed lines

@@ -79,10 +79,10 @@
 // do the same for custom relationships (true in the last parameter to SugarBean::createRelationshipMeta) - that is, relationships defined in the custom/modules/<modulename>/Ext/vardefs/ area
 foreach ( $GLOBALS['beanFiles'] as $bean => $file )
 {
-	//skip this file if it does not exist
-	if(!file_exists($file)) continue;
+    //skip this file if it does not exist
+    if(!file_exists($file)) continue;
 
-	if (! class_exists ( $bean ))
+    if (! class_exists ( $bean ))
     {
         require ($file) ;
     }

Spacing +55 added lines, -55 removed lines

@@ -1,6 +1,6 @@ 
 <?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.
@@ -39,107 +39,107 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-include ('include/modules.php') ;
+include ('include/modules.php');
 
 
 
-global $db, $mod_strings ;
-$log = & $GLOBALS [ 'log' ] ;
+global $db, $mod_strings;
+$log = & $GLOBALS ['log'];
 
-$query = "DELETE FROM relationships" ;
-$db->query ( $query ) ;
+$query = "DELETE FROM relationships";
+$db->query($query);
 
 //clear cache before proceeding..
-VardefManager::clearVardef () ;
+VardefManager::clearVardef();
 
 // loop through all of the modules and create entries in the Relationships table (the relationships metadata) for every standard relationship, that is, relationships defined in the /modules/<module>/vardefs.php
 // SugarBean::createRelationshipMeta just takes the relationship definition in a file and inserts it as is into the Relationships table
 // It does not override or recreate existing relationships
-foreach ( $GLOBALS['beanFiles'] as $bean => $file )
+foreach ($GLOBALS['beanFiles'] as $bean => $file)
 {
-    if (strlen ( $file ) > 0 && file_exists ( $file ))
+    if (strlen($file) > 0 && file_exists($file))
     {
-        if (! class_exists ( $bean ))
+        if (!class_exists($bean))
         {
-            require ($file) ;
+            require ($file);
         }
-        $focus = new $bean ( ) ;
-        if ( $focus instanceOf SugarBean ) {
-            $table_name = $focus->table_name ;
-            $empty = array() ;
-            if (empty ( $_REQUEST [ 'silent' ] ))
-                echo $mod_strings [ 'LBL_REBUILD_REL_PROC_META' ] . $focus->table_name . "..." ;
-            SugarBean::createRelationshipMeta ( $focus->getObjectName (), $db, $table_name, $empty, $focus->module_dir ) ;
-            if (empty ( $_REQUEST [ 'silent' ] ))
-                echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+        $focus = new $bean( );
+        if ($focus instanceOf SugarBean) {
+            $table_name = $focus->table_name;
+            $empty = array();
+            if (empty ($_REQUEST ['silent']))
+                echo $mod_strings ['LBL_REBUILD_REL_PROC_META'].$focus->table_name."...";
+            SugarBean::createRelationshipMeta($focus->getObjectName(), $db, $table_name, $empty, $focus->module_dir);
+            if (empty ($_REQUEST ['silent']))
+                echo $mod_strings ['LBL_DONE'].'<br>';
         }
     }
 }
 
 // do the same for custom relationships (true in the last parameter to SugarBean::createRelationshipMeta) - that is, relationships defined in the custom/modules/<modulename>/Ext/vardefs/ area
-foreach ( $GLOBALS['beanFiles'] as $bean => $file )
+foreach ($GLOBALS['beanFiles'] as $bean => $file)
 {
 	//skip this file if it does not exist
-	if(!file_exists($file)) continue;
+	if (!file_exists($file)) continue;
 
-	if (! class_exists ( $bean ))
+	if (!class_exists($bean))
     {
-        require ($file) ;
+        require ($file);
     }
-    $focus = new $bean ( ) ;
-    if ( $focus instanceOf SugarBean ) {
-        $table_name = $focus->table_name ;
-        $empty = array() ;
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_REBUILD_REL_PROC_C_META' ] . $focus->table_name . "..." ;
-        SugarBean::createRelationshipMeta ( $focus->getObjectName (), $db, $table_name, $empty, $focus->module_dir, true ) ;
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+    $focus = new $bean( );
+    if ($focus instanceOf SugarBean) {
+        $table_name = $focus->table_name;
+        $empty = array();
+        if (empty ($_REQUEST ['silent']))
+            echo $mod_strings ['LBL_REBUILD_REL_PROC_C_META'].$focus->table_name."...";
+        SugarBean::createRelationshipMeta($focus->getObjectName(), $db, $table_name, $empty, $focus->module_dir, true);
+        if (empty ($_REQUEST ['silent']))
+            echo $mod_strings ['LBL_DONE'].'<br>';
     }
 }
 
 // finally, whip through the list of relationships defined in TableDictionary.php, that is all the relationships in the metadata directory, and install those
-    $dictionary = array ( ) ;
-    require ('modules/TableDictionary.php') ;
+    $dictionary = array( );
+    require ('modules/TableDictionary.php');
     //for module installer incase we already loaded the table dictionary
-    if (file_exists ( 'custom/application/Ext/TableDictionary/tabledictionary.ext.php' ))
+    if (file_exists('custom/application/Ext/TableDictionary/tabledictionary.ext.php'))
     {
-        include ('custom/application/Ext/TableDictionary/tabledictionary.ext.php') ;
+        include ('custom/application/Ext/TableDictionary/tabledictionary.ext.php');
     }
-    $rel_dictionary = $dictionary ;
-    foreach ( $rel_dictionary as $rel_name => $rel_data )
+    $rel_dictionary = $dictionary;
+    foreach ($rel_dictionary as $rel_name => $rel_data)
     {
-        $table = isset($rel_data [ 'table' ]) ? $rel_data [ 'table' ] : "" ;
+        $table = isset($rel_data ['table']) ? $rel_data ['table'] : "";
 
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_REBUILD_REL_PROC_C_META' ] . $rel_name . "..." ;
-        SugarBean::createRelationshipMeta ( $rel_name, $db, $table, $rel_dictionary, '' ) ;
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+        if (empty ($_REQUEST ['silent']))
+            echo $mod_strings ['LBL_REBUILD_REL_PROC_C_META'].$rel_name."...";
+        SugarBean::createRelationshipMeta($rel_name, $db, $table, $rel_dictionary, '');
+        if (empty ($_REQUEST ['silent']))
+            echo $mod_strings ['LBL_DONE'].'<br>';
     }
 
 //clean relationship cache..will be rebuilt upon first access.
-if (empty ( $_REQUEST [ 'silent' ] ))
-    echo $mod_strings [ 'LBL_REBUILD_REL_DEL_CACHE' ] ;
-Relationship::delete_cache () ;
+if (empty ($_REQUEST ['silent']))
+    echo $mod_strings ['LBL_REBUILD_REL_DEL_CACHE'];
+Relationship::delete_cache();
 
 //////////////////////////////////////////////////////////////////////////////
 // Remove the "Rebuild Relationships" red text message on admin logins
 
 
-if (empty ( $_REQUEST [ 'silent' ] ))
-    echo $mod_strings [ 'LBL_REBUILD_REL_UPD_WARNING' ] ;
+if (empty ($_REQUEST ['silent']))
+    echo $mod_strings ['LBL_REBUILD_REL_UPD_WARNING'];
 
 $rel = new Relationship();
 Relationship::delete_cache();
 $rel->build_relationship_cache();
 
 // unset the session variable so it is not picked up in DisplayWarnings.php
-if (isset ( $_SESSION [ 'rebuild_relationships' ] ))
+if (isset ($_SESSION ['rebuild_relationships']))
 {
-    unset ( $_SESSION [ 'rebuild_relationships' ] ) ;
+    unset ($_SESSION ['rebuild_relationships']);
 }
 
-if (empty ( $_REQUEST [ 'silent' ] ))
-    echo $mod_strings [ 'LBL_DONE' ] ;
+if (empty ($_REQUEST ['silent']))
+    echo $mod_strings ['LBL_DONE'];
 ?>

Braces +29 added lines, -17 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
+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.
@@ -67,11 +68,13 @@ 
         if ( $focus instanceOf SugarBean ) {
             $table_name = $focus->table_name ;
             $empty = array() ;
-            if (empty ( $_REQUEST [ 'silent' ] ))
-                echo $mod_strings [ 'LBL_REBUILD_REL_PROC_META' ] . $focus->table_name . "..." ;
+            if (empty ( $_REQUEST [ 'silent' ] )) {
+                            echo $mod_strings [ 'LBL_REBUILD_REL_PROC_META' ] . $focus->table_name . "..." ;
+            }
             SugarBean::createRelationshipMeta ( $focus->getObjectName (), $db, $table_name, $empty, $focus->module_dir ) ;
-            if (empty ( $_REQUEST [ 'silent' ] ))
-                echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+            if (empty ( $_REQUEST [ 'silent' ] )) {
+                            echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+            }
         }
     }
 }
@@ -80,7 +83,9 @@ 
 foreach ( $GLOBALS['beanFiles'] as $bean => $file )
 {
 	//skip this file if it does not exist
-	if(!file_exists($file)) continue;
+	if(!file_exists($file)) {
+	    continue;
+	}
 
 	if (! class_exists ( $bean ))
     {
@@ -90,11 +95,13 @@ 
     if ( $focus instanceOf SugarBean ) {
         $table_name = $focus->table_name ;
         $empty = array() ;
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_REBUILD_REL_PROC_C_META' ] . $focus->table_name . "..." ;
+        if (empty ( $_REQUEST [ 'silent' ] )) {
+                    echo $mod_strings [ 'LBL_REBUILD_REL_PROC_C_META' ] . $focus->table_name . "..." ;
+        }
         SugarBean::createRelationshipMeta ( $focus->getObjectName (), $db, $table_name, $empty, $focus->module_dir, true ) ;
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+        if (empty ( $_REQUEST [ 'silent' ] )) {
+                    echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+        }
     }
 }
 
@@ -111,24 +118,28 @@ 
     {
         $table = isset($rel_data [ 'table' ]) ? $rel_data [ 'table' ] : "" ;
 
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_REBUILD_REL_PROC_C_META' ] . $rel_name . "..." ;
+        if (empty ( $_REQUEST [ 'silent' ] )) {
+                    echo $mod_strings [ 'LBL_REBUILD_REL_PROC_C_META' ] . $rel_name . "..." ;
+        }
         SugarBean::createRelationshipMeta ( $rel_name, $db, $table, $rel_dictionary, '' ) ;
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+        if (empty ( $_REQUEST [ 'silent' ] )) {
+                    echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+        }
     }
 
 //clean relationship cache..will be rebuilt upon first access.
-if (empty ( $_REQUEST [ 'silent' ] ))
+if (empty ( $_REQUEST [ 'silent' ] )) {
     echo $mod_strings [ 'LBL_REBUILD_REL_DEL_CACHE' ] ;
+}
 Relationship::delete_cache () ;
 
 //////////////////////////////////////////////////////////////////////////////
 // Remove the "Rebuild Relationships" red text message on admin logins
 
 
-if (empty ( $_REQUEST [ 'silent' ] ))
+if (empty ( $_REQUEST [ 'silent' ] )) {
     echo $mod_strings [ 'LBL_REBUILD_REL_UPD_WARNING' ] ;
+}
 
 $rel = new Relationship();
 Relationship::delete_cache();
@@ -140,6 +151,7 @@ 
     unset ( $_SESSION [ 'rebuild_relationships' ] ) ;
 }
 
-if (empty ( $_REQUEST [ 'silent' ] ))
+if (empty ( $_REQUEST [ 'silent' ] )) {
     echo $mod_strings [ 'LBL_DONE' ] ;
+}
 ?>