adamjakab / SuiteCRM

include/Smarty/plugins/modifier.in_array.php

Indentation +2 added lines, -2 removed lines

@@ -44,9 +44,9 @@
  */
 function smarty_modifier_in_array($needle = null, $haystack = null)
 {
-	//Smarty barfs if Array is empty
+    //Smarty barfs if Array is empty
     if($haystack == null || empty($haystack)) {
-       return false;	
+        return false;	
     }
     return in_array($needle, $haystack);
 }

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 function smarty_modifier_in_array($needle = null, $haystack = null)
 {
 	//Smarty barfs if Array is empty
-    if($haystack == null || empty($haystack)) {
+    if ($haystack == null || empty($haystack)) {
        return false;	
     }
     return in_array($needle, $haystack);

include/Smarty/plugins/function.sugar_email_btn.php

Indentation +17 added lines, -17 removed lines

@@ -39,24 +39,24 @@
 
 
 
- /**
- * smarty_function_sugar_email_btn
- * This is the constructor for the Smarty plugin.
- * This function exists so that the proper email button based on user prefs is loaded into the quotes module.
- * 
- * @param $params The runtime Smarty key/value arguments
- * @param $smarty The reference to the Smarty object used in this invocation
- */
+    /**
+     * smarty_function_sugar_email_btn
+     * This is the constructor for the Smarty plugin.
+     * This function exists so that the proper email button based on user prefs is loaded into the quotes module.
+     * 
+     * @param $params The runtime Smarty key/value arguments
+     * @param $smarty The reference to the Smarty object used in this invocation
+     */
 function smarty_function_sugar_email_btn($params, &$smarty)
 {
-	global $app_strings, $current_user;
-	$pdfButtons = '';
-	$client = $current_user->getPreference('email_link_type');
-	if ($client != 'sugar') {
-		$pdfButtons = '<input title="'. $app_strings["LBL_EMAIL_COMPOSE"] . '" class="button" type="submit" name="button" value="'. $app_strings["LBL_EMAIL_COMPOSE"] . '" onclick="location.href=\'mailto:\';return false;"> ';
-	} else {
-		$pdfButtons = '<input id="email_as_pdf_button" title="'. $app_strings["LBL_EMAIL_PDF_BUTTON_TITLE"] . '" class="button" type="submit" name="button" value="'. $app_strings["LBL_EMAIL_PDF_BUTTON_LABEL"] . '" onclick="this.form.email_action.value=\'EmailLayout\';"> ';
-	}
-	return $pdfButtons;
+    global $app_strings, $current_user;
+    $pdfButtons = '';
+    $client = $current_user->getPreference('email_link_type');
+    if ($client != 'sugar') {
+        $pdfButtons = '<input title="'. $app_strings["LBL_EMAIL_COMPOSE"] . '" class="button" type="submit" name="button" value="'. $app_strings["LBL_EMAIL_COMPOSE"] . '" onclick="location.href=\'mailto:\';return false;"> ';
+    } else {
+        $pdfButtons = '<input id="email_as_pdf_button" title="'. $app_strings["LBL_EMAIL_PDF_BUTTON_TITLE"] . '" class="button" type="submit" name="button" value="'. $app_strings["LBL_EMAIL_PDF_BUTTON_LABEL"] . '" onclick="this.form.email_action.value=\'EmailLayout\';"> ';
+    }
+    return $pdfButtons;
 }
 ?>

Spacing +2 added lines, -2 removed lines

@@ -53,9 +53,9 @@
 	$pdfButtons = '';
 	$client = $current_user->getPreference('email_link_type');
 	if ($client != 'sugar') {
-		$pdfButtons = '<input title="'. $app_strings["LBL_EMAIL_COMPOSE"] . '" class="button" type="submit" name="button" value="'. $app_strings["LBL_EMAIL_COMPOSE"] . '" onclick="location.href=\'mailto:\';return false;"> ';
+		$pdfButtons = '<input title="'.$app_strings["LBL_EMAIL_COMPOSE"].'" class="button" type="submit" name="button" value="'.$app_strings["LBL_EMAIL_COMPOSE"].'" onclick="location.href=\'mailto:\';return false;"> ';
 	} else {
-		$pdfButtons = '<input id="email_as_pdf_button" title="'. $app_strings["LBL_EMAIL_PDF_BUTTON_TITLE"] . '" class="button" type="submit" name="button" value="'. $app_strings["LBL_EMAIL_PDF_BUTTON_LABEL"] . '" onclick="this.form.email_action.value=\'EmailLayout\';"> ';
+		$pdfButtons = '<input id="email_as_pdf_button" title="'.$app_strings["LBL_EMAIL_PDF_BUTTON_TITLE"].'" class="button" type="submit" name="button" value="'.$app_strings["LBL_EMAIL_PDF_BUTTON_LABEL"].'" onclick="this.form.email_action.value=\'EmailLayout\';"> ';
 	}
 	return $pdfButtons;
 }

include/Smarty/plugins/modifier.lookup.php

Indentation +5 added lines, -5 removed lines

@@ -42,9 +42,9 @@
 
 
 function smarty_modifier_lookup($value='', $from=array()){
-	$value = trim($value);
-	if (array_key_exists($value, $from)) { 
-		return $from[$value]; 
-	} 
-	return ''; 
+    $value = trim($value);
+    if (array_key_exists($value, $from)) { 
+        return $from[$value]; 
+    } 
+    return ''; 
 } 

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?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.
@@ -41,7 +41,7 @@ 
 
 
 
-function smarty_modifier_lookup($value='', $from=array()){
+function smarty_modifier_lookup($value = '', $from = array()) {
 	$value = trim($value);
 	if (array_key_exists($value, $from)) { 
 		return $from[$value]; 

Braces +3 added lines, -1 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.

include/Smarty/plugins/function.sugarvar_connector.php

Indentation +8 added lines, -8 removed lines

@@ -74,14 +74,14 @@
 
 function smarty_function_sugarvar_connector($params, &$smarty) {
       
-      $displayParams = $smarty->get_template_vars('displayParams');
-      if(!isset($displayParams['module'])) {
-         $smarty->trigger_error("sugarvar_connector: missing 'module' parameter");
-         $GLOBALS['log']->error("sugarvar_connector: missing 'module' parameter");
-         return;     	
-      }
+        $displayParams = $smarty->get_template_vars('displayParams');
+        if(!isset($displayParams['module'])) {
+            $smarty->trigger_error("sugarvar_connector: missing 'module' parameter");
+            $GLOBALS['log']->error("sugarvar_connector: missing 'module' parameter");
+            return;     	
+        }
       
-      require_once('include/connectors/utils/ConnectorUtils.php');
-      echo ConnectorUtils::getConnectorButtonScript($displayParams, $smarty);
+        require_once('include/connectors/utils/ConnectorUtils.php');
+        echo ConnectorUtils::getConnectorButtonScript($displayParams, $smarty);
 }
 ?>
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 */
 
 
-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.
@@ -75,7 +75,7 @@ 
 function smarty_function_sugarvar_connector($params, &$smarty) {
       
       $displayParams = $smarty->get_template_vars('displayParams');
-      if(!isset($displayParams['module'])) {
+      if (!isset($displayParams['module'])) {
          $smarty->trigger_error("sugarvar_connector: missing 'module' parameter");
          $GLOBALS['log']->error("sugarvar_connector: missing 'module' parameter");
          return;     	

Braces +3 added lines, -1 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.

include/Smarty/plugins/function.sugar_include.php

Indentation +25 added lines, -25 removed lines

@@ -57,33 +57,33 @@
     global $app_strings;
 
     if(isset($params['type']) && $params['type'] == 'php') {
-		if(!isset($params['file'])) {
-		   $smarty->trigger_error($app_strings['ERR_MISSING_REQUIRED_FIELDS'] . 'include');
-		} 
+        if(!isset($params['file'])) {
+            $smarty->trigger_error($app_strings['ERR_MISSING_REQUIRED_FIELDS'] . 'include');
+        } 
 		
-		$includeFile = $params['file'];
-		if(!file_exists($includeFile)) {
-		   $smarty->trigger_error($app_strings['ERR_NO_SUCH_FILE'] . ': ' . $includeFile);
-		}
+        $includeFile = $params['file'];
+        if(!file_exists($includeFile)) {
+            $smarty->trigger_error($app_strings['ERR_NO_SUCH_FILE'] . ': ' . $includeFile);
+        }
 		
-	    ob_start();
-	    require($includeFile);
-	    $output_html = ob_get_contents();
-	    ob_end_clean();
-	    echo $output_html; 
+        ob_start();
+        require($includeFile);
+        $output_html = ob_get_contents();
+        ob_end_clean();
+        echo $output_html; 
     } else if(is_array($params['include'])) {
-	   	  $code = '';
-	   	  foreach($params['include'] as $include) {
-	   	  	      if(isset($include['file'])) {
-	   	  	         $file = $include['file'];
-	   	  	         if(preg_match('/[\.]js$/si',$file)) {
-	   	  	            $code .= "<script src=\"". getJSPath($include['file']) ."\"></script>";
-	   	  	         } else if(preg_match('/[\.]php$/si', $file)) {
-	   	  	            require_once($file);	
-	   	  	         }
-	   	  	      } 
-	   	  } //foreach
-	      return $code;
-   	} //if
+                $code = '';
+                foreach($params['include'] as $include) {
+                        if(isset($include['file'])) {
+                            $file = $include['file'];
+                            if(preg_match('/[\.]js$/si',$file)) {
+                                $code .= "<script src=\"". getJSPath($include['file']) ."\"></script>";
+                            } else if(preg_match('/[\.]php$/si', $file)) {
+                                require_once($file);	
+                            }
+                        } 
+                } //foreach
+            return $code;
+        } //if
 }
 ?>
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -56,14 +56,14 @@ 
 {
     global $app_strings;
 
-    if(isset($params['type']) && $params['type'] == 'php') {
-		if(!isset($params['file'])) {
-		   $smarty->trigger_error($app_strings['ERR_MISSING_REQUIRED_FIELDS'] . 'include');
+    if (isset($params['type']) && $params['type'] == 'php') {
+		if (!isset($params['file'])) {
+		   $smarty->trigger_error($app_strings['ERR_MISSING_REQUIRED_FIELDS'].'include');
 		} 
 		
 		$includeFile = $params['file'];
-		if(!file_exists($includeFile)) {
-		   $smarty->trigger_error($app_strings['ERR_NO_SUCH_FILE'] . ': ' . $includeFile);
+		if (!file_exists($includeFile)) {
+		   $smarty->trigger_error($app_strings['ERR_NO_SUCH_FILE'].': '.$includeFile);
 		}
 		
 	    ob_start();
@@ -71,14 +71,14 @@ 
 	    $output_html = ob_get_contents();
 	    ob_end_clean();
 	    echo $output_html; 
-    } else if(is_array($params['include'])) {
+    } else if (is_array($params['include'])) {
 	   	  $code = '';
-	   	  foreach($params['include'] as $include) {
-	   	  	      if(isset($include['file'])) {
+	   	  foreach ($params['include'] as $include) {
+	   	  	      if (isset($include['file'])) {
 	   	  	         $file = $include['file'];
-	   	  	         if(preg_match('/[\.]js$/si',$file)) {
-	   	  	            $code .= "<script src=\"". getJSPath($include['file']) ."\"></script>";
-	   	  	         } else if(preg_match('/[\.]php$/si', $file)) {
+	   	  	         if (preg_match('/[\.]js$/si', $file)) {
+	   	  	            $code .= "<script src=\"".getJSPath($include['file'])."\"></script>";
+	   	  	         } else if (preg_match('/[\.]php$/si', $file)) {
 	   	  	            require_once($file);	
 	   	  	         }
 	   	  	      } 

include/Smarty/Smarty_Compiler.class.php

Indentation +31 added lines, -31 removed lines

@@ -130,7 +130,7 @@ 
 
         // matches all valid variables (no quotes, no modifiers)
         $this->_avar_regexp = '(?:' . $this->_dvar_regexp . '|'
-           . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')';
+            . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')';
 
         // matches valid variable syntax:
         // $foo
@@ -172,7 +172,7 @@ 
         // |foo|bar
         // |foo:$foo->bar
         $this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|' . $this->_num_const_regexp . '|'
-           . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
+            . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
 
         // matches valid function name:
         // foo123
@@ -193,7 +193,7 @@ 
         // "text"|bar
         // $foo->bar
         $this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '|'
-           . $this->_var_regexp . '|' . $this->_num_const_regexp  . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
+            . $this->_var_regexp . '|' . $this->_num_const_regexp  . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
 
         // matches valid parenthesised function parameters:
         //
@@ -210,7 +210,7 @@ 
         // _foo_bar($foo,"bar")
         // foo123($foo,$foo->bar(),"foo")
         $this->_func_call_regexp = '(?:' . $this->_func_regexp . '\s*(?:'
-           . $this->_parenth_param_regexp . '))';
+            . $this->_parenth_param_regexp . '))';
     }
 
     /**
@@ -263,11 +263,11 @@ 
 
         /* replace special blocks by "{php}" */
         $source_content = preg_replace_callback($search, create_function ('$matches', "return '"
-                                       . $this->_quote_replace($this->left_delimiter) . 'php'
-                                       . "' . str_repeat(\"\n\", substr_count('\$matches[1]', \"\n\")) .'"
-                                       . $this->_quote_replace($this->right_delimiter)
-                                       . "';")
-                                       , $source_content);
+                                        . $this->_quote_replace($this->left_delimiter) . 'php'
+                                        . "' . str_repeat(\"\n\", substr_count('\$matches[1]', \"\n\")) .'"
+                                        . $this->_quote_replace($this->right_delimiter)
+                                        . "';")
+                                        , $source_content);
 
         /* Gather all template tags. */
         preg_match_all("~{$ldq}\s*(.*?)\s*{$rdq}~s", $source_content, $_match);
@@ -388,7 +388,7 @@ 
                 if ($postfilter === false) continue;
                 if ($postfilter[3] || is_callable($postfilter[0])) {
                     $compiled_content = call_user_func_array($postfilter[0],
-                                                              array($compiled_content, &$this));
+                                                                array($compiled_content, &$this));
                     $this->_plugins['postfilter'][$filter_name][3] = true;
                 } else {
                     $this->_trigger_fatal_error("Smarty plugin error: postfilter '$filter_name' is not implemented");
@@ -649,8 +649,8 @@ 
                 $output = call_user_func_array($plugin_func, array($tag_args, &$this));
                 if($output != '') {
                 $output = '<?php ' . $this->_push_cacheable_state('compiler', $tag_command)
-                                   . $output
-                                   . $this->_pop_cacheable_state('compiler', $tag_command) . ' ?>';
+                                    . $output
+                                    . $this->_pop_cacheable_state('compiler', $tag_command) . ' ?>';
                 }
             } else {
                 $this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__);
@@ -1115,7 +1115,7 @@ 
             $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
         else
             $output .= "if ({$section_props}['max'] < 0)\n" .
-                       "    {$section_props}['max'] = {$section_props}['loop'];\n";
+                        "    {$section_props}['max'] = {$section_props}['loop'];\n";
 
         if (!isset($attrs['step']))
             $output .= "{$section_props}['step'] = 1;\n";
@@ -1124,9 +1124,9 @@ 
             $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" .
-                       "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
+                        "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" .
+                        "else\n" .
+                        "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
         }
 
         $output .= "if ({$section_props}['show']) {\n";
@@ -1136,9 +1136,9 @@ 
             $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
         }
         $output .= "    if ({$section_props}['total'] == 0)\n" .
-                   "        {$section_props}['show'] = false;\n" .
-                   "} else\n" .
-                   "    {$section_props}['total'] = 0;\n";
+                    "        {$section_props}['show'] = false;\n" .
+                    "} else\n" .
+                    "    {$section_props}['total'] = 0;\n";
 
         $output .= "if ({$section_props}['show']):\n";
         $output .= "
@@ -1987,8 +1987,8 @@ 
         }
         if (!isset($this->_plugin_info[$type][$name])) {
             $this->_plugin_info[$type][$name] = array($this->_current_file,
-                                                      $this->_current_line_no,
-                                                      $delayed_loading);
+                                                        $this->_current_line_no,
+                                                        $delayed_loading);
         }
     }
 
@@ -2056,7 +2056,7 @@ 
             case 'get':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_GET";
@@ -2065,7 +2065,7 @@ 
             case 'post':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_POST";
@@ -2074,7 +2074,7 @@ 
             case 'cookies':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_COOKIE";
@@ -2083,7 +2083,7 @@ 
             case 'env':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_ENV";
@@ -2092,7 +2092,7 @@ 
             case 'server':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_SERVER";
@@ -2101,7 +2101,7 @@ 
             case 'session':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_SESSION";
@@ -2114,7 +2114,7 @@ 
             case 'request':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 if ($this->request_use_auto_globals) {
@@ -2141,7 +2141,7 @@ 
             case 'const':
                 if ($this->security && !$this->security_settings['ALLOW_CONSTANTS']) {
                     $this->_syntax_error("(secure mode) constants not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 array_shift($indexes);
@@ -2197,7 +2197,7 @@ 
                 return ((is_object($this->_plugins[$type][$name][0][0])) ?
                         "\$this->_plugins['$type']['$name'][0][0]->"    /* method callback */
                         : (string)($this->_plugins[$type][$name][0][0]).'::'    /* class callback */
-                       ). $this->_plugins[$type][$name][0][1];
+                        ). $this->_plugins[$type][$name][0][1];
 
             } else {
                 /* function callback */
@@ -2342,7 +2342,7 @@ 
             $message = " expected {/$_open_tag} (opened line $_line_no).";
         }
         $this->_syntax_error("mismatched tag {/$close_tag}.$message",
-                             E_USER_ERROR, __FILE__, __LINE__);
+                                E_USER_ERROR, __FILE__, __LINE__);
     }
 
 }

Spacing +232 added lines, -232 removed lines

@@ -38,41 +38,41 @@ 
     /**#@+
      * @access private
      */
-    var $_folded_blocks         =   array();    // keeps folded template blocks
-    var $_current_file          =   null;       // the current template being compiled
-    var $_current_line_no       =   1;          // line number for error messages
-    var $_capture_stack         =   array();    // keeps track of nested capture buffers
-    var $_plugin_info           =   array();    // keeps track of plugins to load
-    var $_init_smarty_vars      =   false;
-    var $_permitted_tokens      =   array('true','false','yes','no','on','off','null');
-    var $_db_qstr_regexp        =   null;        // regexps are setup in the constructor
-    var $_si_qstr_regexp        =   null;
-    var $_qstr_regexp           =   null;
-    var $_func_regexp           =   null;
-    var $_reg_obj_regexp        =   null;
-    var $_var_bracket_regexp    =   null;
-    var $_num_const_regexp      =   null;
-    var $_dvar_guts_regexp      =   null;
-    var $_dvar_regexp           =   null;
-    var $_cvar_regexp           =   null;
-    var $_svar_regexp           =   null;
-    var $_avar_regexp           =   null;
-    var $_mod_regexp            =   null;
-    var $_var_regexp            =   null;
-    var $_parenth_param_regexp  =   null;
-    var $_func_call_regexp      =   null;
-    var $_obj_ext_regexp        =   null;
-    var $_obj_start_regexp      =   null;
-    var $_obj_params_regexp     =   null;
-    var $_obj_call_regexp       =   null;
-    var $_cacheable_state       =   0;
-    var $_cache_attrs_count     =   0;
-    var $_nocache_count         =   0;
-    var $_cache_serial          =   null;
-    var $_cache_include         =   null;
-
-    var $_strip_depth           =   0;
-    var $_additional_newline    =   "\n";
+    var $_folded_blocks         = array(); // keeps folded template blocks
+    var $_current_file          = null; // the current template being compiled
+    var $_current_line_no       = 1; // line number for error messages
+    var $_capture_stack         = array(); // keeps track of nested capture buffers
+    var $_plugin_info           = array(); // keeps track of plugins to load
+    var $_init_smarty_vars      = false;
+    var $_permitted_tokens      = array('true', 'false', 'yes', 'no', 'on', 'off', 'null');
+    var $_db_qstr_regexp        = null; // regexps are setup in the constructor
+    var $_si_qstr_regexp        = null;
+    var $_qstr_regexp           = null;
+    var $_func_regexp           = null;
+    var $_reg_obj_regexp        = null;
+    var $_var_bracket_regexp    = null;
+    var $_num_const_regexp      = null;
+    var $_dvar_guts_regexp      = null;
+    var $_dvar_regexp           = null;
+    var $_cvar_regexp           = null;
+    var $_svar_regexp           = null;
+    var $_avar_regexp           = null;
+    var $_mod_regexp            = null;
+    var $_var_regexp            = null;
+    var $_parenth_param_regexp  = null;
+    var $_func_call_regexp      = null;
+    var $_obj_ext_regexp        = null;
+    var $_obj_start_regexp      = null;
+    var $_obj_params_regexp     = null;
+    var $_obj_call_regexp       = null;
+    var $_cacheable_state       = 0;
+    var $_cache_attrs_count     = 0;
+    var $_nocache_count         = 0;
+    var $_cache_serial          = null;
+    var $_cache_include         = null;
+
+    var $_strip_depth           = 0;
+    var $_additional_newline    = "\n";
 
     /**#@-*/
     /**
@@ -91,7 +91,7 @@ 
         $this->_si_qstr_regexp = '\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'';
 
         // matches single or double quoted strings
-        $this->_qstr_regexp = '(?:' . $this->_db_qstr_regexp . '|' . $this->_si_qstr_regexp . ')';
+        $this->_qstr_regexp = '(?:'.$this->_db_qstr_regexp.'|'.$this->_si_qstr_regexp.')';
 
         // matches bracket portion of vars
         // [0]
@@ -115,9 +115,9 @@ 
         // $foo[5].bar[$foobar][4]
         $this->_dvar_math_regexp = '(?:[\+\*\/\%]|(?:-(?!>)))';
         $this->_dvar_math_var_regexp = '[\$\w\.\+\-\*\/\%\d\>\[\]]';
-        $this->_dvar_guts_regexp = '\w+(?:' . $this->_var_bracket_regexp
-                . ')*(?:\.\$?\w+(?:' . $this->_var_bracket_regexp . ')*)*(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?';
-        $this->_dvar_regexp = '\$' . $this->_dvar_guts_regexp;
+        $this->_dvar_guts_regexp = '\w+(?:'.$this->_var_bracket_regexp
+                . ')*(?:\.\$?\w+(?:'.$this->_var_bracket_regexp.')*)*(?:'.$this->_dvar_math_regexp.'(?:'.$this->_num_const_regexp.'|'.$this->_dvar_math_var_regexp.')*)?';
+        $this->_dvar_regexp = '\$'.$this->_dvar_guts_regexp;
 
         // matches config vars:
         // #foo#
@@ -129,8 +129,8 @@ 
         $this->_svar_regexp = '\%\w+\.\w+\%';
 
         // matches all valid variables (no quotes, no modifiers)
-        $this->_avar_regexp = '(?:' . $this->_dvar_regexp . '|'
-           . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')';
+        $this->_avar_regexp = '(?:'.$this->_dvar_regexp.'|'
+           . $this->_cvar_regexp.'|'.$this->_svar_regexp.')';
 
         // matches valid variable syntax:
         // $foo
@@ -139,7 +139,7 @@ 
         // #foo#
         // "text"
         // "text"
-        $this->_var_regexp = '(?:' . $this->_avar_regexp . '|' . $this->_qstr_regexp . ')';
+        $this->_var_regexp = '(?:'.$this->_avar_regexp.'|'.$this->_qstr_regexp.')';
 
         // matches valid object call (one level of object nesting allowed in parameters):
         // $foo->bar
@@ -152,16 +152,16 @@ 
         // $foo->bar($foo->bar)
         // $foo->bar($foo->bar())
         // $foo->bar($foo->bar($blah,$foo,44,"foo",$foo[0].bar))
-        $this->_obj_ext_regexp = '\->(?:\$?' . $this->_dvar_guts_regexp . ')';
+        $this->_obj_ext_regexp = '\->(?:\$?'.$this->_dvar_guts_regexp.')';
         $this->_obj_restricted_param_regexp = '(?:'
-                . '(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')(?:' . $this->_obj_ext_regexp . '(?:\((?:(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')'
-                . '(?:\s*,\s*(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . '))*)?\))?)*)';
-        $this->_obj_single_param_regexp = '(?:\w+|' . $this->_obj_restricted_param_regexp . '(?:\s*,\s*(?:(?:\w+|'
-                . $this->_var_regexp . $this->_obj_restricted_param_regexp . ')))*)';
-        $this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp
-                . '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
-        $this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
-        $this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
+                . '(?:'.$this->_var_regexp.'|'.$this->_num_const_regexp.')(?:'.$this->_obj_ext_regexp.'(?:\((?:(?:'.$this->_var_regexp.'|'.$this->_num_const_regexp.')'
+                . '(?:\s*,\s*(?:'.$this->_var_regexp.'|'.$this->_num_const_regexp.'))*)?\))?)*)';
+        $this->_obj_single_param_regexp = '(?:\w+|'.$this->_obj_restricted_param_regexp.'(?:\s*,\s*(?:(?:\w+|'
+                . $this->_var_regexp.$this->_obj_restricted_param_regexp.')))*)';
+        $this->_obj_params_regexp = '\((?:'.$this->_obj_single_param_regexp
+                . '(?:\s*,\s*'.$this->_obj_single_param_regexp.')*)?\)';
+        $this->_obj_start_regexp = '(?:'.$this->_dvar_regexp.'(?:'.$this->_obj_ext_regexp.')+)';
+        $this->_obj_call_regexp = '(?:'.$this->_obj_start_regexp.'(?:'.$this->_obj_params_regexp.')?(?:'.$this->_dvar_math_regexp.'(?:'.$this->_num_const_regexp.'|'.$this->_dvar_math_var_regexp.')*)?)';
         
         // matches valid modifier syntax:
         // |foo
@@ -171,8 +171,8 @@ 
         // |foo:"bar":$foobar
         // |foo|bar
         // |foo:$foo->bar
-        $this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|' . $this->_num_const_regexp . '|'
-           . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
+        $this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|'.$this->_num_const_regexp.'|'
+           . $this->_obj_call_regexp.'|'.$this->_avar_regexp.'|'.$this->_qstr_regexp.'))*)';
 
         // matches valid function name:
         // foo123
@@ -192,8 +192,8 @@ 
         // "text"
         // "text"|bar
         // $foo->bar
-        $this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '|'
-           . $this->_var_regexp . '|' . $this->_num_const_regexp  . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
+        $this->_param_regexp = '(?:\s*(?:'.$this->_obj_call_regexp.'|'
+           . $this->_var_regexp.'|'.$this->_num_const_regexp.'|\w+)(?>'.$this->_mod_regexp.'*)\s*)';
 
         // matches valid parenthesised function parameters:
         //
@@ -201,16 +201,16 @@ 
         //    $foo, $bar, "text"
         // $foo|bar, "foo"|bar, $foo->bar($foo)|bar
         $this->_parenth_param_regexp = '(?:\((?:\w+|'
-                . $this->_param_regexp . '(?:\s*,\s*(?:(?:\w+|'
-                . $this->_param_regexp . ')))*)?\))';
+                . $this->_param_regexp.'(?:\s*,\s*(?:(?:\w+|'
+                . $this->_param_regexp.')))*)?\))';
 
         // matches valid function call:
         // foo()
         // foo_bar($foo)
         // _foo_bar($foo,"bar")
         // foo123($foo,$foo->bar(),"foo")
-        $this->_func_call_regexp = '(?:' . $this->_func_regexp . '\s*(?:'
-           . $this->_parenth_param_regexp . '))';
+        $this->_func_call_regexp = '(?:'.$this->_func_regexp.'\s*(?:'
+           . $this->_parenth_param_regexp.'))';
     }
 
     /**
@@ -257,13 +257,13 @@ 
         /* fetch all special blocks */
         $search = "~{$ldq}\*(.*?)\*{$rdq}|{$ldq}\s*literal\s*{$rdq}(.*?){$ldq}\s*/literal\s*{$rdq}|{$ldq}\s*php\s*{$rdq}(.*?){$ldq}\s*/php\s*{$rdq}~s";
 
-        preg_match_all($search, $source_content, $match,  PREG_SET_ORDER);
+        preg_match_all($search, $source_content, $match, PREG_SET_ORDER);
         $this->_folded_blocks = $match;
         reset($this->_folded_blocks);
 
         /* replace special blocks by "{php}" */
-        $source_content = preg_replace_callback($search, create_function ('$matches', "return '"
-                                       . $this->_quote_replace($this->left_delimiter) . 'php'
+        $source_content = preg_replace_callback($search, create_function('$matches', "return '"
+                                       . $this->_quote_replace($this->left_delimiter).'php'
                                        . "' . str_repeat(\"\n\", substr_count('\$matches[1]', \"\n\")) .'"
                                        . $this->_quote_replace($this->right_delimiter)
                                        . "';")
@@ -283,7 +283,7 @@ 
                 $sp_match[1] = array_unique($sp_match[1]);
                 usort($sp_match[1], '_smarty_sort_length');
                 for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; $curr_sp++) {
-                    $text_blocks[$curr_tb] = str_replace($sp_match[1][$curr_sp],'%%%SMARTYSP'.$curr_sp.'%%%',$text_blocks[$curr_tb]);
+                    $text_blocks[$curr_tb] = str_replace($sp_match[1][$curr_sp], '%%%SMARTYSP'.$curr_sp.'%%%', $text_blocks[$curr_tb]);
                 }
                 /* process each one */
                 for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; $curr_sp++) {
@@ -312,7 +312,7 @@ 
             $compiled_tags[] = $this->_compile_tag($template_tags[$i]);
             $this->_current_line_no += substr_count($template_tags[$i], "\n");
         }
-        if (count($this->_tag_stack)>0) {
+        if (count($this->_tag_stack) > 0) {
             list($_open_tag, $_line_no) = end($this->_tag_stack);
             $this->_syntax_error("unclosed tag \{$_open_tag} (opened line $_line_no).", E_USER_ERROR, __FILE__, __LINE__);
             return;
@@ -337,7 +337,7 @@ 
                         /* remove trailing whitespaces from the last text_block */
                         $text_blocks[$j] = rtrim($text_blocks[$j]);
                     }
-                    $text_blocks[$j] = "<?php echo '" . strtr($text_blocks[$j], array("'"=>"\'", "\\"=>"\\\\")) . "'; ?>";
+                    $text_blocks[$j] = "<?php echo '".strtr($text_blocks[$j], array("'"=>"\'", "\\"=>"\\\\"))."'; ?>";
                     if ($compiled_tags[$j] == '{/strip}') {
                         $compiled_tags[$j] = "\n"; /* slurped by php, but necessary
                                     if a newline is following the closing strip-tag */
@@ -350,19 +350,19 @@ 
         }
         $compiled_content = '';
         
-        $tag_guard = '%%%SMARTYOTG' . md5(uniqid(rand(), true)) . '%%%';
+        $tag_guard = '%%%SMARTYOTG'.md5(uniqid(rand(), true)).'%%%';
         
         /* Interleave the compiled contents and text blocks to get the final result. */
         for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) {
             if ($compiled_tags[$i] == '') {
                 // tag result empty, remove first newline from following text block
-                $text_blocks[$i+1] = preg_replace('~^(\r\n|\r|\n)~', '', $text_blocks[$i+1]);
+                $text_blocks[$i + 1] = preg_replace('~^(\r\n|\r|\n)~', '', $text_blocks[$i + 1]);
             }
             // replace legit PHP tags with placeholder
             $text_blocks[$i] = str_replace('<?', $tag_guard, $text_blocks[$i]);
             $compiled_tags[$i] = str_replace('<?', $tag_guard, $compiled_tags[$i]);
             
-            $compiled_content .= $text_blocks[$i] . $compiled_tags[$i];
+            $compiled_content .= $text_blocks[$i].$compiled_tags[$i];
         }
         $compiled_content .= str_replace('<?', $tag_guard, $text_blocks[$i]);
 
@@ -374,12 +374,12 @@ 
         $compiled_content = str_replace($tag_guard, '<?', $compiled_content); 
         
         // remove \n from the end of the file, if any
-        if (strlen($compiled_content) && (substr($compiled_content, -1) == "\n") ) {
+        if (strlen($compiled_content) && (substr($compiled_content, -1) == "\n")) {
             $compiled_content = substr($compiled_content, 0, -1);
         }
 
         if (!empty($this->_cache_serial)) {
-            $compiled_content = "<?php \$this->_cache_serials['".$this->_cache_include."'] = '".$this->_cache_serial."'; ?>" . $compiled_content;
+            $compiled_content = "<?php \$this->_cache_serials['".$this->_cache_include."'] = '".$this->_cache_serial."'; ?>".$compiled_content;
         }
 
         // run compiled template through postfilter functions
@@ -406,7 +406,7 @@ 
             $_plugins_params = "array('plugins' => array(";
             foreach ($this->_plugin_info as $plugin_type => $plugins) {
                 foreach ($plugins as $plugin_name => $plugin_info) {
-                    $_plugins_params .= "array('$plugin_type', '$plugin_name', '" . strtr($plugin_info[0], array("'" => "\\'", "\\" => "\\\\")) . "', $plugin_info[1], ";
+                    $_plugins_params .= "array('$plugin_type', '$plugin_name', '".strtr($plugin_info[0], array("'" => "\\'", "\\" => "\\\\"))."', $plugin_info[1], ";
                     $_plugins_params .= $plugin_info[2] ? 'true),' : 'false),';
                 }
             }
@@ -422,7 +422,7 @@ 
             $this->_init_smarty_vars = false;
         }
 
-        $compiled_content = $template_header . $compiled_content;
+        $compiled_content = $template_header.$compiled_content;
         return true;
     }
 
@@ -439,8 +439,8 @@ 
             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
-                . '|\/?' . $this->_reg_obj_regexp . '|\/?' . $this->_func_regexp . ')(' . $this->_mod_regexp . '*))
+        if (!preg_match('~^(?:('.$this->_num_const_regexp.'|'.$this->_obj_call_regexp.'|'.$this->_var_regexp
+                . '|\/?'.$this->_reg_obj_regexp.'|\/?'.$this->_func_regexp.')('.$this->_mod_regexp.'*))
                       (?:\s+(.*))?$
                     ~xs', $template_tag, $match)) {
             $this->_syntax_error("unrecognized tag: $template_tag", E_USER_ERROR, __FILE__, __LINE__);
@@ -450,14 +450,14 @@ 
         $tag_modifier = isset($match[2]) ? $match[2] : null;
         $tag_args = isset($match[3]) ? $match[3] : null;
 
-        if (preg_match('~^' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '$~', $tag_command)) {
+        if (preg_match('~^'.$this->_num_const_regexp.'|'.$this->_obj_call_regexp.'|'.$this->_var_regexp.'$~', $tag_command)) {
             /* tag name is a variable or object */
-            $_return = $this->_parse_var_props($tag_command . $tag_modifier);
-            return "<?php echo $_return; ?>" . $this->_additional_newline;
+            $_return = $this->_parse_var_props($tag_command.$tag_modifier);
+            return "<?php echo $_return; ?>".$this->_additional_newline;
         }
 
         /* If the tag name is a registered object, we process it. */
-        if (preg_match('~^\/?' . $this->_reg_obj_regexp . '$~', $tag_command)) {
+        if (preg_match('~^\/?'.$this->_reg_obj_regexp.'$~', $tag_command)) {
             return $this->_compile_registered_object_tag($tag_command, $this->_parse_attrs($tag_args), $tag_modifier);
         }
 
@@ -539,17 +539,17 @@ 
 
             case 'strip':
             case '/strip':
-                if (substr($tag_command, 0, 1)=='/') {
+                if (substr($tag_command, 0, 1) == '/') {
                     $this->_pop_tag('strip');
-                    if (--$this->_strip_depth==0) { /* outermost closing {/strip} */
+                    if (--$this->_strip_depth == 0) { /* outermost closing {/strip} */
                         $this->_additional_newline = "\n";
-                        return '{' . $tag_command . '}';
+                        return '{'.$tag_command.'}';
                     }
                 } else {
                     $this->_push_tag('strip');
-                    if ($this->_strip_depth++==0) { /* outermost opening {strip} */
+                    if ($this->_strip_depth++ == 0) { /* outermost opening {strip} */
                         $this->_additional_newline = "";
-                        return '{' . $tag_command . '}';
+                        return '{'.$tag_command.'}';
                     }
                 }
                 return '';
@@ -565,14 +565,14 @@ 
                         return '';
 
                     case 3: /* literal */
-                        return "<?php echo '" . strtr($block[2], array("'"=>"\'", "\\"=>"\\\\")) . "'; ?>" . $this->_additional_newline;
+                        return "<?php echo '".strtr($block[2], array("'"=>"\'", "\\"=>"\\\\"))."'; ?>".$this->_additional_newline;
 
                     case 4: /* php */
                         if ($this->security && !$this->security_settings['PHP_TAGS']) {
                             $this->_syntax_error("(secure mode) php tags not permitted", E_USER_WARNING, __FILE__, __LINE__);
                             return;
                         }
-                        return '<?php ' . $block[3] .' ?>';
+                        return '<?php '.$block[3].' ?>';
                 }
                 break;
 
@@ -629,7 +629,7 @@ 
 
             include_once $plugin_file;
 
-            $plugin_func = 'smarty_compiler_' . $tag_command;
+            $plugin_func = 'smarty_compiler_'.$tag_command;
             if (!is_callable($plugin_func)) {
                 $message = "plugin function $plugin_func() not found in $plugin_file\n";
                 $have_function = false;
@@ -647,10 +647,10 @@ 
         if ($found) {
             if ($have_function) {
                 $output = call_user_func_array($plugin_func, array($tag_args, &$this));
-                if($output != '') {
-                $output = '<?php ' . $this->_push_cacheable_state('compiler', $tag_command)
+                if ($output != '') {
+                $output = '<?php '.$this->_push_cacheable_state('compiler', $tag_command)
                                    . $output
-                                   . $this->_pop_cacheable_state('compiler', $tag_command) . ' ?>';
+                                   . $this->_pop_cacheable_state('compiler', $tag_command).' ?>';
                 }
             } else {
                 $this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__);
@@ -704,7 +704,7 @@ 
 
             include_once $plugin_file;
 
-            $plugin_func = 'smarty_block_' . $tag_command;
+            $plugin_func = 'smarty_block_'.$tag_command;
             if (!function_exists($plugin_func)) {
                 $message = "plugin function $plugin_func() not found in $plugin_file\n";
                 $have_function = false;
@@ -734,12 +734,12 @@ 
             $this->_pop_tag($tag_command);
 
         if ($start_tag) {
-            $output = '<?php ' . $this->_push_cacheable_state('block', $tag_command);
+            $output = '<?php '.$this->_push_cacheable_state('block', $tag_command);
             $attrs = $this->_parse_attrs($tag_args);
-            $_cache_attrs='';
+            $_cache_attrs = '';
             $arg_list = $this->_compile_arg_list('block', $tag_command, $attrs, $_cache_attrs);
             $output .= "$_cache_attrs\$this->_tag_stack[] = array('$tag_command', array(".implode(',', $arg_list).')); ';
-            $output .= '$_block_repeat=true;' . $this->_compile_plugin_call('block', $tag_command).'($this->_tag_stack[count($this->_tag_stack)-1][1], null, $this, $_block_repeat);';
+            $output .= '$_block_repeat=true;'.$this->_compile_plugin_call('block', $tag_command).'($this->_tag_stack[count($this->_tag_stack)-1][1], null, $this, $_block_repeat);';
             $output .= 'while ($_block_repeat) { ob_start(); ?>';
         } else {
             $output = '<?php $_block_content = ob_get_contents(); ob_end_clean(); ';
@@ -747,8 +747,8 @@ 
             if ($tag_modifier != '') {
                 $this->_parse_modifiers($_out_tag_text, $tag_modifier);
             }
-            $output .= '$_block_repeat=false;echo ' . $_out_tag_text . '; } ';
-            $output .= " array_pop(\$this->_tag_stack); " . $this->_pop_cacheable_state('block', $tag_command) . '?>';
+            $output .= '$_block_repeat=false;echo '.$_out_tag_text.'; } ';
+            $output .= " array_pop(\$this->_tag_stack); ".$this->_pop_cacheable_state('block', $tag_command).'?>';
         }
 
         return true;
@@ -789,7 +789,7 @@ 
 
             include_once $plugin_file;
 
-            $plugin_func = 'smarty_function_' . $tag_command;
+            $plugin_func = 'smarty_function_'.$tag_command;
             if (!function_exists($plugin_func)) {
                 $message = "plugin function $plugin_func() not found in $plugin_file\n";
                 $have_function = false;
@@ -816,13 +816,13 @@ 
         $arg_list = $this->_compile_arg_list('function', $tag_command, $attrs, $_cache_attrs);
 
         $output = $this->_compile_plugin_call('function', $tag_command).'(array('.implode(',', $arg_list)."), \$this)";
-        if($tag_modifier != '') {
+        if ($tag_modifier != '') {
             $this->_parse_modifiers($output, $tag_modifier);
         }
 
-        if($output != '') {
-            $output =  '<?php ' . $_cacheable_state . $_cache_attrs . 'echo ' . $output . ';'
-                . $this->_pop_cacheable_state('function', $tag_command) . "?>" . $this->_additional_newline;
+        if ($output != '') {
+            $output = '<?php '.$_cacheable_state.$_cache_attrs.'echo '.$output.';'
+                . $this->_pop_cacheable_state('function', $tag_command)."?>".$this->_additional_newline;
         }
 
         return true;
@@ -848,10 +848,10 @@ 
         list($object, $obj_comp) = explode('->', $tag_command);
 
         $arg_list = array();
-        if(count($attrs)) {
+        if (count($attrs)) {
             $_assign_var = false;
             foreach ($attrs as $arg_name => $arg_value) {
-                if($arg_name == 'assign') {
+                if ($arg_name == 'assign') {
                     $_assign_var = $arg_value;
                     unset($attrs['assign']);
                     continue;
@@ -862,7 +862,7 @@ 
             }
         }
 
-        if($this->_reg_objects[$object][2]) {
+        if ($this->_reg_objects[$object][2]) {
             // smarty object argument format
             $args = "array(".implode(',', (array)$arg_list)."), \$this";
         } else {
@@ -876,13 +876,13 @@ 
         $prefix = '';
         $postfix = '';
         $newline = '';
-        if(!is_object($this->_reg_objects[$object][0])) {
-            $this->_trigger_fatal_error("registered '$object' is not an object" , $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
-        } elseif(!empty($this->_reg_objects[$object][1]) && !in_array($obj_comp, $this->_reg_objects[$object][1])) {
+        if (!is_object($this->_reg_objects[$object][0])) {
+            $this->_trigger_fatal_error("registered '$object' is not an object", $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
+        } elseif (!empty($this->_reg_objects[$object][1]) && !in_array($obj_comp, $this->_reg_objects[$object][1])) {
             $this->_trigger_fatal_error("'$obj_comp' is not a registered component of object '$object'", $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
-        } elseif(method_exists($this->_reg_objects[$object][0], $obj_comp)) {
+        } elseif (method_exists($this->_reg_objects[$object][0], $obj_comp)) {
             // method
-            if(in_array($obj_comp, $this->_reg_objects[$object][3])) {
+            if (in_array($obj_comp, $this->_reg_objects[$object][3])) {
                 // block method
                 if ($start_tag) {
                     $prefix = "\$this->_tag_stack[] = array('$obj_comp', $args); ";
@@ -904,22 +904,22 @@ 
             $return = "\$this->_reg_objects['$object'][0]->$obj_comp";
         }
 
-        if($return != null) {
-            if($tag_modifier != '') {
+        if ($return != null) {
+            if ($tag_modifier != '') {
                 $this->_parse_modifiers($return, $tag_modifier);
             }
 
-            if(!empty($_assign_var)) {
-                $output = "\$this->assign('" . $this->_dequote($_assign_var) ."',  $return);";
+            if (!empty($_assign_var)) {
+                $output = "\$this->assign('".$this->_dequote($_assign_var)."',  $return);";
             } else {
-                $output = 'echo ' . $return . ';';
+                $output = 'echo '.$return.';';
                 $newline = $this->_additional_newline;
             }
         } else {
             $output = '';
         }
 
-        return '<?php ' . $prefix . $output . $postfix . "?>" . $newline;
+        return '<?php '.$prefix.$output.$postfix."?>".$newline;
     }
 
     /**
@@ -957,7 +957,7 @@ 
 
         $_params = "array('args' => array(".implode(', ', (array)$arg_list)."))";
 
-        return "<?php require_once(SMARTY_CORE_DIR . 'core.run_insert_handler.php');\necho smarty_core_run_insert_handler($_params, \$this); ?>" . $this->_additional_newline;
+        return "<?php require_once(SMARTY_CORE_DIR . 'core.run_insert_handler.php');\necho smarty_core_run_insert_handler($_params, \$this); ?>".$this->_additional_newline;
     }
 
     /**
@@ -992,8 +992,8 @@ 
             $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 ';
 
@@ -1005,13 +1005,13 @@ 
             "\$_smarty_tpl_vars = \$this->_tpl_vars;\n";
 
 
-        $_params = "array('smarty_include_tpl_file' => " . $include_file . ", 'smarty_include_vars' => array(".implode(',', (array)$arg_list)."))";
-        $output .= "\$this->_smarty_include($_params);\n" .
-        "\$this->_tpl_vars = \$_smarty_tpl_vars;\n" .
+        $_params = "array('smarty_include_tpl_file' => ".$include_file.", 'smarty_include_vars' => array(".implode(',', (array)$arg_list)."))";
+        $output .= "\$this->_smarty_include($_params);\n".
+        "\$this->_tpl_vars = \$_smarty_tpl_vars;\n".
         "unset(\$_smarty_tpl_vars);\n";
 
         if (isset($assign_var)) {
-            $output .= "\$this->assign(" . $assign_var . ", ob_get_contents()); ob_end_clean();\n";
+            $output .= "\$this->assign(".$assign_var.", ob_get_contents()); ob_end_clean();\n";
         }
 
         $output .= ' ?>';
@@ -1035,20 +1035,20 @@ 
         }
 
         $assign_var = (empty($attrs['assign'])) ? '' : $this->_dequote($attrs['assign']);
-        $once_var = (empty($attrs['once']) || $attrs['once']=='false') ? 'false' : 'true';
+        $once_var = (empty($attrs['once']) || $attrs['once'] == 'false') ? 'false' : 'true';
 
         $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))
+        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';
                 $arg_list[] = "'$arg_name' => $arg_value";
             }
         }
 
-        $_params = "array('smarty_file' => " . $attrs['file'] . ", 'smarty_assign' => '$assign_var', 'smarty_once' => $once_var, 'smarty_include_vars' => array(".implode(',', $arg_list)."))";
+        $_params = "array('smarty_file' => ".$attrs['file'].", 'smarty_assign' => '$assign_var', 'smarty_once' => $once_var, 'smarty_include_vars' => array(".implode(',', $arg_list)."))";
 
-        return "<?php require_once(SMARTY_CORE_DIR . 'core.smarty_include_php.php');\nsmarty_core_smarty_include_php($_params, \$this); ?>" . $this->_additional_newline;
+        return "<?php require_once(SMARTY_CORE_DIR . 'core.smarty_include_php.php');\nsmarty_core_smarty_include_php($_params, \$this); ?>".$this->_additional_newline;
     }
 
 
@@ -1114,7 +1114,7 @@ 
         if (!isset($attrs['max']))
             $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
         else
-            $output .= "if ({$section_props}['max'] < 0)\n" .
+            $output .= "if ({$section_props}['max'] < 0)\n".
                        "    {$section_props}['max'] = {$section_props}['loop'];\n";
 
         if (!isset($attrs['step']))
@@ -1123,9 +1123,9 @@ 
         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" .
+            $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".
                        "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
         }
 
@@ -1135,9 +1135,9 @@ 
         } else {
             $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
         }
-        $output .= "    if ({$section_props}['total'] == 0)\n" .
-                   "        {$section_props}['show'] = false;\n" .
-                   "} else\n" .
+        $output .= "    if ({$section_props}['total'] == 0)\n".
+                   "        {$section_props}['show'] = false;\n".
+                   "} else\n".
                    "    {$section_props}['total'] = 0;\n";
 
         $output .= "if ({$section_props}['show']):\n";
@@ -1182,7 +1182,7 @@ 
         }
 
         if (isset($attrs['key'])) {
-            $key  = $this->_dequote($attrs['key']);
+            $key = $this->_dequote($attrs['key']);
             if (!preg_match('~^\w+$~', $key)) {
                 return $this->_syntax_error("foreach: 'key' must to be a variable name (literal string)", E_USER_ERROR, __FILE__, __LINE__);
             }
@@ -1262,8 +1262,8 @@ 
 
         /* Tokenize args for 'if' tag. */
         preg_match_all('~(?>
-                ' . $this->_obj_call_regexp . '(?:' . $this->_mod_regexp . '*)? | # valid object call
-                ' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)?    | # var or quoted string
+                ' . $this->_obj_call_regexp.'(?:'.$this->_mod_regexp.'*)? | # valid object call
+                ' . $this->_var_regexp.'(?:'.$this->_mod_regexp.'*)?    | # var or quoted string
                 \-?0[xX][0-9a-fA-F]+|\-?\d+(?:\.\d+)?|\.\d+|!==|===|==|!=|<>|<<|>>|<=|>=|\&\&|\|\||\(|\)|,|\!|\^|=|\&|\~|<|>|\||\%|\+|\-|\/|\*|\@    | # valid non-word token
                 \b\w+\b                                                        | # valid word token
                 \S+                                                           # anything else
@@ -1271,7 +1271,7 @@ 
 
         $tokens = $match[0];
 
-        if(empty($tokens)) {
+        if (empty($tokens)) {
             $_error_msg = $elseif ? "'elseif'" : "'if'";
             $_error_msg .= ' statement requires arguments'; 
             $this->_syntax_error($_error_msg, E_USER_ERROR, __FILE__, __LINE__);
@@ -1280,7 +1280,7 @@ 
                 
         // make sure we have balanced parenthesis
         $token_count = array_count_values($tokens);
-        if(isset($token_count['(']) && $token_count['('] != $token_count[')']) {
+        if (isset($token_count['(']) && $token_count['('] != $token_count[')']) {
             $this->_syntax_error("unbalanced parenthesis in if statement", E_USER_ERROR, __FILE__, __LINE__);
         }
 
@@ -1370,15 +1370,15 @@ 
                     /* If last token was a ')', we operate on the parenthesized
                        expression. The start of the expression is on the stack.
                        Otherwise, we operate on the last encountered token. */
-                    if ($tokens[$i-1] == ')') {
+                    if ($tokens[$i - 1] == ')') {
                         $is_arg_start = array_pop($is_arg_stack);
                         if ($is_arg_start != 0) {
-                            if (preg_match('~^' . $this->_func_regexp . '$~', $tokens[$is_arg_start-1])) {
+                            if (preg_match('~^'.$this->_func_regexp.'$~', $tokens[$is_arg_start - 1])) {
                                 $is_arg_start--;
                             } 
                         } 
                     } else
-                        $is_arg_start = $i-1;
+                        $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));
@@ -1388,7 +1388,7 @@ 
                        return modified tokens, where the first one is the result
                        of the 'is' expression and the rest are the tokens it
                        didn't touch. */
-                    $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
+                    $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i + 1));
 
                     /* Replace the old tokens with the new ones. */
                     array_splice($tokens, $is_arg_start, count($tokens), $new_tokens);
@@ -1399,19 +1399,19 @@ 
                     break;
 
                 default:
-                    if(preg_match('~^' . $this->_func_regexp . '$~', $token) ) {
+                    if (preg_match('~^'.$this->_func_regexp.'$~', $token)) {
                             // function call
-                            if($this->security &&
+                            if ($this->security &&
                                !in_array($token, $this->security_settings['IF_FUNCS'])) {
                                 $this->_syntax_error("(secure mode) '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
                             }
-                    } elseif(preg_match('~^' . $this->_var_regexp . '$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i+1]) && $tokens[$i+1] == '(') {
+                    } elseif (preg_match('~^'.$this->_var_regexp.'$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i + 1]) && $tokens[$i + 1] == '(') {
                         // variable function call
                         $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);                      
-                    } elseif(preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)$~', $token)) {
+                    } elseif (preg_match('~^'.$this->_obj_call_regexp.'|'.$this->_var_regexp.'(?:'.$this->_mod_regexp.'*)$~', $token)) {
                         // object or variable
                         $token = $this->_parse_var_props($token);
-                    } elseif(is_numeric($token)) {
+                    } elseif (is_numeric($token)) {
                         // number, skip it
                     } else {
                         $this->_syntax_error("unidentified token '$token'", E_USER_ERROR, __FILE__, __LINE__);
@@ -1483,7 +1483,7 @@ 
                 if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') {
                     $expr_end++;
                     $expr_arg = $tokens[$expr_end++];
-                    $expr = "!(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
+                    $expr = "!(1 & ($is_arg / ".$this->_parse_var_props($expr_arg)."))";
                 } else
                     $expr = "!(1 & $is_arg)";
                 break;
@@ -1492,7 +1492,7 @@ 
                 if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') {
                     $expr_end++;
                     $expr_arg = $tokens[$expr_end++];
-                    $expr = "(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
+                    $expr = "(1 & ($is_arg / ".$this->_parse_var_props($expr_arg)."))";
                 } else
                     $expr = "(1 & $is_arg)";
                 break;
@@ -1501,7 +1501,7 @@ 
                 if (@$tokens[$expr_end] == 'by') {
                     $expr_end++;
                     $expr_arg = $tokens[$expr_end++];
-                    $expr = "!($is_arg % " . $this->_parse_var_props($expr_arg) . ")";
+                    $expr = "!($is_arg % ".$this->_parse_var_props($expr_arg).")";
                 } else {
                     $this->_syntax_error("expecting 'by' after 'div'", E_USER_ERROR, __FILE__, __LINE__);
                 }
@@ -1532,11 +1532,11 @@ 
     {
 
         /* Tokenize tag attributes. */
-        preg_match_all('~(?:' . $this->_obj_call_regexp . '|' . $this->_qstr_regexp . ' | (?>[^"\'=\s]+)
+        preg_match_all('~(?:'.$this->_obj_call_regexp.'|'.$this->_qstr_regexp.' | (?>[^"\'=\s]+)
                          )+ |
                          [=]
                         ~x', $tag_args, $match);
-        $tokens       = $match[0];
+        $tokens = $match[0];
 
         $attrs = array();
         /* Parse state:
@@ -1577,9 +1577,9 @@ 
                             $token = 'false';
                         } else if ($token == 'null') {
                             $token = 'null';
-                        } else if (preg_match('~^' . $this->_num_const_regexp . '|0[xX][0-9a-fA-F]+$~', $token)) {
+                        } else if (preg_match('~^'.$this->_num_const_regexp.'|0[xX][0-9a-fA-F]+$~', $token)) {
                             /* treat integer literally */
-                        } else if (!preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . ')*$~', $token)) {
+                        } else if (!preg_match('~^'.$this->_obj_call_regexp.'|'.$this->_var_regexp.'(?:'.$this->_mod_regexp.')*$~', $token)) {
                             /* treat as a string, double-quote it escaping quotes */
                             $token = '"'.addslashes($token).'"';
                         }
@@ -1593,8 +1593,8 @@ 
             $last_token = $token;
         }
 
-        if($state != 0) {
-            if($state == 1) {
+        if ($state != 0) {
+            if ($state == 1) {
                 $this->_syntax_error("expecting '=' after attribute name '$last_token'", E_USER_ERROR, __FILE__, __LINE__);
             } else {
                 $this->_syntax_error("missing attribute value", E_USER_ERROR, __FILE__, __LINE__);
@@ -1614,7 +1614,7 @@ 
      */
     function _parse_vars_props(&$tokens)
     {
-        foreach($tokens as $key => $val) {
+        foreach ($tokens as $key => $val) {
             $tokens[$key] = $this->_parse_var_props($val);
         }
     }
@@ -1631,52 +1631,52 @@ 
     {
         $val = trim($val);
 
-        if(preg_match('~^(' . $this->_obj_call_regexp . '|' . $this->_dvar_regexp . ')(' . $this->_mod_regexp . '*)$~', $val, $match)) {
+        if (preg_match('~^('.$this->_obj_call_regexp.'|'.$this->_dvar_regexp.')('.$this->_mod_regexp.'*)$~', $val, $match)) {
             // $ variable or object
             $return = $this->_parse_var($match[1]);
             $modifiers = $match[2];
-            if (!empty($this->default_modifiers) && !preg_match('~(^|\|)smarty:nodefaults($|\|)~',$modifiers)) {
-                $_default_mod_string = implode('|',(array)$this->default_modifiers);
-                $modifiers = empty($modifiers) ? $_default_mod_string : $_default_mod_string . '|' . $modifiers;
+            if (!empty($this->default_modifiers) && !preg_match('~(^|\|)smarty:nodefaults($|\|)~', $modifiers)) {
+                $_default_mod_string = implode('|', (array)$this->default_modifiers);
+                $modifiers = empty($modifiers) ? $_default_mod_string : $_default_mod_string.'|'.$modifiers;
             }
             $this->_parse_modifiers($return, $modifiers);
             return $return;
-        } elseif (preg_match('~^' . $this->_db_qstr_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
+        } elseif (preg_match('~^'.$this->_db_qstr_regexp.'(?:'.$this->_mod_regexp.'*)$~', $val)) {
                 // double quoted text
-                preg_match('~^(' . $this->_db_qstr_regexp . ')('. $this->_mod_regexp . '*)$~', $val, $match);
+                preg_match('~^('.$this->_db_qstr_regexp.')('.$this->_mod_regexp.'*)$~', $val, $match);
                 $return = $this->_expand_quoted_text($match[1]);
-                if($match[2] != '') {
+                if ($match[2] != '') {
                     $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] != '') {
+                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] != '') {
+                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('\\' => '\\\\', '"' => '\\"')) .'"');
+            return $this->_expand_quoted_text('"'.strtr($val, array('\\' => '\\\\', '"' => '\\"')).'"');
         }
         return $val;
     }
@@ -1690,11 +1690,11 @@ 
     function _expand_quoted_text($var_expr)
     {
         // if contains unescaped $, expand it
-        if(preg_match_all('~(?:\`(?<!\\\\)\$' . $this->_dvar_guts_regexp . '(?:' . $this->_obj_ext_regexp . ')*\`)|(?:(?<!\\\\)\$\w+(\[[a-zA-Z0-9]+\])*)~', $var_expr, $_match)) {
+        if (preg_match_all('~(?:\`(?<!\\\\)\$'.$this->_dvar_guts_regexp.'(?:'.$this->_obj_ext_regexp.')*\`)|(?:(?<!\\\\)\$\w+(\[[a-zA-Z0-9]+\])*)~', $var_expr, $_match)) {
             $_match = $_match[0];
             $_replace = array();
-            foreach($_match as $_var) {
-                $_replace[$_var] = '".(' . $this->_parse_var(str_replace('`','',$_var)) . ')."';
+            foreach ($_match as $_var) {
+                $_replace[$_var] = '".('.$this->_parse_var(str_replace('`', '', $_var)).')."';
             }
             $var_expr = strtr($var_expr, $_replace);
             $_return = preg_replace('~\.""|(?<!\\\\)""\.~', '', $var_expr);
@@ -1702,7 +1702,7 @@ 
             $_return = $var_expr;
         }
         // replace double quoted literal string with single quotes
-        $_return = preg_replace('~^"([\s\w]+)"$~',"'\\1'",$_return);
+        $_return = preg_replace('~^"([\s\w]+)"$~', "'\\1'", $_return);
         return $_return;
     }
 
@@ -1718,26 +1718,26 @@ 
         $_has_math = false;
         $_math_vars = preg_split('~('.$this->_dvar_math_regexp.'|'.$this->_qstr_regexp.')~', $var_expr, -1, PREG_SPLIT_DELIM_CAPTURE);
 
-        if(count($_math_vars) > 1) {
+        if (count($_math_vars) > 1) {
             $_first_var = "";
             $_complete_var = "";
             $_output = "";
             // simple check if there is any math, to stop recursion (due to modifiers with "xx % yy" as parameter)
-            foreach($_math_vars as $_k => $_math_var) {
+            foreach ($_math_vars as $_k => $_math_var) {
                 $_math_var = $_math_vars[$_k];
 
-                if(!empty($_math_var) || is_numeric($_math_var)) {
+                if (!empty($_math_var) || is_numeric($_math_var)) {
                     // hit a math operator, so process the stuff which came before it
-                    if(preg_match('~^' . $this->_dvar_math_regexp . '$~', $_math_var)) {
+                    if (preg_match('~^'.$this->_dvar_math_regexp.'$~', $_math_var)) {
                         $_has_math = true;
-                        if(!empty($_complete_var) || is_numeric($_complete_var)) {
+                        if (!empty($_complete_var) || is_numeric($_complete_var)) {
                             $_output .= $this->_parse_var($_complete_var);
                         }
 
                         // just output the math operator to php
                         $_output .= $_math_var;
 
-                        if(empty($_first_var))
+                        if (empty($_first_var))
                             $_first_var = $_complete_var;
 
                         $_complete_var = "";
@@ -1746,8 +1746,8 @@ 
                     }
                 }
             }
-            if($_has_math) {
-                if(!empty($_complete_var) || is_numeric($_complete_var))
+            if ($_has_math) {
+                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)
@@ -1756,15 +1756,15 @@ 
         }
 
         // 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)))
+        if (is_numeric(substr($var_expr, 0, 1)))
             $_var_ref = $var_expr;
         else
             $_var_ref = substr($var_expr, 1);
         
-        if(!$_has_math) {
+        if (!$_has_math) {
             
             // get [foo] and .foo and ->foo and (...) pieces
-            preg_match_all('~(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\$?\w+|\.\$?\w+|\S+~', $_var_ref, $match);
+            preg_match_all('~(?:^\w+)|'.$this->_obj_params_regexp.'|(?:'.$this->_var_bracket_regexp.')|->\$?\w+|\.\$?\w+|\S+~', $_var_ref, $match);
                         
             $_indexes = $match[0];
             $_var_name = array_shift($_indexes);
@@ -1782,9 +1782,9 @@ 
                     $_var_name = substr(array_shift($_indexes), 1);
                     $_output = "\$this->_smarty_vars['$_var_name']";
                 }
-            } elseif(is_numeric($_var_name) && is_numeric(substr($var_expr, 0, 1))) {
+            } elseif (is_numeric($_var_name) && is_numeric(substr($var_expr, 0, 1))) {
                 // because . is the operator for accessing arrays thru inidizes we need to put it together again for floating point numbers
-                if(count($_indexes) > 0)
+                if (count($_indexes) > 0)
                 {
                     $_var_name .= implode("", $_indexes);
                     $_indexes = array();
@@ -1801,9 +1801,9 @@ 
                         $_output .= "[$_index]";
                     } elseif (substr($_index, 0, 1) == '$') {
                         if (strpos($_index, '.') !== false) {
-                            $_output .= '[' . $this->_parse_var($_index) . ']';
+                            $_output .= '['.$this->_parse_var($_index).']';
                         } else {
-                            $_output .= "[\$this->_tpl_vars['" . substr($_index, 1) . "']]";
+                            $_output .= "[\$this->_tpl_vars['".substr($_index, 1)."']]";
                         }
                     } else {
                         $_var_parts = explode('.', $_index);
@@ -1813,19 +1813,19 @@ 
                     }
                 } else if (substr($_index, 0, 1) == '.') {
                     if (substr($_index, 1, 1) == '$')
-                        $_output .= "[\$this->_tpl_vars['" . substr($_index, 2) . "']]";
+                        $_output .= "[\$this->_tpl_vars['".substr($_index, 2)."']]";
                     else
-                        $_output .= "['" . substr($_index, 1) . "']";
-                } else if (substr($_index,0,2) == '->') {
-                    if(substr($_index,2,2) == '__') {
+                        $_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__);
-                    } elseif($this->security && substr($_index, 2, 1) == '_') {
+                    } elseif ($this->security && substr($_index, 2, 1) == '_') {
                         $this->_syntax_error('(secure) call to private object member is not allowed', E_USER_ERROR, __FILE__, __LINE__);
                     } elseif (substr($_index, 2, 1) == '$') {
                         if ($this->security) {
                             $this->_syntax_error('(secure) call to dynamic object member is not allowed', E_USER_ERROR, __FILE__, __LINE__);
                         } else {
-                            $_output .= '->{(($_var=$this->_tpl_vars[\''.substr($_index,3).'\']) && substr($_var,0,2)!=\'__\') ? $_var : $this->trigger_error("cannot access property \\"$_var\\"")}';
+                            $_output .= '->{(($_var=$this->_tpl_vars[\''.substr($_index, 3).'\']) && substr($_var,0,2)!=\'__\') ? $_var : $this->trigger_error("cannot access property \\"$_var\\"")}';
                         }
                     } else {
                         $_output .= $_index;
@@ -1850,7 +1850,7 @@ 
      */
     function _parse_parenth_args($parenth_args)
     {
-        preg_match_all('~' . $this->_param_regexp . '~',$parenth_args, $match);
+        preg_match_all('~'.$this->_param_regexp.'~', $parenth_args, $match);
         $orig_vals = $match = $match[0];
         $this->_parse_vars_props($match);
         $replace = array();
@@ -1913,18 +1913,18 @@ 
      */
     function _parse_modifiers(&$output, $modifier_string)
     {
-        preg_match_all('~\|(@?\w+)((?>:(?:'. $this->_qstr_regexp . '|[^|]+))*)~', '|' . $modifier_string, $_match);
+        preg_match_all('~\|(@?\w+)((?>:(?:'.$this->_qstr_regexp.'|[^|]+))*)~', '|'.$modifier_string, $_match);
         list(, $_modifiers, $modifier_arg_strings) = $_match;
 
         for ($_i = 0, $_for_max = count($_modifiers); $_i < $_for_max; $_i++) {
             $_modifier_name = $_modifiers[$_i];
 
-            if($_modifier_name == 'smarty') {
+            if ($_modifier_name == 'smarty') {
                 // skip smarty modifier
                 continue;
             }
 
-            preg_match_all('~:(' . $this->_qstr_regexp . '|[^:]+)~', $modifier_arg_strings[$_i], $_match);
+            preg_match_all('~:('.$this->_qstr_regexp.'|[^:]+)~', $modifier_arg_strings[$_i], $_match);
             $_modifier_args = $_match[1];
 
             if (substr($_modifier_name, 0, 1) == '@') {
@@ -1938,22 +1938,22 @@ 
                 && !$this->_get_plugin_filepath('modifier', $_modifier_name)
                 && function_exists($_modifier_name)) {
                 if ($this->security && !in_array($_modifier_name, $this->security_settings['MODIFIER_FUNCS'])) {
-                    $this->_trigger_fatal_error("[plugin] (secure mode) modifier '$_modifier_name' is not allowed" , $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
+                    $this->_trigger_fatal_error("[plugin] (secure mode) modifier '$_modifier_name' is not allowed", $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
                 } else {
-                    $this->_plugins['modifier'][$_modifier_name] = array($_modifier_name,  null, null, false);
+                    $this->_plugins['modifier'][$_modifier_name] = array($_modifier_name, null, null, false);
                 }
             }
             $this->_add_plugin('modifier', $_modifier_name);
 
             $this->_parse_vars_props($_modifier_args);
 
-            if($_modifier_name == 'default') {
+            if ($_modifier_name == 'default') {
                 // supress notifications of default modifier vars and args
-                if(substr($output, 0, 1) == '$') {
-                    $output = '@' . $output;
+                if (substr($output, 0, 1) == '$') {
+                    $output = '@'.$output;
                 }
-                if(isset($_modifier_args[0]) && substr($_modifier_args[0], 0, 1) == '$') {
-                    $_modifier_args[0] = '@' . $_modifier_args[0];
+                if (isset($_modifier_args[0]) && substr($_modifier_args[0], 0, 1) == '$') {
+                    $_modifier_args[0] = '@'.$_modifier_args[0];
                 }
             }
             if (count($_modifier_args) > 0)
@@ -1962,7 +1962,7 @@ 
                 $_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))";
+                $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))";
 
             } else {
 
@@ -2003,9 +2003,9 @@ 
     {
         /* Extract the reference name. */
         $_ref = substr($indexes[0], 1);
-        foreach($indexes as $_index_no=>$_index) {
-            if (substr($_index, 0, 1) != '.' && $_index_no<2 || !preg_match('~^(\.|\[|->)~', $_index)) {
-                $this->_syntax_error('$smarty' . implode('', array_slice($indexes, 0, 2)) . ' is an invalid reference', E_USER_ERROR, __FILE__, __LINE__);
+        foreach ($indexes as $_index_no=>$_index) {
+            if (substr($_index, 0, 1) != '.' && $_index_no < 2 || !preg_match('~^(\.|\[|->)~', $_index)) {
+                $this->_syntax_error('$smarty'.implode('', array_slice($indexes, 0, 2)).' is an invalid reference', E_USER_ERROR, __FILE__, __LINE__);
             }
         }
 
@@ -2129,7 +2129,7 @@ 
                 return null;
 
             case 'template':
-                $compiled_ref = "'" . addslashes($this->_current_file) . "'";
+                $compiled_ref = "'".addslashes($this->_current_file)."'";
                 $_max_index = 1;
                 break;
 
@@ -2146,10 +2146,10 @@ 
                 }
                 array_shift($indexes);
                 if (preg_match('!^\.\w+$!', $indexes[0])) {
-                    $compiled_ref = '@' . substr($indexes[0], 1);
+                    $compiled_ref = '@'.substr($indexes[0], 1);
                 } else {
                     $_val = $this->_parse_var_props(substr($indexes[0], 1));
-                    $compiled_ref = '@constant(' . $_val . ')';
+                    $compiled_ref = '@constant('.$_val.')';
                 }
                 $_max_index = 1;
                 break;
@@ -2168,12 +2168,12 @@ 
                 break;
                 
             default:
-                $this->_syntax_error('$smarty.' . $_ref . ' is an unknown reference', E_USER_ERROR, __FILE__, __LINE__);
+                $this->_syntax_error('$smarty.'.$_ref.' is an unknown reference', E_USER_ERROR, __FILE__, __LINE__);
                 break;
         }
 
         if (isset($_max_index) && count($indexes) > $_max_index) {
-            $this->_syntax_error('$smarty' . implode('', $indexes) .' is an invalid reference', E_USER_ERROR, __FILE__, __LINE__);
+            $this->_syntax_error('$smarty'.implode('', $indexes).' is an invalid reference', E_USER_ERROR, __FILE__, __LINE__);
         }
 
         array_shift($indexes);
@@ -2197,7 +2197,7 @@ 
                 return ((is_object($this->_plugins[$type][$name][0][0])) ?
                         "\$this->_plugins['$type']['$name'][0][0]->"    /* method callback */
                         : (string)($this->_plugins[$type][$name][0][0]).'::'    /* class callback */
-                       ). $this->_plugins[$type][$name][0][1];
+                       ).$this->_plugins[$type][$name][0][1];
 
             } else {
                 /* function callback */
@@ -2221,7 +2221,7 @@ 
                 if ($prefilter === false) {
                     unset($this->_plugins['prefilter'][$filter_name]);
                     $_params = array('plugins' => array(array('prefilter', $filter_name, null, null, false)));
-                    require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
+                    require_once(SMARTY_CORE_DIR.'core.load_plugins.php');
                     smarty_core_load_plugins($_params, $this);
                 }
             }
@@ -2231,7 +2231,7 @@ 
                 if ($postfilter === false) {
                     unset($this->_plugins['postfilter'][$filter_name]);
                     $_params = array('plugins' => array(array('postfilter', $filter_name, null, null, false)));
-                    require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
+                    require_once(SMARTY_CORE_DIR.'core.load_plugins.php');
                     smarty_core_load_plugins($_params, $this);
                 }
             }
@@ -2258,7 +2258,7 @@ 
      * @param string $file
      * @param integer $line
      */
-    function _syntax_error($error_msg, $error_type = E_USER_ERROR, $file=null, $line=null)
+    function _syntax_error($error_msg, $error_type = E_USER_ERROR, $file = null, $line = null)
     {
         $this->_trigger_fatal_error("syntax error: $error_msg", $this->_current_file, $this->_current_line_no, $file, $line, $error_type);
     }
@@ -2273,10 +2273,10 @@ 
     function _push_cacheable_state($type, $name) {
         $_cacheable = !isset($this->_plugins[$type][$name]) || $this->_plugins[$type][$name][4];
         if ($_cacheable
-            || 0<$this->_cacheable_state++) return '';
+            || 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
+            . $this->_cache_serial.'#'.$this->_nocache_count
             . '}\'; endif;';
         return $_ret;
     }
@@ -2291,9 +2291,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++)
+            . $this->_cache_serial.'#'.($this->_nocache_count++)
             . '}\'; endif;';
     }
 
@@ -2316,12 +2316,12 @@ 
     function _pop_tag($close_tag)
     {
         $message = '';
-        if (count($this->_tag_stack)>0) {
+        if (count($this->_tag_stack) > 0) {
             list($_open_tag, $_line_no) = array_pop($this->_tag_stack);
             if ($close_tag == $_open_tag) {
                 return $_open_tag;
             }
-            if ($close_tag == 'if' && ($_open_tag == 'else' || $_open_tag == 'elseif' )) {
+            if ($close_tag == 'if' && ($_open_tag == 'else' || $_open_tag == 'elseif')) {
                 return $this->_pop_tag($close_tag);
             }
             if ($close_tag == 'section' && $_open_tag == 'sectionelse') {
@@ -2357,10 +2357,10 @@ 
  */
 function _smarty_sort_length($a, $b)
 {
-    if($a == $b)
+    if ($a == $b)
         return 0;
 
-    if(strlen($a) == strlen($b))
+    if (strlen($a) == strlen($b))
         return ($a > $b) ? -1 : 1;
 
     return (strlen($a) > strlen($b)) ? -1 : 1;

Braces +148 added lines, -108 removed lines

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

data/Relationships/SugarRelationship.php

Spacing +23 added lines, -23 removed lines

@@ -1,5 +1,5 @@ 
 <?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.
@@ -45,9 +45,9 @@ 
 require_once("data/BeanFactory.php");
 
 
-define('REL_LHS','LHS');
-define('REL_RHS','RHS');
-define('REL_BOTH','BOTH_SIDES');
+define('REL_LHS', 'LHS');
+define('REL_RHS', 'RHS');
+define('REL_BOTH', 'BOTH_SIDES');
 define('REL_MANY_MANY', 'many-to-many');
 define('REL_ONE_MANY', 'one-to-many');
 define('REL_ONE_ONE', 'one-to-one');
@@ -126,7 +126,7 @@ 
         $focus = $link->getFocus();
         $related = $link->getBeans();
         $result = true;
-        foreach($related as $relBean)
+        foreach ($related as $relBean)
         {
             if (empty($relBean->id)) {
                 continue;
@@ -151,7 +151,7 @@ 
      * @param $rowID id of SugarBean to remove from the relationship
      * @return void
      */
-    public function removeById($rowID){
+    public function removeById($rowID) {
         $this->removeRow(array("id" => $rowID));
     }
 
@@ -206,7 +206,7 @@ 
             return $this->updateRow($existing['id'], array_merge($existing, $row));
 
         $values = array();
-        foreach($this->getFields() as  $def)
+        foreach ($this->getFields() as  $def)
         {
             $field = $def['name'];
             if (isset($row[$field]))
@@ -233,12 +233,12 @@ 
         $newVals = array();
         //Unset the ID since we are using it to update the row
         if (isset($values['id'])) unset($values['id']);
-        foreach($values as $field => $val)
+        foreach ($values as $field => $val)
         {
             $newVals[] = "$field='$val'";
         }
 
-        $newVals = implode(",",$newVals);
+        $newVals = implode(",", $newVals);
 
         $query = "UPDATE {$this->getRelationshipTable()} set $newVals WHERE id='$id'";
 
@@ -261,7 +261,7 @@ 
         {
             $stringSets[] = "$field = '$val'";
         }
-        $whereString = "WHERE " . implode(" AND ", $stringSets);
+        $whereString = "WHERE ".implode(" AND ", $stringSets);
 
         $query = "UPDATE {$this->getRelationshipTable()} set deleted=1 , date_modified = '$date_modified' $whereString";
 
@@ -278,7 +278,7 @@ 
     {
         $leftIDName = $this->def['join_key_lhs'];
         $rightIDName = $this->def['join_key_rhs'];
-        if (empty($row[$leftIDName]) ||  empty($row[$rightIDName]))
+        if (empty($row[$leftIDName]) || empty($row[$rightIDName]))
             return false;
 
         $leftID = $row[$leftIDName];
@@ -294,7 +294,7 @@ 
         if (!empty($row))
         {
             return $row;
-        } else{
+        } else {
             return false;
         }
     }
@@ -310,7 +310,7 @@ 
         $roleCheck = "";
         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($this->def['relationship_role_column']) && !empty($this->def["relationship_role_column_value"]) && !$ignore_role_filter)
         {
             if (empty($table))
                 $roleCheck = " AND $this->relationship_role_column";
@@ -319,9 +319,9 @@ 
             //role column value.
             if (empty($this->def['relationship_role_column_value']))
             {
-                $roleCheck.=' IS NULL';
+                $roleCheck .= ' IS NULL';
             } else {
-                $roleCheck.= " = '$this->relationship_role_column_value'";
+                $roleCheck .= " = '$this->relationship_role_column_value'";
             }
         }
         return $roleCheck;
@@ -354,7 +354,7 @@ 
      * @param string $link_name name of link being triggerd
      * @return void
      */
-    protected function callBeforeAdd($focus, $related, $link_name="")
+    protected function callBeforeAdd($focus, $related, $link_name = "")
     {
         $custom_logic_arguments = $this->getCustomLogicArguments($focus, $related, $link_name);
         $focus->call_custom_logic('before_relationship_add', $custom_logic_arguments);
@@ -367,7 +367,7 @@ 
      * @param string $link_name name of link being triggerd
      * @return void
      */
-    protected function callAfterAdd($focus, $related, $link_name="")
+    protected function callAfterAdd($focus, $related, $link_name = "")
     {
         $custom_logic_arguments = $this->getCustomLogicArguments($focus, $related, $link_name);
         $focus->call_custom_logic('after_relationship_add', $custom_logic_arguments);
@@ -379,7 +379,7 @@ 
      * @param string $link_name
      * @return void
      */
-    protected function callBeforeDelete($focus, $related, $link_name="")
+    protected function callBeforeDelete($focus, $related, $link_name = "")
     {
         $custom_logic_arguments = $this->getCustomLogicArguments($focus, $related, $link_name);
         $focus->call_custom_logic('before_relationship_delete', $custom_logic_arguments);
@@ -391,7 +391,7 @@ 
      * @param string $link_name
      * @return void
      */
-    protected function callAfterDelete($focus, $related, $link_name="")
+    protected function callAfterDelete($focus, $related, $link_name = "")
     {
         $custom_logic_arguments = $this->getCustomLogicArguments($focus, $related, $link_name);
         $focus->call_custom_logic('after_relationship_delete', $custom_logic_arguments);
@@ -405,7 +405,7 @@ 
      */
     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){
+        foreach (array("lhs_field", "operator", "rhs_value") as $required) {
             if (empty($optional_array[$required]))
                 return "";
         }
@@ -438,7 +438,7 @@ 
         $GLOBALS['resavingRelatedBeans'] = true;
 
         //Resave any bean not currently in the middle of a save operation
-        foreach(self::$beansToResave as $module => $beans)
+        foreach (self::$beansToResave as $module => $beans)
         {
             foreach ($beans as $bean)
             {
@@ -469,7 +469,7 @@ 
     public function isParentRelationship()
     {
         //check role fields to see if this is a parent (flex relate) relationship
-        if(!empty($this->def["relationship_role_column"]) && !empty($this->def["relationship_role_column_value"])
+        if (!empty($this->def["relationship_role_column"]) && !empty($this->def["relationship_role_column_value"])
            && $this->def["relationship_role_column"] == "parent_type" && $this->def['rhs_key'] == "parent_id")
         {
             return true;
@@ -482,7 +482,7 @@ 
         if (isset($this->def[$name]))
             return $this->def[$name];
 
-        switch($name)
+        switch ($name)
         {
             case "relationship_type":
                 return $this->type;

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

Indentation +2 added lines, -2 removed lines

@@ -102,9 +102,9 @@
 
         //join the related module's table
         $join .= "$join_type $targetTableWithAlias ON $targetTable.$targetKey=$startingTable.$startingKey"
-               . " AND $targetTable.deleted=$deleted\n"
+                . " AND $targetTable.deleted=$deleted\n"
         //Next add any role filters
-               . $this->getRoleWhere();
+                . $this->getRoleWhere();
 
         if($return_array){
             return array(

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?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.
@@ -87,14 +87,14 @@ 
         $targetTable = $linkIsLHS ? $this->def['rhs_table'] : $this->def['lhs_table'];
         $targetTableWithAlias = $targetTable;
         $targetKey = $linkIsLHS ? $this->def['rhs_key'] : $this->def['lhs_key'];
-        $join_type= isset($params['join_type']) ? $params['join_type'] : ' INNER JOIN ';
+        $join_type = isset($params['join_type']) ? $params['join_type'] : ' INNER JOIN ';
 
         $join = '';
 
         //Set up any table aliases required
-        if ( ! empty($params['join_table_alias']))
+        if (!empty($params['join_table_alias']))
         {
-            $targetTableWithAlias = $targetTable . " ". $params['join_table_alias'];
+            $targetTableWithAlias = $targetTable." ".$params['join_table_alias'];
             $targetTable = $params['join_table_alias'];
         }
 
@@ -106,7 +106,7 @@ 
         //Next add any role filters
                . $this->getRoleWhere();
 
-        if($return_array){
+        if ($return_array) {
             return array(
                 'join' => $join,
                 'type' => $this->type,

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

Indentation +2 added lines, -2 removed lines

@@ -295,7 +295,7 @@ 
         //First join the relationship table
         $join .= "$join_type $targetTableWithAlias ON $startingTable.$startingKey=$targetTable.$targetKey AND $targetTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere(($linkIsLHS) ? $targetTable : $startingTable) . "\n";
+                . $this->getRoleWhere(($linkIsLHS) ? $targetTable : $startingTable) . "\n";
 
         if($return_array){
             return array(
@@ -354,7 +354,7 @@ 
 
         $query .= "$join_type $targetTableWithAlias ON $startingTable.$startingKey=$targetTable.$targetKey AND $targetTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere($tableInRoleFilter) . "\n";
+                . $this->getRoleWhere($tableInRoleFilter) . "\n";
 
         if (!empty($params['return_as_array'])) {
             $return_array = true;

Spacing +16 added lines, -16 removed lines

@@ -1,5 +1,5 @@ 
 <?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 +66,7 @@ 
         // 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;
@@ -77,7 +77,7 @@ 
         {
             $oldLink = $rhs->$rhsLinkName;
             $prevRelated = $oldLink->getBeans(null);
-            foreach($prevRelated as $oldLHS)
+            foreach ($prevRelated as $oldLHS)
             {
                 if ($oldLHS->id != $lhs->id)
                     $this->remove($oldLHS, $rhs, false);
@@ -131,12 +131,12 @@ 
         //Now update the RHS bean's ID field
         $rhsID = $this->def['rhs_key'];
         $rhs->$rhsID = $lhs->id;
-        foreach($additionalFields as $field => $val)
+        foreach ($additionalFields as $field => $val)
         {
             $rhs->$field = $val;
         }
         //Update role fields
-        if(!empty($this->def["relationship_role_column"]) && !empty($this->def["relationship_role_column_value"]))
+        if (!empty($this->def["relationship_role_column"]) && !empty($this->def["relationship_role_column_value"]))
         {
             $roleField = $this->def["relationship_role_column"];
             $rhs->$roleField = $this->def["relationship_role_column_value"];
@@ -240,7 +240,7 @@ 
 
             //Add any optional where clause
             if (!empty($params['where'])) {
-                $add_where = is_string($params['where']) ? $params['where'] : "$rhsTable." . $this->getOptionalWhereClause($params['where']);
+                $add_where = is_string($params['where']) ? $params['where'] : "$rhsTable.".$this->getOptionalWhereClause($params['where']);
                 if (!empty($add_where))
                     $where .= " AND $add_where";
             }
@@ -282,22 +282,22 @@ 
         $targetTable = $linkIsLHS ? $this->def['rhs_table'] : $this->def['lhs_table'];
         $targetTableWithAlias = $targetTable;
         $targetKey = $linkIsLHS ? $this->def['rhs_key'] : $this->def['lhs_key'];
-        $join_type= isset($params['join_type']) ? $params['join_type'] : ' INNER JOIN ';
+        $join_type = isset($params['join_type']) ? $params['join_type'] : ' INNER JOIN ';
         $join = '';
 
         //Set up any table aliases required
-        if ( ! empty($params['join_table_alias']))
+        if (!empty($params['join_table_alias']))
         {
-            $targetTableWithAlias = $targetTable. " ".$params['join_table_alias'];
+            $targetTableWithAlias = $targetTable." ".$params['join_table_alias'];
             $targetTable = $params['join_table_alias'];
         }
 
         //First join the relationship table
         $join .= "$join_type $targetTableWithAlias ON $startingTable.$startingKey=$targetTable.$targetKey AND $targetTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere(($linkIsLHS) ? $targetTable : $startingTable) . "\n";
+               . $this->getRoleWhere(($linkIsLHS) ? $targetTable : $startingTable)."\n";
 
-        if($return_array){
+        if ($return_array) {
             return array(
                 'join' => $join,
                 'type' => $this->type,
@@ -320,10 +320,10 @@ 
         $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'];
-        $join_type= isset($params['join_type']) ? $params['join_type'] : ' INNER JOIN ';
+        $join_type = isset($params['join_type']) ? $params['join_type'] : ' INNER JOIN ';
         $query = '';
 
-        $alias = empty($params['join_table_alias']) ? "{$link->name}_rel": $params['join_table_alias'];
+        $alias = empty($params['join_table_alias']) ? "{$link->name}_rel" : $params['join_table_alias'];
         $alias = $GLOBALS['db']->getValidDBName($alias, false, 'alias');
 
         $tableInRoleFilter = "";
@@ -342,7 +342,7 @@ 
                 || $targetTable == "tasks"
                 || $targetTable == "calls"
             )
-            && substr($alias, 0, 12 + strlen($targetTable)) == $targetTable . "_activities_"
+            && substr($alias, 0, 12 + strlen($targetTable)) == $targetTable."_activities_"
         )
         {
             $tableInRoleFilter = $linkIsLHS ? $alias : $startingTable;
@@ -354,13 +354,13 @@ 
 
         $query .= "$join_type $targetTableWithAlias ON $startingTable.$startingKey=$targetTable.$targetKey AND $targetTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere($tableInRoleFilter) . "\n";
+               . $this->getRoleWhere($tableInRoleFilter)."\n";
 
         if (!empty($params['return_as_array'])) {
             $return_array = true;
         }
 
-        if($return_array){
+        if ($return_array) {
             return array(
                 'join' => $query,
                 'type' => $this->type,

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'];
+        }
     }
 }