adamjakab / SuiteCRM

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/SugarBean.php

Braces +338 added lines, -325 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.
@@ -315,8 +317,9 @@ 
         global  $dictionary, $current_user;
         static $loaded_defs = array();
         $this->db = DBManagerFactory::getInstance();
-        if (empty($this->module_name))
-            $this->module_name = $this->module_dir;
+        if (empty($this->module_name)) {
+                    $this->module_name = $this->module_dir;
+        }
         if((false == $this->disable_vardefs && empty($loaded_defs[$this->object_name])) || !empty($GLOBALS['reload_vardefs']))
         {
             VardefManager::loadVardef($this->module_dir, $this->object_name);
@@ -339,12 +342,15 @@ 
                 $this->setupCustomFields($this->module_dir);
             }
             //load up field_arrays from CacheHandler;
-            if(empty($this->list_fields))
-                $this->list_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'list_fields');
-            if(empty($this->column_fields))
-                $this->column_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'column_fields');
-            if(empty($this->required_fields))
-                $this->required_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'required_fields');
+            if(empty($this->list_fields)) {
+                            $this->list_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'list_fields');
+            }
+            if(empty($this->column_fields)) {
+                            $this->column_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'column_fields');
+            }
+            if(empty($this->required_fields)) {
+                            $this->required_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'required_fields');
+            }
 
             if(isset($GLOBALS['dictionary'][$this->object_name]) && !$this->disable_vardefs)
             {
@@ -361,8 +367,7 @@ 
             $loaded_defs[$this->object_name]['required_fields'] =& $this->required_fields;
             $loaded_defs[$this->object_name]['field_name_map'] =& $this->field_name_map;
             $loaded_defs[$this->object_name]['field_defs'] =& $this->field_defs;
-        }
-        else
+        } else
         {
             $this->column_fields =& $loaded_defs[$this->object_name]['column_fields'] ;
             $this->list_fields =& $loaded_defs[$this->object_name]['list_fields'];
@@ -400,8 +405,9 @@ 
      */
     function getObjectName()
     {
-        if ($this->object_name)
-            return $this->object_name;
+        if ($this->object_name) {
+                    return $this->object_name;
+        }
 
         // This is a quick way out. The generated metadata files have the table name
         // as the key. The correct way to do this is to override this function
@@ -459,8 +465,7 @@ 
         if (isset($dictionary[$this->getObjectName()]['audited']))
         {
             return $dictionary[$this->getObjectName()]['audited'];
-        }
-        else
+        } else
         {
             return false;
         }
@@ -598,8 +603,9 @@ 
      */
     function getFieldDefinition($name)
     {
-        if ( !isset($this->field_defs[$name]) )
-            return false;
+        if ( !isset($this->field_defs[$name]) ) {
+                    return false;
+        }
 
         return $this->field_defs[$name];
     }
@@ -657,8 +663,9 @@ 
      */
     public function unPopulateDefaultValues()
     {
-        if ( !is_array($this->field_defs) )
-            return;
+        if ( !is_array($this->field_defs) ) {
+                    return;
+        }
 
         foreach ($this->field_defs as $field => $value) {
 		    if( !empty($this->$field)
@@ -698,8 +705,9 @@ 
     }
 
     function populateDefaultValues($force=false){
-        if ( !is_array($this->field_defs) )
-            return;
+        if ( !is_array($this->field_defs) ) {
+                    return;
+        }
         foreach($this->field_defs as $field=>$value){
             if((isset($value['default']) || !empty($value['display_default'])) && ($force || empty($this->$field))){
                 $type = $value['type'];
@@ -717,10 +725,11 @@ 
                         }
                         break;
                     case 'multienum':
-                        if(empty($value['default']) && !empty($value['display_default']))
-                            $this->$field = $value['display_default'];
-                        else
-                            $this->$field = $value['default'];
+                        if(empty($value['default']) && !empty($value['display_default'])) {
+                                                    $this->$field = $value['display_default'];
+                        } else {
+                                                    $this->$field = $value['default'];
+                        }
                         break;
                     case 'bool':
                     	if(isset($this->$field)){
@@ -770,8 +779,7 @@ 
         {
             $GLOBALS['log']->fatal("removeRelationshipMeta: Metadata for table ".$tablename. " does not exist");
             display_notice("meta data absent for table ".$tablename." keyed to $key ");
-        }
-        else
+        } else
         {
             if (isset($dictionary[$key]['relationships']))
             {
@@ -821,8 +829,7 @@ 
             if($iscustom)
             {
                 $filename='custom/modules/' . $module_dir . '/Ext/Vardefs/vardefs.ext.php';
-            }
-            else
+            } else
             {
                 if ($key == 'User')
                 {
@@ -830,8 +837,7 @@ 
                     // this must be done because the Employees/vardefs.php does an include_once on
                     // Users/vardefs.php
                     $filename='modules/Users/vardefs.php';
-                }
-                else
+                } else
                 {
                     $filename='modules/'. $module_dir . '/vardefs.php';
                 }
@@ -845,8 +851,7 @@ 
                 {
                     $dictionary = $GLOBALS['dictionary'];
                 }
-            }
-            else
+            } else
             {
                 $GLOBALS['log']->debug("createRelationshipMeta: no metadata file found" . $filename);
                 return;
@@ -857,8 +862,7 @@ 
         {
             $GLOBALS['log']->fatal("createRelationshipMeta: Metadata for table ".$tablename. " does not exist");
             display_notice("meta data absent for table ".$tablename." keyed to $key ");
-        }
-        else
+        } else
         {
             if (isset($dictionary[$key]['relationships']))
             {
@@ -884,8 +888,7 @@ 
                     if (Relationship::exists($rel_name,$db))
                     {
                         $GLOBALS['log']->debug('Skipping, reltionship already exists '.$rel_name);
-                    }
-                    else
+                    } else
                     {
                         $seed = BeanFactory::getBean("Relationships");
                         $keys = array_keys($seed->field_defs);
@@ -895,12 +898,10 @@ 
                             if ($key == "id")
                             {
                                 $toInsert[$key] = create_guid();
-                            }
-                            else if ($key == "relationship_name")
+                            } else if ($key == "relationship_name")
                             {
                                 $toInsert[$key] = $rel_name;
-                            }
-                            else if (isset($rel_def[$key]))
+                            } else if (isset($rel_def[$key]))
                             {
                                 $toInsert[$key] = $rel_def[$key];
                             }
@@ -916,8 +917,7 @@ 
                         $db->query($insert_string, true);
                     }
                 }
-            }
-            else
+            } else
             {
                 //todo
                 //log informational message stating no relationships meta was set for this bean.
@@ -986,10 +986,11 @@ 
             //if rel_name is provided, search the fieldef array keys by name.
             if (isset($fieldDefs[$rel_name]['type']) && $fieldDefs[$rel_name]['type'] == 'link')
             {
-                if ($class == "Link2")
-                    $this->$rel_name = new $class($rel_name, $this);
-                else
-                    $this->$rel_name = new $class($fieldDefs[$rel_name]['relationship'], $this, $fieldDefs[$rel_name]);
+                if ($class == "Link2") {
+                                    $this->$rel_name = new $class($rel_name, $this);
+                } else {
+                                    $this->$rel_name = new $class($fieldDefs[$rel_name]['relationship'], $this, $fieldDefs[$rel_name]);
+                }
 
                 if (empty($this->$rel_name) ||
                         (method_exists($this->$rel_name, "loadedSuccesfully") && !$this->$rel_name->loadedSuccesfully()))
@@ -1048,8 +1049,9 @@ 
     function get_linked_beans($field_name,$bean_name = '', $order_by = '', $begin_index = 0, $end_index = -1, $deleted=0, $optional_where="")
     {
         //if bean_name is Case then use aCase
-        if($bean_name=="Case")
-            $bean_name = "aCase";
+        if($bean_name=="Case") {
+                    $bean_name = "aCase";
+        }
 
         if($this->load_relationship($field_name)) {
             if ($this->$field_name instanceof Link) {
@@ -1057,19 +1059,20 @@ 
                 return array_values($this->$field_name->getBeans(new $bean_name(), $order_by, $begin_index, $end_index, $deleted, $optional_where));
             } else {
                 // Link2 style
-                if ($end_index != -1 || !empty($deleted) || !empty($optional_where) || !empty($order_by))
-                    return array_values($this->$field_name->getBeans(array(
+                if ($end_index != -1 || !empty($deleted) || !empty($optional_where) || !empty($order_by)) {
+                                    return array_values($this->$field_name->getBeans(array(
                         'where' => $optional_where,
                         'deleted' => $deleted,
                         'limit' => ($end_index - $begin_index),
                         'order_by' => $order_by
                     )));
-                else
-                    return array_values($this->$field_name->getBeans());
+                } else {
+                                    return array_values($this->$field_name->getBeans());
+                }
             }
+        } else {
+                    return array();
         }
-        else
-            return array();
     }
 
     /**
@@ -1131,8 +1134,7 @@ 
                            || is_bool($value_array['importable']) && $value_array['importable'] == true)) {
                         $importableFields[$key]=$value_array;
                     }
-                }
-                else {
+                } else {
 
                     //Expose the cooresponding id field of a relate field if it is only defined as a link so that users can relate records by id during import
                     if( isset($value_array['type']) && ($value_array['type'] == 'relate') && isset($value_array['id_name']) )
@@ -1217,8 +1219,7 @@ 
             if ($this->load_relationship($name))
             {
                 $this->$name->delete($id);
-            }
-            else
+            } else
             {
                 $GLOBALS['log']->fatal("error loading relationship $name");
             }
@@ -1239,8 +1240,7 @@ 
         {
             $GLOBALS['log']->fatal("create_tables: Metadata for table ".$this->table_name. " does not exist");
             display_notice("meta data absent for table ".$this->table_name." keyed to $key ");
-        }
-        else
+        } else
         {
             if(!$this->db->tableExists($this->table_name))
             {
@@ -1248,12 +1248,11 @@ 
                     if($this->bean_implements('ACL')){
                         if(!empty($this->acltype)){
                             ACLAction::addActions($this->getACLCategory(), $this->acltype);
-                        }else{
+                        } else{
                             ACLAction::addActions($this->getACLCategory());
                         }
                     }
-            }
-            else
+            } else
             {
                 echo "Table already exists : $this->table_name<br>";
             }
@@ -1281,10 +1280,13 @@ 
             $GLOBALS['log']->fatal("drop_tables: Metadata for table ".$this->table_name. " does not exist");
             echo "meta data absent for table ".$this->table_name."<br>\n";
         } else {
-            if(empty($this->table_name))return;
-            if ($this->db->tableExists($this->table_name))
-
+            if(empty($this->table_name)) {
+                return;
+            }
+            if ($this->db->tableExists($this->table_name)) {
+            
                 $this->db->dropTable($this);
+            }
             if ($this->db->tableExists($this->table_name. '_cstm'))
             {
                 $this->db->dropTableName($this->table_name. '_cstm');
@@ -1322,8 +1324,9 @@ 
             if (isset($def['type'])) {
                 $type=$def['type'];
             }
-            if(isset($def['dbType']))
-                $type .= $def['dbType'];
+            if(isset($def['dbType'])) {
+                            $type .= $def['dbType'];
+            }
 
             if($def['type'] == 'html' || $def['type'] == 'longhtml') {
                 $this->$key = SugarCleaner::cleanHtml($this->$key, true);
@@ -1373,7 +1376,9 @@ 
 
         $this->_checkOptimisticLocking($action, $isUpdate);
 
-        if(!empty($this->modified_by_name)) $this->old_modified_by_name = $this->modified_by_name;
+        if(!empty($this->modified_by_name)) {
+            $this->old_modified_by_name = $this->modified_by_name;
+        }
         if($this->update_modified_by)
         {
             $this->modified_user_id = 1;
@@ -1384,8 +1389,9 @@ 
                 $this->modified_by_name = $current_user->user_name;
             }
         }
-        if ($this->deleted != 1)
-            $this->deleted = 0;
+        if ($this->deleted != 1) {
+                    $this->deleted = 0;
+        }
         if(!$isUpdate)
         {
             if (empty($this->date_entered))
@@ -1607,7 +1613,7 @@ 
 
                 if(!$notify_mail->Send()) {
                     $GLOBALS['log']->fatal("Notifications: error sending e-mail (method: {$notify_mail->Mailer}), (error: {$notify_mail->ErrorInfo})");
-                }else{
+                } else{
                     $GLOBALS['log']->info("Notifications: e-mail successfully sent");
                 }
             }
@@ -1646,8 +1652,7 @@ 
         $xtpl = new XTemplate(get_notify_template_file($current_language));
         if($this->module_dir == "Cases") {
             $template_name = "Case"; //we should use Case, you can refer to the en_us.notify_template.html.
-        }
-        else {
+        } else {
             $template_name = $beanList[$this->module_dir]; //bug 20637, in workflow this->object_name = strange chars.
         }
 
@@ -1745,8 +1750,7 @@ 
             // if we should use relation data from properties (for REQUEST-independent calls)
             $rel_id = isset($this->new_rel_id) ? $this->new_rel_id : '';
             $rel_link = isset($this->new_rel_relname) ? $this->new_rel_relname : '';
-        }
-        else
+        } else
         {
             // if we should use relation data from REQUEST
             $rel_id = isset($_REQUEST['relate_id']) ? $_REQUEST['relate_id'] : '';
@@ -1765,8 +1769,7 @@ 
             if ($isRelationshipLoaded && !empty($this->$rel_link) && $this->$rel_link->getRelationshipObject() && $this->$rel_link->getRelationshipObject()->getLHSModule() == $this->$rel_link->getRelationshipObject()->getRHSModule() )
             {
                 $new_rel_link = $this->$rel_link->getRelationshipObject()->getLHSLink();
-            }
-            else
+            } else
             {
                 //Try to find the link in this bean based on the relationship
                 foreach ($this->field_defs as $key => $def)
@@ -1800,7 +1803,9 @@ 
             foreach ($this->relationship_fields as $id => $rel_name)
             {
 
-                if (in_array($id, $exclude)) continue;
+                if (in_array($id, $exclude)) {
+                    continue;
+                }
 
                 if(!empty($this->$id))
                 {
@@ -1853,8 +1858,10 @@ 
         foreach ($this->field_defs as $def)
         {
             if ($def ['type'] == 'relate' && isset ($def ['id_name']) && isset ($def ['link']) && isset ($def['save'])) {
-                if (in_array($def['id_name'], $exclude) || in_array($def['id_name'], $this->relationship_fields))
-                    continue; // continue to honor the exclude array and exclude any relationships that will be handled by the relationship_fields mechanism
+                if (in_array($def['id_name'], $exclude) || in_array($def['id_name'], $this->relationship_fields)) {
+                                    continue;
+                }
+                // continue to honor the exclude array and exclude any relationships that will be handled by the relationship_fields mechanism
 
                 $linkField = $def ['link'];
                 if (isset($this->field_defs[$linkField])) {
@@ -1911,12 +1918,14 @@ 
         {
             if (!empty($def['type']) && $def['type'] == "parent")
             {
-                if (empty($def['type_name']) || empty($def['id_name']))
-                    continue;
+                if (empty($def['type_name']) || empty($def['id_name'])) {
+                                    continue;
+                }
                 $typeField = $def['type_name'];
                 $idField = $def['id_name'];
-                if (in_array($idField, $exclude))
-                    continue;
+                if (in_array($idField, $exclude)) {
+                                    continue;
+                }
                 //Determine if the parent field has changed.
                 if (
                     //First check if the fetched row parent existed and now we no longer have one
@@ -2039,8 +2048,9 @@ 
 	{
 		global $disable_date_format;
 		global $timedate;
-		if (empty($timedate))
-			$timedate=TimeDate::getInstance();
+		if (empty($timedate)) {
+					$timedate=TimeDate::getInstance();
+		}
 
 		if(empty($this->field_defs))
 		{
@@ -2052,15 +2062,16 @@ 
 			if(!isset($this->processed_dates_times[$field]))
 			{
 				$this->processed_dates_times[$field] = '1';
-				if(empty($this->$field)) continue;
+				if(empty($this->$field)) {
+				    continue;
+				}
 				if($field == 'date_modified' || $field == 'date_entered')
 				{
 					$this->$field = $this->db->fromConvert($this->$field, 'datetime');
 					if(empty($disable_date_format)) {
 						$this->$field = $timedate->to_display_date_time($this->$field);
 					}
-				}
-				elseif(isset($this->field_name_map[$field]['type']))
+				} elseif(isset($this->field_name_map[$field]['type']))
 				{
 					$type = $this->field_name_map[$field]['type'];
 
@@ -2086,8 +2097,7 @@ 
 									$this->$rel_field = $timedate->to_display_time($mergetime);
 								}
 							}
-						}
-						else
+						} else
 						{
 							if(empty($disable_date_format)) {
 								$this->$field = $timedate->to_display_date($this->$field, false);
@@ -2098,8 +2108,7 @@ 
 						if($this->$field == '0000-00-00 00:00:00')
 						{
 							$this->$field = '';
-						}
-						else
+						} else
 						{
 							if(empty($disable_date_format)) {
 								$this->$field = $timedate->to_display_date_time($this->$field, true, true);
@@ -2188,7 +2197,9 @@ 
             switch($def['type']) {
                 case 'datetime':
                 case 'datetimecombo':
-                    if(empty($this->$field)) break;
+                    if(empty($this->$field)) {
+                        break;
+                    }
                     if ($this->$field == 'NULL') {
                     	$this->$field = '';
                     	break;
@@ -2200,7 +2211,9 @@ 
                     }
                     break;
                 case 'date':
-                    if(empty($this->$field)) break;
+                    if(empty($this->$field)) {
+                        break;
+                    }
                     if ($this->$field == 'NULL') {
                     	$this->$field = '';
                     	break;
@@ -2212,7 +2225,9 @@ 
                     }
                     break;
                 case 'time':
-                    if(empty($this->$field)) break;
+                    if(empty($this->$field)) {
+                        break;
+                    }
                     if ($this->$field == 'NULL') {
                     	$this->$field = '';
                     	break;
@@ -2301,7 +2316,9 @@ 
 
         $query .= $custom_join['join'];
         $query .= " WHERE $this->table_name.id = ".$this->db->quoted($id);
-        if ($deleted) $query .= " AND $this->table_name.deleted=0";
+        if ($deleted) {
+            $query .= " AND $this->table_name.deleted=0";
+        }
         $GLOBALS['log']->debug("Retrieve $this->object_name : ".$query);
         $result = $this->db->limitQuery($query,0,1,true, "Retrieving record by id $this->table_name:$id found ");
         if(empty($result))
@@ -2358,21 +2375,23 @@ 
             if ($def [ 'type' ] == 'relate' && isset ( $def [ 'id_name'] ) && isset ( $def [ 'link'] ) && isset ( $def[ 'save' ])) {
                 if (isset($this->$key)) {
                     $this->rel_fields_before_value[$key]=$this->$key;
-                    if (isset($this->$def [ 'id_name']))
-                        $this->rel_fields_before_value[$def [ 'id_name']]=$this->$def [ 'id_name'];
+                    if (isset($this->$def [ 'id_name'])) {
+                                            $this->rel_fields_before_value[$def [ 'id_name']]=$this->$def [ 'id_name'];
+                    }
+                } else {
+                                    $this->rel_fields_before_value[$key]=null;
                 }
-                else
-                    $this->rel_fields_before_value[$key]=null;
            }
         }
         if (isset($this->relationship_fields) && is_array($this->relationship_fields))
         {
             foreach ($this->relationship_fields as $rel_id=>$rel_name)
             {
-                if (isset($this->$rel_id))
-                    $this->rel_fields_before_value[$rel_id]=$this->$rel_id;
-                else
-                    $this->rel_fields_before_value[$rel_id]=null;
+                if (isset($this->$rel_id)) {
+                                    $this->rel_fields_before_value[$rel_id]=$this->$rel_id;
+                } else {
+                                    $this->rel_fields_before_value[$rel_id]=null;
+                }
             }
         }
 
@@ -2398,8 +2417,9 @@ 
         $nullvalue='';
         foreach($this->field_defs as $field=>$field_value)
         {
-            if($field == 'user_preferences' && $this->module_dir == 'Users')
-                continue;
+            if($field == 'user_preferences' && $this->module_dir == 'Users') {
+                            continue;
+            }
             if(isset($row[$field]))
             {
                 $this->$field = $row[$field];
@@ -2407,8 +2427,7 @@ 
                 if(!empty($row[$owner])){
                     $this->$owner = $row[$owner];
                 }
-            }
-            else
+            } else
             {
                 $this->$field = $nullvalue;
             }
@@ -2452,10 +2471,11 @@ 
         //handle distinct clause
         $star = '*';
         if(substr_count(strtolower($query), 'distinct')){
-            if (!empty($this->seed) && !empty($this->seed->table_name ))
-                $star = 'DISTINCT ' . $this->seed->table_name . '.id';
-            else
-                $star = 'DISTINCT ' . $this->table_name . '.id';
+            if (!empty($this->seed) && !empty($this->seed->table_name )) {
+                            $star = 'DISTINCT ' . $this->seed->table_name . '.id';
+            } else {
+                            $star = 'DISTINCT ' . $this->table_name . '.id';
+            }
 
         }
 
@@ -2476,10 +2496,11 @@ 
                 preg_match($pattern, $union_query, $matches);
                 if (!empty($matches)) {
                     if (stristr($matches[0], "distinct")) {
-                        if (!empty($this->seed) && !empty($this->seed->table_name ))
-                            $star = 'DISTINCT ' . $this->seed->table_name . '.id';
-                        else
-                            $star = 'DISTINCT ' . $this->table_name . '.id';
+                        if (!empty($this->seed) && !empty($this->seed->table_name )) {
+                                                    $star = 'DISTINCT ' . $this->seed->table_name . '.id';
+                        } else {
+                                                    $star = 'DISTINCT ' . $this->table_name . '.id';
+                        }
                     }
                 } // if
                 $replacement = 'SELECT count(' . $star . ') c FROM ';
@@ -2529,7 +2550,7 @@ 
             if(!empty($owner_where)){
                 if(empty($where)){
                     $where = $owner_where;
-                }else{
+                } else{
                     $where .= ' AND '.  $owner_where;
                 }
             }
@@ -2550,14 +2571,14 @@ 
     */
     public function process_order_by($order_by, $submodule = null, $suppress_table_name = false)
     {
-        if (empty($order_by))
-            return $order_by;
+        if (empty($order_by)) {
+                    return $order_by;
+        }
         //submodule is empty,this is for list object in focus
         if (empty($submodule))
         {
             $bean_queried = $this;
-        }
-        else
+        } else
         {
             //submodule is set, so this is for subpanel, use submodule
             $bean_queried = $submodule;
@@ -2652,8 +2673,7 @@ 
             if(empty($where))
             {
                 $where = $owner_where;
-            }
-            else
+            } else
             {
                 $where .= ' AND '.  $owner_where;
             }
@@ -2739,8 +2759,7 @@ 
             if(empty($entire_where))
             {
                 $entire_where = ' WHERE ' . $where;
-            }
-            else
+            } else
             {
                 $entire_where .= ' AND ' . $where;
             }
@@ -2780,16 +2799,15 @@ 
                             }
                             //call function from required file
                             $query_array = $shortcut_function_name($parameters);
-                        }else{
+                        } else{
                             //call function from parent bean
                             $query_array = $parentbean->$shortcut_function_name($parameters);
                         }
-                    }
-                    else
+                    } else
                     {
                         $query_array = $parentbean->$shortcut_function_name();
                     }
