adamjakab / SuiteCRM

include/Smarty/plugins/modifier.multienum_to_ac.php

Braces +5 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -50,12 +52,10 @@ 
 	if(count($expl) == 1){
 		if(array_key_exists($value, $field_options)){
 			return $field_options[$value] . ", ";
-		}
-		else{
+		} else{
 			return '';
 		}
-	}
-	else{
+	} else{
 		$final_array = array();
 		foreach($expl as $key_val){
 			if(array_key_exists($key_val, $field_options)){

include/Smarty/plugins/function.sugar_link.php

Braces +11 added lines, -8 removed lines

@@ -33,7 +33,9 @@ 
 */
 
 
-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,7 @@ 
 		$link_url .= 'module=iFrames&action=index';
 		$link_url .= '&record='.$params['data']['0'];
 		$link_url .= '&tab=true';
-    }else{
+    } else{
 		$action = (!empty($params['action']))?$params['action']:'index';
 	    
 	    $link_url = 'index.php?';
@@ -107,12 +109,13 @@ 
     $module = ' module="'.$params['module'].'"';
 	$accesskey = (!empty($params['accesskey']))?' accesskey="'.$params['accesskey'].'" ':'';
     $options = (!empty($params['options']))?' '.$params['options'].'':'';
-    if(!empty($params['data']) && is_array($params['data']))
-		$label =$params['data']['4'];
-	elseif ( !empty($params['label']) )
-	    $label = $params['label'];
-	else
-	    $label = (!empty($GLOBALS['app_list_strings']['moduleList'][$params['module']]))?$GLOBALS['app_list_strings']['moduleList'][$params['module']]:$params['module'];
+    if(!empty($params['data']) && is_array($params['data'])) {
+    		$label =$params['data']['4'];
+    } elseif ( !empty($params['label']) ) {
+		    $label = $params['label'];
+	} else {
+		    $label = (!empty($GLOBALS['app_list_strings']['moduleList'][$params['module']]))?$GLOBALS['app_list_strings']['moduleList'][$params['module']]:$params['module'];
+	}
 
     $link = '<a href="'.ajaxLink($link_url).'"'.$id.$class.$style.$options.$title.$module.'>'.$label.'</a>';
     return $link;

include/Smarty/plugins/modifier.regex_replace.php

Braces +6 added lines, -4 removed lines

@@ -23,8 +23,9 @@ 
 function smarty_modifier_regex_replace($string, $search, $replace)
 {
     if(is_array($search)) {
-      foreach($search as $idx => $s)
-        $search[$idx] = _smarty_regex_replace_check($s);
+      foreach($search as $idx => $s) {
+              $search[$idx] = _smarty_regex_replace_check($s);
+      }
     } else {
       $search = _smarty_regex_replace_check($search);
     }       
@@ -34,8 +35,9 @@ 
 
 function _smarty_regex_replace_check($search)
 {
-    if (($pos = strpos($search,"\0")) !== false)
-      $search = substr($search,0,$pos);
+    if (($pos = strpos($search,"\0")) !== false) {
+          $search = substr($search,0,$pos);
+    }
     if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
         /* remove eval-modifier from $search */
         $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);

include/Smarty/plugins/modifier.strip_tags.php

Braces +6 added lines, -5 removed lines

@@ -21,11 +21,12 @@
  */
 function smarty_modifier_strip_tags($string, $replace_with_space = true)
 {
-    if ($replace_with_space)
-        return preg_replace('!<[^>]*?>!', ' ', $string);
-    else
-        return strip_tags($string);
-}
+    if ($replace_with_space) {
+            return preg_replace('!<[^>]*?>!', ' ', $string);
+    } else {
+            return strip_tags($string);
+    }
+    }
 
 /* vim: set expandtab: */
 

include/Smarty/plugins/function.sugar_getlink.php

Braces +27 added lines, -18 removed lines

@@ -52,26 +52,35 @@
 function smarty_function_sugar_getlink($params, &$smarty) {
 
 	// error checking for required parameters
-	if(!isset($params['url'])) 
-		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'url');
-	if(!isset($params['title']))
-		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'title');
+	if(!isset($params['url'])) {
+			$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'url');
+	}
+	if(!isset($params['title'])) {
+			$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'title');
+	}
 
 	// set defaults
