adamjakab / SuiteCRM

include/MVC/Controller/SugarController.php

Braces +52 added lines, -46 removed lines

@@ -171,11 +171,13 @@ 
 	 *
 	 */
 	public function setup($module = ''){
-		if(empty($module) && !empty($_REQUEST['module']))
-			$module = $_REQUEST['module'];
+		if(empty($module) && !empty($_REQUEST['module'])) {
+					$module = $_REQUEST['module'];
+		}
 		//set the module
-		if(!empty($module))
-			$this->setModule($module);
+		if(!empty($module)) {
+					$this->setModule($module);
+		}
 
 		if(!empty($_REQUEST['target_module']) && $_REQUEST['target_module'] != 'undefined') {
 			$this->target_module = $_REQUEST['target_module'];
@@ -199,18 +201,24 @@ 
 	 *
 	 */
 	private function loadPropertiesFromRequest(){
-		if(!empty($_REQUEST['action']))
-			$this->action = $_REQUEST['action'];
-		if(!empty($_REQUEST['record']))
-			$this->record = $_REQUEST['record'];
-		if(!empty($_REQUEST['view']))
-			$this->view = $_REQUEST['view'];
-		if(!empty($_REQUEST['return_module']))
-			$this->return_module = $_REQUEST['return_module'];
-		if(!empty($_REQUEST['return_action']))
-			$this->return_action = $_REQUEST['return_action'];
-		if(!empty($_REQUEST['return_id']))
-			$this->return_id = $_REQUEST['return_id'];
+		if(!empty($_REQUEST['action'])) {
+					$this->action = $_REQUEST['action'];
+		}
+		if(!empty($_REQUEST['record'])) {
+					$this->record = $_REQUEST['record'];
+		}
+		if(!empty($_REQUEST['view'])) {
+					$this->view = $_REQUEST['view'];
+		}
+		if(!empty($_REQUEST['return_module'])) {
+					$this->return_module = $_REQUEST['return_module'];
+		}
+		if(!empty($_REQUEST['return_action'])) {
+					$this->return_action = $_REQUEST['return_action'];
+		}
+		if(!empty($_REQUEST['return_id'])) {
+					$this->return_id = $_REQUEST['return_id'];
+		}
 	}
 
 	/**
@@ -235,8 +243,9 @@ 
 				$this->bean = new $class();
 				if(!empty($this->record)){
 					$this->bean->retrieve($this->record);
-					if($this->bean)
-						$GLOBALS['FOCUS'] = $this->bean;
+					if($this->bean) {
+											$GLOBALS['FOCUS'] = $this->bean;
+					}
 				}
 			}
 		}
@@ -250,7 +259,7 @@ 
 		if(!$$var){
 			if($merge && !empty($this->$var)){
 				$$var = $this->$var;
-			}else{
+			} else{
 				$$var = array();
 			}
 			if(file_exists('include/MVC/Controller/'. $var . '.php')){
@@ -293,13 +302,11 @@ 
             if(!empty($this->view))
             {
                 $this->processView();
-            }
-            elseif(!empty($this->redirect_url))
+            } elseif(!empty($this->redirect_url))
             {
             			$this->redirect();
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->handleException($e);
         }
@@ -321,8 +328,7 @@ 
         {
             $logicHook->setBean($this->bean);
             $logicHook->call_custom_logic($this->bean->module_dir, "handle_exception", $e);
-        }
-        else
+        } else
         {
             $logicHook->call_custom_logic('', "handle_exception", $e);
         }
@@ -384,7 +390,7 @@ 
             }
 
 			$this->redirect();
-		}else{
+		} else{
 			$this->no_access();
 		}
 	}
@@ -491,8 +497,9 @@ 
 	 */
 	protected function redirect(){
 
-		if(!empty($this->redirect_url))
-			SugarApplication::redirect($this->redirect_url);
+		if(!empty($this->redirect_url)) {
+					SugarApplication::redirect($this->redirect_url);
+		}
 	}
 
 	////////////////////////////////////////////////////////
@@ -586,7 +593,7 @@ 
 				sugar_cleanup(true);
 			}
 			$this->bean->mark_deleted($_REQUEST['record']);
-		}else{
+		} else{
 			sugar_die("A record number must be specified to delete");
 		}
 	}