-                }  else {
+                } else {
                     $related_field_name = $this_subpanel->get_data_source_name();
                     if (!$parentbean->load_relationship($related_field_name)){
                         unset ($parentbean->$related_field_name);
@@ -2805,8 +2823,7 @@ 
                     if(empty($where_definition))
                     {
                         $where_definition = $table_where;
-                    }
-                    else
+                    } else
                     {
                         $where_definition .= ' AND ' . $table_where;
                     }
@@ -2897,8 +2914,7 @@ 
         {
             $subpanel_def->load_sub_subpanels();
             $subpanel_list=$subpanel_def->sub_subpanels;
-        }
-        else
+        } else
         {
             $subpanel_list[]=$subpanel_def;
         }
@@ -2925,7 +2941,7 @@ 
                         }
                         //call function from required file
                         $tmp_final_query =  $shortcut_function_name($parameters);
-                    }else{
+                    } else{
                         //call function from parent bean
                         $tmp_final_query =  $parentbean->$shortcut_function_name($parameters);
                     }
@@ -2953,8 +2969,9 @@ 
                 $query_fields = $GLOBALS['db']->getSelectFieldsFromQuery($subquery['select']);
                 foreach($query_fields as $field => $select)
                 {
-                    if (!in_array($field, $all_fields))
-                        $all_fields[] = $field;
+                    if (!in_array($field, $all_fields)) {
+                                            $all_fields[] = $field;
+                    }
                 }
                 $subqueries[$i]['query_fields'] = $query_fields;
             }
