adamjakab / SuiteCRM

modules/Administration/repairSelectModule.php

Braces +2 added lines, -1 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.

modules/Administration/RebuildExpressionPlugins.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+<?php 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/RepairIndex.php

Braces +15 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.
@@ -43,14 +45,17 @@ 
 ////	LOCAL UTILITY
 function compare($table_name, $db_indexes, $var_indexes) {
 	global $add_index, $drop_index, $change_index;
-	if(empty($change_index))$change_index = array();
+	if(empty($change_index)) {
+	    $change_index = array();
+	}
 	foreach ($var_indexes as $var_i_name=>$var_i_def) {
 		//find corresponding db index with same name
 		//else by columns in the index.
 		$sel_db_index = null;
 		$var_fields_string ='';
-		if(count($var_i_def['fields'])>0)
-			$var_fields_string = implode('',$var_i_def['fields']);
+		if(count($var_i_def['fields'])>0) {
+					$var_fields_string = implode('',$var_i_def['fields']);
+		}
 		$field_list_match = false;
 		if(isset($db_indexes[$var_i_name])) {
 			$sel_db_index = $db_indexes[$var_i_name];
@@ -101,12 +106,16 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	PROCESS
-if(!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+if(!is_admin($current_user)) {
+    sugar_die("Unauthorized access to administration.");
+}
 set_time_limit(3600);
 /**
  * Note: $_REQUEST['silent'] is set from ModuleInstaller::repair_indices();
  */
-if(!isset($_REQUEST['silent'])) $_REQUEST['silent'] = false;
+if(!isset($_REQUEST['silent'])) {
+    $_REQUEST['silent'] = false;
+}
 
 $add_index=array();
 $drop_index=array();

modules/Administration/PasswordManager.php

Braces +27 added lines, -20 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.
@@ -95,9 +97,9 @@ 
 		if (isset($_REQUEST['system_ldap_enabled']) && $_REQUEST['system_ldap_enabled'] == 'on') {
 			$_POST['system_ldap_enabled'] = 1;
 			clearPasswordSettings();
-		} 
-		else 
-			$_POST['system_ldap_enabled'] = 0;
+		} else {
+					$_POST['system_ldap_enabled'] = 0;
+		}
 
 
         if(isset($_REQUEST['authenticationClass']))
@@ -114,18 +116,21 @@ 
             $_POST['ldap_group_attr_req_dn'] = 0;
         }
 
-		if (isset($_REQUEST['ldap_group_checkbox']) && $_REQUEST['ldap_group_checkbox'] == 'on') 
-			$_POST['ldap_group'] = 1;
-		else
-			$_POST['ldap_group'] = 0;
+		if (isset($_REQUEST['ldap_group_checkbox']) && $_REQUEST['ldap_group_checkbox'] == 'on') {
+					$_POST['ldap_group'] = 1;
+		} else {
+					$_POST['ldap_group'] = 0;
+		}
 			
-		if (isset($_REQUEST['ldap_authentication_checkbox']) && $_REQUEST['ldap_authentication_checkbox'] == 'on') 
-			$_POST['ldap_authentication'] = 1;
-		else
-		    $_POST['ldap_authentication'] = 0;
+		if (isset($_REQUEST['ldap_authentication_checkbox']) && $_REQUEST['ldap_authentication_checkbox'] == 'on') {
+					$_POST['ldap_authentication'] = 1;
+		} else {
+				    $_POST['ldap_authentication'] = 0;
+		}
 		
-		if( isset($_REQUEST['passwordsetting_lockoutexpirationtime']) && is_numeric($_REQUEST['passwordsetting_lockoutexpirationtime'])  )
-		    $_POST['passwordsetting_lockoutexpiration'] = 2;
+		if( isset($_REQUEST['passwordsetting_lockoutexpirationtime']) && is_numeric($_REQUEST['passwordsetting_lockoutexpirationtime'])  ) {
+				    $_POST['passwordsetting_lockoutexpiration'] = 2;
+		}
 
 		$configurator->saveConfig();
 		
@@ -142,7 +147,9 @@ 
 $sugar_smarty = new Sugar_Smarty();
 
 // if no IMAP libraries available, disable Save/Test Settings
-if(!function_exists('imap_open')) $sugar_smarty->assign('IE_DISABLED', 'DISABLED');
+if(!function_exists('imap_open')) {
+    $sugar_smarty->assign('IE_DISABLED', 'DISABLED');
+}
 
 $config_strings=return_module_language($GLOBALS['current_language'],'Configurator');
 $sugar_smarty->assign('CONF', $config_strings);
@@ -167,7 +174,7 @@ 
 if(!function_exists('mcrypt_cbc')){
 	$sugar_smarty->assign("LDAP_ENC_KEY_READONLY", 'readonly');
 	$sugar_smarty->assign("LDAP_ENC_KEY_DESC", $config_strings['LDAP_ENC_KEY_NO_FUNC_DESC']);
-}else{
+} else{
 	$sugar_smarty->assign("LDAP_ENC_KEY_DESC", $config_strings['LBL_LDAP_ENC_KEY_DESC']);
 }
 $sugar_smarty->assign("settings", $focus->settings);
@@ -175,10 +182,10 @@ 
 if ($valid_public_key){
 	if(!empty($focus->settings['captcha_on'])){
 		$sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'inline');
-	}else{
+	} else{
 		$sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'none');
 	}
-}else{
+} else{
 	$sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'inline');
 }
 