-	if(!isset($params['attr']))
-		$params['attr'] = '';
-	if(!isset($params['img_name'])) 
-		$params['img_name'] = '';
-	if(!isset($params['img_attr']))
-		$params['img_attr'] = '';
-	if(!isset($params['img_width']))
-		$params['img_width'] = null;
-	if(!isset($params['img_height']))
-		$params['height'] = null;
-	if(!isset($params['img_placement']))
-		$params['img_placement'] = 'imageonly';
-	if(!isset($params['img_alt']))
-		$params['img_alt'] = '';
+	if(!isset($params['attr'])) {
+			$params['attr'] = '';
+	}
+	if(!isset($params['img_name'])) {
+			$params['img_name'] = '';
+	}
+	if(!isset($params['img_attr'])) {
+			$params['img_attr'] = '';
+	}
+	if(!isset($params['img_width'])) {
+			$params['img_width'] = null;
+	}
+	if(!isset($params['img_height'])) {
+			$params['height'] = null;
+	}
+	if(!isset($params['img_placement'])) {
+			$params['img_placement'] = 'imageonly';
+	}
+	if(!isset($params['img_alt'])) {
+			$params['img_alt'] = '';
+	}
 
 	return SugarThemeRegistry::current()->getLink($params['url'], $params['title'], $params['attr'], $params['img_name'], 
 		$params['img_attr'], $params['img_width'], $params['img_height'], $params['img_alt'], $params['img_placement']);	

include/Smarty/plugins/function.multienum_to_array.php

Braces +12 added lines, -10 removed lines