@@ -2968,8 +2985,7 @@ 
                     if (!isset($subquery['query_fields'][$field]))
                     {
                         $subquery['select'] .= " NULL $field,";
-                    }
-                    else
+                    } else
                     {
                         $subquery['select'] .= " {$subquery['query_fields'][$field]},";
                     }
@@ -2991,12 +3007,10 @@ 
                 if (!empty($subquery['params']['distinct']) && !empty($subpanel_def->table_name))
                 {
                     $query_rows = "( SELECT count(DISTINCT ". $subpanel_def->table_name . ".id)".  $subquery['from_min'].$query_array['join']. $subquery['where'].' )';
-                }
-                elseif ($select_position !== false && $distinct_position!= false)
+                } elseif ($select_position !== false && $distinct_position!= false)
                 {
                     $query_rows = "( ".substr_replace($query_array['select'],"SELECT count(",$select_position,6). ")" .  $subquery['from_min'].$query_array['join']. $subquery['where'].' )';
-                }
-                else
+                } else
                 {
                     //resort to default behavior.
                     $query_rows = "( SELECT count(*)".  $subquery['from_min'].$query_array['join']. $subquery['where'].' )';
@@ -3010,8 +3024,7 @@ 
                         if (empty($subquery['where']))
                         {
                             $subquerystring.=" WHERE " .$subquery['secondary_where'];
-                        }
-                        else
+                        } else
                         {
                             $subquerystring.=" AND " .$subquery['secondary_where'];
                         }
@@ -3054,8 +3067,7 @@ 
             {
                 $submodule->assign_display_fields($submodule->module_dir);
                 $response['list'] = array($submodule);
-            }
-            else
+            } else
         {
                 $response['list'] = array();
             }
@@ -3120,8 +3132,7 @@ 
             if(empty($where))
             {
                 $where = $owner_where;
-            }
-            else
+            } else
             {
                 $where .= ' AND '.  $owner_where;
             }
@@ -3168,8 +3179,7 @@ 
         if(empty($filter))
         {
             $ret_array['select'] = " SELECT $distinct $this->table_name.* ";
-        }
-        else
+        } else
         {
             $ret_array['select'] = " SELECT $distinct $this->table_name.id ";
         }
@@ -3183,8 +3193,7 @@ 
         {
             $ret_array['secondary_select']=& $ret_array['select'];
             $ret_array['secondary_from'] = & $ret_array['from'];
-        }
-        else
+        } else
         {
             $ret_array['secondary_select'] = '';
         }