@@ -652,7 +659,7 @@ 
             unset($_REQUEST[$seed->module_dir.'2_'.strtoupper($seed->object_name).'_offset']);//after massupdate, the page should redirect to no offset page
             $storeQuery->saveFromRequest($_REQUEST['module']);
             $_REQUEST = array('return_module' => $temp_req['return_module'], 'return_action' => $temp_req['return_action']);//for post_massupdate, to go back to original page.
-		}else{
+		} else{
 			sugar_die("You must massupdate at least one record");
 		}
 	}
@@ -711,8 +718,7 @@ 
 
 		        if(method_exists($dashlet, $requestedMethod) || method_exists($dashlet, '__call')) {
 		            echo $dashlet->$requestedMethod();
-		        }
-		        else {
+		        } else {
 		            echo 'no method';
 		        }
 		    }
@@ -734,15 +740,13 @@ 
 		    if(!empty($_REQUEST['configure']) && $_REQUEST['configure']) { // save settings
 		        $dashletDefs[$id]['options'] = $dashlet->saveOptions($_REQUEST);
 		        $current_user->setPreference('dashlets', $dashletDefs, 0, $_REQUEST['module']);
-		    }
-		    else { // display options
+		    } else { // display options
 		        $json = getJSONobj();
 		        return 'result = ' . $json->encode((array('header' => $dashlet->title . ' : ' . $mod_strings['LBL_OPTIONS'],
 		                                                 'body'  => $dashlet->displayOptions())));
 
 		    }
-		}
-		else {
+		} else {
 		    return '0';
 		}
 	}
@@ -824,13 +828,14 @@ 
 						$this->_processed = true;
 						$this->no_access();
 					}
-				}else{
+				} else{
 					$this->_processed = true;
 					$this->no_access();
 				}
 			}
