adamjakab / SuiteCRM

modules/Administration/DiagnosticDelete.php

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/RepairFieldCasing.php

Braces +4 added lines, -3 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.
@@ -98,8 +100,7 @@ 
 	       foreach($views as $view) {
                 try{
                     $parser = ParserFactory::getParser($view, $module);
-                }
-                catch(Exception $e){
+                } catch(Exception $e){
                     $GLOBALS['log']->fatal("Caught exception in RepairFieldCasing script: ".$e->getMessage());
                     continue;
                 }

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_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/RebuildJSLang.php

Braces +4 added lines, -3 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,8 +50,7 @@ 
 
     //remove language cache files
     LanguageManager::clearLanguageCache();
-}
-else{
+} else{
 	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>

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