@@ -3229,17 +3238,15 @@ 
                     if(isset($this->field_defs[$field]))
                     {
                         $fields[$field]= $this->field_defs[$field];
-                    }
-                    else
+                    } else
                     {
                         $fields[$field] = array('force_exists'=>true);
                     }
                 }
-            }else{
+            } else{
                 $fields = 	$filter;
             }
-        }
-        else
+        } else
         {
             $fields = 	$this->field_defs;
         }
@@ -3255,8 +3262,9 @@ 
 			$this->field_defs[$field]['source'] == 'non-db')
 		{
 			$addrelatefield = $this->get_relationship_field($field);
-			if ($addrelatefield)
-				$addrelate[$addrelatefield] = true;
+			if ($addrelatefield) {
+							$addrelate[$addrelatefield] = true;
+			}
 		}
 		if(!empty($this->field_defs[$field]['id_name'])){
 			$addrelate[$this->field_defs[$field]['id_name']] = true;
@@ -3278,15 +3286,15 @@ 
             {
                 if(!empty($filter) && isset($filter[$field]['force_exists']) && $filter[$field]['force_exists'])
                 {
-                    if ( isset($filter[$field]['force_default']) )
-                        $ret_array['select'] .= ", {$filter[$field]['force_default']} $field ";
-                    else
-                    //spaces are a fix for length issue problem with unions.  The union only returns the maximum number of characters from the first select statement.
+                    if ( isset($filter[$field]['force_default']) ) {
+                                            $ret_array['select'] .= ", {$filter[$field]['force_default']} $field ";
+                    } else {
+                                        //spaces are a fix for length issue problem with unions.  The union only returns the maximum number of characters from the first select statement.
                         $ret_array['select'] .= ", '                                                                                                                                                                                                                                                              ' $field ";
+                    }
                 }
                 continue;
-            }
-            else
+            } else
             {
                 $data = $this->field_defs[$field];
             }
@@ -3306,8 +3314,9 @@ 
                     }
                 }
 		
-            	if (!$process_field)
-                	continue;
+            	if (!$process_field) {
+            	                	continue;
+            	}
             }
 
             if(  (!isset($data['source']) || $data['source'] == 'db') && (!empty($alias) || !empty($filter) ))
@@ -3385,16 +3394,14 @@ 
                     if(empty($join_type))
                     {
                         $params['join_type'] = ' LEFT JOIN ';
-                    }
-                    else
+                    } else
                     {
                         $params['join_type'] = $join_type;
                     }
                     if(isset($data['join_name']))
                     {
                         $params['join_table_alias'] = $data['join_name'];
-                    }
-                    else
+                    } else
                     {
                         $params['join_table_alias']	= 'jt' . $jtcount;
 
@@ -3402,8 +3409,7 @@ 
                     if(isset($data['join_link_name']))
                     {
                         $params['join_table_link_alias'] = $data['join_link_name'];
-                    }
-                    else
+                    } else
                     {
                         $params['join_table_link_alias'] = 'jtl' . $jtcount;
                     }
@@ -3443,8 +3449,7 @@ 
                                 if(isset($rel_mod->field_defs['assigned_user_id']))
                                 {
                                     $ret_array['secondary_select'].= " , ".	$params['join_table_alias'] . ".assigned_user_id {$field}_owner, '$rel_module' {$field}_mod";
-                                }
-                                else
+                                } else
                                 {
                                     if(isset($rel_mod->field_defs['created_by']))
                                     {
@@ -3457,8 +3462,7 @@ 
                         if(isset($data['db_concat_fields']))
                         {
                             $ret_array['secondary_select'] .= ' , ' . $this->db->concat($params['join_table_alias'], $data['db_concat_fields']) . ' ' . $field;
-                        }
-                        else
+                        } else
                         {
                             if(!isset($data['relationship_fields']))
                             {
@@ -3471,7 +3475,9 @@ 
                         }
                         $count_used =0;
                         foreach($used_join_key as $used_key) {
-                            if($used_key == $join['rel_key']) $count_used++;
+                            if($used_key == $join['rel_key']) {
+                                $count_used++;
+                            }
                         }
                         if($count_used <= 1) {//27416, the $ret_array['secondary_select'] should always generate, regardless the dbtype
                             // add rel_key only if it was not aready added
@@ -3485,7 +3491,9 @@ 
                         {
                             foreach($data['relationship_fields'] as $r_name=>$alias_name)
                             {
-                                if(!empty( $secondarySelectedFields[$alias_name]))continue;
+                                if(!empty( $secondarySelectedFields[$alias_name])) {
+                                    continue;
+                                }
                                 $ret_array['secondary_select'] .= ', ' . $params['join_table_link_alias'].'.'. $r_name .' ' . $alias_name;
                                 $secondarySelectedFields[$alias_name] = true;
                             }
@@ -3498,14 +3506,12 @@ 
                                 $ret_array['secondary_where'] = $params['join_table_link_alias'] . '.' . $join['rel_key']. "='" .$parentbean->id . "'";
                             }
                         }
-                    }
-                    else
+                    } else
                     {
                         if(isset($data['db_concat_fields']))
                         {
                             $ret_array['select'] .= ' , ' . $this->db->concat($params['join_table_alias'], $data['db_concat_fields']) . ' ' . $field;
-                        }
-                        else
+                        } else
                         {
                             $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.' . $data['rname'] . ' ' . $field;
                         }
@@ -3532,8 +3538,7 @@ 
                                 if(isset($rel_mod->field_defs['assigned_user_id']))
                                 {
                                     $ret_array['select'] .= ' , ' .$params['join_table_alias'] . '.assigned_user_id ' .  $field . '_owner';
-                                }
-                                else
+                                } else
                                 {
                                     $ret_array['select'] .= ' , ' .$params['join_table_alias'] . '.created_by ' .  $field . '_owner';
                                 }
@@ -3568,20 +3573,22 @@ 
 	                       $where = preg_replace('/'.$data['name'].'/', $db_field, $where);
 
 				// For relationship fields replace their alias by the corresponsding link table and r_name
-				if(isset($data['relationship_fields']))
-					foreach($data['relationship_fields'] as $r_name=>$alias_name)
+				if(isset($data['relationship_fields'])) {
+									foreach($data['relationship_fields'] as $r_name=>$alias_name)
 					{
 						$db_field = $this->db->concat($params['join_table_link_alias'], $r_name);
+				}
 						$where = preg_replace('/' . $alias_name . '/', $db_field, $where);
 					}
                     	}
-                    }else{
+                    } else{
                         $where = preg_replace('/(^|[\s(])' . $data['name'] . '/', '${1}' . $params['join_table_alias'] . '.'.$data['rname'], $where);
 
 			// For relationship fields replace their alias by the corresponsding link table and r_name
-			if(isset($data['relationship_fields']))
-				foreach($data['relationship_fields'] as $r_name=>$alias_name)
+			if(isset($data['relationship_fields'])) {
+							foreach($data['relationship_fields'] as $r_name=>$alias_name)
 					$where = preg_replace('/(^|[\s(])' . $alias_name . '/', '${1}' . $params['join_table_link_alias'] . '.'.$r_name, $where);
+			}
                     }
                     if(!$table_joined)
                     {
@@ -3598,8 +3605,7 @@ 
             if(isset($this->field_defs['assigned_user_id']) && empty($selectedFields[$this->table_name.'.assigned_user_id']))
             {
                 $ret_array['select'] .= ", $this->table_name.assigned_user_id ";
-            }
-            else if(isset($this->field_defs['created_by']) &&  empty($selectedFields[$this->table_name.'.created_by']))
+            } else if(isset($this->field_defs['created_by']) &&  empty($selectedFields[$this->table_name.'.created_by']))
             {
                 $ret_array['select'] .= ", $this->table_name.created_by ";
             }
@@ -3621,14 +3627,15 @@ 
         if($show_deleted == 0)
         {
             $where_auto = "$this->table_name.deleted=0";
-        }else if($show_deleted == 1)
+        } else if($show_deleted == 1)
         {
             $where_auto = "$this->table_name.deleted=1";
         }
-        if($where != "")
-            $ret_array['where'] = " where ($where) AND $where_auto";
-        else
-            $ret_array['where'] = " where $where_auto";
+        if($where != "") {
+                    $ret_array['where'] = " where ($where) AND $where_auto";
+        } else {
+                    $ret_array['where'] = " where $where_auto";
+        }
 
         //make call to process the order by clause
         $order_by = $this->process_order_by($order_by);
@@ -3656,8 +3663,9 @@ 
 		foreach ($this->field_defs as $field_def => $value)
 		{
 			if (isset($value['relationship_fields']) && 
-				in_array($field, $value['relationship_fields']) )
-				return $field_def;
+				in_array($field, $value['relationship_fields']) ) {
+							return $field_def;
+			}
 		}
 
 		return false;