-		}else
-			$this->_processed = false;
+		} else {
+					$this->_processed = false;
+		}
 	}
 
 	/**
@@ -865,8 +870,9 @@ 
         $this->loadMapping('entry_point_registry');
 
         if ( isset($this->entry_point_registry[$entryPoint]['auth'])
-                && !$this->entry_point_registry[$entryPoint]['auth'] )
-            return false;
+                && !$this->entry_point_registry[$entryPoint]['auth'] ) {
+                    return false;
+        }
         return true;
     }
 
@@ -879,8 +885,7 @@ 
 		$file = self::getActionFilename($this->do_action);
 		if ( isset($this->action_view_map[strtolower($this->do_action)]) ) {
 	        $action = $this->action_view_map[strtolower($this->do_action)];
-	    }
-	    else {
+	    } else {
 	        $action = $this->do_action;
 	    }
 	    // index actions actually maps to the view.list.php view
@@ -913,12 +918,13 @@ 
 			$GLOBALS['log']->debug('Using Action File Map:' . $this->action_file_map[strtolower($this->do_action)]);
 			require_once($this->action_file_map[strtolower($this->do_action)]);
 			$this->_processed = true;
-		}elseif(!empty($this->action_view_map[strtolower($this->do_action)])){
+		} elseif(!empty($this->action_view_map[strtolower($this->do_action)])){
 			$GLOBALS['log']->debug('Using Action View Map:' . $this->action_view_map[strtolower($this->do_action)]);
 			$this->view = $this->action_view_map[strtolower($this->do_action)];
 			$this->_processed = true;
-		}else
-			$this->no_action();
+		} else {
+					$this->no_action();
+		}
 	}
 
 	/**

include/javascript/getYUIComboFile.php

Braces +15 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.
@@ -38,7 +40,9 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-if (empty($_REQUEST)) die();
+if (empty($_REQUEST)) {
+    die();
+}
 
 $yui_path = array(
     "2.9.0" => "include/javascript/yui",
@@ -58,20 +62,24 @@ 
 foreach ($_REQUEST as $param => $val)
 {
 	//No backtracking in the path
-	if (strpos($param, "..") !== false)
-        continue;
+	if (strpos($param, "..") !== false) {
+	        continue;
+	}
 
 	$version = explode("/", $param);
 	$version = $version[0];
-    if (empty($yui_path[$version])) continue;
+    if (empty($yui_path[$version])) {
+        continue;
+    }
 
     $path = $yui_path[$version] . substr($param, strlen($version));
 
 	$extension = substr($path, strrpos($path, "_") + 1);
 
 	//Only allowed file extensions
-	if (empty($types[$extension]))
-	   continue;
+	if (empty($types[$extension])) {
+		   continue;
+	}
 
 	if (empty($contentType))
     {

include/Dashlets/DashletGenericChart.php

Braces +59 added lines, -36 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.
@@ -121,10 +123,12 @@ 
         // load language files
         $this->loadLanguage($classname, 'modules/Charts/Dashlets/');
 
-        if ( empty($options['title']) )
-            $this->title = $this->dashletStrings['LBL_TITLE'];
-        if ( isset($options['autoRefresh']) )
-            $this->autoRefresh = $options['autoRefresh'];
+        if ( empty($options['title']) ) {
+                    $this->title = $this->dashletStrings['LBL_TITLE'];
+        }
+        if ( isset($options['autoRefresh']) ) {
+                    $this->autoRefresh = $options['autoRefresh'];
+        }
 
         $this->layoutManager = new LayoutManager();
         $this->layoutManager->setAttribute('context', 'Report');
@@ -140,8 +144,8 @@ 
     public function setRefreshIcon()
     {
     	$additionalTitle = '';
-        if($this->isRefreshable)
-
+        if($this->isRefreshable) {
+        
             $additionalTitle .= '<a href="#" onclick="SUGAR.mySugar.retrieveDashlet(\''
                 . $this->id
                 . '\',\'predefined_chart\'); return false;"><!--not_in_theme!-->'
@@ -154,6 +158,7 @@ 
                     translate('LBL_DASHLET_REFRESH', 'Home')
                 )
                 . '</a>';
+        }
         return $additionalTitle;
     }
 
@@ -200,25 +205,32 @@ 
 
         $options = array();
 
-        foreach($req as $name => $value)
-            if(!is_array($value)) $req[$name] = trim($value);
+        foreach($req as $name => $value) {
+                    if(!is_array($value)) $req[$name] = trim($value);
+        }
 
         foreach($this->_searchFields as $name => $params) {
             $widgetDef = $params;
-            if ( isset($this->getSeedBean()->field_defs[$name]) )
-                $widgetDef = $this->getSeedBean()->field_defs[$name];
-            if ( $widgetDef['type'] == 'date')           // special case date types
+            if ( isset($this->getSeedBean()->field_defs[$name]) ) {
+                            $widgetDef = $this->getSeedBean()->field_defs[$name];
+            }
+            if ( $widgetDef['type'] == 'date') {
+                // special case date types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req['type_'.$widgetDef['name']], $timedate->get_date_format(), $timedate->dbDayFormat);
-            elseif ( $widgetDef['type'] == 'time')       // special case time types
+            } elseif ( $widgetDef['type'] == 'time') {
+                // special case time types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req['type_'.$widgetDef['name']], $timedate->get_time_format(), $timedate->dbTimeFormat);
-            elseif ( $widgetDef['type'] == 'datepicker') // special case datepicker types
+            } elseif ( $widgetDef['type'] == 'datepicker') {
+                // special case datepicker types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req[$widgetDef['name']], $timedate->get_date_format(), $timedate->dbDayFormat);
-            elseif (!empty($req[$widgetDef['name']]))
-                $options[$widgetDef['name']] = $req[$widgetDef['name']];
+            } elseif (!empty($req[$widgetDef['name']])) {
+                            $options[$widgetDef['name']] = $req[$widgetDef['name']];
+            }
         }
 
-        if (!empty($req['dashletTitle']))
-            $options['title'] = $req['dashletTitle'];
+        if (!empty($req['dashletTitle'])) {
+                    $options['title'] = $req['dashletTitle'];
+        }
 
         $options['autoRefresh'] = empty($req['autoRefresh']) ? '0' : $req['autoRefresh'];
 
@@ -241,19 +253,24 @@ 
                     $currentSearchFields[$name] = array();
 
                     $widgetDef = $params;
-                    if ( isset($this->getSeedBean()->field_defs[$name]) )
-                        $widgetDef = $this->getSeedBean()->field_defs[$name];
+                    if ( isset($this->getSeedBean()->field_defs[$name]) ) {
+                                            $widgetDef = $this->getSeedBean()->field_defs[$name];
+                    }
 
-                    if($widgetDef['type'] == 'enum' || $widgetDef['type'] == 'singleenum') $widgetDef['remove_blank'] = true; // remove the blank option for the dropdown
+                    if($widgetDef['type'] == 'enum' || $widgetDef['type'] == 'singleenum') {
+                        $widgetDef['remove_blank'] = true;
+                    }
+                    // remove the blank option for the dropdown
 
-                    if ( empty($widgetDef['input_name0']) )
-                        $widgetDef['input_name0'] = empty($this->$name) ? '' : $this->$name;
+                    if ( empty($widgetDef['input_name0']) ) {
+                                            $widgetDef['input_name0'] = empty($this->$name) ? '' : $this->$name;
+                    }
                     $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], $this->getSeedBean()->module_dir);
-                    if ( $currentSearchFields[$name]['label'] == $widgetDef['vname'] )
-                        $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], 'Charts');
+                    if ( $currentSearchFields[$name]['label'] == $widgetDef['vname'] ) {
+                                            $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], 'Charts');
+                    }
                     $currentSearchFields[$name]['input'] = $this->layoutManager->widgetDisplayInput($widgetDef, true, (empty($this->$name) ? '' : $this->$name));
-                }
-                else { // ability to create spacers in input fields
+                } else { // ability to create spacers in input fields
                     $currentSearchFields['blank' + $count]['label'] = '';
                     $currentSearchFields['blank' + $count]['input'] = '';
                     $count++;
@@ -289,8 +306,9 @@ 
      */
     protected function getSeedBean()
     {
-        if ( !($this->_seedBean instanceof SugarBean) )
-            $this->_seedBean = SugarModule::get($this->_seedName)->loadBean();
+        if ( !($this->_seedBean instanceof SugarBean) ) {
+                    $this->_seedBean = SugarModule::get($this->_seedName)->loadBean();
+        }
 
         return $this->_seedBean;
     }
