adamjakab / SuiteCRM

modules/Administration/UpgradeAccess.php

Braces +15 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.
@@ -48,7 +50,9 @@ 
 $htaccess_file   = getcwd() . "/.htaccess";
 $contents = '';
 $basePath = parse_url($sugar_config['site_url'], PHP_URL_PATH);
-if(empty($basePath)) $basePath = '/';
+if(empty($basePath)) {
+    $basePath = '/';
+}
 
 $restrict_str = <<<EOQ
 # BEGIN SUGARCRM RESTRICTIONS
@@ -74,9 +78,15 @@ 
     $skip = false;
     while($line = fgets($fp)){
 
-    	if(preg_match('/\s*#\s*BEGIN\s*SUGARCRM\s*RESTRICTIONS/i', $line))$skip = true;
-        if(!$skip)$contents .= $line;
-        if(preg_match('/\s*#\s*END\s*SUGARCRM\s*RESTRICTIONS/i', $line))$skip = false;
+    	if(preg_match('/\s*#\s*BEGIN\s*SUGARCRM\s*RESTRICTIONS/i', $line)) {
+    	    $skip = true;
+    	}
+        if(!$skip) {
+            $contents .= $line;
+        }
+        if(preg_match('/\s*#\s*END\s*SUGARCRM\s*RESTRICTIONS/i', $line)) {
+            $skip = false;
+        }
     }
 }
 if(substr($contents, -1) != "\n") {

modules/Administration/UpgradeWizard_commit.php

Braces +37 added lines, -33 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.
@@ -169,14 +171,12 @@ 
 if( $install_type != "module" ){
     if( !isset($_REQUEST['zip_from_dir']) || ($_REQUEST['zip_from_dir'] == "") ){
         $zip_from_dir     = ".";
-    }
-    else{
+    } else{
         $zip_from_dir   = $_REQUEST['zip_from_dir'];
     }
     if( !isset($_REQUEST['zip_to_dir']) || ($_REQUEST['zip_to_dir'] == "") ){
         $zip_to_dir     = ".";
-    }
-    else{
+    } else{
         $zip_to_dir     = $_REQUEST['zip_to_dir'];
     }
 }
@@ -262,10 +262,11 @@ 
 
         $sugar_home_dir = getCwd();
         $dest_file  = clean_path( "$sugar_home_dir/$zip_to_dir/$file_to_copy" );
-        if($zip_to_dir != '.')
-        	$rest_file  = clean_path("$rest_dir/$zip_to_dir/$file_to_copy");
-        else
-        	$rest_file  = clean_path("$rest_dir/$file_to_copy");
+        if($zip_to_dir != '.') {
+                	$rest_file  = clean_path("$rest_dir/$zip_to_dir/$file_to_copy");
+        } else {
+                	$rest_file  = clean_path("$rest_dir/$file_to_copy");
+        }
 
         switch( $mode ){
             case "Install":
@@ -273,8 +274,9 @@ 
 
                 if($install_type=="patch" && is_file($dest_file))
                 {
-	                if(!is_dir(dirname( $rest_file )))
-                		mkdir_recursive( dirname( $rest_file ) );
+	                if(!is_dir(dirname( $rest_file ))) {
+	                                		mkdir_recursive( dirname( $rest_file ) );
+	                }
 
 	                copy( $dest_file, $rest_file);
 	                sugar_touch( $rest_file, filemtime($dest_file) );
@@ -290,8 +292,7 @@ 
                 {
 	                copy( $rest_file, $dest_file);
 	                sugar_touch( $dest_file, filemtime($rest_file) );
-                }
-                elseif(file_exists($dest_file) && !unlink($dest_file))
+                } elseif(file_exists($dest_file) && !unlink($dest_file))
                 {
                     die($mod_strings['ERR_UW_REMOVE_FAILED'].$dest_file);
                 }
@@ -315,8 +316,7 @@ 
 
         if( $mode == "Install" || $mode=="Enable" ){
             $sugar_config['languages'] = $sugar_config['languages'] + array( $_REQUEST['new_lang_name'] => $_REQUEST['new_lang_desc'] );
-        }
-        else if( $mode == "Uninstall" || $mode=="Disable" ){
+        } else if( $mode == "Uninstall" || $mode=="Disable" ){
             $new_langs = array();
             $old_langs = $sugar_config['languages'];
             foreach( $old_langs as $key => $value ){
@@ -353,7 +353,7 @@ 
             //here we can determine if this is an upgrade or a new version
             	if(!empty($previous_version)){
             		$mi->install( "$unzip_dir", true, $previous_version);
-            	}else{
+            	} else{
                 	$mi->install( "$unzip_dir" );
             	}
 
@@ -366,24 +366,27 @@ 
 				}
             	break;
             case "Uninstall":
-                if($remove_tables == 'false')
-                	$GLOBALS['mi_remove_tables'] = false;
-                else
-                	$GLOBALS['mi_remove_tables'] = true;
+                if($remove_tables == 'false') {
+                                	$GLOBALS['mi_remove_tables'] = false;
+                } else {
+                                	$GLOBALS['mi_remove_tables'] = true;
+                }
                 $mi->uninstall( "$unzip_dir" );
                 break;
              case "Disable":
-                if(!$overwrite_files)
-                	$GLOBALS['mi_overwrite_files'] = false;
-                else
-                	$GLOBALS['mi_overwrite_files'] = true;
+                if(!$overwrite_files) {
+                                	$GLOBALS['mi_overwrite_files'] = false;
+                } else {
+                                	$GLOBALS['mi_overwrite_files'] = true;
+                }
                 $mi->disable( "$unzip_dir" );
                 break;
              case "Enable":
-                if(!$overwrite_files)
-                	$GLOBALS['mi_overwrite_files'] = false;
-                else
-                	$GLOBALS['mi_overwrite_files'] = true;
+                if(!$overwrite_files) {
+                                	$GLOBALS['mi_overwrite_files'] = false;
+                } else {
+                                	$GLOBALS['mi_overwrite_files'] = true;
+                }
                 $mi->enable( "$unzip_dir" );
                 break;
             default:
@@ -473,8 +476,9 @@ 
         	if (!empty($manifest['post_install_url']))
         	{
         		$url_conf = $manifest['post_install_url'];
-        		if (is_string($url_conf))
-        			$url_conf = array('url' => $url_conf);
+        		if (is_string($url_conf)) {
+        		        			$url_conf = array('url' => $url_conf);
+        		}
         		if (isset($url_conf['type']) && $url_conf['type'] == 'popup')
         		{
         			echo '<script type="text/javascript">window.open("' . $url_conf['url']
@@ -543,8 +547,9 @@ 
 print( "<input type=submit value=\"{$mod_strings['LBL_UW_BTN_BACK_TO_MOD_LOADER']}\" /><br>" );
 echo "</div>";
 echo "<br>";
-if(isset($lang_changed_string))
+if(isset($lang_changed_string)) {
 	print($lang_changed_string);
+}
 if ($install_type != "module" && $install_type != "langpack"){
     if( sizeof( $files_to_handle ) > 0 ){
         echo '<div style="text-align: left; cursor: hand; cursor: pointer; text-decoration: underline;" onclick=\'this.style.display="none"; toggleDisplay("more");\' id="all_text">' . SugarThemeRegistry::current()->getImage('advanced_search', '', null, null, ".gif", $mod_strings['LBL_ADVANCED_SEARCH']) . ' Show Details</div><div id=\'more\' style=\'display: none\'>
@@ -556,8 +561,7 @@ 
         }
         print( "</ul>\n" );
         echo '</div>';
-    }
-    else if( $mode != 'Disable' && $mode !='Enable' ){
+    } else if( $mode != 'Disable' && $mode !='Enable' ){
         print( "{$mod_strings['LBL_UW_NO_FILES_SELECTED']} $file_action.<br>\n" );
     }
 

modules/Administration/UpgradeWizard_prepare.php

Braces +29 added lines, -28 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.
@@ -178,8 +180,7 @@ 
 		while( $f = $d->read() ){
 			if( $f == "." || $f == ".." ){
 				continue;
-			}
-			else if( preg_match("/(.*)\.lang\.php\$/", $f, $match) ){
+			} else if( preg_match("/(.*)\.lang\.php\$/", $f, $match) ){
 				$new_lang_name = $match[1];
 			}
 		}
@@ -200,8 +201,9 @@ 
 		break;
 	case "module":
 		$previous_install = array();
-		if(!empty($id_name) & !empty($version))
-		$previous_install = $uh->determineIfUpgrade($id_name, $version);
+		if(!empty($id_name) & !empty($version)) {
+				$previous_install = $uh->determineIfUpgrade($id_name, $version);
+		}
 		$previous_version = (empty($previous_install['version'])) ? '' : $previous_install['version'];
 		$previous_id = (empty($previous_install['id'])) ? '' : $previous_install['id'];
 		$show_files = false;
@@ -231,15 +233,16 @@ 
 <form action="<?php print( $form_action . "_commit" ); ?>" name="files" method="post"  onSubmit="return validateForm(<?php print($require_license); ?>);">
 <?php
 if(empty($new_studio_mod_files)) {
-	if(!empty($mode) && $mode == 'Uninstall')
-	echo $mod_strings['LBL_UW_UNINSTALL_READY'];
-	else if($mode == 'Disable')
-	echo $mod_strings['LBL_UW_DISABLE_READY'];
-	else if($mode == 'Enable')
-	echo $mod_strings['LBL_UW_ENABLE_READY'];
-	else
-	echo $mod_strings['LBL_UW_PATCH_READY'];
-} else {
+	if(!empty($mode) && $mode == 'Uninstall') {
+		echo $mod_strings['LBL_UW_UNINSTALL_READY'];
+	} else if($mode == 'Disable') {
+		echo $mod_strings['LBL_UW_DISABLE_READY'];
+	} else if($mode == 'Enable') {
+		echo $mod_strings['LBL_UW_ENABLE_READY'];
+	} else {
+		echo $mod_strings['LBL_UW_PATCH_READY'];
+	}
+	} else {
 	echo $mod_strings['LBL_UW_PATCH_READY2'];
 	echo '<input type="checkbox" onclick="toggle_these(0, ' . count($new_studio_mod_files) . ', this)"> '.$mod_strings['LBL_UW_CHECK_ALL'];
 	foreach($new_studio_mod_files as $the_file) {
@@ -255,7 +258,7 @@ 
 	if($found_readme){
 		if(file_exists($readme_file) && filesize($readme_file) > 0){
 			$readme_contents = file_get_contents($readme_file);
-		}elseif(!empty($manifest['readme'])){
+		} elseif(!empty($manifest['readme'])){
 			$readme_contents = $manifest['readme'];
 		}
 	}
@@ -327,8 +330,7 @@ 
 		if( $install_type == "langpack" ){
 			print( $mod_strings['LBL_UW_LANGPACK_READY_UNISTALL'] );
 			echo '<br><br>';
-		}
-		else if($install_type != "module"){
+		} else if($install_type != "module"){
 			print( $mod_strings['LBL_UW_FILES_REMOVED'] );
 		}
 		break;
@@ -369,10 +371,11 @@ 
 	$cache_html_files = findAllFilesRelative( sugar_cached("layout"), array());
 
 	foreach($new_files as $the_file) {
-		if(substr(strtolower($the_file), -5, 5) == '.html' && in_array($the_file, $cache_html_files))
-		array_push($new_studio_mod_files, $the_file);
-		else
-		array_push($new_sugar_mod_files, $the_file);
+		if(substr(strtolower($the_file), -5, 5) == '.html' && in_array($the_file, $cache_html_files)) {
+				array_push($new_studio_mod_files, $the_file);
+		} else {
+				array_push($new_sugar_mod_files, $the_file);
+		}
 	}
 
 	echo '<script>
@@ -427,12 +430,10 @@ 
 				print( " (no changes)" );
 			}
 			print( "<br>\n" );
-		}
-		else if( $mode == "Uninstall" && file_exists( $new_file ) ){
+		} else if( $mode == "Uninstall" && file_exists( $new_file ) ){
 			if( md5_file( $unzip_file ) == md5_file( $new_file ) ){
 				$checked = "checked=\"true\"";
-			}
-			else{
+			} else{
 				$highlight_start    = "<font color=red>";
 				$highlight_end      = "</font>";
 			}
@@ -458,7 +459,7 @@ 
                 			}
             			}
         				return true;';
-		}else{
+		} else{
 			echo 'return true;';
 		}
 		echo '}</script>';
@@ -472,13 +473,13 @@ 
 			print('<li>'.$modified_file.'</li>');
 		}
 		print('</ul>');
-	}else{
+	} else{
 		echo '<script>' .
 	        'function handleFileChange(){';
 		echo 'return true;';
 		echo '}</script>';
 	}
-}else{
+} else{
 	echo '<script>' .
         'function handleFileChange(){';
 	echo 'return true;';

modules/Administration/RepairActivities.php

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.
@@ -38,7 +40,9 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-if(!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+if(!is_admin($current_user)) {
+    sugar_die("Unauthorized access to administration.");
+}
 
 global $timedate;
 

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/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'];
     }