@@ -3705,24 +3713,23 @@ 
                         if(isset($field_def['db_concat_fields']))
                         {
                             $queries[$child_info['parent_type']] .= ' , ' . $this->db->concat($templates[$child_info['parent_type']]->table_name, $field_def['db_concat_fields']) . ' parent_name';
-                        }
-                        else
+                        } else
                         {
                             $queries[$child_info['parent_type']] .= ' , name parent_name';
                         }
                         if(isset($templates[$child_info['parent_type']]->field_defs['assigned_user_id']))
                         {
                             $queries[$child_info['parent_type']] .= ", assigned_user_id parent_name_owner , '{$child_info['parent_type']}' parent_name_mod";;
-                        }else if(isset($templates[$child_info['parent_type']]->field_defs['created_by']))
+                        } else if(isset($templates[$child_info['parent_type']]->field_defs['created_by']))
                         {
                             $queries[$child_info['parent_type']] .= ", created_by parent_name_owner, '{$child_info['parent_type']}' parent_name_mod";
                         }
                         $queries[$child_info['parent_type']] .= " FROM " . $templates[$child_info['parent_type']]->table_name ." WHERE id IN ('{$child_info['parent_id']}'";
-                    }
-                    else
+                    } else
                     {
-                        if(empty($parent_child_map[$child_info['parent_id']]))
-                        $queries[$child_info['parent_type']] .= " ,'{$child_info['parent_id']}'";
+                        if(empty($parent_child_map[$child_info['parent_id']])) {
+                                                $queries[$child_info['parent_type']] .= " ,'{$child_info['parent_id']}'";
+                        }
                     }
                     $parent_child_map[$child_info['parent_id']][] = $child_info['child_id'];
                 }
@@ -3795,8 +3802,7 @@ 
                     $row_offset = (floor(($rows_found -1) / $limit)) * $limit;
                 }
             }
-        }
-        else
+        } else
         {
             if((empty($limit) || $limit == -1))
             {
@@ -3813,8 +3819,7 @@ 
         if(!empty($limit) && $limit != -1 && $limit != -99)
         {
             $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $this->object_name list: ");
-        }
-        else
+        } else
         {
             $result = $db->query($query,true,"Error retrieving $this->object_name list: ");
         }
@@ -3831,7 +3836,9 @@ 
             while ($max_per_page == -99 || ($index < $row_offset + $max_per_page))
             {
                 $row = $db->fetchByAssoc($result);
-                if (empty($row)) break;
+                if (empty($row)) {
+                    break;
+                }
 
                 //instantiate a new class each time. This is because php5 passes
                 //by reference by default so if we continually update $this, we will
@@ -3851,11 +3858,10 @@ 
                         }
 
                         $GLOBALS['log']->debug("$temp->object_name({$row['id']}): ".$field." = ".$temp->$field);
-                    }else if (isset($row[$this->table_name .'.'.$field]))
+                    } else if (isset($row[$this->table_name .'.'.$field]))
                     {
                         $temp->$field = $row[$this->table_name .'.'.$field];
-                    }
-                    else
+                    } else
                     {
                         $temp->$field = "";
                     }
@@ -3863,7 +3869,9 @@ 
 
                 $temp->check_date_relationships_load();
                 $temp->fill_in_additional_list_fields();
-                if($temp->hasCustomFields()) $temp->custom_fields->fill_relationships();
+                if($temp->hasCustomFields()) {
+                    $temp->custom_fields->fill_relationships();
+                }
                 $temp->call_custom_logic("process_record");
 
                 // fix defect #44206. implement the same logic as sugar_currency_format
@@ -3910,8 +3918,9 @@ 
         if (!$is_count_query)
         {
             $count_query = SugarBean::create_list_count_query($query);
-        } else
-            $count_query=$query;
+        } else {
+                    $count_query=$query;
+        }
 
         $result = $this->db->query($count_query, true, "Error running count query for $this->object_name List: ");
         $row_num = 0;
@@ -3984,8 +3993,7 @@ 
                 $row_offset = (floor(($rows_found -1) / $limit)) * $limit;
 
             }
-        }
-        else
+        } else
         {
             if((empty($limit) || $limit == -1))
             {
@@ -4007,8 +4015,7 @@ 
             if(!empty($limit) && $limit != -1 && $limit != -99)
             {
                 $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $parent_bean->object_name list: ");
-            }
-            else
+            } else
             {
                 $result = $db->query($query,true,"Error retrieving $this->object_name list: ");
             }
@@ -4054,13 +4061,11 @@ 
                             {
                                 $current_bean->$field = $this->convertField($row[$field], $value);
                                 unset($row[$field]);
-                            }
-                            else if (isset($row[$this->table_name .'.'.$field]))
+                            } else if (isset($row[$this->table_name .'.'.$field]))
                             {
                                 $current_bean->$field = $this->convertField($row[$this->table_name .'.'.$field], $value);
                                 unset($row[$this->table_name .'.'.$field]);
-                            }
-                            else
+                            } else
                             {
                                 $current_bean->$field = "";
                                 unset($row[$field]);
@@ -4084,8 +4089,7 @@ 
                             {
                                 $execute_function[] = 	$value['function_class'];
                                 $execute_function[] = 	$value['function_name'];
-                            }
-                            else
+                            } else
                             {
                                 $execute_function	= $value['function_name'];
                             }
@@ -4098,8 +4102,7 @@ 
                                         $can_execute = false;
                                     } else if($param == '$this') {
                                         $execute_params[] = $this;
-                                    }
-                                    else
+                                    } else
                                     {
                                         $execute_params[] = $this->$param;
                                     }
@@ -4110,13 +4113,11 @@ 
                                         $can_execute = false;
                                     } else if($param == '$this') {
                                         $execute_params[] = $current_bean;
-                                    }
-                                    else
+                                    } else
                                     {
                                         $execute_params[] = $current_bean->$param;
                                     }
-                                }
-                                else
+                                } else
                                 {
                                     $can_execute = false;
                                 }
@@ -4177,8 +4178,7 @@ 
             if(isset($post_retrieve))
             {
                 $parent_fields = $this->retrieve_parent_fields($post_retrieve);
-            }
-            else
+            } else
             {
                 $parent_fields = array();
             }
@@ -4197,8 +4197,7 @@ 
                     $previous_offset++;
                 }
             }
-        }
-        else
+        } else
         {
             $row_found 	= 0;
             $parent_fields = array();
@@ -4267,8 +4266,9 @@ 
 
         $response = Array();
         $response['bean'] = $this;
-        if (empty($total_rows))
-            $total_rows=0;
+        if (empty($total_rows)) {
+                    $total_rows=0;
+        }
         $response['row_count'] = $total_rows;
         $response['next_offset'] = $next_offset;
         $response['previous_offset'] = $previous_offset;
@@ -4311,8 +4311,7 @@ 
                 {
                     $bean->$field = $row[$field];
                     $GLOBALS['log']->debug("process_full_list: $bean->object_name({$row['id']}): ".$field." = ".$bean->$field);
-                }
-                else
+                } else
                 {
                     $bean->$field = '';
                 }
@@ -4329,8 +4328,11 @@ 
             $list[] = $bean;
         }
         //}
-        if (isset($list)) return $list;
-        else return null;
+        if (isset($list)) {
+            return $list;
+        } else {
+            return null;
+        }
     }
 
     /**
@@ -4394,10 +4396,12 @@ 
             $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
 
         }
-		if(!empty($this->field_defs['created_by']) && !empty($this->created_by))
-		$this->created_by_name = get_assigned_user_name($this->created_by);
-		if(!empty($this->field_defs['modified_user_id']) && !empty($this->modified_user_id))
-		$this->modified_by_name = get_assigned_user_name($this->modified_user_id);
+		if(!empty($this->field_defs['created_by']) && !empty($this->created_by)) {
+				$this->created_by_name = get_assigned_user_name($this->created_by);
+		}
+		if(!empty($this->field_defs['modified_user_id']) && !empty($this->modified_user_id)) {
+				$this->modified_by_name = get_assigned_user_name($this->modified_user_id);
+		}
 
 		if(!empty($this->field_defs['parent_name'])){
 			$this->fill_in_additional_parent_fields();
@@ -4412,7 +4416,7 @@ 
 
         if(!empty($this->parent_id) && !empty($this->last_parent_id) && $this->last_parent_id == $this->parent_id){
             return false;
-        }else{
+        } else{
             $this->parent_name = '';
         }
         if(!empty($this->parent_type)) {
@@ -4442,8 +4446,9 @@ 
         {
             $list=$this->$linkFieldName->get();
             $this->$idField = '' ; // match up with null value in $this->populateFromRow()
-            if (!empty($list))
-                $this->$idField = $list[0];
+            if (!empty($list)) {
+                            $this->$idField = $list[0];
+            }
         }
     }
 
@@ -4452,11 +4457,13 @@ 
     */
     function fill_in_relationship_fields(){
         global $fill_in_rel_depth;
-        if(empty($fill_in_rel_depth) || $fill_in_rel_depth < 0)
-            $fill_in_rel_depth = 0;
+        if(empty($fill_in_rel_depth) || $fill_in_rel_depth < 0) {
+                    $fill_in_rel_depth = 0;
+        }
 
-        if($fill_in_rel_depth > 1)
-            return;
+        if($fill_in_rel_depth > 1) {
+                    return;
+        }
 
         $fill_in_rel_depth++;
 
@@ -4498,13 +4505,13 @@ 
                     }
                     if(!empty($this->$id_name) && isset($this->$name))
                     {
-                        if(!isset($field['additionalFields']))
-                           $field['additionalFields'] = array();
+                        if(!isset($field['additionalFields'])) {
+                                                   $field['additionalFields'] = array();
+                        }
                         if(!empty($field['rname']))
                         {
                             $field['additionalFields'][$field['rname']]= $name;
-                        }
-                        else
+                        } else
                         {
                             $field['additionalFields']['name']= $name;
                         }
