adamjakab / SuiteCRM

modules/Activities/SetAcceptStatus.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.
@@ -50,8 +52,7 @@ 
         $focus = new Meeting();
         $focus->id = $_REQUEST['object_id'];
         $test = $focus->set_accept_status($current_user, $_REQUEST['accept_status']);
-    }
-    else if ($_REQUEST['object_type'] == "Call")
+    } else if ($_REQUEST['object_type'] == "Call")
     {
         $focus = new Call();
         $focus->id = $_REQUEST['object_id'];

modules/Activities/EmailReminder.php

Braces +8 added lines, -7 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.
@@ -74,7 +76,7 @@ 
                     $max_time = $seconds;
                 }
             }
-        }else{
+        } else{
             $max_time = 8400;
         }
         $this->now = $GLOBALS['timedate']->nowDb();
@@ -130,15 +132,15 @@ 
 
         if ( empty($_SESSION['authenticated_user_language']) ) {
             $current_language = $GLOBALS['sugar_config']['default_language'];
-        }else{
+        } else{
             $current_language = $_SESSION['authenticated_user_language'];
         }            
 
         if ( !empty($bean->created_by) ) {
             $user_id = $bean->created_by;
-        }else if ( !empty($bean->assigned_user_id) ) {
+        } else if ( !empty($bean->assigned_user_id) ) {
             $user_id = $bean->assigned_user_id;
-        }else {
+        } else {
             $user_id = $GLOBALS['current_user']->id;
         }
         $user = new User();