@@ -67,17 +67,19 @@
 {
 	$ret = "";
 	if(empty($params['string'])) {
-        if (empty($params['default']))
-            $ret = array();
-        else if(is_array($params['default']))
-            $ret = $params['default'];
-        else
-           $ret = unencodeMultienum($params['default']);
+        if (empty($params['default'])) {
+                    $ret = array();
+        } else if(is_array($params['default'])) {
+                    $ret = $params['default'];
+        } else {
+                   $ret = unencodeMultienum($params['default']);
+        }
     } else {
-    	if (is_array($params['string']))
-    	  $ret = $params['string'];
-    	else
-    	  $ret = unencodeMultienum($params['string']);
+    	if (is_array($params['string'])) {
+    	    	  $ret = $params['string'];
+    	} else {
+    	    	  $ret = unencodeMultienum($params['string']);
+    	}
     }
 	
     

include/Smarty/plugins/function.sugar_button.php

Braces +9 added lines, -5 removed lines

@@ -338,7 +338,9 @@ 
 			break;
 
 			case "SUBPANELSAVE":
-                if($view == 'QuickCreate' || (isset($_REQUEST['target_action']) && strtolower($_REQUEST['target_action']) == 'quickcreate')) $view =  "form_SubpanelQuickCreate_{$module}";
+                if($view == 'QuickCreate' || (isset($_REQUEST['target_action']) && strtolower($_REQUEST['target_action']) == 'quickcreate')) {
+                    $view =  "form_SubpanelQuickCreate_{$module}";
+                }
 
                 /* BEGIN - SECURITY GROUPS - redirect a subpanel save to the detail view if select popup and user in more than 1 group*/ 
                 /**
@@ -475,8 +477,9 @@ 
     $set_submit = false;
     $is_hidden_field = false;
     //if the code is wrapped with the form element, it will escape the operation for JS replacement
-    if(isset($dom_tree['tag']) && $dom_tree['tag'] == 'form')
-        return false;
+    if(isset($dom_tree['tag']) && $dom_tree['tag'] == 'form') {
+            return false;
+    }
 
     if(isset($dom_tree['type']) && $dom_tree['type'] == 'hidden') {
         $is_hidden_field = true;
@@ -486,8 +489,9 @@ 
     if(isset($dom_tree['onclick'])) {
         if(strpos($dom_tree['onclick'], "this.form") !== false) {
             $dom_tree['onclick'] = str_replace("this.form", "_form", $dom_tree['onclick']);
-            if(substr($dom_tree['onclick'], -1) != ';')
-                $dom_tree['onclick'] .= ";";
+            if(substr($dom_tree['onclick'], -1) != ';') {
+                            $dom_tree['onclick'] .= ";";
+            }
             //Onclick handler contains returning a variable, for example it prompts a confirm message.
             if(strpos($dom_tree['onclick'], "return ") !== false ) {
                 $dom_tree['onclick'] = $js_form.' var _onclick=(function(){ldelim}'.$dom_tree['onclick']."{rdelim}()); if(_onclick!==false) _form.submit();";

include/Smarty/Smarty_Compiler.class.php

Braces +148 added lines, -108 removed lines

@@ -243,7 +243,9 @@ 
         // run template source through prefilter functions
         if (count($this->_plugins['prefilter']) > 0) {
             foreach ($this->_plugins['prefilter'] as $filter_name => $prefilter) {
-                if ($prefilter === false) continue;
+                if ($prefilter === false) {
+                    continue;
+                }
                 if ($prefilter[3] || is_callable($prefilter[0])) {
                     $source_content = call_user_func_array($prefilter[0],
                                                             array($source_content, &$this));
@@ -385,7 +387,9 @@ 
         // run compiled template through postfilter functions
         if (count($this->_plugins['postfilter']) > 0) {
             foreach ($this->_plugins['postfilter'] as $filter_name => $postfilter) {
-                if ($postfilter === false) continue;
+                if ($postfilter === false) {
+                    continue;
+                }
                 if ($postfilter[3] || is_callable($postfilter[0])) {
                     $compiled_content = call_user_func_array($postfilter[0],
                                                               array($compiled_content, &$this));
@@ -435,8 +439,9 @@ 
     function _compile_tag($template_tag)
     {
         /* Matched comment. */
-        if (substr($template_tag, 0, 1) == '*' && substr($template_tag, -1) == '*')
-            return '';
+        if (substr($template_tag, 0, 1) == '*' && substr($template_tag, -1) == '*') {
+                    return '';
+        }
         
         /* Split tag into two three parts: command, command modifiers and the arguments. */
         if(! preg_match('~^(?:(' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp
@@ -474,18 +479,21 @@ 
 
             case 'else':
                 list($_open_tag) = end($this->_tag_stack);
-                if ($_open_tag != 'if' && $_open_tag != 'elseif')
-                    $this->_syntax_error('unexpected {else}', E_USER_ERROR, __FILE__, __LINE__);
-                else
-                    $this->_push_tag('else');
+                if ($_open_tag != 'if' && $_open_tag != 'elseif') {
+                                    $this->_syntax_error('unexpected {else}', E_USER_ERROR, __FILE__, __LINE__);
+                } else {
+                                    $this->_push_tag('else');
+                }
                 return '<?php else: ?>';
 
             case 'elseif':
                 list($_open_tag) = end($this->_tag_stack);
-                if ($_open_tag != 'if' && $_open_tag != 'elseif')
-                    $this->_syntax_error('unexpected {elseif}', E_USER_ERROR, __FILE__, __LINE__);
-                if ($_open_tag == 'if')
-                    $this->_push_tag('elseif');
+                if ($_open_tag != 'if' && $_open_tag != 'elseif') {
+                                    $this->_syntax_error('unexpected {elseif}', E_USER_ERROR, __FILE__, __LINE__);
+                }
+                if ($_open_tag == 'if') {
+                                    $this->_push_tag('elseif');
+                }
                 return $this->_compile_if_tag($tag_args, true);
 
             case '/if':
@@ -515,10 +523,11 @@ 
 
             case '/section':
                 $_open_tag = $this->_pop_tag('section');
-                if ($_open_tag == 'sectionelse')
-                    return "<?php endif; ?>";
-                else
-                    return "<?php endfor; endif; ?>";
+                if ($_open_tag == 'sectionelse') {
+                                    return "<?php endif; ?>";
+                } else {
+                                    return "<?php endfor; endif; ?>";
+                }
 
             case 'foreach':
                 $this->_push_tag('foreach');
@@ -531,10 +540,11 @@ 
 
             case '/foreach':
                 $_open_tag = $this->_pop_tag('foreach');
-                if ($_open_tag == 'foreachelse')
-                    return "<?php endif; unset(\$_from); ?>";
-                else
-                    return "<?php endforeach; endif; unset(\$_from); ?>";
+                if ($_open_tag == 'foreachelse') {
+                                    return "<?php endif; unset(\$_from); ?>";
+                } else {
+                                    return "<?php endforeach; endif; unset(\$_from); ?>";
+                }
                 break;
 
             case 'strip':
@@ -677,8 +687,9 @@ 
         if (substr($tag_command, 0, 1) == '/') {
             $start_tag = false;
             $tag_command = substr($tag_command, 1);
-        } else
-            $start_tag = true;
+        } else {
+                    $start_tag = true;
+        }
 
         $found = false;
         $have_function = true;
@@ -728,10 +739,11 @@ 
          */
         $this->_add_plugin('block', $tag_command);
 
-        if ($start_tag)
-            $this->_push_tag($tag_command);
-        else
-            $this->_pop_tag($tag_command);
+        if ($start_tag) {
+                    $this->_push_tag($tag_command);
+        } else {
+                    $this->_pop_tag($tag_command);
+        }
 
         if ($start_tag) {
             $output = '<?php ' . $this->_push_cacheable_state('block', $tag_command);
@@ -856,8 +868,9 @@ 
                     unset($attrs['assign']);
                     continue;
                 }
-                if (is_bool($arg_value))
-                    $arg_value = $arg_value ? 'true' : 'false';
+                if (is_bool($arg_value)) {
+                                    $arg_value = $arg_value ? 'true' : 'false';
+                }
                 $arg_list[] = "'$arg_name' => $arg_value";
             }
         }