@@ -412,9 +430,14 @@ 
         }
 
         //if(isset($sortby1[0]) && $sortby1[0]=='') unset($sortby1[0]);//the beginning of lead_source_dom is blank.
-        if(isset($sortby1[0]) && $sortby1[0]==array()) unset($sortby1[0]);//the beginning of month after search is blank.
+        if(isset($sortby1[0]) && $sortby1[0]==array()) {
+            unset($sortby1[0]);
+        }
+        //the beginning of month after search is blank.
 
-        if($ifsort2==false) $sortby2=array(0);
+        if($ifsort2==false) {
+            $sortby2=array(0);
+        }
 
         if($keycolname2!=null) {
             $sortby2 = array();
@@ -438,7 +461,9 @@ 
 
         foreach($sortby1 as $sort1) {
             foreach($sortby2 as $sort2) {
-                if($ifsort2) $a=0;
+                if($ifsort2) {
+                    $a=0;
+                }
                 foreach($data_set as $key => $value){
                     if($value[$keycolname1] == $sort1 && (!$ifsort2 || $value[$keycolname2]== $sort2)) {
                         if($translate1) {
@@ -461,15 +486,13 @@ 
                     if($translate1) {
                         $val[$keycolname1] = $app_list_strings[$keycolname1.'_dom'][$sort1];
                         $val[$keycolname1.'_dom_option'] = $sort1;
-                    }
-                    else {
+                    } else {
                         $val[$keycolname1] = $sort1;
                     }
                     if($translate2) {
                         $val[$keycolname2] = $app_list_strings[$keycolname2.'_dom'][$sort2];
                         $val[$keycolname2.'_dom_option'] = $sort2;
-                    }
-                    elseif($keycolname2!=null) {
+                    } elseif($keycolname2!=null) {
                         $val[$keycolname2] = $sort2;
                     }
                     array_push($data, $val);

include/Dashlets/DashletCacheBuilder.php

Braces +6 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.
@@ -73,8 +75,9 @@ 
                 if(is_file(preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file))) { // is there an associated meta data file?
                     $dashletFiles[$class]['meta'] = preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file);
                     require($dashletFiles[$class]['meta']);
-                    if ( isset($dashletMeta[$class]['module']) )
-                        $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
+                    if ( isset($dashletMeta[$class]['module']) ) {
+                                            $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
+                    }
                 }
                 
                 $filesInDirectory = array();

include/SugarPHPMailer.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.
@@ -121,9 +123,9 @@ 
     			$this->Username = $oe->mail_smtpuser;
     			$this->Password = $oe->mail_smtppass;
     		}
+		} else {
+					$this->Mailer = "sendmail";
 		}
-		else
-			$this->Mailer = "sendmail";
 	}
 
 	/**
@@ -154,9 +156,9 @@ 
     			$this->Username = $oe->mail_smtpuser;
     			$this->Password = $oe->mail_smtppass;
     		}
+		} else {
+				  $this->Mailer = "sendmail";
 		}
-		else
-		  $this->Mailer = "sendmail";
 	}
 
     /**
@@ -300,7 +302,9 @@ 
 			$filename = urldecode($match);
 			$cid = $filename;
 			$file_location = $local_prefix.$filename;
-			if(!file_exists($file_location)) continue;
+			if(!file_exists($file_location)) {
+			    continue;
+			}
 			if($object) {
 			    if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
 			        switch(strtolower($typematch[1])) {

include/MySugar/retrieve_dash_page.php

Braces +20 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.
@@ -94,8 +96,7 @@ 
         $old_dashlets = array();
         $current_user->setPreference('columns', $old_columns, 0, 'home');
         $current_user->setPreference('dashlets', $old_dashlets, 0, 'home');
-    }
-    else{
+    } else{
         // This is here to get Sugar dashlets added above the rest
         $dashlets[create_guid()] = array('className' => 'iFrameDashlet',
             'module' => 'Home',
@@ -150,8 +151,11 @@ 
         $columns[1]['dashlets'] = array();
 
         foreach($dashlets as $guid=>$dashlet) {
-            if( $dashlet['forceColumn'] == 0 ) array_push($columns[0]['dashlets'], $guid);
-            else array_push($columns[1]['dashlets'], $guid);
+            if( $dashlet['forceColumn'] == 0 ) {
+                array_push($columns[0]['dashlets'], $guid);
+            } else {
+                array_push($columns[1]['dashlets'], $guid);
+            }
             $count++;
         }
     }
@@ -179,8 +183,9 @@ 
     $dashlets = array_merge($dashlets,$dashletsDashboard);
     $current_user->setPreference('dashlets', $dashlets, 0, 'Home');
 }
-if ( !empty($pagesDashboard) || !empty($dashletsDashboard) )
+if ( !empty($pagesDashboard) || !empty($dashletsDashboard) ) {
     $current_user->resetPreferences('Dashboard');
+}
 
 if (empty($pages)){
     $pages = array();
@@ -217,12 +222,14 @@ 
         // only display dashlets that are from visibile modules and that the user has permission to list
         if(!empty($id) && isset($dashlets[$id]) && is_file($dashlets[$id]['fileLocation'])) {
             $module = 'Home';
-            if ( !empty($dashletsFiles[$dashlets[$id]['className']]['module']) )
-                $module = $dashletsFiles[$dashlets[$id]['className']]['module'];
+            if ( !empty($dashletsFiles[$dashlets[$id]['className']]['module']) ) {
+                            $module = $dashletsFiles[$dashlets[$id]['className']]['module'];
+            }
             // Bug 24772 - Look into the user preference for the module the dashlet is a part of in case
             //             of the Report Chart dashlets.
-            elseif ( !empty($dashlets[$id]['module']) )
-                $module = $dashlets[$id]['module'];
+            elseif ( !empty($dashlets[$id]['module']) ) {
+                            $module = $dashlets[$id]['module'];
+            }
 
             $myDashlet = new MySugar($module);
 
@@ -267,7 +274,9 @@ 
 $_SESSION['current_tab'] = $activePage;
 
 
-if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $sugar_smarty->assign('lock_homepage', true);
+if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) {
+    $sugar_smarty->assign('lock_homepage', true);
+}
 
 
 $sugar_smarty->assign('sugarVersion', $sugar_version);

include/Smarty/plugins/function.html_options.php

Braces +10 added lines, -6 removed lines

@@ -68,15 +68,18 @@ 
         }
     }
 
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
+    if (!isset($options) && !isset($values)) {
+            return '';
+    }
+    /* raise error here? */
 
     $_html_result = '';
 
     if (isset($options)) {
         
-        foreach ($options as $_key=>$_val)
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
+        foreach ($options as $_key=>$_val) {
+                    $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
+        }
 
     } else {
         
@@ -99,8 +102,9 @@ 
     if(!is_array($value)) {
         $_html_result = '<option label="' . smarty_function_escape_special_chars($value) . '" value="' .
             smarty_function_escape_special_chars($key) . '"';
-        if (in_array((string)$key, $selected))
-            $_html_result .= ' selected="selected"';
+        if (in_array((string)$key, $selected)) {
+                    $_html_result .= ' selected="selected"';
+        }
         $_html_result .= '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
     } else {
         $_html_result = smarty_function_html_options_optgroup($key, $value, $selected);

include/Smarty/plugins/function.html_radios.php

Braces +13 added lines, -6 removed lines

@@ -100,15 +100,18 @@ 
         }
     }
 
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
+    if (!isset($options) && !isset($values)) {
+            return '';
+    }
+    /* raise error here? */
 
     $_html_result = array();
 
     if (isset($options)) {
 
-        foreach ($options as $_key=>$_val)
-            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
+        foreach ($options as $_key=>$_val) {
+                    $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
+        }
 
     } else {
 
@@ -141,13 +144,17 @@ 
         . smarty_function_escape_special_chars($name) . '" value="'
         . smarty_function_escape_special_chars($value) . '"';
 
-   if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
+   if ($labels && $label_ids) {
+       $_output .= ' id="' . $_id . '"';
+   }
 
     if ((string)$value==$selected) {
         $_output .= ' checked="checked"';
     }
     $_output .= $extra . ' />' . $output;
-    if ($labels) $_output .= '</label>';
+    if ($labels) {
+        $_output .= '</label>';
+    }
     $_output .=  $separator;
 
     return $_output;

include/Smarty/plugins/function.sugar_getimage.php

Braces +21 added lines, -14 removed lines

@@ -54,26 +54,33 @@
 function smarty_function_sugar_getimage($params, &$smarty) {
 
 	// error checking for required parameters
-	if(!isset($params['name'])) 
-		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
+	if(!isset($params['name'])) {
+			$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
+	}
 
 	// temp hack to deprecate the use of other_attributes
-	if(isset($params['other_attributes']))
-		$params['attr'] = $params['other_attributes'];
+	if(isset($params['other_attributes'])) {
+			$params['attr'] = $params['other_attributes'];
+	}
 
 	// set defaults
-	if(!isset($params['attr']))
-		$params['attr'] = '';
-	if(!isset($params['width']))
-		$params['width'] = null;
-	if(!isset($params['height']))
-		$params['height'] = null;
-	if(!isset($params['alt'])) 
-		$params['alt'] = '';
+	if(!isset($params['attr'])) {
+			$params['attr'] = '';
+	}
+	if(!isset($params['width'])) {
+			$params['width'] = null;
+	}
+	if(!isset($params['height'])) {
+			$params['height'] = null;
+	}
+	if(!isset($params['alt'])) {
+			$params['alt'] = '';
+	}
 
 	// deprecated ?
-	if(!isset($params['ext']))
-		$params['ext'] = null;
+	if(!isset($params['ext'])) {
+			$params['ext'] = null;
+	}
 
 	return SugarThemeRegistry::current()->getImage($params['name'], $params['attr'], $params['width'], $params['height'], $params['ext'], $params['alt']);	
 }