@@ -153,8 +155,7 @@ 
         {
             $from_address = $admin->settings['notify_fromaddress'];
             $from_name = $admin->settings['notify_fromname'] ? "" : $admin->settings['notify_fromname'];
-        }
-        else
+        } else
         {
             $from_address = $user->emailAddress->getReplyToAddress($user);
             $from_name = $user->full_name;

modules/Leads/metadata/additionalDetails.php

Braces +42 added lines, -17 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,31 +58,54 @@ 
 
     if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
 		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
-		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
-		$overlib_string .= '<br>';  
-		if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
-	if(!empty($fields['LEAD_SOURCE'])) $overlib_string .= '<b>'. $mod_strings['LBL_LEAD_SOURCE'] . '</b> ' . $fields['LEAD_SOURCE'] . '<br>';
+		!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) {
+    			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
+    }
+	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
+	}
+	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) {
+			$overlib_string .= '<br>';
+	}
+		if(!empty($fields['PHONE_MOBILE'])) {
+		    $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
+		}
+	if(!empty($fields['PHONE_HOME'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
+	}
+	if(!empty($fields['PHONE_OTHER'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
+	}
+	if(!empty($fields['LEAD_SOURCE'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_LEAD_SOURCE'] . '</b> ' . $fields['LEAD_SOURCE'] . '<br>';
+	}
 
-	if(!empty($fields['EMAIL2'])) 
-		$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
+	if(!empty($fields['EMAIL2'])) {
+			$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
 								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
 								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
 								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&" .
 								 "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>") .
 								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><br>";
+	}
 	
 	if(!empty($fields['DESCRIPTION'])) { 
 		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+		if(strlen($fields['DESCRIPTION']) > 300) {
+		    $overlib_string .= '...';
+		}
 	}	
 	
 	return array('fieldToAddTo' => 'NAME', 

modules/Leads/views/view.showduplicates.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.
@@ -85,7 +87,9 @@ 
             $first = true;
             foreach ($duplicates as $duplicate_id)
             {
-                if (!$first) $query .= ' OR ';
+                if (!$first) {
+                    $query .= ' OR ';
+                }
                 $first = false;
                 $query .= "id='$duplicate_id' ";
             }

modules/Leads/views/view.convertlead.php

Braces +63 added lines, -65 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.
@@ -179,8 +181,7 @@ 
         if($sugar_config['lead_conv_activity_opt'] == 'move')
         {
         	$smarty->assign('convertModuleListOptions', get_select_options_with_id(array('None'=>$app_strings['LBL_NONE'], 'Contacts' => $app_list_strings["moduleListSingular"]['Contacts']), ''));	
-        }
-        else if($sugar_config['lead_conv_activity_opt'] == 'copy')
+        } else if($sugar_config['lead_conv_activity_opt'] == 'copy')
         {
         	$smarty->assign('convertModuleListOptions', get_select_options_with_id(array('Contacts' => $app_list_strings["moduleListSingular"]['Contacts']), ''));
         }
@@ -212,17 +213,14 @@ 
 	                if ($module == "Accounts" && $field == 'name')
 	                {
 	                    $focus->name = $this->focus->account_name;
-	                }
-	                else if ($module == "Opportunities" && $field == 'amount')
+	                } else if ($module == "Opportunities" && $field == 'amount')
 	                {
 	                    $focus->amount = unformat_number($this->focus->opportunity_amount);
-	                } 
-                 	else if ($module == "Opportunities" && $field == 'name') {
+	                } else if ($module == "Opportunities" && $field == 'name') {
                  		if ($opportunityNameInLayout && !empty($this->focus->opportunity_name)){
                            $focus->name = $this->focus->opportunity_name;
                  		}
-                   	}
-	                else if ($field == "id")
+                   	} else if ($field == "id")
                     {
 						//If it is not a contact, don't copy the ID from the lead
                     	if ($module == "Contacts") {
@@ -232,25 +230,25 @@ 
 	                {
 	                	//Special case where company and person have the same field with a different name
 	                	$focus->phone_office = $this->focus->phone_work;
-	                }
-					else if (strpos($field, "billing_address") !== false && $focus->field_defs[$field]["type"] == "varchar") /* Bug 42219 fix */         
+	                } else if (strpos($field, "billing_address") !== false && $focus->field_defs[$field]["type"] == "varchar") {
+					    /* Bug 42219 fix */         
 					{
 						$tmp_field = str_replace("billing_", "primary_", $field);
+					}
 						$focus->field_defs[$field]["type"] = "text";
                         if (isset($this->focus->$tmp_field)) {
 						    $focus->$field = $this->focus->$tmp_field;
                         }
-					 }
-
-					else if (strpos($field, "shipping_address") !== false && $focus->field_defs[$field]["type"] == "varchar") /* Bug 42219 fix */
+					 } else if (strpos($field, "shipping_address") !== false && $focus->field_defs[$field]["type"] == "varchar") {
+					    /* Bug 42219 fix */
 					{
 						$tmp_field = str_replace("shipping_", "primary_", $field);
+					}
 						if (isset($this->focus->$tmp_field)) {
                             $focus->$field = $this->focus->$tmp_field;
                         }
 						$focus->field_defs[$field]["type"] = "text";
-					}    					
-                    else if (isset($this->focus->$field))
+					} else if (isset($this->focus->$field))
                     {
                         $focus->$field = $this->focus->$field;
                     }
@@ -403,8 +401,7 @@ 
                 unset($_REQUEST["convert_create_Contacts"]);
                 unset($_POST["convert_create_Contacts"]);
             }
-        }
-        elseif (!empty($_REQUEST["convert_create_Contacts"]) && $_REQUEST["convert_create_Contacts"] != "false" && !isset($_POST['ContinueContact'])) 
+        } elseif (!empty($_REQUEST["convert_create_Contacts"]) && $_REQUEST["convert_create_Contacts"] != "false" && !isset($_POST['ContinueContact'])) 
         {
             require_once('modules/Contacts/ContactFormBase.php');
             $contactForm = new ContactFormBase();
@@ -425,8 +422,7 @@ 
             $_REQUEST['account_id'] = $_REQUEST['selectedAccount'];
             unset($_REQUEST["convert_create_Accounts"]);
             unset($_POST["convert_create_Accounts"]);
-        }
-        elseif (!empty($_REQUEST["convert_create_Accounts"]) && $_REQUEST["convert_create_Accounts"] != "false" && empty($_POST['ContinueAccount']))
+        } elseif (!empty($_REQUEST["convert_create_Accounts"]) && $_REQUEST["convert_create_Accounts"] != "false" && empty($_POST['ContinueAccount']))
         {
             require_once('modules/Accounts/AccountFormBase.php');
             $accountForm = new AccountFormBase();
@@ -445,8 +441,9 @@ 
             {
                 //Save the new record
                 $bean = $beanList[$module];
-	            if (empty($beans[$module]))
-	            	$beans[$module] = new $bean();
+	            if (empty($beans[$module])) {
+	            	            	$beans[$module] = new $bean();
+	            }
 
             	$this->populateNewBean($module, $beans[$module], $beans['Contacts'], $lead);
                 // when creating a new contact, create the id for linking with other modules
@@ -536,8 +533,7 @@ 
                     {
                         $id_field = $relObject->rhs_key;
                         $lead->$id_field = $bean->id;
-                    }
-                    else 
+                    } else 
                     {
                         $bean->$leadsRel->add($lead->id);
                     }
@@ -550,8 +546,7 @@ 
                 {
                     $bean->account_id = $beans['Accounts']->id;
                     $bean->account_name = $beans['Accounts']->name;
-                }
-                else if (!empty($selects['Accounts']))
+                } else if (!empty($selects['Accounts']))
                 {
                     $bean->account_id = $selects['Accounts'];
                 }