@@ -4539,8 +4546,7 @@ 
 		if(isset($_SESSION['show_deleted']))
 		{
 			$this->mark_undeleted($id);
-		}
-		else
+		} else
 		{
 			// call the custom business logic
 			$custom_logic_arguments['id'] = $id;
@@ -4802,8 +4808,7 @@ 
         if(!empty($row_offset) && $row_offset != 0 && !empty($limit) && $limit != -1)
         {
             $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $template->object_name list: ");
-        }
-        else
+        } else
         {
             $result = $db->query($query, true);
         }
@@ -4872,8 +4877,7 @@ 
     if (!empty($limit))
     {
         $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $this->object_name list: ");
-    }
-    else
+    } else
     {
         $result = $db->query($query, true);
     }
@@ -4919,8 +4923,7 @@ 
             if(empty($ids))
             {
                 $ids = "('" . $row['id'] . "'";
-            }
-            else
+            } else
             {
                 $ids .= ",'" . $row['id'] . "'";
             }
@@ -4928,7 +4931,7 @@ 
         if(empty($ids))
         {
             $ids = "('')";
-        }else{
+        } else{
             $ids .= ')';
         }
 
@@ -5000,10 +5003,12 @@ 
             if(isset($this->$field)){
 
                 // cn: bug 12270 - sensitive fields being passed arbitrarily in listViews
-                if(isset($sensitiveFields[$field]))
-                    continue;
-                if(!isset($cache[$field]))
-                    $cache[$field] = strtoupper($field);
+                if(isset($sensitiveFields[$field])) {
+                                    continue;
+                }
+                if(!isset($cache[$field])) {
+                                    $cache[$field] = strtoupper($field);
+                }
 
                 //Fields hidden by Dependent Fields
                 if (isset($value['hidden']) && $value['hidden'] === true) {
@@ -5020,18 +5025,17 @@ 
                     elseif(!empty($value['options']) && !empty($mod_strings[$value['options']][$this->$field]))
                     {
                         $return_array[$cache[$field]] = $mod_strings[$value['options']][$this->$field];
-                    }
-                    else{
+                    } else{
                         $return_array[$cache[$field]] = $this->$field;
                     }
                     //end bug 21672
 // tjy: no need to do this str_replace as the changes in 29994 for ListViewGeneric.tpl for translation handle this now
 //				}elseif(!empty($value['type']) && $value['type'] == 'multienum'&& empty($value['function'])){
 //					$return_array[strtoupper($field)] = str_replace('^,^', ', ', $this->$field );
-                }elseif(!empty($value['custom_module']) && $value['type'] != 'currency'){
+                } elseif(!empty($value['custom_module']) && $value['type'] != 'currency'){
 //					$this->format_field($value);
                     $return_array[$cache[$field]] = $this->$field;
-                }else{
+                } else{
                     $return_array[$cache[$field]] = $this->$field;
                 }
                 // handle "Assigned User Name"
@@ -5150,23 +5154,29 @@ 
     }
 
     function getRelatedFields($module, $id, $fields, $return_array = false){
-        if(empty($GLOBALS['beanList'][$module]))return '';
+        if(empty($GLOBALS['beanList'][$module])) {
+            return '';
+        }
         $object = BeanFactory::getObjectName($module);
 
         VardefManager::loadVardef($module, $object);
-        if(empty($GLOBALS['dictionary'][$object]['table']))return '';
+        if(empty($GLOBALS['dictionary'][$object]['table'])) {
+            return '';
+        }
         $table = $GLOBALS['dictionary'][$object]['table'];
         $query  = 'SELECT id';
         foreach($fields as $field=>$alias){
             if(!empty($GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields'])){
                 $query .= ' ,' .$this->db->concat($table, $GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields']) .  ' as ' . $alias ;
-            }else if(!empty($GLOBALS['dictionary'][$object]['fields'][$field]) &&
+            } else if(!empty($GLOBALS['dictionary'][$object]['fields'][$field]) &&
                 (empty($GLOBALS['dictionary'][$object]['fields'][$field]['source']) ||
                 $GLOBALS['dictionary'][$object]['fields'][$field]['source'] != "non-db"))
             {
                 $query .= ' ,' .$table . '.' . $field . ' as ' . $alias;
             }
-            if(!$return_array)$this->$alias = '';
+            if(!$return_array) {
+                $this->$alias = '';
+            }
         }
         if($query == 'SELECT id' || empty($id)){
             return '';
@@ -5177,8 +5187,7 @@ 
         {
             $query .= " , ".	$table  . ".assigned_user_id owner";
 
-        }
-        else if(isset($GLOBALS['dictionary'][$object]['fields']['created_by']))
+        } else if(isset($GLOBALS['dictionary'][$object]['fields']['created_by']))
         {
             $query .= " , ".	$table . ".created_by owner";
 
@@ -5214,8 +5223,9 @@ 
         {
             if(isset($this->field_name_map[$field]) && empty($this->$field))
             {
-                if($this->field_name_map[$field]['type'] != 'date' && $this->field_name_map[$field]['type'] != 'enum')
-                $this->$field = $field;
+                if($this->field_name_map[$field]['type'] != 'date' && $this->field_name_map[$field]['type'] != 'enum') {
+                                $this->$field = $field;
+                }
                 if($this->field_name_map[$field]['type'] == 'date')
                 {
                     $this->$field = $timedate->to_display_date('1980-07-09');
@@ -5290,8 +5300,7 @@ 
             $query = "INSERT INTO $table (id, ". implode(',', array_keys($relate_values)) . ", date_modified) VALUES ('" . create_guid() . "', " . "'" . implode("', '", $relate_values) . "', ".$date_modified.")" ;
 
             $this->db->query($query, false, "Creating Relationship:" . $query);
-        }
-        else if ($do_update)
+        } else if ($do_update)
         {
             $conds = array();
             foreach($data_values as $key=>$value)
@@ -5370,10 +5379,12 @@ 
         if(!isset($this->processed) || $this->processed == false){
             //add some logic to ensure we do not get into an infinite loop
             if(!empty($this->logicHookDepth[$event])) {
-                if($this->logicHookDepth[$event] > $this->max_logic_depth)
-                    return;
-            }else
-                $this->logicHookDepth[$event] = 0;
+                if($this->logicHookDepth[$event] > $this->max_logic_depth) {
+                                    return;
+                }
+            } else {
+                            $this->logicHookDepth[$event] = 0;
+            }
 
             //we have to put the increment operator here
             //otherwise we may never increase the depth for that event in the case
@@ -5403,16 +5414,13 @@ 
         if ($this->custom_fields->avail_fields[$name]['ext1'])
         {
             $realKey = 'ext1';
-        }
-        elseif ($this->custom_fields->avail_fields[$name]['ext2'])
+        } elseif ($this->custom_fields->avail_fields[$name]['ext2'])
         {
             $realKey = 'ext2';
-        }
-        elseif ($this->custom_fields->avail_fields[$name]['ext3'])
+        } elseif ($this->custom_fields->avail_fields[$name]['ext3'])
         {
             $realKey = 'ext3';
-        }
-        else
+        } else
         {
             $GLOBALS['log']->fatal("SUGARBEAN: cannot find Real Key for custom field of type dropdown - cannot return Value.");
             return false;
@@ -5446,9 +5454,11 @@ 
 		/**
         if($is_owner == 'not_set')
 		*/
-    	if($is_owner === 'not_set') //eggsurplus: should be ===
+    	if($is_owner === 'not_set') {
+    	    //eggsurplus: should be ===
         {
             $not_set = true;
+    	}
             $is_owner = $this->isOwner($current_user->id);
         }
 		// DJM - OBS Customizations - May 2009
@@ -5499,8 +5509,9 @@ 
 			// DJM - OBS Customizations - END CHANGE
     	}
         //if we don't implent acls return true
-        if(!$this->bean_implements('ACL'))
-        return true;
+        if(!$this->bean_implements('ACL')) {
+                return true;
+        }
         $view = strtolower($view);
         switch ($view)
         {
@@ -5518,7 +5529,7 @@ 
                     $temp = new $class();
                     if(!empty($this->fetched_row) && !empty($this->fetched_row['id']) && !empty($this->fetched_row['assigned_user_id']) && !empty($this->fetched_row['created_by'])){
                         $temp->populateFromRow($this->fetched_row);
-                    }else{
+                    } else{
                         $temp->retrieve($this->id);
                     }
                     $is_owner = $temp->isOwner($current_user->id);
@@ -5597,10 +5608,11 @@ 
             }
             return false;
         } elseif (isset($this->assigned_user_id)) {
-            if($this->assigned_user_id == $user_id) return true;
+            if($this->assigned_user_id == $user_id) {
+                return true;
+            }
             return false;
-        }
-        else
+        } else
         {
             //other wise if there is a created_by that is the owner
             if(isset($this->created_by) && $this->created_by == $user_id)
@@ -5642,8 +5654,7 @@ 
         if($this->ACLAccess('DetailView'))
         {
             $array_assign['MAIN'] = 'a';
-        }
-        else
+        } else
         {
             $array_assign['MAIN'] = 'span';
         }
@@ -5662,20 +5673,20 @@ 
 
         foreach($this->field_defs as $field=>$data)
         {
-            if( !$dbOnly || !isset($data['source']) || $data['source'] == 'db')
-            if(!$stringOnly || is_string($this->$field))
+            if( !$dbOnly || !isset($data['source']) || $data['source'] == 'db') {
+                        if(!$stringOnly || is_string($this->$field))
             if($upperKeys)
             {
                                 if(!isset($cache[$field])){
                                     $cache[$field] = strtoupper($field);
+            }
                                 }
                 $arr[$cache[$field]] = $this->$field;
-            }
-            else
+            } else
             {
                 if(isset($this->$field)){
                     $arr[$field] = $this->$field;
-                }else{
+                } else{
                     $arr[$field] = '';
                 }
             }
@@ -5750,7 +5761,9 @@ 
 
         $this->fill_in_additional_list_fields();
 
-        if($this->hasCustomFields())$this->custom_fields->fill_relationships();
+        if($this->hasCustomFields()) {
+            $this->custom_fields->fill_relationships();
+        }
         $this->call_custom_logic("process_record");
     }
 