@@ -194,9 +201,9 @@ 
 $mail->setMailerForSystem();
 if($mail->Mailer == 'smtp' && $mail->Host ==''){
 	$sugar_smarty->assign("SMTP_SERVER_NOT_SET", '1');
-	}
-else
+	} else {
 	$sugar_smarty->assign("SMTP_SERVER_NOT_SET", '0');
+}
 	
 $focus = new InboundEmail();
 $focus->checkImap();

modules/Administration/UpgradeHistory.php

Braces +32 added lines, -29 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,13 +96,13 @@ 
 
             if(empty($patch_to_check->id_name)){
                 $where = " WHERE name = '$patch_to_check->name' ";
-            }else{
+            } else{
                 $where = " WHERE id_name = '$patch_to_check->id_name' ";
             }
 
             if(!empty($patch_to_check->id)){
                 $where .= "  AND id != '$patch_to_check->id'  ";
-            }else{
+            } else{
                 $where .= "  AND id is not null  ";
             }
 
@@ -129,7 +131,7 @@ 
         $result = $this->db->query($query);
          if(empty($result)){
             return null;
-         }else{
+         } else{
             $temp_version = 0;
             $id = '';
             while($row = $this->db->fetchByAssoc($result))
@@ -139,10 +141,11 @@ 
                     $id = $row['id'];
                 }
             }//end while
-            if($this->is_right_version_greater(explode('.', $temp_version), explode('.', $version), false))
-                return array('id' => $id, 'version' => $temp_version);
-            else
-                return null;
+            if($this->is_right_version_greater(explode('.', $temp_version), explode('.', $version), false)) {
+                            return array('id' => $id, 'version' => $temp_version);
+            } else {
+                            return null;
+            }
          }
     }
 
@@ -171,7 +174,7 @@ 
                 //we have found a match
                 //if the patch_to_check version is greater than the found version
                 return ($this->is_right_version_greater(explode('.', $history_object->version), explode('.', $patch_to_check->version)));
-            }else{
+            } else{
                 return true;
             }
         }