@@ -591,8 +586,7 @@ 
             $bean->load_relationship($meetingsRel);
             $bean->$meetingsRel->add($current_user->id);
             return $bean;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -611,8 +605,7 @@ 
                     <a href='index.php?module={$bean->module_dir}&action=DetailView&record={$bean->id}'>
                        {$bean->get_summary_text()}
                     </a></li>";
-            }
-            else {
+            } else {
                 global $app_list_strings;
                 if(!empty($app_list_strings['moduleListSingular'][$bean->module_dir])) {
                     $module_name = $app_list_strings['moduleListSingular'][$bean->module_dir];
@@ -652,7 +645,7 @@ 
             $account_id = create_guid();
             if(!empty($beans['Accounts']->id)){
                 $account_id = $beans['Accounts']->id;
-            }else{
+            } else{
                 $beans['Accounts']->id = $account_id;
             }
             $accountParentInfo = array('id'=>$account_id,'type'=>'Accounts');
@@ -683,8 +676,7 @@ 
 	                                        }
 	                                    }
 	                                }
-	                            }
-	                            else if ($sugar_config['lead_conv_activity_opt'] == 'move') {
+	                            } else if ($sugar_config['lead_conv_activity_opt'] == 'move') {
 	                                // if to move activities, should be only one module selected
 	                                if ($_POST['lead_conv_ac_op_sel'] == $module) {
 	                                    $this->moveActivity($activity, $bean);
@@ -749,7 +741,9 @@ 
 	    $lead
 	    )
 	{
-		if (!$lead) return;
+		if (!$lead) {
+		    return;
+		}
 
 		global $beanList, $db;
 
@@ -855,7 +849,10 @@ 
 			if(!isset($_REQUEST[$module . $field]) && isset($lead->$field) && $field != 'id')
 			{
 				$bean->$field = $lead->$field;
-				if($field == 'date_entered') $bean->$field = gmdate($GLOBALS['timedate']->get_db_date_time_format()); //bug 41030
+				if($field == 'date_entered') {
+				    $bean->$field = gmdate($GLOBALS['timedate']->get_db_date_time_format());
+				}
+				//bug 41030
 			}
 		}
         populateFromPost($module, $bean, true);
@@ -872,10 +869,11 @@ 
 				$contact->$fieldDef['id_name'] = $bean->id ;
 				if ($fieldDef['id_name'] != $select) {
 					$rname = isset($fieldDef['rname']) ? $fieldDef['rname'] : "";
-					if (!empty($rname) && isset($bean->$rname))
-						$contact->$select = $bean->$rname;
-					else
-						$contact->$select = $bean->name;
+					if (!empty($rname) && isset($bean->$rname)) {
+											$contact->$select = $bean->$rname;
+					} else {
+											$contact->$select = $bean->name;
+					}
 				}
 			}
 		} else if ($module != "Contacts"){
@@ -911,30 +909,33 @@ 
 				if(!isset($_REQUEST[$bean->module_dir . $field]) && strpos($field, "_address_") !== false)
 				{
 					$set = "primary";
-					if (strpos($field, "alt_") !== false || strpos($field, "shipping_") !== false)
-						$set = "alt";
+					if (strpos($field, "alt_") !== false || strpos($field, "shipping_") !== false) {
+											$set = "alt";
+					}
 					$type = "";
 
-					if(strpos($field, "_address_street_2") !== false)
-						$type = "_address_street_2";
-					else if(strpos($field, "_address_street_3") !== false)
-						$type = "_address_street_3";
-					else if(strpos($field, "_address_street_4") !== false)
-						$type = "";
-					else if(strpos($field, "_address_street") !== false)
-						$type = "_address_street";
-					else if(strpos($field, "_address_city") !== false)
-						$type = "_address_city";
-					else if(strpos($field, "_address_state") !== false)
-						$type = "_address_state";
-					else if(strpos($field, "_address_postalcode") !== false)
-						$type = "_address_postalcode";
-					else if(strpos($field, "_address_country") !== false)
-						$type = "_address_country";
+					if(strpos($field, "_address_street_2") !== false) {
+											$type = "_address_street_2";
+					} else if(strpos($field, "_address_street_3") !== false) {
+											$type = "_address_street_3";
+					} else if(strpos($field, "_address_street_4") !== false) {
+											$type = "";
+					} else if(strpos($field, "_address_street") !== false) {
+											$type = "_address_street";
+					} else if(strpos($field, "_address_city") !== false) {
+											$type = "_address_city";
+					} else if(strpos($field, "_address_state") !== false) {
+											$type = "_address_state";
+					} else if(strpos($field, "_address_postalcode") !== false) {
+											$type = "_address_postalcode";
+					} else if(strpos($field, "_address_country") !== false) {
+											$type = "_address_country";
+					}
 
 						$var = $set.$type;
-					if (isset($contact->$var))
-						$bean->$field = $contact->$var;
+					if (isset($contact->$var)) {
+											$bean->$field = $contact->$var;
+					}
 				}
 			}
 	}
