adamjakab / SuiteCRM

include/SubPanel/SubPanel.php

Braces +20 added lines, -12 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.
@@ -141,8 +143,7 @@ 
 			if(empty($widget_data['widget_class']))
 			{
 				$widget_contents .= "widget_class not defined for top subpanel buttons";
-			}
-			else
+			} else
 			{
 				$widget_contents .= $layout_manager->widgetDisplay($widget_data);
 			}
@@ -163,7 +164,7 @@ 
 
 		if(isset($this->listview)){
 			$ListView =& $this->listview;
-		}else{
+		} else{
 			$ListView = new ListView();
 		}
 		$ListView->initNewXTemplate($xTemplatePath,$this->subpanel_defs->mod_strings);
@@ -178,7 +179,9 @@ 
 		$ListView->xTemplateAssign("SUBPANEL_ID", $this->subpanel_id);
 		$ListView->xTemplateAssign("SUBPANEL_SEARCH", $this->getSearchForm());
 		$display_sps = '';
-		if($this->search_query == '' && empty($this->collections)) $display_sps = 'display:none';
+		if($this->search_query == '' && empty($this->collections)) {
+		    $display_sps = 'display:none';
+		}
 		$ListView->xTemplateAssign("DISPLAY_SPS",$display_sps);
 
 		if(is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace']))
@@ -311,10 +314,12 @@ 
   		$moduleInstaller = new ModuleInstaller();
   		$moduleInstaller->silent = true; // make sure that the ModuleInstaller->log() function doesn't echo while rebuilding the layoutdefs
   		$moduleInstaller->rebuild_layoutdefs();
-  		if (file_exists('modules/'.  $panel->parent_bean->module_dir . '/layout_defs.php'))
-  			include('modules/'.  $panel->parent_bean->module_dir . '/layout_defs.php');
-  		if (file_exists('custom/modules/'.  $panel->parent_bean->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php'))
-  			include('custom/modules/'.  $panel->parent_bean->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php');
+  		if (file_exists('modules/'.  $panel->parent_bean->module_dir . '/layout_defs.php')) {
+  		  			include('modules/'.  $panel->parent_bean->module_dir . '/layout_defs.php');
+  		}
+  		if (file_exists('custom/modules/'.  $panel->parent_bean->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php')) {
+  		  			include('custom/modules/'.  $panel->parent_bean->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php');
+  		}
   }
 
 	function get_subpanel_setup($module)
@@ -400,7 +405,9 @@ 
 
 		$where_clauses = $searchForm->generateSearchWhere(true, $seed->module_dir);
 
-		if (count($where_clauses) > 0 )$this->search_query = '('. implode(' ) AND ( ', $where_clauses) . ')';
+		if (count($where_clauses) > 0 ) {
+		    $this->search_query = '('. implode(' ) AND ( ', $where_clauses) . ')';
+		}
 		$GLOBALS['log']->info("Subpanel Where Clause: $this->search_query");
 
 		return print_r($where_clauses,true);
@@ -436,8 +443,9 @@ 
 
 			$searchForm->setup($subpanel_searchMetaData, $searchMetaData['searchFields'], 'SubpanelSearchFormGeneric.tpl', 'basic_search');
 
-			if(!empty($this->collections))
-				$searchForm->searchFields['collection'] = array();
+			if(!empty($this->collections)) {
+							$searchForm->searchFields['collection'] = array();
+			}
 
 			$searchForm->populateFromRequest();
 

include/SubPanel/SubPanelTilesTabs.php

Braces +22 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.
@@ -111,8 +113,9 @@ 
     function _getTabs($tabs, $showTabs = true, $selectedGroup='All')
     {
         //WDong Bug: 12258 "All" tab in the middle of a record's detail view is not localized.
-        if($selectedGroup=='All')
-        	$selectedGroup=translate('LBL_TABGROUP_ALL');
+        if($selectedGroup=='All') {
+                	$selectedGroup=translate('LBL_TABGROUP_ALL');
+        }
 
     	// Set up a mapping from subpanelID, found in the $tabs list, to the source module name
     	// As the $GLOBALS['tabStructure'] array holds the Group Tabs by module name we need to efficiently convert between the two
@@ -127,8 +130,9 @@ 
             // Bug #44344 : Custom relationships under same module only show once in subpanel tabs
             // use object property instead new object to have ability run unit test (can override subpanel_definitions)
             $subpanel =  $this->subpanel_definitions->load_subpanel( $subpanelID );
-    		if ($subpanel !== false)
-    		  $moduleNames [ $subpanelID ] = $subpanel->get_module_name() ;
+    		if ($subpanel !== false) {
+    		    		  $moduleNames [ $subpanelID ] = $subpanel->get_module_name() ;
+    		}
     	}
 
     	$groups =  array () ;
@@ -138,11 +142,12 @@ 
         {
             foreach( $subModules['modules'] as $key => $subModule )
             {
-    			foreach ( $tabs as $subpanelID )
-                    if (isset($moduleNames[ $subpanelID ] ) && strcasecmp( $subModule , $moduleNames[ $subpanelID ] ) === 0)
+    			foreach ( $tabs as $subpanelID ) {
+    			                    if (isset($moduleNames[ $subpanelID ] ) && strcasecmp( $subModule , $moduleNames[ $subpanelID ] ) === 0)
                     {
                         // Bug #44344 : Custom relationships under same module only show once in subpanel tabs
                         $groups [ translate ( $mainTab ) ] [ 'modules' ] [] = $subpanelID ;
+    			}
                     	$found [ $subpanelID ] = true ;
                 	}
             }
@@ -152,8 +157,9 @@ 
 
         foreach( $tabs as $subpanelID )
         {
-        	if ( ! isset ( $found [ $subpanelID ] ) )
-	        	$groups [ translate ('LBL_TABGROUP_OTHER') ]['modules'] [] = $subpanelID ;
+        	if ( ! isset ( $found [ $subpanelID ] ) ) {
+        		        	$groups [ translate ('LBL_TABGROUP_OTHER') ]['modules'] [] = $subpanelID ;
+        	}
         }
 
         /* Move history to same tab as activities */
@@ -168,8 +174,7 @@ 
                     	/* Move hist from there to here */
                         $groups[$mainTab]['modules'] []= 'history';
                     }
-                }
-                else if(false !== ($i = array_search('history', array_map('strtolower', $group['modules']))))
+                } else if(false !== ($i = array_search('history', array_map('strtolower', $group['modules']))))
                 {
                     unset($groups[$mainTab]['modules'][$i]);
                     if(empty($groups[$mainTab]['modules']))
@@ -184,10 +189,11 @@ 
          * Note that if a tab group already exists with the name 'All',
          * it will be overwritten in this union operation.
          */
-        if(count($groups) <= 1)
-        	$groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs));
-        else
-            $groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs)) + $groups;
+        if(count($groups) <= 1) {
+                	$groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs));
+        } else {
+                    $groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs)) + $groups;
+        }
         /* Note - all $display checking and array_intersects with $tabs
          * are now redundant (thanks to GroupedTabStructure), and could
          * be removed for performance, but for now can stay to help ensure
@@ -261,8 +267,7 @@ 
             	$sugarTab->setup($sugarTabs, $otherTabs, $displayTabs, $selectedGroup);
             	$sugarTab->display();
             }
-        }
-        else
+        } else
         {
             $tabs = SubPanelTilesTabs::applyUserCustomLayoutToTabs($tabs, $selectedGroup);
 

include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateLeadNameButton.php

Braces +63 added lines, -41 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.
@@ -69,53 +71,73 @@ 
 		
 		//from accounts
 		if ($defines['focus']->object_name == 'Account') {
-			if(isset($defines['focus']->billing_address_street)) 
-				$additionalFormFields['primary_address_street'] = $defines['focus']->billing_address_street;
-			if(isset($defines['focus']->billing_address_city)) 
-				$additionalFormFields['primary_address_city'] = $defines['focus']->billing_address_city;						  		
-			if(isset($defines['focus']->billing_address_state)) 
-				$additionalFormFields['primary_address_state'] = $defines['focus']->billing_address_state;
-			if(isset($defines['focus']->billing_address_country)) 
-				$additionalFormFields['primary_address_country'] = $defines['focus']->billing_address_country;
-			if(isset($defines['focus']->billing_address_postalcode)) 
-				$additionalFormFields['primary_address_postalcode'] = $defines['focus']->billing_address_postalcode;
-			if(isset($defines['focus']->phone_office)) 
-				$additionalFormFields['phone_work'] = $defines['focus']->phone_office;
-			if(isset($defines['focus']->id)) 
-				$additionalFormFields['account_id'] = $defines['focus']->id;
+			if(isset($defines['focus']->billing_address_street)) {
+							$additionalFormFields['primary_address_street'] = $defines['focus']->billing_address_street;
+			}
+			if(isset($defines['focus']->billing_address_city)) {
+							$additionalFormFields['primary_address_city'] = $defines['focus']->billing_address_city;
+			}
+			if(isset($defines['focus']->billing_address_state)) {
+							$additionalFormFields['primary_address_state'] = $defines['focus']->billing_address_state;
+			}
+			if(isset($defines['focus']->billing_address_country)) {
+							$additionalFormFields['primary_address_country'] = $defines['focus']->billing_address_country;
+			}
+			if(isset($defines['focus']->billing_address_postalcode)) {
+							$additionalFormFields['primary_address_postalcode'] = $defines['focus']->billing_address_postalcode;
+			}
+			if(isset($defines['focus']->phone_office)) {
+							$additionalFormFields['phone_work'] = $defines['focus']->phone_office;
+			}
+			if(isset($defines['focus']->id)) {
+							$additionalFormFields['account_id'] = $defines['focus']->id;
+			}
 		}
 		//from contacts
 		if ($defines['focus']->object_name == 'Contact') {
-			if(isset($defines['focus']->salutation)) 
-				$additionalFormFields['salutation'] = $defines['focus']->salutation;
-			if(isset($defines['focus']->first_name)) 
-				$additionalFormFields['first_name'] = $defines['focus']->first_name;
-			if(isset($defines['focus']->last_name)) 
-				$additionalFormFields['last_name'] = $defines['focus']->last_name;
-			if(isset($defines['focus']->primary_address_street)) 
-				$additionalFormFields['primary_address_street'] = $defines['focus']->primary_address_street;
-			if(isset($defines['focus']->primary_address_city)) 
-				$additionalFormFields['primary_address_city'] = $defines['focus']->primary_address_city;						  		
-			if(isset($defines['focus']->primary_address_state)) 
-				$additionalFormFields['primary_address_state'] = $defines['focus']->primary_address_state;
-			if(isset($defines['focus']->primary_address_country)) 
-				$additionalFormFields['primary_address_country'] = $defines['focus']->primary_address_country;
-			if(isset($defines['focus']->primary_address_postalcode)) 
-				$additionalFormFields['primary_address_postalcode'] = $defines['focus']->primary_address_postalcode;
-			if(isset($defines['focus']->phone_work)) 
-				$additionalFormFields['phone_work'] = $defines['focus']->phone_work;
-			if(isset($defines['focus']->id)) 
-				$additionalFormFields['contact_id'] = $defines['focus']->id;
+			if(isset($defines['focus']->salutation)) {
+							$additionalFormFields['salutation'] = $defines['focus']->salutation;
+			}
+			if(isset($defines['focus']->first_name)) {
+							$additionalFormFields['first_name'] = $defines['focus']->first_name;
+			}
+			if(isset($defines['focus']->last_name)) {
+							$additionalFormFields['last_name'] = $defines['focus']->last_name;
+			}
+			if(isset($defines['focus']->primary_address_street)) {
+							$additionalFormFields['primary_address_street'] = $defines['focus']->primary_address_street;
+			}
+			if(isset($defines['focus']->primary_address_city)) {
+							$additionalFormFields['primary_address_city'] = $defines['focus']->primary_address_city;
+			}
+			if(isset($defines['focus']->primary_address_state)) {
+							$additionalFormFields['primary_address_state'] = $defines['focus']->primary_address_state;
+			}
+			if(isset($defines['focus']->primary_address_country)) {
+							$additionalFormFields['primary_address_country'] = $defines['focus']->primary_address_country;
+			}
+			if(isset($defines['focus']->primary_address_postalcode)) {
+							$additionalFormFields['primary_address_postalcode'] = $defines['focus']->primary_address_postalcode;
+			}
+			if(isset($defines['focus']->phone_work)) {
+							$additionalFormFields['phone_work'] = $defines['focus']->phone_work;
+			}
+			if(isset($defines['focus']->id)) {
+							$additionalFormFields['contact_id'] = $defines['focus']->id;
+			}
 		}
 		
 		//from opportunities
 		if ($defines['focus']->object_name == 'Opportunity') {
-			if(isset($defines['focus']->id)) 
-				$additionalFormFields['opportunity_id'] = $defines['focus']->id;
-			if(isset($defines['focus']->account_name)) 
-				$additionalFormFields['account_name'] = $defines['focus']->account_name;
-			if(isset($defines['focus']->account_id)) 
-				$additionalFormFields['account_id'] = $defines['focus']->account_id;
+			if(isset($defines['focus']->id)) {
+							$additionalFormFields['opportunity_id'] = $defines['focus']->id;
+			}
+			if(isset($defines['focus']->account_name)) {
+							$additionalFormFields['account_name'] = $defines['focus']->account_name;
+			}
+			if(isset($defines['focus']->account_id)) {
+							$additionalFormFields['account_id'] = $defines['focus']->account_id;
+			}
 		}
 		
 		$button = $this->_get_form($defines, $additionalFormFields);

include/generic/SugarWidgets/SugarWidgetFieldrelate.php

Braces +8 added lines, -11 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.
@@ -53,8 +55,7 @@ 
         if (is_array($layout_def['input_name0']))
         {
             $values = $layout_def['input_name0'];
-        }
-        else
+        } else
         {
             $values[] = $layout_def['input_name0'];
         }
@@ -182,12 +183,10 @@ 
 		//#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
 		if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
 			$display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
-		}
-        elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
+		} elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
         {
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]['join_table_alias'].'_name');
-        }
-		elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
+        } elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
 			$display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']]['join_table_alias'].'_name');
 		}
 		$cell = $layout_def['fields'][$display];
@@ -202,12 +201,10 @@ 
         //#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
         if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
              $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
-        }
-        elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
+        } elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
         {
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]['join_table_alias'].'_name');
-        }
-        elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
+        } elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']]['join_table_alias'].'_name');
         }
         $recordField = $this->getTruncatedColumnAlias(strtoupper($layout_def['table_alias']).'_'.strtoupper($layout_def['name']));

include/generic/SugarWidgets/SugarWidgetSubPanelDetailViewLink.php

Braces +7 added lines, -8 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.
@@ -55,8 +57,7 @@ 
 		if(isset($layout_def['varname']))
 		{
 			$key = strtoupper($layout_def['varname']);
-		}
-		else
+		} else
 		{
 			$key = $this->_get_column_alias($layout_def);
 			$key = strtoupper($key);
@@ -71,8 +72,7 @@ 
 		if(empty($layout_def['target_record_key']))
 		{
 			$record = $layout_def['fields']['ID'];
-		}
-		else
+		} else
 		{
 			$record_key = strtoupper($layout_def['target_record_key']);
 			$record = $layout_def['fields'][$record_key];
@@ -88,8 +88,7 @@ 
 			if(empty($layout_def['target_module']))
 			{
 				$module = $layout_def['module'];
-			}
-		else
+			} else
 			{
 				$module = $layout_def['target_module'];
 			}
@@ -132,7 +131,7 @@ 
             }
             return '<a href="' . $link . '" >'."$value</a>";
 
-		}else{
+		} else{
 			return $value;
 		}
 		

include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButtonProjects.php

Braces +7 added lines, -8 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.
@@ -61,11 +63,9 @@ 
 
 		if ($layout_def['module'] == 'Holidays'){
 			$action = 'DeleteHolidayRelationship';
-		}
-		else if ($layout_def['module'] == 'Users' || $layout_def['module'] == 'Contacts'){
+		} else if ($layout_def['module'] == 'Users' || $layout_def['module'] == 'Contacts'){
 			$action = 'DeleteResourceRelationship';
-		}
-		else{
+		} else{
 			$action = 'DeleteRelationship';
 		}
 
@@ -85,8 +85,7 @@ 
 		
 		if ($current_user->id == $focus->assigned_user_id || is_admin($current_user)){
 			$is_owner = true;
-		}
-		else{
+		} else{
 			$is_owner = false;
 		}
 				
@@ -119,7 +118,7 @@ 
 			. ' class="listViewTdToolsS1"'
 			. " onclick=\"return confirm('$remove_confirmation_text');\""
 			. ">$icon_remove_html&nbsp;$icon_remove_text</a>";
-		}else{
+		} else{
 			return '';
 		}
 	}

include/generic/SugarWidgets/SugarWidgetFieldmultienum.php

Braces +10 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.
@@ -56,8 +58,9 @@ 
 			$value = preg_replace("/^'/", "'%", $val, 1);
 			$value = preg_replace("/'$/", "%'", $value, 1);
 			$query .= $value;
-			if ($key != ($arr_count - 1))
-    			$query.= " OR " ;	
+			if ($key != ($arr_count - 1)) {
+			    			$query.= " OR " ;
+			}
     	}
 		return '('.$query.')';        
 	}
@@ -68,7 +71,7 @@ 
         foreach ($layout_def['input_name0'] as $value) {
             if($value != ""){
                 array_push($arr, "'".$GLOBALS['db']->quote($value)."'");
-            }else{
+            } else{
                 array_push($arr, "'^^'");
             }
         }
@@ -82,8 +85,9 @@ 
 			$value = preg_replace("/^'/", "'%", $val, 1);
 			$value = preg_replace("/'$/", "%'", $value, 1);
 			$query .= $value;
-			if ($key != ($arr_count - 1))
-    			$query.= " OR " ;	
+			if ($key != ($arr_count - 1)) {
+			    			$query.= " OR " ;
+			}
     	}
 		return '('.$query.')';        
 	}

include/generic/SugarWidgets/SugarWidgetFieldsingleenum.php

Braces +6 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.
@@ -49,18 +51,15 @@ 
         if(!empty($layout_def['remove_blank']) && $layout_def['remove_blank']) {
             if ( is_array($layout_def['options']) ) {
                 $ops = $layout_def['options'];
-            }
-            elseif (isset($layout_def['options']) && isset($app_list_strings[$layout_def['options']])){ 
+            } elseif (isset($layout_def['options']) && isset($app_list_strings[$layout_def['options']])){ 
             	$ops = $app_list_strings[$layout_def['options']];
                 if(array_key_exists('', $app_list_strings[$layout_def['options']])) {
              	   unset($ops['']);
 	            }
-            }
-            else{
+            } else{
             	$ops = array();
             }
-        }
-        else {
+        } else {
             $ops = $app_list_strings[$layout_def['options']];
         }
         

include/generic/SugarWidgets/SugarWidgetReportField.php

Braces +11 added lines, -8 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.
@@ -184,19 +186,20 @@ 
  function queryOrderBy($layout_def)
  {
      $field_def = array();
-	if(!empty($this->reporter->all_fields[$layout_def['column_key']])) $field_def = $this->reporter->all_fields[$layout_def['column_key']];
+	if(!empty($this->reporter->all_fields[$layout_def['column_key']])) {
+	    $field_def = $this->reporter->all_fields[$layout_def['column_key']];
+	}
 
     if (!empty($layout_def['group_function']))
     {
         $order_by = $this->_get_column_alias($layout_def);
-    }
-    elseif (!empty($field_def['sort_on']))
+    } elseif (!empty($field_def['sort_on']))
 	{
 			$order_by = $layout_def['table_alias'].".".$field_def['sort_on'];
-            if(!empty($field_def['sort_on2']))
-                $order_by .= ', ' . $layout_def['table_alias'].".".$field_def['sort_on2'];
-    }
-	else {
+            if(!empty($field_def['sort_on2'])) {
+                            $order_by .= ', ' . $layout_def['table_alias'].".".$field_def['sort_on2'];
+            }
+    } else {
 		$order_by = $this->_get_column_alias($layout_def)." \n";
 	}