@@ -948,8 +961,9 @@ 
         }
 
         foreach ($attrs as $arg_name => $arg_value) {
-            if (is_bool($arg_value))
-                $arg_value = $arg_value ? 'true' : 'false';
+            if (is_bool($arg_value)) {
+                            $arg_value = $arg_value ? 'true' : 'false';
+            }
             $arg_list[] = "'$arg_name' => $arg_value";
         }
 
@@ -987,13 +1001,15 @@ 
                 $theme_template = $arg_value;
                 continue;
             }
-            if (is_bool($arg_value))
-                $arg_value = $arg_value ? 'true' : 'false';
+            if (is_bool($arg_value)) {
+                            $arg_value = $arg_value ? 'true' : 'false';
+            }
             $arg_list[] = "'$arg_name' => $arg_value";
         }
 
-        if ( $theme_template == 'true' )
-            $include_file = '"'.SugarThemeRegistry::current()->getTemplate(str_replace(array('"',"'"),'',$include_file)).'"';
+        if ( $theme_template == 'true' ) {
+                    $include_file = '"'.SugarThemeRegistry::current()->getTemplate(str_replace(array('"',"'"),'',$include_file)).'"';
+        }
 
         $output = '<?php ';
 
@@ -1040,8 +1056,9 @@ 
         $arg_list = array();
         foreach($attrs as $arg_name => $arg_value) {
             if($arg_name != 'file' AND $arg_name != 'once' AND $arg_name != 'assign') {
-                if(is_bool($arg_value))
-                    $arg_value = $arg_value ? 'true' : 'false';
+                if(is_bool($arg_value)) {
+                                    $arg_value = $arg_value ? 'true' : 'false';
+                }
                 $arg_list[] = "'$arg_name' => $arg_value";
             }
         }
@@ -1079,10 +1096,11 @@ 
                     break;
 
                 case 'show':
-                    if (is_bool($attr_value))
-                        $show_attr_value = $attr_value ? 'true' : 'false';
-                    else
-                        $show_attr_value = "(bool)$attr_value";
+                    if (is_bool($attr_value)) {
+                                            $show_attr_value = $attr_value ? 'true' : 'false';
+                    } else {
+                                            $show_attr_value = "(bool)$attr_value";
+                    }
                     $output .= "{$section_props}['show'] = $show_attr_value;\n";
                     break;
 
@@ -1105,24 +1123,28 @@ 
             }
         }
 
-        if (!isset($attrs['show']))
-            $output .= "{$section_props}['show'] = true;\n";
+        if (!isset($attrs['show'])) {
+                    $output .= "{$section_props}['show'] = true;\n";
+        }
 