@@ -956,12 +957,10 @@ 
                 if (isset($dictionary[$from->object_name]['relationships']) && isset($dictionary[$from->object_name]['relationships'][$rel_name]))
                 {
                     $rel_def = $dictionary[$from->object_name]['relationships'][$rel_name];
-                }
-                else if (isset($dictionary[$to->object_name]['relationships']) && isset($dictionary[$to->object_name]['relationships'][$rel_name]))
+                } else if (isset($dictionary[$to->object_name]['relationships']) && isset($dictionary[$to->object_name]['relationships'][$rel_name]))
                 {
                     $rel_def = $dictionary[$to->object_name]['relationships'][$rel_name];
-                }
-                else if (isset($dictionary[$rel_name]) && isset($dictionary[$rel_name]['relationships'])
+                } else if (isset($dictionary[$rel_name]) && isset($dictionary[$rel_name]['relationships'])
                         && isset($dictionary[$rel_name]['relationships'][$rel_name]))
                 {
                 	$rel_def = $dictionary[$rel_name]['relationships'][$rel_name];
@@ -970,8 +969,7 @@ 
                     if ($rel_def['lhs_module'] == $from->module_dir && $rel_def['rhs_module'] == $to->module_dir )
                     {
                     	return $field;
-                    }
-                    else if ($rel_def['rhs_module'] == $from->module_dir && $rel_def['lhs_module'] == $to->module_dir )
+                    } else if ($rel_def['rhs_module'] == $from->module_dir && $rel_def['lhs_module'] == $to->module_dir )
                     {
                     	return $field;
                     }