@@ -179,8 +182,9 @@ 
         //with a matching unique_key in the database
         foreach($patch_list as $more_recent_patch)
         {
-            if($more_recent_patch->id == $patch_to_check->id)
-                break;
+            if($more_recent_patch->id == $patch_to_check->id) {
+                            break;
+            }
 
             //we will only resort to checking the files if we cannot find the unique_keys
             //or the unique_keys do not match
@@ -204,25 +208,27 @@ 
     {
         if(is_file($check_path))
         {
-            if(file_exists($recent_path))
-                return true;
-            else
-                return false;
-        }
-        elseif(is_dir($check_path))
+            if(file_exists($recent_path)) {
+                            return true;
+            } else {
+                            return false;
+            }
+        } elseif(is_dir($check_path))
         {
             $status = false;
 
             $d = dir( $check_path );
             while( $f = $d->read() )
             {
-                if( $f == "." || $f == ".." )
-                    continue;
+                if( $f == "." || $f == ".." ) {
+                                    continue;
+                }
 
                 $status = $this->foundConflict("$check_path/$f", "$recent_path/$f");
 
-                if($status)
-                    break;
+                if($status) {
+                                    break;
+                }
             }
 
             $d->close();
@@ -244,20 +250,17 @@ 
     function is_right_version_greater($left, $right, $equals_is_greater = true){
         if(count($left) == 0 && count($right) == 0){
             return $equals_is_greater;
-        }
-        else if(count($left) == 0 || count($right) == 0){
+        } else if(count($left) == 0 || count($right) == 0){
             return true;
-        }
-        else if($left[0] == $right[0]){
+        } else if($left[0] == $right[0]){
             array_shift($left);
             array_shift($right);
             return $this->is_right_version_greater($left, $right, $equals_is_greater);
-        }
-        else if($left[0] < $right[0]){
+        } else if($left[0] < $right[0]){
            return true;
+        } else {
+                    return false;
         }
-        else
-            return false;
     }
 
     /**

modules/Administration/RebuildConfig.php

Braces +5 added lines, -5 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.
@@ -56,8 +58,7 @@ 
     $config_check = $mod_strings['MSG_CONFIG_FILE_READY_FOR_REBUILD'];
     $disable_config_rebuild = '';
     $config_file_ready = true;
-}
-else {
+} else {
     $config_check = $mod_strings['MSG_MAKE_CONFIG_FILE_WRITABLE'];
 }
 
@@ -70,8 +71,7 @@ 
     if ( rebuildConfigFile($clean_config, $sugar_version) ) {
     	$config_check = $mod_strings['MSG_CONFIG_FILE_REBUILD_SUCCESS'];
         $disable_config_rebuild = 'disabled="disabled"';
-    }
-    else {
+    } else {
         $config_check = $mod_strings['MSG_CONFIG_FILE_REBUILD_FAILED'];
     }	
 

modules/Administration/UpgradeWizard.php

Braces +6 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.
@@ -66,8 +68,7 @@ 
 	$uploaddLabel = $mod_strings['LBL_UW_UPLOAD_MODULE'];
 	$descItemsQueued = $mod_strings['LBL_UW_DESC_MODULES_QUEUED'];
 	$descItemsInstalled = $mod_strings['LBL_UW_DESC_MODULES_INSTALLED'];
-}
-else {
+} else {
 
 	$uploaddLabel = $mod_strings['LBL_UPLOAD_UPGRADE'];
 	$descItemsQueued = $mod_strings['DESC_FILES_QUEUED'];
@@ -209,8 +210,7 @@ 
 
 if( $view == "module") {
 	print( getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_LOADER_TITLE']), false) );
-}
-else {
+} else {
 	print( getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_NAME'],$mod_strings['LBL_UPGRADE_WIZARD_TITLE']), false) );
 }
 
@@ -231,7 +231,7 @@ 
 	$form .= '</table></form>';
 //rrs
 
-}else{
+} else{
     $form =<<<eoq
 <form name="the_form" enctype="multipart/form-data" action="{$form_action}" method="post"  >
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="edit view">

modules/Administration/repairDatabase.php

Braces +9 added lines, -7 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.
@@ -70,8 +71,7 @@ 
 		    $sql = str_replace('&#039;',"'", $_POST['sql']);
 		    //echo html_entity_decode($_POST['sql']);
 		    echo $sql;
-		}
-		elseif (isset ($_POST['raction']) && strtolower($_POST['raction']) == "execute") {
+		} elseif (isset ($_POST['raction']) && strtolower($_POST['raction']) == "execute") {
 			$sql = str_replace(
 				array(
 					"\n",
@@ -96,8 +96,9 @@ 
 	} else {
 
 		if (!$export && empty ($_REQUEST['repair_silent'])) {
-			if ( empty($hideModuleMenu) )
-		        echo getClassicModuleTitle($mod_strings['LBL_REPAIR_DATABASE'], array($mod_strings['LBL_REPAIR_DATABASE']), true);
+			if ( empty($hideModuleMenu) ) {
+					        echo getClassicModuleTitle($mod_strings['LBL_REPAIR_DATABASE'], array($mod_strings['LBL_REPAIR_DATABASE']), true);
+			}
 			echo "<h1 id=\"rdloading\">{$mod_strings['LBL_REPAIR_DATABASE_PROCESSING']}</h1>";
 			ob_flush();
 		}
@@ -137,8 +138,9 @@ 
 
 		foreach ($dictionary as $meta) {
 
-			if ( !isset($meta['table']) || isset($repairedTables[$meta['table']]))
-                continue;
+			if ( !isset($meta['table']) || isset($repairedTables[$meta['table']])) {
+			                continue;
+			}
             
             $tablename = $meta['table'];
 			$fielddefs = $meta['fields'];

modules/Administration/UpgradeFields.php

Braces +5 added lines, -3 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.
@@ -120,8 +121,9 @@ 
 	echo sizeof($fields)." field(s) missing from $mod->table_name"."_cstm<br>";
 	foreach ($fields as $field) {
 		echo "Adding Column $field to $mod->table_name"."_cstm<br>";
-		if (!$simulate)
-			$mod->custom_fields->add_existing_custom_field($field);
+		if (!$simulate) {
+					$mod->custom_fields->add_existing_custom_field($field);
+		}
 	}
 
 }