-        if (!isset($attrs['loop']))
-            $output .= "{$section_props}['loop'] = 1;\n";
+        if (!isset($attrs['loop'])) {
+                    $output .= "{$section_props}['loop'] = 1;\n";
+        }
 
-        if (!isset($attrs['max']))
-            $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
-        else
-            $output .= "if ({$section_props}['max'] < 0)\n" .
+        if (!isset($attrs['max'])) {
+                    $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
+        } else {
+                    $output .= "if ({$section_props}['max'] < 0)\n" .
                        "    {$section_props}['max'] = {$section_props}['loop'];\n";
+        }
 
-        if (!isset($attrs['step']))
-            $output .= "{$section_props}['step'] = 1;\n";
+        if (!isset($attrs['step'])) {
+                    $output .= "{$section_props}['step'] = 1;\n";
+        }
 
-        if (!isset($attrs['start']))
-            $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
-        else {
+        if (!isset($attrs['start'])) {
+                    $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
+        } else {
             $output .= "if ({$section_props}['start'] < 0)\n" .
                        "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" .
                        "else\n" .
@@ -1377,8 +1399,9 @@ 
                                 $is_arg_start--;
                             } 
                         } 
-                    } else
-                        $is_arg_start = $i-1;
+                    } else {
+                                            $is_arg_start = $i-1;
+                    }
                     /* Construct the argument for 'is' expression, so it knows
                        what to operate on. */
                     $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
@@ -1420,10 +1443,11 @@ 
             }
         }
 
-        if ($elseif)
-            return '<?php elseif ('.implode(' ', $tokens).'): ?>';
-        else
-            return '<?php if ('.implode(' ', $tokens).'): ?>';
+        if ($elseif) {
+                    return '<?php elseif ('.implode(' ', $tokens).'): ?>';
+        } else {
+                    return '<?php if ('.implode(' ', $tokens).'): ?>';
+        }
     }
 
 
@@ -1447,10 +1471,12 @@ 
         }
 
         foreach ($attrs as $arg_name => $arg_value) {
-            if (is_bool($arg_value))
-                $arg_value = $arg_value ? 'true' : 'false';
-            if (is_null($arg_value))
-                $arg_value = 'null';
+            if (is_bool($arg_value)) {
+                            $arg_value = $arg_value ? 'true' : 'false';
+            }
+            if (is_null($arg_value)) {
+                            $arg_value = 'null';
+            }
             if ($_cache_attrs && in_array($arg_name, $_cache_attrs)) {
                 $arg_list[] = "'$arg_name' => (\$this->_cache_including) ? \$_cache_attrs['$arg_name'] : (\$_cache_attrs['$arg_name']=$arg_value)";
             } else {
@@ -1475,8 +1501,9 @@ 
         if (($first_token = array_shift($tokens)) == 'not') {
             $negate_expr = true;
             $expr_type = array_shift($tokens);
-        } else
-            $expr_type = $first_token;
+        } else {
+                    $expr_type = $first_token;
+        }
 
         switch ($expr_type) {
             case 'even':
@@ -1484,8 +1511,9 @@ 
                     $expr_end++;
                     $expr_arg = $tokens[$expr_end++];
                     $expr = "!(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
-                } else
-                    $expr = "!(1 & $is_arg)";
+                } else {
+                                    $expr = "!(1 & $is_arg)";
+                }
                 break;
 
             case 'odd':
@@ -1493,8 +1521,9 @@ 
                     $expr_end++;
                     $expr_arg = $tokens[$expr_end++];
                     $expr = "(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
-                } else
-                    $expr = "(1 & $is_arg)";
+                } else {
+                                    $expr = "(1 & $is_arg)";
+                }
                 break;
 
             case 'div':
@@ -1553,16 +1582,18 @@ 
                     if (preg_match('~^\w+$~', $token)) {
                         $attr_name = $token;
                         $state = 1;
-                    } else
-                        $this->_syntax_error("invalid attribute name: '$token'", E_USER_ERROR, __FILE__, __LINE__);
+                    } else {
+                                            $this->_syntax_error("invalid attribute name: '$token'", E_USER_ERROR, __FILE__, __LINE__);
+                    }
                     break;
 
                 case 1:
                     /* If the token is '=', then we go to state 2. */
                     if ($token == '=') {
                         $state = 2;
-                    } else
-                        $this->_syntax_error("expecting '=' after attribute name '$last_token'", E_USER_ERROR, __FILE__, __LINE__);
+                    } else {
+                                            $this->_syntax_error("expecting '=' after attribute name '$last_token'", E_USER_ERROR, __FILE__, __LINE__);
+                    }
                     break;
 
                 case 2:
@@ -1586,8 +1617,9 @@ 
 
                         $attrs[$attr_name] = $token;
                         $state = 0;
-                    } else
-                        $this->_syntax_error("'=' cannot be an attribute value", E_USER_ERROR, __FILE__, __LINE__);
+                    } else {
+                                            $this->_syntax_error("'=' cannot be an attribute value", E_USER_ERROR, __FILE__, __LINE__);
+                    }
                     break;
             }
             $last_token = $token;
@@ -1649,32 +1681,27 @@ 
                     $this->_parse_modifiers($return, $match[2]);
                 }
                 return $return;
-            }
-        elseif(preg_match('~^' . $this->_num_const_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
+            } elseif(preg_match('~^' . $this->_num_const_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
                 // numerical constant
                 preg_match('~^(' . $this->_num_const_regexp . ')('. $this->_mod_regexp . '*)$~', $val, $match);
                 if($match[2] != '') {
                     $this->_parse_modifiers($match[1], $match[2]);
                     return $match[1];
                 }
-            }
-        elseif(preg_match('~^' . $this->_si_qstr_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
+            } elseif(preg_match('~^' . $this->_si_qstr_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
                 // single quoted text
                 preg_match('~^(' . $this->_si_qstr_regexp . ')('. $this->_mod_regexp . '*)$~', $val, $match);
                 if($match[2] != '') {
                     $this->_parse_modifiers($match[1], $match[2]);
                     return $match[1];
                 }
-            }
-        elseif(preg_match('~^' . $this->_cvar_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
+            } elseif(preg_match('~^' . $this->_cvar_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
                 // config var
                 return $this->_parse_conf_var($val);
-            }
-        elseif(preg_match('~^' . $this->_svar_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
+            } elseif(preg_match('~^' . $this->_svar_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
                 // section var
                 return $this->_parse_section_prop($val);
-            }
-        elseif(!in_array($val, $this->_permitted_tokens) && !is_numeric($val)) {
+            } elseif(!in_array($val, $this->_permitted_tokens) && !is_numeric($val)) {
             // literal string
             return $this->_expand_quoted_text('"' . strtr($val, array('\\' => '\\\\', '"' => '\\"')) .'"');
         }
@@ -1737,8 +1764,9 @@ 
                         // just output the math operator to php
                         $_output .= $_math_var;
 
-                        if(empty($_first_var))
-                            $_first_var = $_complete_var;
+                        if(empty($_first_var)) {
+                                                    $_first_var = $_complete_var;
+                        }
 
                         $_complete_var = "";
                     } else {
@@ -1747,8 +1775,9 @@ 
                 }
             }
             if($_has_math) {
-                if(!empty($_complete_var) || is_numeric($_complete_var))
-                    $_output .= $this->_parse_var($_complete_var);
+                if(!empty($_complete_var) || is_numeric($_complete_var)) {
+                                    $_output .= $this->_parse_var($_complete_var);
+                }
 
                 // get the modifiers working (only the last var from math + modifier is left)
                 $var_expr = $_complete_var;
@@ -1756,10 +1785,11 @@ 
         }
 
         // prevent cutting of first digit in the number (we _definitly_ got a number if the first char is a digit)
-        if(is_numeric(substr($var_expr, 0, 1)))
-            $_var_ref = $var_expr;
-        else
-            $_var_ref = substr($var_expr, 1);
+        if(is_numeric(substr($var_expr, 0, 1))) {
+                    $_var_ref = $var_expr;
+        } else {
+                    $_var_ref = substr($var_expr, 1);
+        }
         
         if(!$_has_math) {
             
@@ -1812,10 +1842,11 @@ 
                         $_output .= "[\$this->_sections['$_var_section']['$_var_section_prop']]";
                     }
                 } else if (substr($_index, 0, 1) == '.') {
-                    if (substr($_index, 1, 1) == '$')
-                        $_output .= "[\$this->_tpl_vars['" . substr($_index, 2) . "']]";
-                    else
-                        $_output .= "['" . substr($_index, 1) . "']";
+                    if (substr($_index, 1, 1) == '$') {
+                                            $_output .= "[\$this->_tpl_vars['" . substr($_index, 2) . "']]";
+                    } else {
+                                            $_output .= "['" . substr($_index, 1) . "']";
+                    }
                 } else if (substr($_index,0,2) == '->') {
                     if(substr($_index,2,2) == '__') {
                         $this->_syntax_error('call to internal object members is not allowed', E_USER_ERROR, __FILE__, __LINE__);
@@ -1956,10 +1987,11 @@ 
                     $_modifier_args[0] = '@' . $_modifier_args[0];
                 }
             }
-            if (count($_modifier_args) > 0)
-                $_modifier_args = ', '.implode(', ', $_modifier_args);
-            else
-                $_modifier_args = '';
+            if (count($_modifier_args) > 0) {
+                            $_modifier_args = ', '.implode(', ', $_modifier_args);
+            } else {
+                            $_modifier_args = '';
+            }
 
             if ($_map_array) {
                 $output = "((is_array(\$_tmp=$output)) ? \$this->_run_mod_handler('$_modifier_name', true, \$_tmp$_modifier_args) : " . $this->_compile_plugin_call('modifier', $_modifier_name) . "(\$_tmp$_modifier_args))";
@@ -2273,8 +2305,12 @@ 
     function _push_cacheable_state($type, $name) {
         $_cacheable = !isset($this->_plugins[$type][$name]) || $this->_plugins[$type][$name][4];
         if ($_cacheable
-            || 0<$this->_cacheable_state++) return '';
-        if (!isset($this->_cache_serial)) $this->_cache_serial = md5(uniqid('Smarty'));
+            || 0<$this->_cacheable_state++) {
+            return '';
+        }
+        if (!isset($this->_cache_serial)) {
+            $this->_cache_serial = md5(uniqid('Smarty'));
+        }
         $_ret = 'if ($this->caching && !$this->_cache_including): echo \'{nocache:'
             . $this->_cache_serial . '#' . $this->_nocache_count
             . '}\'; endif;';
@@ -2291,7 +2327,9 @@ 
     function _pop_cacheable_state($type, $name) {
         $_cacheable = !isset($this->_plugins[$type][$name]) || $this->_plugins[$type][$name][4];
         if ($_cacheable
-            || --$this->_cacheable_state>0) return '';
+            || --$this->_cacheable_state>0) {
+            return '';
+        }
         return 'if ($this->caching && !$this->_cache_including): echo \'{/nocache:'
             . $this->_cache_serial . '#' . ($this->_nocache_count++)
             . '}\'; endif;';
@@ -2357,11 +2395,13 @@ 
  */
 function _smarty_sort_length($a, $b)
 {
-    if($a == $b)
-        return 0;
+    if($a == $b) {
+            return 0;
+    }
 
-    if(strlen($a) == strlen($b))
-        return ($a > $b) ? -1 : 1;
+    if(strlen($a) == strlen($b)) {
+            return ($a > $b) ? -1 : 1;
+    }
 
     return (strlen($a) > strlen($b)) ? -1 : 1;
 }

data/Relationships/One2OneBeanRelationship.php

Braces +9 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -72,11 +74,13 @@ 
     protected function updateLinks($lhs, $lhsLinkName, $rhs, $rhsLinkName)
     {
         //RHS and LHS only ever have one bean
-        if (isset($lhs->$lhsLinkName))
-            $lhs->$lhsLinkName->beans = array($rhs->id => $rhs);
+        if (isset($lhs->$lhsLinkName)) {
+                    $lhs->$lhsLinkName->beans = array($rhs->id => $rhs);
+        }
 
-        if (isset($rhs->$rhsLinkName))
-            $rhs->$rhsLinkName->beans = array($lhs->id => $lhs);
+        if (isset($rhs->$rhsLinkName)) {
+                    $rhs->$rhsLinkName->beans = array($lhs->id => $lhs);
+        }
     }
 
     public function getJoin($link, $params = array(), $return_array = false)