modules/UpgradeWizard/silentUpgrade_dce_step2.php

Braces +9 added lines, -11 removed lines

@@ -52,8 +52,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);
 				}
 			}
@@ -205,8 +204,7 @@ 
 
     if( write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
         return true;
-    }
-    else {
+    } else {
         return false;
     }
 }
@@ -265,8 +263,7 @@ 
             echo "FAILURE\n";
             exit(1);
         }
-    }
-    else if(is_file("{$cwd}/include/entryPoint.php")) {
+    } else if(is_file("{$cwd}/include/entryPoint.php")) {
         //this should be a regular sugar install
         $upgradeType = constant('SUGARCRM_INSTALL');
         //check if this is a valid zip file
@@ -284,8 +281,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";
@@ -314,7 +310,7 @@ 
 			$_GET['CONVERT_FILE_ONLY'] = true;
 			if(!class_exists('TemplateConverter')){
 				include($argv[7].'templateConverter.php');
-			}else{
+			} else{
 				TemplateConverter::convertFile($_GET['TEMPLATE_PATH']);
 			}
 
@@ -392,7 +388,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
@@ -704,7 +702,7 @@ 
 			   echo 'Global '.$mod_strings['LBL_UPGRADE_TEAM_EXISTS'].'<br>';
 			   logThis(" Finish Building private teams", $path);
 
-			}else{
+			} else{
 			   $globalteam->create_team("Global", $mod_strings['LBL_GLOBAL_TEAM_DESC'], $globalteam->global_team);
 			}
 

modules/UpgradeWizard/silentUpgrade_dce_step1.php

Braces +13 added lines, -20 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);
 				}
 			}
@@ -227,8 +226,7 @@ 
 
     if( write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
         return true;
-    }
-    else {
+    } else {
         return false;
     }
 }
@@ -287,8 +285,7 @@ 
             echo "FAILURE\n";
             exit(1);
         }
-    }
-    else if(is_file("{$cwd}/include/entryPoint.php")) {
+    } else if(is_file("{$cwd}/include/entryPoint.php")) {
         //this should be a regular sugar install
         $upgradeType = constant('SUGARCRM_INSTALL');
         //check if this is a valid zip file
@@ -306,8 +303,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";
@@ -336,7 +332,7 @@ 
 			$_GET['CONVERT_FILE_ONLY'] = true;
 			if(!class_exists('TemplateConverter')){
 				include($argv[7].'templateConverter.php');
-			}else{
+			} else{
 				TemplateConverter::convertFile($_GET['TEMPLATE_PATH']);
 			}
 
@@ -414,7 +410,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
@@ -522,8 +520,7 @@ 
 	$_SESSION['instancePath'] = $instancePath;
 	if(file_exists("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php")){
 		require_once("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php");
-	}
-	else{
+	} else{
 		require_once("{$argv[4]}/modules/UpgradeWizard/uw_utils.php");
 	}
     if(function_exists('set_upgrade_vars')){
@@ -583,8 +580,7 @@ 
 			//$targetFile = clean_path(getcwd() . '/' . $srcFile);
 			    if (strpos($srcFile,".svn") !== false) {
 				  //do nothing
-			    }
-			    else{
+			    } else{
 			     $existsCustomFile = true;
 			     //log the custom file in
 			     logThis($file, $path);
@@ -596,17 +592,14 @@ 
 				echo 'Stop and Exit Upgrade. There are customized files. Take a look in the upgrade log';
 				logThis("Stop and Exit Upgrade. There are customized files. Take a look in the upgrade log", $path);
 				exit(1);
-			}
-			else{
+			} else{
 			    upgradeDCEFiles($argv,$instanceUpgradePath);
 			}
-    	}
-    	else{
+    	} else{
 			   //copy and update following files from upgrade package
 				upgradeDCEFiles($argv,$instanceUpgradePath);
 		 }
-    }
-    else{
+    } else{
 	   //copy and update following files from upgrade package
 	   upgradeDCEFiles($argv,$instanceUpgradePath);
     }

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/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);
 	}