@@ -5843,7 +5856,10 @@ 
  */
     function decrypt_after_retrieve($value)
     {
-        if(empty($value)) return $value; // no need to decrypt empty
+        if(empty($value)) {
+            return $value;
+        }
+        // no need to decrypt empty
         require_once("include/utils/encryption_utils.php");
         return blowfishDecode($this->getEncryptKey(), $value);
     }
@@ -5870,16 +5886,14 @@ 
                     $_SESSION['o_lock_save'] = $saveform;
                     header('Location: index.php?module=OptimisticLock&action=LockResolve');
                     die();
-                }
-                else
+                } else
                 {
                     unset ($_SESSION['o_lock_object']);
                     unset ($_SESSION['o_lock_id']);
                     unset ($_SESSION['o_lock_dm']);
                 }
             }
-        }
-        else
+        } else
         {
             if(isset($_SESSION['o_lock_object']))	{ unset ($_SESSION['o_lock_object']); }
             if(isset($_SESSION['o_lock_id']))		{ unset ($_SESSION['o_lock_id']); }
@@ -5894,9 +5908,11 @@ 
     */
     private function _sendNotifications($check_notify){
         if($check_notify || (isset($this->notify_inworkflow) && $this->notify_inworkflow == true) // cn: bug 5795 - no invites sent to Contacts, and also bug 25995, in workflow, it will set the notify_on_save=true.
-           && !$this->isOwner($this->created_by) )  // cn: bug 42727 no need to send email to owner (within workflow)
+           && !$this->isOwner($this->created_by) ) {
+            // cn: bug 42727 no need to send email to owner (within workflow)
         {
             $admin = new Administration();
+        }
             $admin->retrieveSettings();
             $sendNotifications = false;
 
@@ -5904,13 +5920,11 @@ 
             {
                 $GLOBALS['log']->info("Notifications: user assignment has changed, checking if user receives notifications");
                 $sendNotifications = true;
-            }
-            elseif(isset($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == 1)
+            } elseif(isset($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == 1)
             {
                 // cn: bug 5795 Send Invites failing for Contacts
                 $sendNotifications = true;
-            }
-            else
+            } else
             {
                 $GLOBALS['log']->info("Notifications: not sending e-mail, notify_on is set to OFF");
             }
@@ -6116,8 +6130,7 @@ 
             !empty($this->field_defs['email_addresses_non_primary']) && $this->field_defs['email_addresses_non_primary']['type'] == 'email')
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }

data/Relationships/SugarRelationship.php

Braces +34 added lines, -23 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.
@@ -135,8 +137,7 @@ 
             if ($link->getSide() == REL_LHS)
             {
                 $sub_result = $this->remove($focus, $relBean);
-            }
-            else
+            } else
             {
                 $sub_result = $this->remove($relBean, $focus);
             }
