adamjakab / SuiteCRM

modules/UpgradeWizard/silentUpgrade_step1.php

Braces +12 added lines, -15 removed lines

@@ -65,8 +65,7 @@ 
 			if ($children != "." && $children != "..") {
 				if (is_dir($thedir . "/" . $children)) {
 					clearCacheSU($thedir . "/" . $children, $extension);
-				}
-				elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
+				} elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
 					unlink($thedir . "/" . $children);
 				}
 			}
@@ -269,8 +268,7 @@ 
 
     if( write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
         return true;
-    }
-    else {
+    } else {
         return false;
     }
 }
@@ -386,7 +384,9 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	STANDARD REQUIRED SUGAR INCLUDES AND PRESETS
-if(!defined('sugarEntry')) define('sugarEntry', true);
+if(!defined('sugarEntry')) {
+    define('sugarEntry', true);
+}
 
 $_SESSION = array();
 $_SESSION['schema_change'] = 'sugar'; // we force-run all SQL
@@ -500,13 +500,11 @@ 
 	   if(isset($logged_user['id']) && $logged_user['id'] != null){
 		//do nothing
 	    $current_user->retrieve($logged_user['id']);
-	   }
-	   else{
+	   } else{
 	   	echo "FAILURE: Not an admin user in users table. Please provide an admin user\n";
 		exit(1);
 	   }
-	}
-	else {
+	} else {
 		echo "*******************************************************************************\n";
 		echo "*** ERROR: 4th parameter must be a valid admin user.\n";
 		echo $usage;
@@ -771,8 +769,9 @@ 
 					include($file);
 					post_install();
 				// cn: only run conversion if admin selects "Sugar runs SQL"
-				if(!empty($_SESSION['allTables']) && $_SESSION['schema_change'] == 'sugar')
-					executeConvertTablesSql($_SESSION['allTables']);
+				if(!empty($_SESSION['allTables']) && $_SESSION['schema_change'] == 'sugar') {
+									executeConvertTablesSql($_SESSION['allTables']);
+				}
 				//set process to done
 				$progArray['post_install']='done';
 				//set_upgrade_progress('commit','in_progress','post_install','done');
@@ -878,8 +877,7 @@ 
 
 			if($new_upgrade->description == null){
 				$new_upgrade->description = "Silent Upgrade was used to upgrade the instance";
-			}
-			else{
+			} else{
 				$new_upgrade->description = $new_upgrade->description." Silent Upgrade was used to upgrade the instance.";
 			}
 		   $new_upgrade->save();
@@ -929,8 +927,7 @@ 
 	ob_start();
 	if(!isset($_REQUEST['silent'])){
 		$_REQUEST['silent'] = true;
-	}
-	else if(isset($_REQUEST['silent']) && $_REQUEST['silent'] != true){
+	} else if(isset($_REQUEST['silent']) && $_REQUEST['silent'] != true){
 		$_REQUEST['silent'] = true;
 	}
 

modules/UpgradeWizard/systemCheckJson.php

Braces +5 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.
@@ -45,8 +47,9 @@ 
  * Reserved. Contributor(s): ______________________________________..
  * *******************************************************************************/
 
-if(ob_get_level() < 1)
+if(ob_get_level() < 1) {
 	ob_start();
+}
 ob_implicit_flush(1);
 
 // load the generated persistence file if found

modules/UpgradeWizard/silentUpgrade_step2.php

Braces +7 added lines, -8 removed lines

@@ -151,8 +151,7 @@ 
             echo "FAILURE\n";
             exit(1);
         }
-    }
-    else {
+    } else {
         //this should be a regular sugar install
         echo "*******************************************************************************\n";
         echo "*** ERROR: Tried to execute in a non-SugarCRM root directory.\n";
@@ -217,7 +216,9 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	STANDARD REQUIRED SUGAR INCLUDES AND PRESETS
-if(!defined('sugarEntry')) define('sugarEntry', true);
+if(!defined('sugarEntry')) {
+    define('sugarEntry', true);
+}
 
 $_SESSION = array();
 $_SESSION['schema_change'] = 'sugar'; // we force-run all SQL
@@ -289,13 +290,11 @@ 
 	   if(isset($logged_user['id']) && $logged_user['id'] != null){
 		//do nothing
 	    $current_user->retrieve($logged_user['id']);
-	   }
-	   else{
+	   } else{
 	   	echo "Not an admin user in users table. Please provide an admin user\n";
 		exit(1);
 	   }
-	}
-	else {
+	} else {
 		echo "*******************************************************************************\n";
 		echo "*** ERROR: 4th parameter must be a valid admin user.\n";
 		echo $usage;
@@ -489,7 +488,7 @@ 
 	if(isset($globalteam->name)){
 		echo 'Global '.$mod_strings['LBL_UPGRADE_TEAM_EXISTS'].'<br>';
 		logThis(" Finish Building Global Team", $path);
-	}else{
+	} else{
 		$globalteam->create_team("Global", $mod_strings['LBL_GLOBAL_TEAM_DESC'], $globalteam->global_team);
 	}
 

modules/AOR_Reports/metadata/popupdefs.php

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');
+}
 /**
  * Advanced OpenReports, SugarCRM Reporting.
  * @package Advanced OpenReports for SugarCRM

modules/AOR_Reports/views/view.edit.php

Braces +3 added lines, -4 removed lines

@@ -94,8 +94,7 @@ 
             }
             if(isset($conditions[$condition_item['condition_order']])) {
                 $conditions[] = $condition_item;
-            }
-            else {
+            } else {
                 $conditions[$condition_item['condition_order']] = $condition_item;
             }
         }
@@ -144,7 +143,7 @@ 
         $modulePathDisplay[] = $currentBean->module_name;
         if(is_array($modulePath)) {
             $split = $modulePath;
-        }else{
+        } else{
             $split = explode(':', $modulePath);
         }
         if ($split && $split[0] == $currentBean->module_dir) {
@@ -162,7 +161,7 @@ 
 
             if(!empty($moduleLabel)){
                 $modulePathDisplay[] = $moduleLabel;
-            }else {
+            } else {
                 $modulePathDisplay[] = $currentBean->module_name;
             }
         }

modules/AOR_Reports/views/view.detail.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
             }
             if(isset($parameters[$condition_item['condition_order']])) {
                 $parameters[] = $condition_item;
-            }
-            else {
+            } else {
                 $parameters[$condition_item['condition_order']] = $condition_item;
             }
         }

modules/AOR_Reports/Dashlets/AORReportsDashlet/AORReportsDashlet.meta.php

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');
+}
 global $app_strings;
 
 $dashletMeta['AORReportsDashlet'] = array('module'		=> 'AOR_Reports',

modules/DynamicFields/UpgradeFields.php

Braces +10 added lines, -4 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.
@@ -89,15 +91,19 @@ 
 			$the_field->set($fieldDef);
 				
 				if(!isset($fields[$col]) && $col != 'id_c'){
-					if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
+					if(!$simulate) {
+					    $db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
+					}
 					unset($fields[$col]);
 					echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
-				}	else{
+				} else{
 					if($col != 'id_c'){
 					if(trim($the_field->get_db_type()) != trim($type)){
 						
 					echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
-					if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
+					if(!$simulate) {
+					    $db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));
+					}
 					}
 					}
 					

modules/jjwg_Maps/jjwg_Maps_Router.php

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');
+}
 
 require_once('include/utils.php');
 require_once('include/export_utils.php');