@@ -202,8 +203,10 @@ 
     protected function addRow($row)
     {
         $existing = $this->checkExisting($row);
-        if (!empty($existing)) //Update the existing row, overriding the values with those passed in
+        if (!empty($existing)) {
+            //Update the existing row, overriding the values with those passed in
             return $this->updateRow($existing['id'], array_merge($existing, $row));
+        }
 
         $values = array();
         foreach($this->getFields() as  $def)
@@ -232,7 +235,9 @@ 
     {
         $newVals = array();
         //Unset the ID since we are using it to update the row
-        if (isset($values['id'])) unset($values['id']);
+        if (isset($values['id'])) {
+            unset($values['id']);
+        }
         foreach($values as $field => $val)
         {
             $newVals[] = "$field='$val'";
@@ -252,8 +257,9 @@ 
      */
     protected function removeRow($where)
     {
-        if (empty($where))
-            return false;
+        if (empty($where)) {
+                    return false;
+        }
 
         $date_modified = TimeDate::getInstance()->getNow()->asDb();
         $stringSets = array();
@@ -278,8 +284,9 @@ 
     {
         $leftIDName = $this->def['join_key_lhs'];
         $rightIDName = $this->def['join_key_rhs'];
-        if (empty($row[$leftIDName]) ||  empty($row[$rightIDName]))
-            return false;
+        if (empty($row[$leftIDName]) ||  empty($row[$rightIDName])) {
+                    return false;
+        }
 
         $leftID = $row[$leftIDName];
         $rightID = $row[$rightIDName];
@@ -308,14 +315,16 @@ 
     {
         $ignore_role_filter = $ignore_role_filter || $this->ignore_role_filter;
         $roleCheck = "";
-        if (empty ($table))
-            $table = $this->getRelationshipTable();
+        if (empty ($table)) {
+                    $table = $this->getRelationshipTable();
+        }
         if (!empty($this->def['relationship_role_column']) && !empty($this->def["relationship_role_column_value"]) && !$ignore_role_filter )
         {
-            if (empty($table))
-                $roleCheck = " AND $this->relationship_role_column";
-            else
-                $roleCheck = " AND $table.{$this->relationship_role_column}";
+            if (empty($table)) {
+                            $roleCheck = " AND $this->relationship_role_column";
+            } else {
+                            $roleCheck = " AND $table.{$this->relationship_role_column}";
+            }
             //role column value.
             if (empty($this->def['relationship_role_column_value']))
             {
@@ -406,8 +415,9 @@ 
     protected function getOptionalWhereClause($optional_array) {
         //lhs_field, operator, and rhs_value must be set in optional_array
         foreach(array("lhs_field", "operator", "rhs_value") as $required){
-            if (empty($optional_array[$required]))
-                return "";
+            if (empty($optional_array[$required])) {
+                            return "";
+            }
         }
 
         return $optional_array['lhs_field']."".$optional_array['operator']."'".$optional_array['rhs_value']."'";
@@ -445,8 +455,7 @@ 
                 if (empty($bean->deleted) && empty($bean->in_save))
                 {
                     $bean->save();
-                }
-                else
+                } else
                 {
                     // Bug 55942 save the in-save id which will be used to send workflow alert later
                     if (isset($bean->id) && !empty($_SESSION['WORKFLOW_ALERTS']))
@@ -479,8 +488,9 @@ 
 
     public function __get($name)
     {
-        if (isset($this->def[$name]))
-            return $this->def[$name];
+        if (isset($this->def[$name])) {
+                    return $this->def[$name];
+        }
 
         switch($name)
         {
@@ -500,8 +510,9 @@ 
                 return array('lhs_table', 'lhs_key', 'rhs_module', 'rhs_table', 'rhs_key', 'relationship_type');
         }
 
-        if (isset($this->$name))
-            return $this->$name;
+        if (isset($this->$name)) {
+                    return $this->$name;
+        }
 
         return null;
     }

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)

data/Relationships/One2MBeanRelationship.php

Braces +39 added lines, -25 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.
@@ -66,7 +68,9 @@ 
         // test to see if the relationship exist if the relationship between the two beans
         // exist then we just fail out with false as we don't want to re-trigger this
         // the save and such as it causes problems with the related() in sugarlogic
-        if($this->relationship_exists($lhs, $rhs) && !empty($GLOBALS['resavingRelatedBeans'])) return false;
+        if($this->relationship_exists($lhs, $rhs) && !empty($GLOBALS['resavingRelatedBeans'])) {
+            return false;
+        }
 
         $lhsLinkName = $this->lhsLink;
         $rhsLinkName = $this->rhsLink;
@@ -79,8 +83,9 @@ 
             $prevRelated = $oldLink->getBeans(null);
             foreach($prevRelated as $oldLHS)
             {
-                if ($oldLHS->id != $lhs->id)
-                    $this->remove($oldLHS, $rhs, false);
+                if ($oldLHS->id != $lhs->id) {
+                                    $this->remove($oldLHS, $rhs, false);
+                }
             }
         }
 
@@ -111,19 +116,22 @@ 
 
         //One2MBean relationships require that the RHS bean be saved or else the relationship will not be saved.
         //If we aren't already in a relationship save, intitiate a save now.
-        if (empty($GLOBALS['resavingRelatedBeans']))
-            SugarRelationship::resaveRelatedBeans();
+        if (empty($GLOBALS['resavingRelatedBeans'])) {
+                    SugarRelationship::resaveRelatedBeans();
+        }
         
         return true;
     }
 
     protected function updateLinks($lhs, $lhsLinkName, $rhs, $rhsLinkName)
     {
-        if (isset($lhs->$lhsLinkName))
-            $lhs->$lhsLinkName->addBean($rhs);
+        if (isset($lhs->$lhsLinkName)) {
+                    $lhs->$lhsLinkName->addBean($rhs);
+        }
         //RHS only has one bean ever, so we don't need to preload the relationship
-        if (isset($rhs->$rhsLinkName))
-            $rhs->$rhsLinkName->beans = array($lhs->id => $lhs);
+        if (isset($rhs->$rhsLinkName)) {
+                    $rhs->$rhsLinkName->beans = array($lhs->id => $lhs);
+        }
     }
 
     protected function updateFields($lhs, $rhs, $additionalFields)
@@ -148,8 +156,9 @@ 
         $rhsID = $this->def['rhs_key'];
 
         //If this relationship has already been removed, we can just return
-        if ($rhs->$rhsID != $lhs->id)
-            return false;
+        if ($rhs->$rhsID != $lhs->id) {
+                    return false;
+        }
 
         $rhs->$rhsID = '';
 
@@ -192,8 +201,7 @@ 
             {
                 $rows[$id] = array('id' => $id);
             }
-        }
-        else //If the link is LHS, we need to query to get the full list and load all the beans.
+        } else //If the link is LHS, we need to query to get the full list and load all the beans.
         {
             $db = DBManagerFactory::getInstance();
             $query = $this->getQuery($link, $params);
@@ -241,8 +249,9 @@ 
             //Add any optional where clause
             if (!empty($params['where'])) {
                 $add_where = is_string($params['where']) ? $params['where'] : "$rhsTable." . $this->getOptionalWhereClause($params['where']);
-                if (!empty($add_where))
-                    $where .= " AND $add_where";
+                if (!empty($add_where)) {
+                                    $where .= " AND $add_where";
+                }
             }
 
             //Add any optional order clauses
@@ -255,7 +264,9 @@ 
             if (empty($params['return_as_array'])) {
                 //Limit is not compatible with return_as_array
                 $query = "SELECT id FROM $from $where";
-                if (!empty($order_by)) $query .= ' ORDER BY '.$order_by;
+                if (!empty($order_by)) {
+                    $query .= ' ORDER BY '.$order_by;
+                }
                 if (!empty($params['limit']) && $params['limit'] > 0) {
                     $offset = isset($params['offset']) ? $params['offset'] : 0;
                     $query = DBManagerFactory::getInstance()->limitQuery($query, $offset, $params['limit'], false, "", false);
@@ -276,8 +287,9 @@ 
     {
         $linkIsLHS = $link->getSide() == REL_LHS;
         $startingTable = (empty($params['left_join_table_alias']) ? $this->def['lhs_table'] : $params['left_join_table_alias']);
-        if (!$linkIsLHS)
-            $startingTable = (empty($params['right_join_table_alias']) ? $this->def['rhs_table'] : $params['right_join_table_alias']);
+        if (!$linkIsLHS) {
+                    $startingTable = (empty($params['right_join_table_alias']) ? $this->def['rhs_table'] : $params['right_join_table_alias']);
+        }
         $startingKey = $linkIsLHS ? $this->def['lhs_key'] : $this->def['rhs_key'];
         $targetTable = $linkIsLHS ? $this->def['rhs_table'] : $this->def['lhs_table'];
         $targetTableWithAlias = $targetTable;
@@ -315,8 +327,9 @@ 
 
         $linkIsLHS = $link->getSide() == REL_RHS;
         $startingTable = (empty($params['left_join_table_alias']) ? $this->def['lhs_table'] : $params['left_join_table_alias']);
-        if (!$linkIsLHS)
-            $startingTable = (empty($params['right_join_table_alias']) ? $this->def['rhs_table'] : $params['right_join_table_alias']);
+        if (!$linkIsLHS) {
+                    $startingTable = (empty($params['right_join_table_alias']) ? $this->def['rhs_table'] : $params['right_join_table_alias']);
+        }
         $startingKey = $linkIsLHS ? $this->def['lhs_key'] : $this->def['rhs_key'];
         $targetTable = $linkIsLHS ? $this->def['rhs_table'] : $this->def['lhs_table'];
         $targetKey = $linkIsLHS ? $this->def['rhs_key'] : $this->def['lhs_key'];
@@ -393,9 +406,10 @@ 
 
     public function getRelationshipTable()
     {
-        if (isset($this->def['table']))
-            return $this->def['table'];
-        else
-            return $this->def['rhs_table'];
+        if (isset($this->def['table'])) {
+                    return $this->def['table'];
+        } else {
+                    return $this->def['rhs_table'];
+        }
     }
 }

data/Relationships/M2MRelationship.php

Braces +33 added lines, -22 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.
@@ -84,8 +86,7 @@ 
         {
             $GLOBALS['log']->error("Warning: Multiple links found for relationship {$this->name} within module {$module}");
             return $this->getMostAppropriateLinkedDefinition($results);
-        }
-        else
+        } else
         {
             return FALSE;
         }
@@ -178,8 +179,9 @@ 
 
         $this->addRow($dataToInsert);
 
-        if ($this->self_referencing)
-            $this->addSelfReferencing($lhs, $rhs, $additionalFields);
+        if ($this->self_referencing) {
+                    $this->addSelfReferencing($lhs, $rhs, $additionalFields);
+        }
 
             $lhs->$lhsLinkName->addBean($rhs);
             $rhs->$rhsLinkName->addBean($lhs);
@@ -339,8 +341,9 @@ 
 
         $this->removeRow($dataToRemove);
 
-        if ($this->self_referencing)
-            $this->removeSelfReferencing($lhs, $rhs);
+        if ($this->self_referencing) {
+                    $this->removeSelfReferencing($lhs, $rhs);
+        }
 
         if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
         {
@@ -395,8 +398,9 @@ 
         $idField = $link->getSide() == REL_LHS ? $this->def['join_key_rhs'] : $this->def['join_key_lhs'];
         while ($row = $db->fetchByAssoc($result, FALSE))
         {
-            if (empty($row['id']) && empty($row[$idField]))
-                continue;
+            if (empty($row['id']) && empty($row[$idField])) {
+                            continue;
+            }
             $id = empty($row['id']) ? $row[$idField] : $row['id'];
             $rows[$id] = $row;
         }
@@ -414,15 +418,17 @@ 
             $targetKey = $this->def['join_key_rhs'];
             $relatedSeed = BeanFactory::getBean($this->getRHSModule());
             $relatedSeedKey = $this->def['rhs_key'];
-            if (!empty($params['where']) || !empty($params['order_by']))
-                $whereTable = (empty($params['right_join_table_alias']) ? $relatedSeed->table_name : $params['right_join_table_alias']);
+            if (!empty($params['where']) || !empty($params['order_by'])) {
+                            $whereTable = (empty($params['right_join_table_alias']) ? $relatedSeed->table_name : $params['right_join_table_alias']);
+            }
         } else {
             $knownKey = $this->def['join_key_rhs'];
             $targetKey = $this->def['join_key_lhs'];
             $relatedSeed = BeanFactory::getBean($this->getLHSModule());
             $relatedSeedKey = $this->def['lhs_key'];
-            if (!empty($params['where']) || !empty($params['order_by']))
-                $whereTable = (empty($params['left_join_table_alias']) ? $relatedSeed->table_name : $params['left_join_table_alias']);
+            if (!empty($params['where']) || !empty($params['order_by'])) {
+                            $whereTable = (empty($params['left_join_table_alias']) ? $relatedSeed->table_name : $params['left_join_table_alias']);
+            }
         }
         $rel_table = $this->getRelationshipTable();
 
@@ -432,8 +438,9 @@ 
         //Add any optional where clause
         if (!empty($params['where'])) {
             $add_where = is_string($params['where']) ? $params['where'] : "$whereTable." . $this->getOptionalWhereClause($params['where']);
-            if (!empty($add_where))
-                $where .= " AND $add_where";
+            if (!empty($add_where)) {
+                            $where .= " AND $add_where";
+            }
         }
 
         //Add any optional order clauses
@@ -454,7 +461,9 @@ 
 
         if (empty($params['return_as_array'])) {
             $query = "SELECT $targetKey id FROM $from WHERE $where AND $rel_table.deleted=$deleted";
-            if(!empty($order_by)) $query .= ' ORDER BY '.$order_by;
+            if(!empty($order_by)) {
+                $query .= ' ORDER BY '.$order_by;
+            }
             //Limit is not compatible with return_as_array
             if (!empty($params['limit']) && $params['limit'] > 0) {
                 $offset = isset($params['offset']) ? $params['offset'] : 0;
@@ -636,18 +645,20 @@ 
 
     public function getRelationshipTable()
     {
-        if (!empty($this->def['table']))
-            return $this->def['table'];
-        else if(!empty($this->def['join_table']))
-            return $this->def['join_table'];
+        if (!empty($this->def['table'])) {
+                    return $this->def['table'];
+        } else if(!empty($this->def['join_table'])) {
+                    return $this->def['join_table'];
+        }
 
         return false;
     }
 
     public function getFields()
     {
-        if (!empty($this->def['fields']))
-            return $this->def['fields'];
+        if (!empty($this->def['fields'])) {
+                    return $this->def['fields'];
+        }
         $fields = array(
             "id" => array('name' => 'id'),
             'date_modified' => array('name' => 'date_modified'),