adamjakab / SuiteCRM

include/Smarty/plugins/function.sugar_button.php

Indentation +109 added lines, -110 removed lines

@@ -281,28 +281,28 @@ 
  */
 function smarty_function_sugar_button($params, &$smarty)
 {
-   if(empty($params['module'])) {
-   	  $smarty->trigger_error("sugar_button: missing required param (module)");
-   } else if(empty($params['id'])) {
-   	  $smarty->trigger_error("sugar_button: missing required param (id)");
-   } else if(empty($params['view'])) {
-   	  $smarty->trigger_error("sugar_button: missing required param (view)");
-   }
-
-   $js_form = (empty($params['form_id'])) ? "var _form = (this.form) ? this.form : document.forms[0];" : "var _form = document.getElementById('{$params['form_id']}');";
-
-   $type = $params['id'];
-   $location = (empty($params['location'])) ? "" : "_".$params['location'];
-
-   if(!is_array($type)) {
-   	  $module = $params['module'];
-   	  $view = $params['view'];
-   	  switch(strtoupper($type)) {
-			case "SEARCH":
+    if(empty($params['module'])) {
+            $smarty->trigger_error("sugar_button: missing required param (module)");
+    } else if(empty($params['id'])) {
+            $smarty->trigger_error("sugar_button: missing required param (id)");
+    } else if(empty($params['view'])) {
+            $smarty->trigger_error("sugar_button: missing required param (view)");
+    }
+
+    $js_form = (empty($params['form_id'])) ? "var _form = (this.form) ? this.form : document.forms[0];" : "var _form = document.getElementById('{$params['form_id']}');";
+
+    $type = $params['id'];
+    $location = (empty($params['location'])) ? "" : "_".$params['location'];
+
+    if(!is_array($type)) {
+            $module = $params['module'];
+            $view = $params['view'];
+            switch(strtoupper($type)) {
+            case "SEARCH":
                 $output = '<input tabindex="2" title="{$APP.LBL_SEARCH_BUTTON_TITLE}" onclick="SUGAR.savedViews.setChooser();" class="button" type="submit" name="button" value="{$APP.LBL_SEARCH_BUTTON_LABEL}" id="search_form_submit"/>&nbsp;';
-			break;
+            break;
 
-			case "CANCEL":
+            case "CANCEL":
                 $cancelButton  = '{if !empty($smarty.request.return_action) && ($smarty.request.return_action == "DetailView" && !empty($smarty.request.return_id))}';
                 $cancelButton .= '<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="SUGAR.ajaxUI.loadContent(\'index.php?action=DetailView&module={$smarty.request.return_module|escape:"url"}&record={$smarty.request.return_id|escape:"url"}\'); return false;" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" type="button" id="'.$type.$location.'"> ';
                 $cancelButton .= '{elseif !empty($smarty.request.return_action) && ($smarty.request.return_action == "DetailView" && !empty($fields.id.value))}';
@@ -314,30 +314,30 @@ 
                 $cancelButton .= '{/if}';
 
                 $output = $cancelButton;
-			break;
+            break;
 
-			case "DELETE":
+            case "DELETE":
                 $output = '{if $bean->aclAccess("delete")}<input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="button" onclick="'.$js_form.' _form.return_module.value=\'' . $module . '\'; _form.return_action.value=\'ListView\'; _form.action.value=\'Delete\'; if(confirm(\'{$APP.NTC_DELETE_CONFIRMATION}\')) SUGAR.ajaxUI.submitForm(_form);" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}" id="delete_button">{/if} ';
             break;
 
-			case "DUPLICATE":
-			    $output = '{if $bean->aclAccess("edit")}<input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="button" onclick="'.$js_form.' _form.return_module.value=\''. $module . '\'; _form.return_action.value=\'DetailView\'; _form.isDuplicate.value=true; _form.action.value=\'' . $view . '\'; _form.return_id.value=\'{$id}\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}" id="duplicate_button">{/if} ';
+            case "DUPLICATE":
+                $output = '{if $bean->aclAccess("edit")}<input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="button" onclick="'.$js_form.' _form.return_module.value=\''. $module . '\'; _form.return_action.value=\'DetailView\'; _form.isDuplicate.value=true; _form.action.value=\'' . $view . '\'; _form.return_id.value=\'{$id}\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}" id="duplicate_button">{/if} ';
             break;
 
-			case "EDIT";
-			    $output = '{if $bean->aclAccess("edit")}<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' _form.return_module.value=\'' . $module . '\'; _form.return_action.value=\'DetailView\'; _form.return_id.value=\'{$id}\'; _form.action.value=\'EditView\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Edit" id="edit_button" value="{$APP.LBL_EDIT_BUTTON_LABEL}">{/if} ';
+            case "EDIT";
+                $output = '{if $bean->aclAccess("edit")}<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' _form.return_module.value=\'' . $module . '\'; _form.return_action.value=\'DetailView\'; _form.return_id.value=\'{$id}\'; _form.action.value=\'EditView\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Edit" id="edit_button" value="{$APP.LBL_EDIT_BUTTON_LABEL}">{/if} ';
             break;
 
-			case "FIND_DUPLICATES":
-			    $output = '{if $bean->aclAccess("edit") && $bean->aclAccess("delete")}<input title="{$APP.LBL_DUP_MERGE}" class="button" onclick="'.$js_form.' _form.return_module.value=\'' . $module . '\'; _form.return_action.value=\'DetailView\'; _form.return_id.value=\'{$id}\'; _form.action.value=\'Step1\'; _form.module.value=\'MergeRecords\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Merge" value="{$APP.LBL_DUP_MERGE}" id="merge_duplicate_button">{/if} ';
+            case "FIND_DUPLICATES":
+                $output = '{if $bean->aclAccess("edit") && $bean->aclAccess("delete")}<input title="{$APP.LBL_DUP_MERGE}" class="button" onclick="'.$js_form.' _form.return_module.value=\'' . $module . '\'; _form.return_action.value=\'DetailView\'; _form.return_id.value=\'{$id}\'; _form.action.value=\'Step1\'; _form.module.value=\'MergeRecords\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Merge" value="{$APP.LBL_DUP_MERGE}" id="merge_duplicate_button">{/if} ';
             break;
 
-			case "SAVE":
-				$view = ($_REQUEST['action'] == 'EditView') ? 'EditView' : (($view == 'EditView') ? 'EditView' : $view);
-				$output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' {if $isDuplicate}_form.return_id.value=\'\'; {/if}_form.action.value=\'Save\'; if(check_form(\'' . $view . '\'))SUGAR.ajaxUI.submitForm(_form);return false;" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" id="'.$type.$location.'">{/if} ';
-			break;
+            case "SAVE":
+                $view = ($_REQUEST['action'] == 'EditView') ? 'EditView' : (($view == 'EditView') ? 'EditView' : $view);
+                $output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' {if $isDuplicate}_form.return_id.value=\'\'; {/if}_form.action.value=\'Save\'; if(check_form(\'' . $view . '\'))SUGAR.ajaxUI.submitForm(_form);return false;" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" id="'.$type.$location.'">{/if} ';
+            break;
 
-			case "SUBPANELSAVE":
+            case "SUBPANELSAVE":
                 if($view == 'QuickCreate' || (isset($_REQUEST['target_action']) && strtolower($_REQUEST['target_action']) == 'quickcreate')) $view =  "form_SubpanelQuickCreate_{$module}";
 
                 /* BEGIN - SECURITY GROUPS - redirect a subpanel save to the detail view if select popup and user in more than 1 group*/ 
@@ -353,112 +353,111 @@ 
                 }
                 //if different here then change the group return right above
                 $output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}"  class="button" onclick="'.$js_form.' disableOnUnloadEditView(); _form.action.value=\'Save\';if(check_form(\''.$view.'\'))return SUGAR.subpanelUtils.inlineSave(_form.id, \'' . $params['module'] . '_subpanel_save_button\');return false;" type="submit" name="' . $params['module'] . '_subpanel_save_button" id="' . $params['module'] . '_subpanel_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
-                
-                */
+                 */
                 $output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}"  class="button" onclick="'.$js_form.' disableOnUnloadEditView(); _form.action.value=\'Save\';if(check_form(\''.$view.'\'))return SUGAR.subpanelUtils.inlineSave(_form.id, \'' . $params['module'] . '_subpanel_save_button\');return false;" type="submit" name="' . $params['module'] . '_subpanel_save_button" id="' . $params['module'] . '_subpanel_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
                 /* END - SECURITY GROUPS */
 
             break;
-			case "SUBPANELCANCEL":
+            case "SUBPANELCANCEL":
                 $output = '<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" class="button" onclick="return SUGAR.subpanelUtils.cancelCreate($(this).attr(\'id\'));return false;" type="submit" name="' . $params['module'] . '_subpanel_cancel_button" id="' . $params['module'] . '_subpanel_cancel_button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"> ';
 
             break;
-		    case "SUBPANELFULLFORM":
+            case "SUBPANELFULLFORM":
                 $output = '<input title="{$APP.LBL_FULL_FORM_BUTTON_TITLE}" class="button" onclick="'.$js_form.' disableOnUnloadEditView(_form); _form.return_action.value=\'DetailView\'; _form.action.value=\'EditView\'; if(typeof(_form.to_pdf)!=\'undefined\') _form.to_pdf.value=\'0\';" type="submit" name="' . $params['module'] . '_subpanel_full_form_button" id="' . $params['module'] . '_subpanel_full_form_button" value="{$APP.LBL_FULL_FORM_BUTTON_LABEL}"> ';
                 $output .= '<input type="hidden" name="full_form" value="full_form">';
             break;
-			case "DCMENUCANCEL":
+            case "DCMENUCANCEL":
                 $output = '<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="javascript:lastLoadedMenu=undefined;DCMenu.closeOverlay();return false;" type="submit" name="' . $params['module'] . '_dcmenu_cancel_button" id="' . $params['module'] . '_dcmenu_cancel_button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"> ';
             break;
-			case "DCMENUSAVE":
+            case "DCMENUSAVE":
                             if ($view == 'QuickCreate') {
                                 $view = "form_DCQuickCreate_{$module}";
                             } else if ($view == 'EditView') {
                                 $view = "form_DCEditView_{$module}";
                             }
-				$output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' _form.action.value=\'Save\';if(check_form(\''.$view.'\'))return DCMenu.save(_form.id, \'' . $params['module'] . '_subpanel_save_button\');return false;" type="submit" name="' . $params['module'] . '_dcmenu_save_button" id="' . $params['module'] . '_dcmenu_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
+                $output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' _form.action.value=\'Save\';if(check_form(\''.$view.'\'))return DCMenu.save(_form.id, \'' . $params['module'] . '_subpanel_save_button\');return false;" type="submit" name="' . $params['module'] . '_dcmenu_save_button" id="' . $params['module'] . '_dcmenu_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
             break;
-			case "DCMENUFULLFORM":
+            case "DCMENUFULLFORM":
                 $output = '<input title="{$APP.LBL_FULL_FORM_BUTTON_TITLE}" accessKey="{$APP.LBL_FULL_FORM_BUTTON_KEY}" class="button" onclick="'.$js_form.' disableOnUnloadEditView(_form); _form.return_action.value=\'DetailView\'; _form.action.value=\'EditView\'; _form.return_module.value=\'' . $params['module'] . '\';_form.return_id.value=_form.record.value;if(typeof(_form.to_pdf)!=\'undefined\') _form.to_pdf.value=\'0\';SUGAR.ajaxUI.submitForm(_form,null,true);DCMenu.closeOverlay();" type="button" name="' . $params['module'] . '_subpanel_full_form_button" id="' . $params['module'] . '_subpanel_full_form_button" value="{$APP.LBL_FULL_FORM_BUTTON_LABEL}"> ';
                 $output .= '<input type="hidden" name="full_form" value="full_form">';
                 $output .= '<input type="hidden" name="is_admin" value="">';
             break;
-			case "POPUPSAVE":
-				$view = ($view == 'QuickCreate') ? "form_QuickCreate_{$module}" : $view;
-				$output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" '
-					 . 'class="button primary" onclick="'.$js_form.' _form.action.value=\'Popup\';'
-					 . 'return check_form(\''.$view.'\')" type="submit" name="' . $params['module']
-					 . '_popupcreate_save_button" id="' . $params['module']
-					 . '_popupcreate_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
+            case "POPUPSAVE":
+                $view = ($view == 'QuickCreate') ? "form_QuickCreate_{$module}" : $view;
+                $output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" '
+                        . 'class="button primary" onclick="'.$js_form.' _form.action.value=\'Popup\';'
+                        . 'return check_form(\''.$view.'\')" type="submit" name="' . $params['module']
+                        . '_popupcreate_save_button" id="' . $params['module']
+                        . '_popupcreate_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
             break;
-			case "POPUPCANCEL":
+            case "POPUPCANCEL":
                 $output = '<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" '
-					 . 'class="button" onclick="toggleDisplay(\'addform\');return false;" '
-					 . 'name="' . $params['module'] . '_popup_cancel_button" type="submit"'
-					 . 'id="' . $params['module'] . '_popup_cancel_button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"> ';
+                        . 'class="button" onclick="toggleDisplay(\'addform\');return false;" '
+                        . 'name="' . $params['module'] . '_popup_cancel_button" type="submit"'
+                        . 'id="' . $params['module'] . '_popup_cancel_button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"> ';
             break;
-			case "AUDIT":
-	            $popup_request_data = array(
-			        'call_back_function' => 'set_return',
-			        'form_name' => 'EditView',
-			        'field_to_name_array' => array(),
-			    );
-	            $json = getJSONobj();
-
-	            require_once('include/SugarFields/Parsers/MetaParser.php');
-	            $encoded_popup_request_data = MetaParser::parseDelimiters($json->encode($popup_request_data));
-	 			$audit_link = '<input id="btn_view_change_log" title="{$APP.LNK_VIEW_CHANGE_LOG}" class="button" onclick=\'open_popup("Audit", "600", "400", "&record={$fields.id.value}&module_name=' . $params['module'] . '", true, false, ' . $encoded_popup_request_data . '); return false;\' type="button" value="{$APP.LNK_VIEW_CHANGE_LOG}">';
+            case "AUDIT":
+                $popup_request_data = array(
+                    'call_back_function' => 'set_return',
+                    'form_name' => 'EditView',
+                    'field_to_name_array' => array(),
+                );
+                $json = getJSONobj();
+
+                require_once('include/SugarFields/Parsers/MetaParser.php');
+                $encoded_popup_request_data = MetaParser::parseDelimiters($json->encode($popup_request_data));
+                    $audit_link = '<input id="btn_view_change_log" title="{$APP.LNK_VIEW_CHANGE_LOG}" class="button" onclick=\'open_popup("Audit", "600", "400", "&record={$fields.id.value}&module_name=' . $params['module'] . '", true, false, ' . $encoded_popup_request_data . '); return false;\' type="button" value="{$APP.LNK_VIEW_CHANGE_LOG}">';
                 $output = '{if $bean->aclAccess("detail")}{if !empty($fields.id.value) && $isAuditEnabled}'.$audit_link.'{/if}{/if}';
             break;
 
 
-   	  } //switch
-      if(isset($params['appendTo'])) {
-          $smarty->append($params['appendTo'], $output);
-          return;
-      }
-      return $output;
-   } else if(is_array($type) && isset($type['sugar_html'])) {
-       require_once('include/SugarHtml/SugarHtml.php');
-
-       $dom_tree = SugarHtml::parseSugarHtml($type['sugar_html']);
-       replaceFormClick($dom_tree, $js_form);
-       $output = SugarHtml::createHtml($dom_tree);
-
-       if(isset($params['appendTo'])) {
-           $smarty->append($params['appendTo'], $output);
-           return;
-       }
-       return $output;
-   } else if(is_array($type) && isset($type['customCode'])) {
-       require_once('include/SugarHtml/SugarHtml.php');
-
-       $dom_tree = SugarHtml::parseHtmlTag($type['customCode']);
-       $hidden_exists = false;
-
-       replaceFormClick($dom_tree, $js_form, $hidden_exists);
-       if($hidden_exists) {
-           //If the customCode contains hidden fields, the extracted hidden fields need to append in the original form
-           $form = $smarty->get_template_vars('form');
-           $hidden_fields = $dom_tree;
-           extractHiddenInputs($hidden_fields);
-           if(!isset($form)) {
-               $form = array();
-           }
-           if(!isset($form['hidden'])) {
-               $form['hidden'] = array();
-           }
-           $form['hidden'][] = SugarHtml::createHtml($hidden_fields);
-           $smarty->assign('form', $form);
-       }
-       $output = SugarHtml::createHtml($dom_tree);
-
-       if(isset($params['appendTo'])) {
-           $smarty->append($params['appendTo'], $output);
-           return;
-       }
-       return $output;
-   }
+            } //switch
+        if(isset($params['appendTo'])) {
+            $smarty->append($params['appendTo'], $output);
+            return;
+        }
+        return $output;
+    } else if(is_array($type) && isset($type['sugar_html'])) {
+        require_once('include/SugarHtml/SugarHtml.php');
+
+        $dom_tree = SugarHtml::parseSugarHtml($type['sugar_html']);
+        replaceFormClick($dom_tree, $js_form);
+        $output = SugarHtml::createHtml($dom_tree);
+
+        if(isset($params['appendTo'])) {
+            $smarty->append($params['appendTo'], $output);
+            return;
+        }
+        return $output;
+    } else if(is_array($type) && isset($type['customCode'])) {
+        require_once('include/SugarHtml/SugarHtml.php');
+
+        $dom_tree = SugarHtml::parseHtmlTag($type['customCode']);
+        $hidden_exists = false;
+
+        replaceFormClick($dom_tree, $js_form, $hidden_exists);
+        if($hidden_exists) {
+            //If the customCode contains hidden fields, the extracted hidden fields need to append in the original form
+            $form = $smarty->get_template_vars('form');
+            $hidden_fields = $dom_tree;
+            extractHiddenInputs($hidden_fields);
+            if(!isset($form)) {
+                $form = array();
+            }
+            if(!isset($form['hidden'])) {
+                $form['hidden'] = array();
+            }
+            $form['hidden'][] = SugarHtml::createHtml($hidden_fields);
+            $smarty->assign('form', $form);
+        }
+        $output = SugarHtml::createHtml($dom_tree);
+
+        if(isset($params['appendTo'])) {
+            $smarty->append($params['appendTo'], $output);
+            return;
+        }
+        return $output;
+    }
 
 }
 /**

Spacing +47 added lines, -47 removed lines

@@ -281,11 +281,11 @@ 
  */
 function smarty_function_sugar_button($params, &$smarty)
 {
-   if(empty($params['module'])) {
+   if (empty($params['module'])) {
    	  $smarty->trigger_error("sugar_button: missing required param (module)");
-   } else if(empty($params['id'])) {
+   } else if (empty($params['id'])) {
    	  $smarty->trigger_error("sugar_button: missing required param (id)");
-   } else if(empty($params['view'])) {
+   } else if (empty($params['view'])) {
    	  $smarty->trigger_error("sugar_button: missing required param (view)");
    }
 
@@ -294,10 +294,10 @@ 
    $type = $params['id'];
    $location = (empty($params['location'])) ? "" : "_".$params['location'];
 
-   if(!is_array($type)) {
+   if (!is_array($type)) {
    	  $module = $params['module'];
    	  $view = $params['view'];
-   	  switch(strtoupper($type)) {
+   	  switch (strtoupper($type)) {
 			case "SEARCH":
                 $output = '<input tabindex="2" title="{$APP.LBL_SEARCH_BUTTON_TITLE}" onclick="SUGAR.savedViews.setChooser();" class="button" type="submit" name="button" value="{$APP.LBL_SEARCH_BUTTON_LABEL}" id="search_form_submit"/>&nbsp;';
 			break;
@@ -317,28 +317,28 @@ 
 			break;
 
 			case "DELETE":
-                $output = '{if $bean->aclAccess("delete")}<input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="button" onclick="'.$js_form.' _form.return_module.value=\'' . $module . '\'; _form.return_action.value=\'ListView\'; _form.action.value=\'Delete\'; if(confirm(\'{$APP.NTC_DELETE_CONFIRMATION}\')) SUGAR.ajaxUI.submitForm(_form);" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}" id="delete_button">{/if} ';
+                $output = '{if $bean->aclAccess("delete")}<input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="button" onclick="'.$js_form.' _form.return_module.value=\''.$module.'\'; _form.return_action.value=\'ListView\'; _form.action.value=\'Delete\'; if(confirm(\'{$APP.NTC_DELETE_CONFIRMATION}\')) SUGAR.ajaxUI.submitForm(_form);" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}" id="delete_button">{/if} ';
             break;
 
 			case "DUPLICATE":
-			    $output = '{if $bean->aclAccess("edit")}<input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="button" onclick="'.$js_form.' _form.return_module.value=\''. $module . '\'; _form.return_action.value=\'DetailView\'; _form.isDuplicate.value=true; _form.action.value=\'' . $view . '\'; _form.return_id.value=\'{$id}\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}" id="duplicate_button">{/if} ';
+			    $output = '{if $bean->aclAccess("edit")}<input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="button" onclick="'.$js_form.' _form.return_module.value=\''.$module.'\'; _form.return_action.value=\'DetailView\'; _form.isDuplicate.value=true; _form.action.value=\''.$view.'\'; _form.return_id.value=\'{$id}\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}" id="duplicate_button">{/if} ';
             break;
 
 			case "EDIT";
-			    $output = '{if $bean->aclAccess("edit")}<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' _form.return_module.value=\'' . $module . '\'; _form.return_action.value=\'DetailView\'; _form.return_id.value=\'{$id}\'; _form.action.value=\'EditView\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Edit" id="edit_button" value="{$APP.LBL_EDIT_BUTTON_LABEL}">{/if} ';
+			    $output = '{if $bean->aclAccess("edit")}<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' _form.return_module.value=\''.$module.'\'; _form.return_action.value=\'DetailView\'; _form.return_id.value=\'{$id}\'; _form.action.value=\'EditView\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Edit" id="edit_button" value="{$APP.LBL_EDIT_BUTTON_LABEL}">{/if} ';
             break;
 
 			case "FIND_DUPLICATES":
-			    $output = '{if $bean->aclAccess("edit") && $bean->aclAccess("delete")}<input title="{$APP.LBL_DUP_MERGE}" class="button" onclick="'.$js_form.' _form.return_module.value=\'' . $module . '\'; _form.return_action.value=\'DetailView\'; _form.return_id.value=\'{$id}\'; _form.action.value=\'Step1\'; _form.module.value=\'MergeRecords\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Merge" value="{$APP.LBL_DUP_MERGE}" id="merge_duplicate_button">{/if} ';
+			    $output = '{if $bean->aclAccess("edit") && $bean->aclAccess("delete")}<input title="{$APP.LBL_DUP_MERGE}" class="button" onclick="'.$js_form.' _form.return_module.value=\''.$module.'\'; _form.return_action.value=\'DetailView\'; _form.return_id.value=\'{$id}\'; _form.action.value=\'Step1\'; _form.module.value=\'MergeRecords\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Merge" value="{$APP.LBL_DUP_MERGE}" id="merge_duplicate_button">{/if} ';
             break;
 
 			case "SAVE":
 				$view = ($_REQUEST['action'] == 'EditView') ? 'EditView' : (($view == 'EditView') ? 'EditView' : $view);
-				$output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' {if $isDuplicate}_form.return_id.value=\'\'; {/if}_form.action.value=\'Save\'; if(check_form(\'' . $view . '\'))SUGAR.ajaxUI.submitForm(_form);return false;" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" id="'.$type.$location.'">{/if} ';
+				$output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' {if $isDuplicate}_form.return_id.value=\'\'; {/if}_form.action.value=\'Save\'; if(check_form(\''.$view.'\'))SUGAR.ajaxUI.submitForm(_form);return false;" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" id="'.$type.$location.'">{/if} ';
 			break;
 
 			case "SUBPANELSAVE":
-                if($view == 'QuickCreate' || (isset($_REQUEST['target_action']) && strtolower($_REQUEST['target_action']) == 'quickcreate')) $view =  "form_SubpanelQuickCreate_{$module}";
+                if ($view == 'QuickCreate' || (isset($_REQUEST['target_action']) && strtolower($_REQUEST['target_action']) == 'quickcreate')) $view = "form_SubpanelQuickCreate_{$module}";
 
                 /* BEGIN - SECURITY GROUPS - redirect a subpanel save to the detail view if select popup and user in more than 1 group*/ 
                 /**
@@ -355,20 +355,20 @@ 
                 $output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}"  class="button" onclick="'.$js_form.' disableOnUnloadEditView(); _form.action.value=\'Save\';if(check_form(\''.$view.'\'))return SUGAR.subpanelUtils.inlineSave(_form.id, \'' . $params['module'] . '_subpanel_save_button\');return false;" type="submit" name="' . $params['module'] . '_subpanel_save_button" id="' . $params['module'] . '_subpanel_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
                 
                 */
-                $output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}"  class="button" onclick="'.$js_form.' disableOnUnloadEditView(); _form.action.value=\'Save\';if(check_form(\''.$view.'\'))return SUGAR.subpanelUtils.inlineSave(_form.id, \'' . $params['module'] . '_subpanel_save_button\');return false;" type="submit" name="' . $params['module'] . '_subpanel_save_button" id="' . $params['module'] . '_subpanel_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
+                $output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}"  class="button" onclick="'.$js_form.' disableOnUnloadEditView(); _form.action.value=\'Save\';if(check_form(\''.$view.'\'))return SUGAR.subpanelUtils.inlineSave(_form.id, \''.$params['module'].'_subpanel_save_button\');return false;" type="submit" name="'.$params['module'].'_subpanel_save_button" id="'.$params['module'].'_subpanel_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
                 /* END - SECURITY GROUPS */
 
             break;
 			case "SUBPANELCANCEL":
-                $output = '<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" class="button" onclick="return SUGAR.subpanelUtils.cancelCreate($(this).attr(\'id\'));return false;" type="submit" name="' . $params['module'] . '_subpanel_cancel_button" id="' . $params['module'] . '_subpanel_cancel_button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"> ';
+                $output = '<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" class="button" onclick="return SUGAR.subpanelUtils.cancelCreate($(this).attr(\'id\'));return false;" type="submit" name="'.$params['module'].'_subpanel_cancel_button" id="'.$params['module'].'_subpanel_cancel_button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"> ';
 
             break;
 		    case "SUBPANELFULLFORM":
-                $output = '<input title="{$APP.LBL_FULL_FORM_BUTTON_TITLE}" class="button" onclick="'.$js_form.' disableOnUnloadEditView(_form); _form.return_action.value=\'DetailView\'; _form.action.value=\'EditView\'; if(typeof(_form.to_pdf)!=\'undefined\') _form.to_pdf.value=\'0\';" type="submit" name="' . $params['module'] . '_subpanel_full_form_button" id="' . $params['module'] . '_subpanel_full_form_button" value="{$APP.LBL_FULL_FORM_BUTTON_LABEL}"> ';
+                $output = '<input title="{$APP.LBL_FULL_FORM_BUTTON_TITLE}" class="button" onclick="'.$js_form.' disableOnUnloadEditView(_form); _form.return_action.value=\'DetailView\'; _form.action.value=\'EditView\'; if(typeof(_form.to_pdf)!=\'undefined\') _form.to_pdf.value=\'0\';" type="submit" name="'.$params['module'].'_subpanel_full_form_button" id="'.$params['module'].'_subpanel_full_form_button" value="{$APP.LBL_FULL_FORM_BUTTON_LABEL}"> ';
                 $output .= '<input type="hidden" name="full_form" value="full_form">';
             break;
 			case "DCMENUCANCEL":
-                $output = '<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="javascript:lastLoadedMenu=undefined;DCMenu.closeOverlay();return false;" type="submit" name="' . $params['module'] . '_dcmenu_cancel_button" id="' . $params['module'] . '_dcmenu_cancel_button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"> ';
+                $output = '<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="javascript:lastLoadedMenu=undefined;DCMenu.closeOverlay();return false;" type="submit" name="'.$params['module'].'_dcmenu_cancel_button" id="'.$params['module'].'_dcmenu_cancel_button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"> ';
             break;
 			case "DCMENUSAVE":
                             if ($view == 'QuickCreate') {
@@ -376,10 +376,10 @@ 
                             } else if ($view == 'EditView') {
                                 $view = "form_DCEditView_{$module}";
                             }
-				$output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' _form.action.value=\'Save\';if(check_form(\''.$view.'\'))return DCMenu.save(_form.id, \'' . $params['module'] . '_subpanel_save_button\');return false;" type="submit" name="' . $params['module'] . '_dcmenu_save_button" id="' . $params['module'] . '_dcmenu_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
+				$output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' _form.action.value=\'Save\';if(check_form(\''.$view.'\'))return DCMenu.save(_form.id, \''.$params['module'].'_subpanel_save_button\');return false;" type="submit" name="'.$params['module'].'_dcmenu_save_button" id="'.$params['module'].'_dcmenu_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
             break;
 			case "DCMENUFULLFORM":
-                $output = '<input title="{$APP.LBL_FULL_FORM_BUTTON_TITLE}" accessKey="{$APP.LBL_FULL_FORM_BUTTON_KEY}" class="button" onclick="'.$js_form.' disableOnUnloadEditView(_form); _form.return_action.value=\'DetailView\'; _form.action.value=\'EditView\'; _form.return_module.value=\'' . $params['module'] . '\';_form.return_id.value=_form.record.value;if(typeof(_form.to_pdf)!=\'undefined\') _form.to_pdf.value=\'0\';SUGAR.ajaxUI.submitForm(_form,null,true);DCMenu.closeOverlay();" type="button" name="' . $params['module'] . '_subpanel_full_form_button" id="' . $params['module'] . '_subpanel_full_form_button" value="{$APP.LBL_FULL_FORM_BUTTON_LABEL}"> ';
+                $output = '<input title="{$APP.LBL_FULL_FORM_BUTTON_TITLE}" accessKey="{$APP.LBL_FULL_FORM_BUTTON_KEY}" class="button" onclick="'.$js_form.' disableOnUnloadEditView(_form); _form.return_action.value=\'DetailView\'; _form.action.value=\'EditView\'; _form.return_module.value=\''.$params['module'].'\';_form.return_id.value=_form.record.value;if(typeof(_form.to_pdf)!=\'undefined\') _form.to_pdf.value=\'0\';SUGAR.ajaxUI.submitForm(_form,null,true);DCMenu.closeOverlay();" type="button" name="'.$params['module'].'_subpanel_full_form_button" id="'.$params['module'].'_subpanel_full_form_button" value="{$APP.LBL_FULL_FORM_BUTTON_LABEL}"> ';
                 $output .= '<input type="hidden" name="full_form" value="full_form">';
                 $output .= '<input type="hidden" name="is_admin" value="">';
             break;
@@ -387,15 +387,15 @@ 
 				$view = ($view == 'QuickCreate') ? "form_QuickCreate_{$module}" : $view;
 				$output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" '
 					 . 'class="button primary" onclick="'.$js_form.' _form.action.value=\'Popup\';'
-					 . 'return check_form(\''.$view.'\')" type="submit" name="' . $params['module']
-					 . '_popupcreate_save_button" id="' . $params['module']
+					 . 'return check_form(\''.$view.'\')" type="submit" name="'.$params['module']
+					 . '_popupcreate_save_button" id="'.$params['module']
 					 . '_popupcreate_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
             break;
 			case "POPUPCANCEL":
                 $output = '<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" '
 					 . 'class="button" onclick="toggleDisplay(\'addform\');return false;" '
-					 . 'name="' . $params['module'] . '_popup_cancel_button" type="submit"'
-					 . 'id="' . $params['module'] . '_popup_cancel_button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"> ';
+					 . 'name="'.$params['module'].'_popup_cancel_button" type="submit"'
+					 . 'id="'.$params['module'].'_popup_cancel_button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"> ';
             break;
 			case "AUDIT":
 	            $popup_request_data = array(
@@ -407,45 +407,45 @@ 
 
 	            require_once('include/SugarFields/Parsers/MetaParser.php');
 	            $encoded_popup_request_data = MetaParser::parseDelimiters($json->encode($popup_request_data));
-	 			$audit_link = '<input id="btn_view_change_log" title="{$APP.LNK_VIEW_CHANGE_LOG}" class="button" onclick=\'open_popup("Audit", "600", "400", "&record={$fields.id.value}&module_name=' . $params['module'] . '", true, false, ' . $encoded_popup_request_data . '); return false;\' type="button" value="{$APP.LNK_VIEW_CHANGE_LOG}">';
+	 			$audit_link = '<input id="btn_view_change_log" title="{$APP.LNK_VIEW_CHANGE_LOG}" class="button" onclick=\'open_popup("Audit", "600", "400", "&record={$fields.id.value}&module_name='.$params['module'].'", true, false, '.$encoded_popup_request_data.'); return false;\' type="button" value="{$APP.LNK_VIEW_CHANGE_LOG}">';
                 $output = '{if $bean->aclAccess("detail")}{if !empty($fields.id.value) && $isAuditEnabled}'.$audit_link.'{/if}{/if}';
             break;
 
 
    	  } //switch
-      if(isset($params['appendTo'])) {
+      if (isset($params['appendTo'])) {
           $smarty->append($params['appendTo'], $output);
           return;
       }
       return $output;
-   } else if(is_array($type) && isset($type['sugar_html'])) {
+   } else if (is_array($type) && isset($type['sugar_html'])) {
        require_once('include/SugarHtml/SugarHtml.php');
 
        $dom_tree = SugarHtml::parseSugarHtml($type['sugar_html']);
        replaceFormClick($dom_tree, $js_form);
        $output = SugarHtml::createHtml($dom_tree);
 
-       if(isset($params['appendTo'])) {
+       if (isset($params['appendTo'])) {
            $smarty->append($params['appendTo'], $output);
            return;
        }
        return $output;
-   } else if(is_array($type) && isset($type['customCode'])) {
+   } else if (is_array($type) && isset($type['customCode'])) {
        require_once('include/SugarHtml/SugarHtml.php');
 
        $dom_tree = SugarHtml::parseHtmlTag($type['customCode']);
        $hidden_exists = false;
 
        replaceFormClick($dom_tree, $js_form, $hidden_exists);
-       if($hidden_exists) {
+       if ($hidden_exists) {
            //If the customCode contains hidden fields, the extracted hidden fields need to append in the original form
            $form = $smarty->get_template_vars('form');
            $hidden_fields = $dom_tree;
            extractHiddenInputs($hidden_fields);
-           if(!isset($form)) {
+           if (!isset($form)) {
                $form = array();
            }
-           if(!isset($form['hidden'])) {
+           if (!isset($form['hidden'])) {
                $form['hidden'] = array();
            }
            $form['hidden'][] = SugarHtml::createHtml($hidden_fields);
@@ -453,7 +453,7 @@ 
        }
        $output = SugarHtml::createHtml($dom_tree);
 
-       if(isset($params['appendTo'])) {
+       if (isset($params['appendTo'])) {
            $smarty->append($params['appendTo'], $output);
            return;
        }
@@ -475,21 +475,21 @@ 
     $set_submit = false;
     $is_hidden_field = false;
     //if the code is wrapped with the form element, it will escape the operation for JS replacement
-    if(isset($dom_tree['tag']) && $dom_tree['tag'] == 'form')
+    if (isset($dom_tree['tag']) && $dom_tree['tag'] == 'form')
         return false;
 
-    if(isset($dom_tree['type']) && $dom_tree['type'] == 'hidden') {
+    if (isset($dom_tree['type']) && $dom_tree['type'] == 'hidden') {
         $is_hidden_field = true;
     }
 
     //Replace the JS syntax where the sugar_button contains the event handler for this.form
-    if(isset($dom_tree['onclick'])) {
-        if(strpos($dom_tree['onclick'], "this.form") !== false) {
+    if (isset($dom_tree['onclick'])) {
+        if (strpos($dom_tree['onclick'], "this.form") !== false) {
             $dom_tree['onclick'] = str_replace("this.form", "_form", $dom_tree['onclick']);
-            if(substr($dom_tree['onclick'], -1) != ';')
+            if (substr($dom_tree['onclick'], -1) != ';')
                 $dom_tree['onclick'] .= ";";
             //Onclick handler contains returning a variable, for example it prompts a confirm message.
-            if(strpos($dom_tree['onclick'], "return ") !== false ) {
+            if (strpos($dom_tree['onclick'], "return ") !== false) {
                 $dom_tree['onclick'] = $js_form.' var _onclick=(function(){ldelim}'.$dom_tree['onclick']."{rdelim}()); if(_onclick!==false) _form.submit();";
             } else {
                 $dom_tree['onclick'] = $js_form.$dom_tree['onclick']."_form.submit();";
@@ -498,19 +498,19 @@ 
             $set_submit = true;
         }
     }
-    foreach($dom_tree as $key => $sub_tree) {
-        if(is_array($sub_tree)) {
+    foreach ($dom_tree as $key => $sub_tree) {
+        if (is_array($sub_tree)) {
             list($_submit, $_hidden) = replaceFormClick($dom_tree[$key], $js_form, $hidden_field_exists);
             $set_submit = ($set_submit) ? $set_submit : $_submit;
             $is_hidden_field = ($is_hidden_field) ? $is_hidden_field : $_hidden;
         }
     }
 
-    if($set_submit && isset($dom_tree['type'])) {
+    if ($set_submit && isset($dom_tree['type'])) {
         $dom_tree['type'] = "button";
         $set_submit = false;
     }
-    if($is_hidden_field && isset($dom_tree['tag']) && $dom_tree['tag'] == 'input' ) {
+    if ($is_hidden_field && isset($dom_tree['tag']) && $dom_tree['tag'] == 'input') {
         $hidden_field_exists = true;
         $is_hidden_field = false;
     }
@@ -527,20 +527,20 @@ 
         'hidden'
     );
     //all hidden fields in the form elements must NOT attach in the original form
-    if(isset($dom_tree['tag']) && $dom_tree['tag'] == 'form') {
+    if (isset($dom_tree['tag']) && $dom_tree['tag'] == 'form') {
         $dom_tree = array();
     }
-    foreach($dom_tree as $key => $sub_tree) {
-        if(is_numeric($key) && isset($sub_tree['tag']) && $sub_tree['tag'] == 'input') {
-            if( !isset($sub_tree['type']) || in_array($sub_tree['type'], $allow_types) === false ) {
+    foreach ($dom_tree as $key => $sub_tree) {
+        if (is_numeric($key) && isset($sub_tree['tag']) && $sub_tree['tag'] == 'input') {
+            if (!isset($sub_tree['type']) || in_array($sub_tree['type'], $allow_types) === false) {
                 unset($dom_tree[$key]);
             }
-        } else if(is_array($sub_tree)) {
+        } else if (is_array($sub_tree)) {
             extractHiddenInputs($dom_tree[$key]);
         }
     }
-    if(isset($dom_tree['tag']) && $dom_tree['tag'] == 'input') {
-        if( !isset($dom_tree['type']) || in_array($dom_tree['type'], $allow_types) === false ) {
+    if (isset($dom_tree['tag']) && $dom_tree['tag'] == 'input') {
+        if (!isset($dom_tree['type']) || in_array($dom_tree['type'], $allow_types) === false) {
             $dom_tree = array();
         }
     }

Braces +9 added lines, -5 removed lines

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

include/Smarty/plugins/shared.make_timestamp.php

Spacing +3 added lines, -3 removed lines

@@ -16,14 +16,14 @@
  */
 function smarty_make_timestamp($string)
 {
-    if(empty($string)) {
+    if (empty($string)) {
         // use "now":
         $time = time();
 
     } elseif (preg_match('/^\d{14}$/', $string)) {
         // it is mysql timestamp format of YYYYMMDDHHMMSS?            
-        $time = mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
-                       substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
+        $time = mktime(substr($string, 8, 2), substr($string, 10, 2), substr($string, 12, 2),
+                       substr($string, 4, 2), substr($string, 6, 2), substr($string, 0, 4));
         
     } elseif (is_numeric($string)) {
         // it is a numeric string, we handle it as timestamp

Indentation +5 added lines, -5 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 /**
- * Smarty shared plugin
- * @package Smarty
- * @subpackage plugins
- */
+         * Smarty shared plugin
+         * @package Smarty
+         * @subpackage plugins
+         */
 
 
 /**
@@ -23,7 +23,7 @@ 
     } elseif (preg_match('/^\d{14}$/', $string)) {
         // it is mysql timestamp format of YYYYMMDDHHMMSS?            
         $time = mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
-                       substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
+                        substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
         
     } elseif (is_numeric($string)) {
         // it is a numeric string, we handle it as timestamp

Doc Comments +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
  *           from a string.
  * @author   Monte Ohrt <monte at ohrt dot com>
  * @param string
- * @return string
+ * @return integer
  */
 function smarty_make_timestamp($string)
 {

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;
 }

Doc Comments +15 added lines, -5 removed lines

@@ -220,7 +220,7 @@ 
      * @param string $resource_name
      * @param string $source_content
      * @param string $compiled_content
-     * @return true
+     * @return null|boolean
      */
     function _compile_file($resource_name, $source_content, &$compiled_content)
     {
@@ -761,7 +761,8 @@ 
      * @param string $tag_command
      * @param string $tag_args
      * @param string $tag_modifier
-     * @return string
+     * @param string $output
+     * @return boolean
      */
     function _compile_custom_tag($tag_command, $tag_args, $tag_modifier, &$output)
     {
@@ -1427,6 +1428,11 @@ 
     }
 
 
+    /**
+     * @param string $type
+     * @param string $name
+     * @param string $cache_code
+     */
     function _compile_arg_list($type, $name, $attrs, &$cache_code) {
         $arg_list = array();
 
@@ -1624,7 +1630,6 @@ 
      * PHP code
      *
      * @param string $val
-     * @param string $tag_attrs
      * @return string
      */
     function _parse_var_props($val)
@@ -1710,7 +1715,6 @@ 
      * parse variable expression into PHP code
      *
      * @param string $var_expr
-     * @param string $output
      * @return string
      */
     function _parse_var($var_expr)
@@ -1978,7 +1982,7 @@ 
      *
      * @param string $type
      * @param string $name
-     * @param boolean? $delayed_loading
+     * @param boolean $delayed_loading
      */
     function _add_plugin($type, $name, $delayed_loading = null)
     {
@@ -2268,6 +2272,8 @@ 
      * check if the compilation changes from cacheable to
      * non-cacheable state with the beginning of the current
      * plugin. return php-code to reflect the transition.
+     * @param string $type
+     * @param string $name
      * @return string
      */
     function _push_cacheable_state($type, $name) {
@@ -2286,6 +2292,8 @@ 
      * check if the compilation changes from non-cacheable to
      * cacheable state with the end of the current plugin return
      * php-code to reflect the transition.
+     * @param string $type
+     * @param string $name
      * @return string
      */
     function _pop_cacheable_state($type, $name) {
@@ -2301,6 +2309,7 @@ 
     /**
      * push opening tag-name, file-name and line-number on the tag-stack
      * @param string the opening tag's name
+     * @param string $open_tag
      */
     function _push_tag($open_tag)
     {
@@ -2311,6 +2320,7 @@ 
      * pop closing tag-name
      * raise an error if this stack-top doesn't match with the closing tag
      * @param string the closing tag's name
+     * @param string $close_tag
      * @return string the opening tag's name
      */
     function _pop_tag($close_tag)

data/SugarBean.php

Indentation +738 added lines, -738 removed lines

@@ -84,27 +84,27 @@ 
     public $id;
 
     /**
-	 * When createing a bean, you can specify a value in the id column as
-	 * long as that value is unique.  During save, if the system finds an
-	 * id, it assumes it is an update.  Setting new_with_id to true will
-	 * make sure the system performs an insert instead of an update.
-	 *
-	 * @var BOOL -- default false
-	 */
-	var $new_with_id = false;
-
-
-	/**
-	 * How deep logic hooks can go
-	 * @var int
-	 */
-	protected $max_logic_depth = 10;
-
-	/**
-	 * Disble vardefs.  This should be set to true only for beans that do not have varders.  Tracker is an example
-	 *
-	 * @var BOOL -- default false
-	 */
+     * When createing a bean, you can specify a value in the id column as
+     * long as that value is unique.  During save, if the system finds an
+     * id, it assumes it is an update.  Setting new_with_id to true will
+     * make sure the system performs an insert instead of an update.
+     *
+     * @var BOOL -- default false
+     */
+    var $new_with_id = false;
+
+
+    /**
+     * How deep logic hooks can go
+     * @var int
+     */
+    protected $max_logic_depth = 10;
+
+    /**
+     * Disble vardefs.  This should be set to true only for beans that do not have varders.  Tracker is an example
+     *
+     * @var BOOL -- default false
+     */
     var $disable_vardefs = false;
 
 
@@ -116,20 +116,20 @@ 
      */
     var $new_assigned_user_name;
 
-	/**
-	 * An array of booleans.  This array is cleared out when data is loaded.
-	 * As date/times are converted, a "1" is placed under the key, the field is converted.
-	 *
-	 * @var Array of booleans
-	 */
-	var $processed_dates_times = array();
+    /**
+     * An array of booleans.  This array is cleared out when data is loaded.
+     * As date/times are converted, a "1" is placed under the key, the field is converted.
+     *
+     * @var Array of booleans
+     */
+    var $processed_dates_times = array();
 
-	/**
-	 * Whether to process date/time fields for storage in the database in GMT
-	 *
-	 * @var BOOL
-	 */
-	var $process_save_dates =true;
+    /**
+     * Whether to process date/time fields for storage in the database in GMT
+     *
+     * @var BOOL
+     */
+    var $process_save_dates =true;
 
     /**
      * This signals to the bean that it is being saved in a mass mode.
@@ -140,20 +140,20 @@ 
      */
     var $save_from_post = true;
 
-	/**
-	 * When running a query on related items using the method: retrieve_by_string_fields
-	 * this value will be set to true if more than one item matches the search criteria.
-	 *
-	 * @var BOOL
-	 */
-	var $duplicates_found = false;
+    /**
+     * When running a query on related items using the method: retrieve_by_string_fields
+     * this value will be set to true if more than one item matches the search criteria.
+     *
+     * @var BOOL
+     */
+    var $duplicates_found = false;
 
-	/**
-	 * true if this bean has been deleted, false otherwise.
-	 *
-	 * @var BOOL
-	 */
-	var $deleted = 0;
+    /**
+     * true if this bean has been deleted, false otherwise.
+     *
+     * @var BOOL
+     */
+    var $deleted = 0;
 
     /**
      * Should the date modified column of the bean be updated during save?
@@ -201,22 +201,22 @@ 
     var $table_name = '';
 
     /**
-    * This is the singular name of the bean.  (i.e. Contact).
-    *
-    * @var String
-    */
+     * This is the singular name of the bean.  (i.e. Contact).
+     *
+     * @var String
+     */
     var $object_name = '';
 
     /** Set this to true if you query contains a sub-select and bean is converting both select statements
-    * into count queries.
-    */
+     * into count queries.
+     */
     var $ungreedy_count=false;
 
     /**
-    * The name of the module folder for this type of bean.
-    *
-    * @var String
-    */
+     * The name of the module folder for this type of bean.
+     *
+     * @var String
+     */
     var $module_dir = '';
     var $module_name = '';
     var $field_name_map;
@@ -249,8 +249,8 @@ 
     var $importable = false;
 
     /**
-    * Set to true in the child beans if the module use the special notification template
-    */
+     * Set to true in the child beans if the module use the special notification template
+     */
     var $special_notification = false;
 
     /**
@@ -282,7 +282,7 @@ 
      */
     protected $loaded_relationships = array();
 
-	/**
+    /**
      * set to true if dependent fields updated
      */
     protected $is_updated_dependent_fields = false;
@@ -661,7 +661,7 @@ 
             return;
 
         foreach ($this->field_defs as $field => $value) {
-		    if( !empty($this->$field)
+            if( !empty($this->$field)
                   && ((isset($value['default']) && $this->$field == $value['default']) || (!empty($value['display_default']) && $this->$field == $value['display_default']))
                     ) {
                 $this->$field = null;
@@ -710,7 +710,7 @@ 
                             $this->$field = $this->parseDateDefault($value['display_default']);
                         }
                         break;
-                   case 'datetime':
+                    case 'datetime':
                    case 'datetimecombo':
                         if(!empty($value['display_default'])){
                             $this->$field = $this->parseDateDefault($value['display_default'], true);
@@ -723,9 +723,9 @@ 
                             $this->$field = $value['default'];
                         break;
                     case 'bool':
-                    	if(isset($this->$field)){
-                    		break;
-                    	}
+                        if(isset($this->$field)){
+                            break;
+                        }
                     default:
                         if ( isset($value['default']) && $value['default'] !== '' ) {
                             $this->$field = htmlentities($value['default'], ENT_QUOTES, 'UTF-8');
@@ -788,10 +788,10 @@ 
     /**
      * This method has been deprecated.
      *
-    * @see removeRelationshipMeta()
+     * @see removeRelationshipMeta()
      * @deprecated 4.5.1 - Nov 14, 2006
      * @static
-    */
+     */
     static function remove_relationship_meta($key,$db,$log,$tablename,$dictionary,$module_dir)
     {
         SugarBean::removeRelationshipMeta($key,$db,$tablename,$dictionary,$module_dir);
@@ -927,10 +927,10 @@ 
 
     /**
      * This method has been deprecated.
-    * @see createRelationshipMeta()
+     * @see createRelationshipMeta()
      * @deprecated 4.5.1 - Nov 14, 2006
      * @static
-    */
+     */
     static function create_relationship_meta($key,&$db,&$log,$tablename,$dictionary,$module_dir)
     {
         SugarBean::createRelationshipMeta($key,$db,$tablename,$dictionary,$module_dir);
@@ -1084,7 +1084,7 @@ 
 
         $linked_fields=array();
 
- //   	require_once('data/Link.php');
+    //   	require_once('data/Link.php');
 
         $fieldDefs = $this->getFieldDefinitions();
 
@@ -1314,8 +1314,8 @@ 
     }
 
     /**
-    * Cleans char, varchar, text, etc. fields of XSS type materials
-    */
+     * Cleans char, varchar, text, etc. fields of XSS type materials
+     */
     function cleanBean() {
         foreach($this->field_defs as $key => $def) {
 
@@ -1338,14 +1338,14 @@ 
     }
 
     /**
-    * Implements a generic insert and update logic for any SugarBean
-    * This method only works for subclasses that implement the same variable names.
-    * This method uses the presence of an id field that is not null to signify and update.
-    * The id field should not be set otherwise.
-    *
-    * @param boolean $check_notify Optional, default false, if set to true assignee of the record is notified via email.
-    * @todo Add support for field type validation and encoding of parameters.
-    */
+     * Implements a generic insert and update logic for any SugarBean
+     * This method only works for subclasses that implement the same variable names.
+     * This method uses the presence of an id field that is not null to signify and update.
+     * The id field should not be set otherwise.
+     *
+     * @param boolean $check_notify Optional, default false, if set to true assignee of the record is notified via email.
+     * @todo Add support for field type validation and encoding of parameters.
+     */
     function save($check_notify = FALSE)
     {
         $this->in_save = true;
@@ -1362,14 +1362,14 @@ 
             $isUpdate = false;
         }
 
-		if ( $this->new_with_id == true )
-		{
-			$isUpdate = false;
-		}
-		if(empty($this->date_modified) || $this->update_date_modified)
-		{
-			$this->date_modified = $GLOBALS['timedate']->nowDb();
-		}
+        if ( $this->new_with_id == true )
+        {
+            $isUpdate = false;
+        }
+        if(empty($this->date_modified) || $this->update_date_modified)
+        {
+            $this->date_modified = $GLOBALS['timedate']->nowDb();
+        }
 
         $this->_checkOptimisticLocking($action, $isUpdate);
 
@@ -1483,10 +1483,10 @@ 
         }
 
 
-		/* BEGIN - SECURITY GROUPS - inheritance */ 
-		require_once('modules/SecurityGroups/SecurityGroup.php');
-		SecurityGroup::inherit($this,$isUpdate);
-		/* END - SECURITY GROUPS */ 
+        /* BEGIN - SECURITY GROUPS - inheritance */ 
+        require_once('modules/SecurityGroups/SecurityGroup.php');
+        SecurityGroup::inherit($this,$isUpdate);
+        /* END - SECURITY GROUPS */ 
         //If we aren't in setup mode and we have a current user and module, then we track
         if(isset($GLOBALS['current_user']) && isset($this->module_dir))
         {
@@ -1527,8 +1527,8 @@ 
     }
 
     /**
-    * Determines which users receive a notification
-    */
+     * Determines which users receive a notification
+     */
     function get_notification_recipients() {
         $notify_user = new User();
         $notify_user->retrieve($this->assigned_user_id);
@@ -1545,11 +1545,11 @@ 
     }
 
     /**
-    * Handles sending out email notifications when items are first assigned to users
-    *
-    * @param string $notify_user user to notify
-    * @param string $admin the admin user that sends out the notification
-    */
+     * Handles sending out email notifications when items are first assigned to users
+     *
+     * @param string $notify_user user to notify
+     * @param string $admin the admin user that sends out the notification
+     */
     function send_assignment_notifications($notify_user, $admin)
     {
         global $current_user;
@@ -1580,7 +1580,7 @@ 
                 $notify_mail->FromName = $from_name;
             }
 
-           $oe = new OutboundEmail();
+            $oe = new OutboundEmail();
             $oe = $oe->getUserMailerSettings($current_user);
             //only send if smtp server is defined
             if($sendEmail){
@@ -1616,9 +1616,9 @@ 
     }
 
     /**
-    * This function handles create the email notifications email.
-    * @param string $notify_user the user to send the notification email to
-    */
+     * This function handles create the email notifications email.
+     * @param string $notify_user the user to send the notification email to
+     */
     function create_notification_email($notify_user) {
         global $sugar_version;
         global $sugar_config;
@@ -2027,104 +2027,104 @@ 
     }
 
     /**
-    * This function retrieves a record of the appropriate type from the DB.
-    * It fills in all of the fields from the DB into the object it was called on.
-    *
-    * @param $id - If ID is specified, it overrides the current value of $this->id.  If not specified the current value of $this->id will be used.
-    * @return this - The object that it was called apon or null if exactly 1 record was not found.
-    *
-	*/
-
-	function check_date_relationships_load()
-	{
-		global $disable_date_format;
-		global $timedate;
-		if (empty($timedate))
-			$timedate=TimeDate::getInstance();
-
-		if(empty($this->field_defs))
-		{
-			return;
-		}
-		foreach($this->field_defs as $fieldDef)
-		{
-			$field = $fieldDef['name'];
-			if(!isset($this->processed_dates_times[$field]))
-			{
-				$this->processed_dates_times[$field] = '1';
-				if(empty($this->$field)) continue;
-				if($field == 'date_modified' || $field == 'date_entered')
-				{
-					$this->$field = $this->db->fromConvert($this->$field, 'datetime');
-					if(empty($disable_date_format)) {
-						$this->$field = $timedate->to_display_date_time($this->$field);
-					}
-				}
-				elseif(isset($this->field_name_map[$field]['type']))
-				{
-					$type = $this->field_name_map[$field]['type'];
-
-					if($type == 'relate'  && isset($this->field_name_map[$field]['custom_module']))
-					{
-						$type = $this->field_name_map[$field]['type'];
-					}
-
-					if($type == 'date')
-					{
-						if($this->$field == '0000-00-00')
-						{
-							$this->$field = '';
-						} elseif(!empty($this->field_name_map[$field]['rel_field']))
-						{
-							$rel_field = $this->field_name_map[$field]['rel_field'];
-
-							if(!empty($this->$rel_field))
-							{
-								if(empty($disable_date_format)) {
-									$mergetime = $timedate->merge_date_time($this->$field,$this->$rel_field);
-									$this->$field = $timedate->to_display_date($mergetime);
-									$this->$rel_field = $timedate->to_display_time($mergetime);
-								}
-							}
-						}
-						else
-						{
-							if(empty($disable_date_format)) {
-								$this->$field = $timedate->to_display_date($this->$field, false);
-							}
-						}
-					} elseif($type == 'datetime' || $type == 'datetimecombo')
-					{
-						if($this->$field == '0000-00-00 00:00:00')
-						{
-							$this->$field = '';
-						}
-						else
-						{
-							if(empty($disable_date_format)) {
-								$this->$field = $timedate->to_display_date_time($this->$field, true, true);
-							}
-						}
-					} elseif($type == 'time')
-					{
-						if($this->$field == '00:00:00')
-						{
-							$this->$field = '';
-						} else
-						{
-							//$this->$field = from_db_convert($this->$field, 'time');
-							if(empty($this->field_name_map[$field]['rel_field']) && empty($disable_date_format))
-							{
-								$this->$field = $timedate->to_display_time($this->$field,true, false);
-							}
-						}
-					} elseif($type == 'encrypt' && empty($disable_date_format)){
-						$this->$field = $this->decrypt_after_retrieve($this->$field);
-					}
-				}
-			}
-		}
-	}
+     * This function retrieves a record of the appropriate type from the DB.
+     * It fills in all of the fields from the DB into the object it was called on.
+     *
+     * @param $id - If ID is specified, it overrides the current value of $this->id.  If not specified the current value of $this->id will be used.
+     * @return this - The object that it was called apon or null if exactly 1 record was not found.
+     *
+     */
+
+    function check_date_relationships_load()
+    {
+        global $disable_date_format;
+        global $timedate;
+        if (empty($timedate))
+            $timedate=TimeDate::getInstance();
+
+        if(empty($this->field_defs))
+        {
+            return;
+        }
+        foreach($this->field_defs as $fieldDef)
+        {
+            $field = $fieldDef['name'];
+            if(!isset($this->processed_dates_times[$field]))
+            {
+                $this->processed_dates_times[$field] = '1';
+                if(empty($this->$field)) continue;
+                if($field == 'date_modified' || $field == 'date_entered')
+                {
+                    $this->$field = $this->db->fromConvert($this->$field, 'datetime');
+                    if(empty($disable_date_format)) {
+                        $this->$field = $timedate->to_display_date_time($this->$field);
+                    }
+                }
+                elseif(isset($this->field_name_map[$field]['type']))
+                {
+                    $type = $this->field_name_map[$field]['type'];
+
+                    if($type == 'relate'  && isset($this->field_name_map[$field]['custom_module']))
+                    {
+                        $type = $this->field_name_map[$field]['type'];
+                    }
+
+                    if($type == 'date')
+                    {
+                        if($this->$field == '0000-00-00')
+                        {
+                            $this->$field = '';
+                        } elseif(!empty($this->field_name_map[$field]['rel_field']))
+                        {
+                            $rel_field = $this->field_name_map[$field]['rel_field'];
+
+                            if(!empty($this->$rel_field))
+                            {
+                                if(empty($disable_date_format)) {
+                                    $mergetime = $timedate->merge_date_time($this->$field,$this->$rel_field);
+                                    $this->$field = $timedate->to_display_date($mergetime);
+                                    $this->$rel_field = $timedate->to_display_time($mergetime);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if(empty($disable_date_format)) {
+                                $this->$field = $timedate->to_display_date($this->$field, false);
+                            }
+                        }
+                    } elseif($type == 'datetime' || $type == 'datetimecombo')
+                    {
+                        if($this->$field == '0000-00-00 00:00:00')
+                        {
+                            $this->$field = '';
+                        }
+                        else
+                        {
+                            if(empty($disable_date_format)) {
+                                $this->$field = $timedate->to_display_date_time($this->$field, true, true);
+                            }
+                        }
+                    } elseif($type == 'time')
+                    {
+                        if($this->$field == '00:00:00')
+                        {
+                            $this->$field = '';
+                        } else
+                        {
+                            //$this->$field = from_db_convert($this->$field, 'time');
+                            if(empty($this->field_name_map[$field]['rel_field']) && empty($disable_date_format))
+                            {
+                                $this->$field = $timedate->to_display_time($this->$field,true, false);
+                            }
+                        }
+                    } elseif($type == 'encrypt' && empty($disable_date_format)){
+                        $this->$field = $this->decrypt_after_retrieve($this->$field);
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * This function processes the fields before save.
@@ -2136,21 +2136,21 @@ 
     }
 
     /**
-    * Removes formatting from values posted from the user interface.
+     * Removes formatting from values posted from the user interface.
      * It only unformats numbers.  Function relies on user/system prefernce for format strings.
      *
      * Internal Function, do not override.
-    */
+     */
     function unformat_all_fields()
     {
         $GLOBALS['log']->deprecated('SugarBean.php: unformat_all_fields() is deprecated');
     }
 
     /**
-    * This functions adds formatting to all number fields before presenting them to user interface.
+     * This functions adds formatting to all number fields before presenting them to user interface.
      *
      * Internal function, do not override.
-    */
+     */
     function format_all_fields()
     {
         $GLOBALS['log']->deprecated('SugarBean.php: format_all_fields() is deprecated');
@@ -2190,8 +2190,8 @@ 
                 case 'datetimecombo':
                     if(empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
-                    	$this->$field = '';
-                    	break;
+                        $this->$field = '';
+                        break;
                     }
                     if ( ! preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/',$this->$field) ) {
                         // This appears to be formatted in user date/time
@@ -2202,8 +2202,8 @@ 
                 case 'date':
                     if(empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
-                    	$this->$field = '';
-                    	break;
+                        $this->$field = '';
+                        break;
                     }
                     if ( ! preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/',$this->$field) ) {
                         // This date appears to be formatted in the user's format
@@ -2214,8 +2214,8 @@ 
                 case 'time':
                     if(empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
-                    	$this->$field = '';
-                    	break;
+                        $this->$field = '';
+                        break;
                     }
                     if ( preg_match('/(am|pm)/i',$this->$field) ) {
                         // This time appears to be formatted in the user's format
@@ -2235,7 +2235,7 @@ 
                         $reformatted = true;
                     }
                     break;
-               case 'uint':
+                case 'uint':
                case 'ulong':
                case 'long':
                case 'short':
@@ -2248,21 +2248,21 @@ 
                         $this->$field = (int)unformat_number($this->$field);
                         $reformatted = true;
                     }
-                   break;
-               case 'bool':
+                    break;
+                case 'bool':
                    if (empty($this->$field)) {
-                       $this->$field = false;
-                   } else if(true === $this->$field || 1 == $this->$field) {
-                       $this->$field = true;
-                   } else if(in_array(strval($this->$field), $boolean_false_values)) {
-                       $this->$field = false;
-                       $reformatted = true;
-                   } else {
-                       $this->$field = true;
-                       $reformatted = true;
-                   }
-                   break;
-               case 'encrypt':
+                        $this->$field = false;
+                    } else if(true === $this->$field || 1 == $this->$field) {
+                        $this->$field = true;
+                    } else if(in_array(strval($this->$field), $boolean_false_values)) {
+                        $this->$field = false;
+                        $reformatted = true;
+                    } else {
+                        $this->$field = true;
+                        $reformatted = true;
+                    }
+                    break;
+                case 'encrypt':
                     $this->$field = $this->encrpyt_before_save($this->$field);
                     break;
             }
@@ -2284,7 +2284,7 @@ 
      * @param boolean $deleted Optional, default true, if set to false deleted filter will not be added.
      *
      * Internal function, do not override.
-    */
+     */
     function retrieve($id = -1, $encode=true,$deleted=true)
     {
 
@@ -2340,17 +2340,17 @@ 
             $this->custom_fields->fill_relationships();
         }
 
-		$this->is_updated_dependent_fields = false;
+        $this->is_updated_dependent_fields = false;
         $this->fill_in_additional_detail_fields();
         $this->fill_in_relationship_fields();
 // save related fields values for audit
-         foreach ($this->get_related_fields() as $rel_field_name)
-         {
-             if (! empty($this->$rel_field_name['name']))
-             {
-                 $this->fetched_rel_row[$rel_field_name['name']] = $this->$rel_field_name['name'];
-             }
-         }
+            foreach ($this->get_related_fields() as $rel_field_name)
+            {
+                if (! empty($this->$rel_field_name['name']))
+                {
+                    $this->fetched_rel_row[$rel_field_name['name']] = $this->$rel_field_name['name'];
+                }
+            }
         //make a copy of fields in the relationship_fields array. These field values will be used to
         //clear relationship.
         foreach ( $this->field_defs as $key => $def )
@@ -2363,7 +2363,7 @@ 
                 }
                 else
                     $this->rel_fields_before_value[$key]=null;
-           }
+            }
         }
         if (isset($this->relationship_fields) && is_array($this->relationship_fields))
         {
@@ -2418,14 +2418,14 @@ 
 
 
     /**
-    * Add any required joins to the list count query.  The joins are required if there
-    * is a field in the $where clause that needs to be joined.
-    *
-    * @param string $query
-    * @param string $where
-    *
-    * Internal Function, do Not override.
-    */
+     * Add any required joins to the list count query.  The joins are required if there
+     * is a field in the $where clause that needs to be joined.
+     *
+     * @param string $query
+     * @param string $where
+     *
+     * Internal Function, do Not override.
+     */
     function add_list_count_joins(&$query, $where)
     {
         $custom_join = $this->getCustomJoin();
@@ -2434,15 +2434,15 @@ 
     }
 
     /**
-    * Changes the select expression of the given query to be 'count(*)' so you
-    * can get the number of items the query will return.  This is used to
-    * populate the upper limit on ListViews.
+     * Changes the select expression of the given query to be 'count(*)' so you
+     * can get the number of items the query will return.  This is used to
+     * populate the upper limit on ListViews.
      *
      * @param string $query Select query string
      * @return string count query
      *
      * Internal function, do not override.
-    */
+     */
     function create_list_count_query($query)
     {
         // remove the 'order by' clause which is expected to be at the end of the query
@@ -2495,21 +2495,21 @@ 
     }
 
     /**
-    * This function returns a paged list of the current object type.  It is intended to allow for
-    * hopping back and forth through pages of data.  It only retrieves what is on the current page.
-    *
-    * @internal This method must be called on a new instance.  It trashes the values of all the fields in the current one.
-    * @param string $order_by
-    * @param string $where Additional where clause
-    * @param int $row_offset Optaional,default 0, starting row number
-    * @param init $limit Optional, default -1
-    * @param int $max Optional, default -1
-    * @param boolean $show_deleted Optional, default 0, if set to 1 system will show deleted records.
-    * @return array Fetched data.
-    *
-    * Internal function, do not override.
-    *
-    */
+     * This function returns a paged list of the current object type.  It is intended to allow for
+     * hopping back and forth through pages of data.  It only retrieves what is on the current page.
+     *
+     * @internal This method must be called on a new instance.  It trashes the values of all the fields in the current one.
+     * @param string $order_by
+     * @param string $where Additional where clause
+     * @param int $row_offset Optaional,default 0, starting row number
+     * @param init $limit Optional, default -1
+     * @param int $max Optional, default -1
+     * @param boolean $show_deleted Optional, default 0, if set to 1 system will show deleted records.
+     * @return array Fetched data.
+     *
+     * Internal function, do not override.
+     *
+     */
     function get_list($order_by = "", $where = "", $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0, $singleSelect=false, $select_fields = array())
     {
         $GLOBALS['log']->debug("get_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
@@ -2539,15 +2539,15 @@ 
     }
 
     /**
-    * Prefixes column names with this bean's table name.
-    *
-    * @param string $order_by  Order by clause to be processed
-    * @param SugarBean $submodule name of the module this order by clause is for
-    * @param boolean $suppress_table_name Whether table name should be suppressed
-    * @return string Processed order by clause
-    *
-    * Internal function, do not override.
-    */
+     * Prefixes column names with this bean's table name.
+     *
+     * @param string $order_by  Order by clause to be processed
+     * @param SugarBean $submodule name of the module this order by clause is for
+     * @param boolean $suppress_table_name Whether table name should be suppressed
+     * @return string Processed order by clause
+     *
+     * Internal function, do not override.
+     */
     public function process_order_by($order_by, $submodule = null, $suppress_table_name = false)
     {
         if (empty($order_by))
@@ -2621,21 +2621,21 @@ 
 
 
     /**
-    * Returns a detail object like retrieving of the current object type.
-    *
-    * It is intended for use in navigation buttons on the DetailView.  It will pass an offset and limit argument to the sql query.
-    * @internal This method must be called on a new instance.  It overrides the values of all the fields in the current one.
-    *
-    * @param string $order_by
-    * @param string $where Additional where clause
-    * @param int $row_offset Optaional,default 0, starting row number
-    * @param init $limit Optional, default -1
-    * @param int $max Optional, default -1
-    * @param boolean $show_deleted Optioanl, default 0, if set to 1 system will show deleted records.
-    * @return array Fetched data.
-    *
-    * Internal function, do not override.
-    */
+     * Returns a detail object like retrieving of the current object type.
+     *
+     * It is intended for use in navigation buttons on the DetailView.  It will pass an offset and limit argument to the sql query.
+     * @internal This method must be called on a new instance.  It overrides the values of all the fields in the current one.
+     *
+     * @param string $order_by
+     * @param string $where Additional where clause
+     * @param int $row_offset Optaional,default 0, starting row number
+     * @param init $limit Optional, default -1
+     * @param int $max Optional, default -1
+     * @param boolean $show_deleted Optioanl, default 0, if set to 1 system will show deleted records.
+     * @return array Fetched data.
+     *
+     * Internal function, do not override.
+     */
     function get_detail($order_by = "", $where = "",  $offset = 0, $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0)
     {
         $GLOBALS['log']->debug("get_detail:  order_by = '$order_by' and where = '$where' and limit = '$limit' and offset = '$offset'");
@@ -2659,25 +2659,25 @@ 
             }
         }
 
-		/* BEGIN - SECURITY GROUPS */
-    	if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
-    	{
-			require_once('modules/SecurityGroups/SecurityGroup.php');
-    		global $current_user;
-    		$owner_where = $this->getOwnerWhere($current_user->id);
-    		$group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
-	    	if(!empty($owner_where)){
-				if(empty($where))
-	    		{
-	    			$where = " (".  $owner_where." or ".$group_where.") ";
-	    		} else {
-	    			$where .= " AND (".  $owner_where." or ".$group_where.") ";
-	    		}
-			} else {
-				$where .= ' AND '.  $group_where;
-			}
-    	}
-    	/* END - SECURITY GROUPS */
+        /* BEGIN - SECURITY GROUPS */
+        if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
+        {
+            require_once('modules/SecurityGroups/SecurityGroup.php');
+            global $current_user;
+            $owner_where = $this->getOwnerWhere($current_user->id);
+            $group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
+            if(!empty($owner_where)){
+                if(empty($where))
+                {
+                    $where = " (".  $owner_where." or ".$group_where.") ";
+                } else {
+                    $where .= " AND (".  $owner_where." or ".$group_where.") ";
+                }
+            } else {
+                $where .= ' AND '.  $group_where;
+            }
+        }
+        /* END - SECURITY GROUPS */
         $query = $this->create_new_list_query($order_by, $where,array(),array(), $show_deleted, $offset);
 
         //Add Limit and Offset to query
@@ -2687,16 +2687,16 @@ 
     }
 
     /**
-    * Fetches data from all related tables.
-    *
-    * @param object $child_seed
-    * @param string $related_field_name relation to fetch data for
-    * @param string $order_by Optional, default empty
-    * @param string $where Optional, additional where clause
-    * @return array Fetched data.
-    *
-    * Internal function, do not override.
-    */
+     * Fetches data from all related tables.
+     *
+     * @param object $child_seed
+     * @param string $related_field_name relation to fetch data for
+     * @param string $order_by Optional, default empty
+     * @param string $where Optional, additional where clause
+     * @return array Fetched data.
+     *
+     * Internal function, do not override.
+     */
     function get_related_list($child_seed,$related_field_name, $order_by = "", $where = "",
     $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0)
     {
@@ -3072,13 +3072,13 @@ 
 
 
     /**
-    * Returns a full (ie non-paged) list of the current object type.
-    *
-    * @param string $order_by the order by SQL parameter. defaults to ""
-    * @param string $where where clause. defaults to ""
-    * @param boolean $check_dates. defaults to false
-    * @param int $show_deleted show deleted records. defaults to 0
-    */
+     * Returns a full (ie non-paged) list of the current object type.
+     *
+     * @param string $order_by the order by SQL parameter. defaults to ""
+     * @param string $where where clause. defaults to ""
+     * @param boolean $check_dates. defaults to false
+     * @param int $show_deleted show deleted records. defaults to 0
+     */
     function get_full_list($order_by = "", $where = "", $check_dates=false, $show_deleted = 0)
     {
         $GLOBALS['log']->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
@@ -3106,7 +3106,7 @@ 
      * @param boolean $singleSelect Optional, default false.
      * @return String select query string, optionally an array value will be returned if $return_array= true.
      */
-	function create_new_list_query($order_by, $where,$filter=array(),$params=array(), $show_deleted = 0,$join_type='', $return_array = false,$parentbean=null, $singleSelect = false, $ifListForExport = false)
+    function create_new_list_query($order_by, $where,$filter=array(),$params=array(), $show_deleted = 0,$join_type='', $return_array = false,$parentbean=null, $singleSelect = false, $ifListForExport = false)
     {
         global $beanFiles, $beanList;
         $selectedFields = array();
@@ -3126,41 +3126,41 @@ 
                 $where .= ' AND '.  $owner_where;
             }
         }
-		/* BEGIN - SECURITY GROUPS */
-    	global $current_user, $sugar_config;
-    	if($this->module_dir == 'Users' && !is_admin($current_user)
-				&& isset($sugar_config['securitysuite_filter_user_list'])
-				&& $sugar_config['securitysuite_filter_user_list'] == true
-    	) {
-			require_once('modules/SecurityGroups/SecurityGroup.php');
-    		global $current_user;
-    		$group_where = SecurityGroup::getGroupUsersWhere($current_user->id);
-    		//$group_where = "user_name = 'admin'";
-    		if(empty($where))
-    		{
-    			$where = " (".$group_where.") ";
-    		} else {
-    			$where .= " AND (".$group_where.") ";
-    		}
-    	} else
-    	if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
-    	{
-			require_once('modules/SecurityGroups/SecurityGroup.php');
-    		global $current_user;
-    		$owner_where = $this->getOwnerWhere($current_user->id);
-    		$group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
-	    	if(!empty($owner_where)){
-				if(empty($where))
-	    		{
-	    			$where = " (".  $owner_where." or ".$group_where.") ";
-	    		} else {
-	    			$where .= " AND (".  $owner_where." or ".$group_where.") ";
-	    		}
-			} else {
-				$where .= ' AND '.  $group_where;
-			}
-    	}
-    	/* END - SECURITY GROUPS */
+        /* BEGIN - SECURITY GROUPS */
+        global $current_user, $sugar_config;
+        if($this->module_dir == 'Users' && !is_admin($current_user)
+                && isset($sugar_config['securitysuite_filter_user_list'])
+                && $sugar_config['securitysuite_filter_user_list'] == true
+        ) {
+            require_once('modules/SecurityGroups/SecurityGroup.php');
+            global $current_user;
+            $group_where = SecurityGroup::getGroupUsersWhere($current_user->id);
+            //$group_where = "user_name = 'admin'";
+            if(empty($where))
+            {
+                $where = " (".$group_where.") ";
+            } else {
+                $where .= " AND (".$group_where.") ";
+            }
+        } else
+        if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
+        {
+            require_once('modules/SecurityGroups/SecurityGroup.php');
+            global $current_user;
+            $owner_where = $this->getOwnerWhere($current_user->id);
+            $group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
+            if(!empty($owner_where)){
+                if(empty($where))
+                {
+                    $where = " (".  $owner_where." or ".$group_where.") ";
+                } else {
+                    $where .= " AND (".  $owner_where." or ".$group_where.") ";
+                }
+            } else {
+                $where .= ' AND '.  $group_where;
+            }
+        }
+        /* END - SECURITY GROUPS */
         if(!empty($params['distinct']))
         {
             $distinct = ' DISTINCT ';
@@ -3246,24 +3246,24 @@ 
 
         $used_join_key = array();
 
-	//walk through the fields and for every relationship field add their relationship_info field
-	//relationshipfield-aliases are resolved in SugarBean::create_new_list_query through their relationship_info field
-	$addrelate = array();
-	foreach($fields as $field=>$value)
-	{
-		if (isset($this->field_defs[$field]) && isset($this->field_defs[$field]['source']) && 
-			$this->field_defs[$field]['source'] == 'non-db')
-		{
-			$addrelatefield = $this->get_relationship_field($field);
-			if ($addrelatefield)
-				$addrelate[$addrelatefield] = true;
-		}
-		if(!empty($this->field_defs[$field]['id_name'])){
-			$addrelate[$this->field_defs[$field]['id_name']] = true;
-		}
-	}
-
-	$fields = array_merge($addrelate, $fields);
+    //walk through the fields and for every relationship field add their relationship_info field
+    //relationshipfield-aliases are resolved in SugarBean::create_new_list_query through their relationship_info field
+    $addrelate = array();
+    foreach($fields as $field=>$value)
+    {
+        if (isset($this->field_defs[$field]) && isset($this->field_defs[$field]['source']) && 
+            $this->field_defs[$field]['source'] == 'non-db')
+        {
+            $addrelatefield = $this->get_relationship_field($field);
+            if ($addrelatefield)
+                $addrelate[$addrelatefield] = true;
+        }
+        if(!empty($this->field_defs[$field]['id_name'])){
+            $addrelate[$this->field_defs[$field]['id_name']] = true;
+        }
+    }
+
+    $fields = array_merge($addrelate, $fields);
 
         foreach($fields as $field=>$value)
         {
@@ -3296,7 +3296,7 @@ 
             //in opportunities module remove the contact_role/opportunity_role field.
             if (isset($data['relationship_fields']) and !empty($data['relationship_fields']))
             {
-		$process_field = false;
+        $process_field = false;
                 foreach ($data['relationship_fields'] as $field_name)
                 {
                     if (isset($fields[$field_name]))
@@ -3306,8 +3306,8 @@ 
                     }
                 }
 		
-            	if (!$process_field)
-                	continue;
+                if (!$process_field)
+                    continue;
             }
 
             if(  (!isset($data['source']) || $data['source'] == 'db') && (!empty($alias) || !empty($filter) ))
@@ -3414,27 +3414,27 @@ 
                     $rel_module = $this->$data['link']->getRelatedModuleName();
                     $table_joined = !empty($joined_tables[$params['join_table_alias']]) || (!empty($joined_tables[$params['join_table_link_alias']]) && isset($data['link_type']) && $data['link_type'] == 'relationship_info');
 
-					//if rname is set to 'name', and bean files exist, then check if field should be a concatenated name
-					global $beanFiles, $beanList;
+                    //if rname is set to 'name', and bean files exist, then check if field should be a concatenated name
+                    global $beanFiles, $beanList;
                     // °3/21/2014 FIX NS-TEAM - Relationship fields could not be displayed in subpanels
                     //if($data['rname'] && !empty($beanFiles[$beanList[$rel_module]])) {
                     if(isset($data['rname']) && $data['rname'] == 'name' && !empty($beanFiles[$beanList[$rel_module]])) {
 
-						//create an instance of the related bean
-						require_once($beanFiles[$beanList[$rel_module]]);
-						$rel_mod = new $beanList[$rel_module]();
-						//if bean has first and last name fields, then name should be concatenated
-						if(isset($rel_mod->field_name_map['first_name']) && isset($rel_mod->field_name_map['last_name'])){
-								$data['db_concat_fields'] = array(0=>'first_name', 1=>'last_name');
-						}
-					}
+                        //create an instance of the related bean
+                        require_once($beanFiles[$beanList[$rel_module]]);
+                        $rel_mod = new $beanList[$rel_module]();
+                        //if bean has first and last name fields, then name should be concatenated
+                        if(isset($rel_mod->field_name_map['first_name']) && isset($rel_mod->field_name_map['last_name'])){
+                                $data['db_concat_fields'] = array(0=>'first_name', 1=>'last_name');
+                        }
+                    }
 
 
-    				if($join['type'] == 'many-to-many')
-    				{
-    					if(empty($ret_array['secondary_select']))
-    					{
-    						$ret_array['secondary_select'] = " SELECT $this->table_name.id ref_id  ";
+                    if($join['type'] == 'many-to-many')
+                    {
+                        if(empty($ret_array['secondary_select']))
+                        {
+                            $ret_array['secondary_select'] = " SELECT $this->table_name.id ref_id  ";
 
                             if(!empty($beanFiles[$beanList[$rel_module]]) && $join_primary)
                             {
@@ -3546,42 +3546,42 @@ 
                     // and this code changes accounts to jt4 as there is a self join with the accounts table.
                     //Martin fix #27494
                     if(isset($data['db_concat_fields'])){
-                    	$buildWhere = false;
+                        $buildWhere = false;
                         if(in_array('first_name', $data['db_concat_fields']) && in_array('last_name', $data['db_concat_fields']))
-                    	{
-                     	   $exp = '/\(\s*?'.$data['name'].'.*?\%\'\s*?\)/';
-                    	   if(preg_match($exp, $where, $matches))
-                    	   {
-                    	   	  $search_expression = $matches[0];
-                    	   	  //Create three search conditions - first + last, first, last
-                    	   	  $first_name_search = str_replace($data['name'], $params['join_table_alias'] . '.first_name', $search_expression);
-                    	   	  $last_name_search = str_replace($data['name'], $params['join_table_alias'] . '.last_name', $search_expression);
-							  $full_name_search = str_replace($data['name'], $this->db->concat($params['join_table_alias'], $data['db_concat_fields']), $search_expression);
-							  $buildWhere = true;
-							  $where = str_replace($search_expression, '(' . $full_name_search . ' OR ' . $first_name_search . ' OR ' . $last_name_search . ')', $where);
-                    	   }
-                    	}
-
-                    	if(!$buildWhere)
-                    	{
-	                       $db_field = $this->db->concat($params['join_table_alias'], $data['db_concat_fields']);
-	                       $where = preg_replace('/'.$data['name'].'/', $db_field, $where);
-
-				// For relationship fields replace their alias by the corresponsding link table and r_name
-				if(isset($data['relationship_fields']))
-					foreach($data['relationship_fields'] as $r_name=>$alias_name)
-					{
-						$db_field = $this->db->concat($params['join_table_link_alias'], $r_name);
-						$where = preg_replace('/' . $alias_name . '/', $db_field, $where);
-					}
-                    	}
+                        {
+                            $exp = '/\(\s*?'.$data['name'].'.*?\%\'\s*?\)/';
+                            if(preg_match($exp, $where, $matches))
+                            {
+                                    $search_expression = $matches[0];
+                                    //Create three search conditions - first + last, first, last
+                                    $first_name_search = str_replace($data['name'], $params['join_table_alias'] . '.first_name', $search_expression);
+                                    $last_name_search = str_replace($data['name'], $params['join_table_alias'] . '.last_name', $search_expression);
+                                $full_name_search = str_replace($data['name'], $this->db->concat($params['join_table_alias'], $data['db_concat_fields']), $search_expression);
+                                $buildWhere = true;
+                                $where = str_replace($search_expression, '(' . $full_name_search . ' OR ' . $first_name_search . ' OR ' . $last_name_search . ')', $where);
+                            }
+                        }
+
+                        if(!$buildWhere)
+                        {
+                            $db_field = $this->db->concat($params['join_table_alias'], $data['db_concat_fields']);
+                            $where = preg_replace('/'.$data['name'].'/', $db_field, $where);
+
+                // For relationship fields replace their alias by the corresponsding link table and r_name
+                if(isset($data['relationship_fields']))
+                    foreach($data['relationship_fields'] as $r_name=>$alias_name)
+                    {
+                        $db_field = $this->db->concat($params['join_table_link_alias'], $r_name);
+                        $where = preg_replace('/' . $alias_name . '/', $db_field, $where);
+                    }
+                        }
                     }else{
                         $where = preg_replace('/(^|[\s(])' . $data['name'] . '/', '${1}' . $params['join_table_alias'] . '.'.$data['rname'], $where);
 
-			// For relationship fields replace their alias by the corresponsding link table and r_name
-			if(isset($data['relationship_fields']))
-				foreach($data['relationship_fields'] as $r_name=>$alias_name)
-					$where = preg_replace('/(^|[\s(])' . $alias_name . '/', '${1}' . $params['join_table_link_alias'] . '.'.$r_name, $where);
+            // For relationship fields replace their alias by the corresponsding link table and r_name
+            if(isset($data['relationship_fields']))
+                foreach($data['relationship_fields'] as $r_name=>$alias_name)
+                    $where = preg_replace('/(^|[\s(])' . $alias_name . '/', '${1}' . $params['join_table_link_alias'] . '.'.$r_name, $where);
                     }
                     if(!$table_joined)
                     {
@@ -3610,12 +3610,12 @@ 
 
         }
 
-	if ($ifListForExport) {
-		if(isset($this->field_defs['email1'])) {
-			$ret_array['select'].= " ,email_addresses.email_address email1";
-			$ret_array['from'].= " LEFT JOIN email_addr_bean_rel on {$this->table_name}.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='{$this->module_dir}' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1 LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id ";
-		}
-	}
+    if ($ifListForExport) {
+        if(isset($this->field_defs['email1'])) {
+            $ret_array['select'].= " ,email_addresses.email_address email1";
+            $ret_array['from'].= " LEFT JOIN email_addr_bean_rel on {$this->table_name}.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='{$this->module_dir}' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1 LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id ";
+        }
+    }
 
         $where_auto = '1=1';
         if($show_deleted == 0)
@@ -3650,18 +3650,18 @@ 
         return  $ret_array['select'] . $ret_array['from'] . $ret_array['where']. $ret_array['order_by'];
     }
 
-	// Check if field is defined through a relationship_info field, add this field when not present 
-	function get_relationship_field($field)
-	{
-		foreach ($this->field_defs as $field_def => $value)
-		{
-			if (isset($value['relationship_fields']) && 
-				in_array($field, $value['relationship_fields']) )
-				return $field_def;
-		}
+    // Check if field is defined through a relationship_info field, add this field when not present 
+    function get_relationship_field($field)
+    {
+        foreach ($this->field_defs as $field_def => $value)
+        {
+            if (isset($value['relationship_fields']) && 
+                in_array($field, $value['relationship_fields']) )
+                return $field_def;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * Returns parent record data for objects that store relationship information
@@ -3768,8 +3768,8 @@ 
         global $sugar_config;
         $db = DBManagerFactory::getInstance('listviews');
         /**
-        * if the row_offset is set to 'end' go to the end of the list
-        */
+         * if the row_offset is set to 'end' go to the end of the list
+         */
         $toEnd = strval($row_offset) == 'end';
         $GLOBALS['log']->debug("process_list_query: ".$query);
         if($max_per_page == -1)
@@ -3897,13 +3897,13 @@ 
     }
 
     /**
-    * Returns the number of rows that the given SQL query should produce
+     * Returns the number of rows that the given SQL query should produce
      *
      * Internal function, do not override.
      * @param string $query valid select  query
      * @param boolean $is_count_query Optional, Default false, set to true if passed query is a count query.
      * @return int count of rows found
-    */
+     */
     function _get_num_rows_in_query($query, $is_count_query=false)
     {
         $num_rows_in_query = 0;
@@ -3945,8 +3945,8 @@ 
     {
         $db = DBManagerFactory::getInstance('listviews');
         /**
-        * if the row_offset is set to 'end' go to the end of the list
-        */
+         * if the row_offset is set to 'end' go to the end of the list
+         */
         $toEnd = strval($row_offset) == 'end';
         global $sugar_config;
         $use_count_query=false;
@@ -4184,7 +4184,7 @@ 
             }
             if(!empty($sugar_config['disable_count_query']) && !empty($limit))
             {
-            	//C.L. Bug 43535 - Use the $index value to set the $rows_found value here
+                //C.L. Bug 43535 - Use the $index value to set the $rows_found value here
                 $rows_found = isset($index) ? $index : $row_offset + count($list);
 
                 if(count($list) >= $limit)
@@ -4334,28 +4334,28 @@ 
     }
 
     /**
-    * Tracks the viewing of a detail record.
-    * This leverages get_summary_text() which is object specific.
-    *
-    * Internal function, do not override.
-    * @param string $user_id - String value of the user that is viewing the record.
-    * @param string $current_module - String value of the module being processed.
-    * @param string $current_view - String value of the current view
-	*/
-	function track_view($user_id, $current_module, $current_view='')
-	{
-	    $trackerManager = TrackerManager::getInstance();
-		if($monitor = $trackerManager->getMonitor('tracker')){
-	        $monitor->setValue('date_modified', $GLOBALS['timedate']->nowDb());
-	        $monitor->setValue('user_id', $user_id);
-	        $monitor->setValue('module_name', $current_module);
-	        $monitor->setValue('action', $current_view);
-	        $monitor->setValue('item_id', $this->id);
-	        $monitor->setValue('item_summary', $this->get_summary_text());
-	        $monitor->setValue('visible', $this->tracker_visibility);
-	        $trackerManager->saveMonitor($monitor);
-		}
-	}
+     * Tracks the viewing of a detail record.
+     * This leverages get_summary_text() which is object specific.
+     *
+     * Internal function, do not override.
+     * @param string $user_id - String value of the user that is viewing the record.
+     * @param string $current_module - String value of the module being processed.
+     * @param string $current_view - String value of the current view
+     */
+    function track_view($user_id, $current_module, $current_view='')
+    {
+        $trackerManager = TrackerManager::getInstance();
+        if($monitor = $trackerManager->getMonitor('tracker')){
+            $monitor->setValue('date_modified', $GLOBALS['timedate']->nowDb());
+            $monitor->setValue('user_id', $user_id);
+            $monitor->setValue('module_name', $current_module);
+            $monitor->setValue('action', $current_view);
+            $monitor->setValue('item_id', $this->id);
+            $monitor->setValue('item_summary', $this->get_summary_text());
+            $monitor->setValue('visible', $this->tracker_visibility);
+            $trackerManager->saveMonitor($monitor);
+        }
+    }
 
     /**
      * Returns the summary text that should show up in the recent history list for this object.
@@ -4368,12 +4368,12 @@ 
     }
 
     /**
-    * This is designed to be overridden and add specific fields to each record.
-    * This allows the generic query to fill in the major fields, and then targeted
-    * queries to get related fields and add them to the record.  The contact's
-    * account for instance.  This method is only used for populating extra fields
-    * in lists.
-    */
+     * This is designed to be overridden and add specific fields to each record.
+     * This allows the generic query to fill in the major fields, and then targeted
+     * queries to get related fields and add them to the record.  The contact's
+     * account for instance.  This method is only used for populating extra fields
+     * in lists.
+     */
     function fill_in_additional_list_fields(){
         if(!empty($this->field_defs['parent_name']) && empty($this->parent_name)){
             $this->fill_in_additional_parent_fields();
@@ -4381,12 +4381,12 @@ 
     }
 
     /**
-    * This is designed to be overridden and add specific fields to each record.
-    * This allows the generic query to fill in the major fields, and then targeted
-    * queries to get related fields and add them to the record.  The contact's
-    * account for instance.  This method is only used for populating extra fields
-    * in the detail form
-    */
+     * This is designed to be overridden and add specific fields to each record.
+     * This allows the generic query to fill in the major fields, and then targeted
+     * queries to get related fields and add them to the record.  The contact's
+     * account for instance.  This method is only used for populating extra fields
+     * in the detail form
+     */
     function fill_in_additional_detail_fields()
     {
         if(!empty($this->field_defs['assigned_user_name']) && !empty($this->assigned_user_id)){
@@ -4394,20 +4394,20 @@ 
             $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
 
         }
-		if(!empty($this->field_defs['created_by']) && !empty($this->created_by))
-		$this->created_by_name = get_assigned_user_name($this->created_by);
-		if(!empty($this->field_defs['modified_user_id']) && !empty($this->modified_user_id))
-		$this->modified_by_name = get_assigned_user_name($this->modified_user_id);
+        if(!empty($this->field_defs['created_by']) && !empty($this->created_by))
+        $this->created_by_name = get_assigned_user_name($this->created_by);
+        if(!empty($this->field_defs['modified_user_id']) && !empty($this->modified_user_id))
+        $this->modified_by_name = get_assigned_user_name($this->modified_user_id);
 
-		if(!empty($this->field_defs['parent_name'])){
-			$this->fill_in_additional_parent_fields();
-		}
+        if(!empty($this->field_defs['parent_name'])){
+            $this->fill_in_additional_parent_fields();
+        }
     }
 
     /**
-    * This is desgined to be overridden or called from extending bean. This method
-    * will fill in any parent_name fields.
-    */
+     * This is desgined to be overridden or called from extending bean. This method
+     * will fill in any parent_name fields.
+     */
     function fill_in_additional_parent_fields() {
 
         if(!empty($this->parent_id) && !empty($this->last_parent_id) && $this->last_parent_id == $this->parent_id){
@@ -4448,8 +4448,8 @@ 
     }
 
     /**
-    * Fill in fields where type = relate
-    */
+     * Fill in fields where type = relate
+     */
     function fill_in_relationship_fields(){
         global $fill_in_rel_depth;
         if(empty($fill_in_rel_depth) || $fill_in_rel_depth < 0)
@@ -4473,7 +4473,7 @@ 
 
                     if (empty($this->$id_name))
                     {
-                       $this->fill_in_link_field($id_name, $field);
+                        $this->fill_in_link_field($id_name, $field);
                     }
                     if(!empty($this->$id_name) && ( $this->object_name != $related_module || ( $this->object_name == $related_module && $this->$id_name != $this->id ))){
                         if(isset($GLOBALS['beanList'][ $related_module])){
@@ -4499,7 +4499,7 @@ 
                     if(!empty($this->$id_name) && isset($this->$name))
                     {
                         if(!isset($field['additionalFields']))
-                           $field['additionalFields'] = array();
+                            $field['additionalFields'] = array();
                         if(!empty($field['rname']))
                         {
                             $field['additionalFields'][$field['rname']]= $name;
@@ -4517,8 +4517,8 @@ 
     }
 
     /**
-    * This is a helper function that is used to quickly created indexes when creating tables.
-    */
+     * This is a helper function that is used to quickly created indexes when creating tables.
+     */
     function create_index($query)
     {
         $GLOBALS['log']->info("create_index: $query");
@@ -4530,21 +4530,21 @@ 
      * This function should be overridden in each module.  It marks an item as deleted.
      *
      * If it is not overridden, then marking this type of item is not allowed
-	 */
-	function mark_deleted($id)
-	{
-		global $current_user;
-		$date_modified = $GLOBALS['timedate']->nowDb();
+     */
+    function mark_deleted($id)
+    {
+        global $current_user;
+        $date_modified = $GLOBALS['timedate']->nowDb();
         $id = $this->db->quote($id);
-		if(isset($_SESSION['show_deleted']))
-		{
-			$this->mark_undeleted($id);
-		}
-		else
-		{
-			// call the custom business logic
-			$custom_logic_arguments['id'] = $id;
-			$this->call_custom_logic("before_delete", $custom_logic_arguments);
+        if(isset($_SESSION['show_deleted']))
+        {
+            $this->mark_undeleted($id);
+        }
+        else
+        {
+            // call the custom business logic
+            $custom_logic_arguments['id'] = $id;
+            $this->call_custom_logic("before_delete", $custom_logic_arguments);
             $this->deleted = 1;
             $this->mark_relationships_deleted($id);
             if ( isset($this->field_defs['modified_user_id']) ) {
@@ -4577,16 +4577,16 @@ 
      * Restores data deleted by call to mark_deleted() function.
      *
      * Internal function, do not override.
-    */
+     */
     function mark_undeleted($id)
     {
         // call the custom business logic
         $custom_logic_arguments['id'] = $id;
         $this->call_custom_logic("before_restore", $custom_logic_arguments);
 
-		$date_modified = $GLOBALS['timedate']->nowDb();
-		$query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='" . $this->db->quote($id) ."'";
-		$this->db->query($query, true,"Error marking record undeleted: ");
+        $date_modified = $GLOBALS['timedate']->nowDb();
+        $query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='" . $this->db->quote($id) ."'";
+        $this->db->query($query, true,"Error marking record undeleted: ");
 
         $this->restoreFiles();
 
@@ -4594,17 +4594,17 @@ 
         $this->call_custom_logic("after_restore", $custom_logic_arguments);
     }
 
-   /**
-    * This function deletes relationships to this object.  It should be overridden
-    * to handle the relationships of the specific object.
-    * This function is called when the item itself is being deleted.
-    *
-    * @param int $id id of the relationship to delete
-    */
-   function mark_relationships_deleted($id)
-   {
+    /**
+     * This function deletes relationships to this object.  It should be overridden
+     * to handle the relationships of the specific object.
+     * This function is called when the item itself is being deleted.
+     *
+     * @param int $id id of the relationship to delete
+     */
+    function mark_relationships_deleted($id)
+    {
     $this->delete_linked($id);
-   }
+    }
 
     /**
      * Returns path for files of bean or false on error
@@ -4784,16 +4784,16 @@ 
     }
 
     /**
-    * This function is used to execute the query and create an array template objects
-    * from the resulting ids from the query.
-    * It is currently used for building sub-panel arrays.
-    *
-    * @param string $query - the query that should be executed to build the list
-    * @param object $template - The object that should be used to copy the records.
-    * @param int $row_offset Optional, default 0
-    * @param int $limit Optional, default -1
-    * @return array
-    */
+     * This function is used to execute the query and create an array template objects
+     * from the resulting ids from the query.
+     * It is currently used for building sub-panel arrays.
+     *
+     * @param string $query - the query that should be executed to build the list
+     * @param object $template - The object that should be used to copy the records.
+     * @param int $row_offset Optional, default 0
+     * @param int $limit Optional, default -1
+     * @return array
+     */
     function build_related_list($query, &$template, $row_offset = 0, $limit = -1)
     {
         $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
@@ -4829,17 +4829,17 @@ 
         return $list;
     }
 
-  /**
-    * This function is used to execute the query and create an array template objects
-    * from the resulting ids from the query.
-    * It is currently used for building sub-panel arrays. It supports an additional
-    * where clause that is executed as a filter on the results
-    *
-    * @param string $query - the query that should be executed to build the list
-    * @param object $template - The object that should be used to copy the records.
-    */
-  function build_related_list_where($query, &$template, $where='', $in='', $order_by, $limit='', $row_offset = 0)
-  {
+    /**
+     * This function is used to execute the query and create an array template objects
+     * from the resulting ids from the query.
+     * It is currently used for building sub-panel arrays. It supports an additional
+     * where clause that is executed as a filter on the results
+     *
+     * @param string $query - the query that should be executed to build the list
+     * @param object $template - The object that should be used to copy the records.
+     */
+    function build_related_list_where($query, &$template, $where='', $in='', $order_by, $limit='', $row_offset = 0)
+    {
     $db = DBManagerFactory::getInstance('listviews');
     // No need to do an additional query
     $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
@@ -4900,7 +4900,7 @@ 
     }
 
     return $list;
-  }
+    }
 
     /**
      * Constructs an comma separated list of ids from passed query results.
@@ -4936,15 +4936,15 @@ 
     }
 
     /**
-    * Optionally copies values from fetched row into the bean.
-    *
-    * Internal function, do not override.
-    *
-    * @param string $query - the query that should be executed to build the list
-    * @param object $template - The object that should be used to copy the records
-    * @param array $field_list List of  fields.
-    * @return array
-    */
+     * Optionally copies values from fetched row into the bean.
+     *
+     * Internal function, do not override.
+     *
+     * @param string $query - the query that should be executed to build the list
+     * @param object $template - The object that should be used to copy the records
+     * @param array $field_list List of  fields.
+     * @return array
+     */
     function build_related_list2($query, &$template, &$field_list)
     {
         $GLOBALS['log']->debug("Finding linked values $this->object_name: ".$query);
@@ -5117,19 +5117,19 @@ 
         $row = $this->convertRow($row);
         $this->fetched_row = $row;
         $this->fromArray($row);
-		$this->is_updated_dependent_fields = false;
+        $this->is_updated_dependent_fields = false;
         $this->fill_in_additional_detail_fields();
         return $this;
     }
 
     /**
-    * This method is called during an import before inserting a bean
-    * Define an associative array called $special_fields
-    * the keys are user defined, and don't directly map to the bean's fields
-    * the value is the method name within that bean that will do extra
-    * processing for that field. example: 'full_name'=>'get_names_from_full_name'
-    *
-    */
+     * This method is called during an import before inserting a bean
+     * Define an associative array called $special_fields
+     * the keys are user defined, and don't directly map to the bean's fields
+     * the value is the method name within that bean that will do extra
+     * processing for that field. example: 'full_name'=>'get_names_from_full_name'
+     *
+     */
     function process_special_fields()
     {
         foreach ($this->special_functions as $func_name)
@@ -5263,8 +5263,8 @@ 
     {
         $where = '';
 
-		// make sure there is a date modified
-		$date_modified = $this->db->convert("'".$GLOBALS['timedate']->nowDb()."'", 'datetime');
+        // make sure there is a date modified
+        $date_modified = $this->db->convert("'".$GLOBALS['timedate']->nowDb()."'", 'datetime');
 
         $row=null;
         if($check_duplicates)
@@ -5341,30 +5341,30 @@ 
     }
 
     /**
-    * Trigger custom logic for this module that is defined for the provided hook
-    * The custom logic file is located under custom/modules/[CURRENT_MODULE]/logic_hooks.php.
-    * That file should define the $hook_version that should be used.
-    * It should also define the $hook_array.  The $hook_array will be a two dimensional array
-    * the first dimension is the name of the event, the second dimension is the information needed
-    * to fire the hook.  Each entry in the top level array should be defined on a single line to make it
-    * easier to automatically replace this file.  There should be no contents of this file that are not replacable.
-    *
-    * $hook_array['before_save'][] = Array(1, testtype, 'custom/modules/Leads/test12.php', 'TestClass', 'lead_before_save_1');
-    * This sample line creates a before_save hook.  The hooks are procesed in the order in which they
-    * are added to the array.  The second dimension is an array of:
-    *		processing index (for sorting before exporting the array)
-    *		A logic type hook
-    *		label/type
-    *		php file to include
-    *		php class the method is in
-    *		php method to call
-    *
-    * The method signature for version 1 hooks is:
-    * function NAME(&$bean, $event, $arguments)
-    * 		$bean - $this bean passed in by reference.
-    *		$event - The string for the current event (i.e. before_save)
-    * 		$arguments - An array of arguments that are specific to the event.
-    */
+     * Trigger custom logic for this module that is defined for the provided hook
+     * The custom logic file is located under custom/modules/[CURRENT_MODULE]/logic_hooks.php.
+     * That file should define the $hook_version that should be used.
+     * It should also define the $hook_array.  The $hook_array will be a two dimensional array
+     * the first dimension is the name of the event, the second dimension is the information needed
+     * to fire the hook.  Each entry in the top level array should be defined on a single line to make it
+     * easier to automatically replace this file.  There should be no contents of this file that are not replacable.
+     *
+     * $hook_array['before_save'][] = Array(1, testtype, 'custom/modules/Leads/test12.php', 'TestClass', 'lead_before_save_1');
+     * This sample line creates a before_save hook.  The hooks are procesed in the order in which they
+     * are added to the array.  The second dimension is an array of:
+     *		processing index (for sorting before exporting the array)
+     *		A logic type hook
+     *		label/type
+     *		php file to include
+     *		php class the method is in
+     *		php method to call
+     *
+     * The method signature for version 1 hooks is:
+     * function NAME(&$bean, $event, $arguments)
+     * 		$bean - $this bean passed in by reference.
+     *		$event - The string for the current event (i.e. before_save)
+     * 		$arguments - An array of arguments that are specific to the event.
+     */
     function call_custom_logic($event, $arguments = null)
     {
         if(!isset($this->processed) || $this->processed == false){
@@ -5428,14 +5428,14 @@ 
         return false;
     }
     /**
-    * Check whether the user has access to a particular view for the current bean/module
-    * @param $view string required, the view to determine access for i.e. DetailView, ListView...
-    * @param $is_owner bool optional, this is part of the ACL check if the current user is an owner they will receive different access
-    */
-	/* BEGIN - SECURITY GROUPS - aclaccess */  
-	/**
+     * Check whether the user has access to a particular view for the current bean/module
+     * @param $view string required, the view to determine access for i.e. DetailView, ListView...
+     * @param $is_owner bool optional, this is part of the ACL check if the current user is an owner they will receive different access
+     */
+    /* BEGIN - SECURITY GROUPS - aclaccess */  
+    /**
     function ACLAccess($view,$is_owner='not_set')
-	*/
+     */
     function ACLAccess($view,$is_owner='not_set',$in_group='not_set')
     {
         global $current_user;
@@ -5443,61 +5443,61 @@ 
             return true;
         }
         $not_set = false;
-		/**
+        /**
         if($is_owner == 'not_set')
-		*/
-    	if($is_owner === 'not_set') //eggsurplus: should be ===
+         */
+        if($is_owner === 'not_set') //eggsurplus: should be ===
         {
             $not_set = true;
             $is_owner = $this->isOwner($current_user->id);
         }
-		// DJM - OBS Customizations - May 2009
-		// Moved this code to convert to lowercase from below.
-		// Added new action variable.
-		$view = strtolower($view);
-		$action = '';
-		// DJM - OBS Customizations - END CHANGE
-    	if($in_group === 'not_set')
-    	{
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			// DJM - OBS Customizations - May 2009
-			// Added the following switch statement to convert the view
-			// into an action value.  As per the switch below.
-			// Added the action parameter to the groupHasAccess call.
-    			switch ($view)
-    			{
-    				case 'list':
-    				case 'index':
-    				case 'listview':
-    					$action = "list";
-					break;
-    				case 'edit':
-    				case 'save':
-		    		case 'popupeditview':
- 		   		case 'editview':
-  		  			$action = "edit";
-					break;
- 		   		case 'view':
- 		   		case 'detail':
- 		   		case 'detailview':
- 		   			$action = "view";
-					break;
- 		   		case 'delete':
- 		   			$action = "delete" ;
-					break;
- 		   		case 'export':
- 		   			$action = "export";
-					break;
- 		   		case 'import':
-  		  			$action = "import";
-					break;
-				default:
-					$action = "";
-					break;
-    			}
-			$in_group = SecurityGroup::groupHasAccess($this->module_dir,$this->id, $action); 
-			// DJM - OBS Customizations - END CHANGE
-    	}
+        // DJM - OBS Customizations - May 2009
+        // Moved this code to convert to lowercase from below.
+        // Added new action variable.
+        $view = strtolower($view);
+        $action = '';
+        // DJM - OBS Customizations - END CHANGE
+        if($in_group === 'not_set')
+        {
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            // DJM - OBS Customizations - May 2009
+            // Added the following switch statement to convert the view
+            // into an action value.  As per the switch below.
+            // Added the action parameter to the groupHasAccess call.
+                switch ($view)
+                {
+                    case 'list':
+                    case 'index':
+                    case 'listview':
+                        $action = "list";
+                    break;
+                    case 'edit':
+                    case 'save':
+                    case 'popupeditview':
+                    case 'editview':
+                        $action = "edit";
+                    break;
+                    case 'view':
+                    case 'detail':
+                    case 'detailview':
+                        $action = "view";
+                    break;
+                    case 'delete':
+                        $action = "delete" ;
+                    break;
+                    case 'export':
+                        $action = "export";
+                    break;
+                    case 'import':
+                        $action = "import";
+                    break;
+                default:
+                    $action = "";
+                    break;
+                }
+            $in_group = SecurityGroup::groupHasAccess($this->module_dir,$this->id, $action); 
+            // DJM - OBS Customizations - END CHANGE
+        }
         //if we don't implent acls return true
         if(!$this->bean_implements('ACL'))
         return true;
@@ -5507,10 +5507,10 @@ 
             case 'list':
             case 'index':
             case 'listview':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'list', true);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'list', true, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'list', true, $this->acltype, $in_group);
             case 'edit':
             case 'save':
                 if( !$is_owner && $not_set && !empty($this->id)){
@@ -5525,32 +5525,32 @@ 
                 }
             case 'popupeditview':
             case 'editview':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'edit', $is_owner, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'edit', $is_owner, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'edit', $is_owner, $this->acltype, $in_group);
             case 'view':
             case 'detail':
             case 'detailview':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'view', $is_owner, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'view', $is_owner, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'view', $is_owner, $this->acltype, $in_group);
             case 'delete':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'delete', $is_owner, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'delete', $is_owner, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'delete', $is_owner, $this->acltype, $in_group);
             case 'export':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'export', $is_owner, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'export', $is_owner, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'export', $is_owner, $this->acltype, $in_group);
             case 'import':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'import', true, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'import', true, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'import', true, $this->acltype, $in_group);
         }
         //if it is not one of the above views then it should be implemented on the page level
         return true;
@@ -5558,10 +5558,10 @@ 
     /* END - SECURITY GROUPS */
 
     /**
-    * Get owner field
-    *
-    * @return STRING
-    */
+     * Get owner field
+     *
+     * @return STRING
+     */
     function getOwnerField($returnFieldName = false)
     {
         if (isset($this->field_defs['assigned_user_id']))
@@ -5578,11 +5578,11 @@ 
     }
 
     /**
-    * Returns true of false if the user_id passed is the owner
-    *
-    * @param GUID $user_id
-    * @return boolean
-    */
+     * Returns true of false if the user_id passed is the owner
+     *
+     * @param GUID $user_id
+     * @return boolean
+     */
     function isOwner($user_id)
     {
         //if we don't have an id we must be the owner as we are creating it
@@ -5611,11 +5611,11 @@ 
         return false;
     }
     /**
-    * Gets there where statement for checking if a user is an owner
-    *
-    * @param GUID $user_id
-    * @return STRING
-    */
+     * Gets there where statement for checking if a user is an owner
+     *
+     * @param GUID $user_id
+     * @return STRING
+     */
     function getOwnerWhere($user_id)
     {
         if(isset($this->field_defs['assigned_user_id']))
@@ -5630,12 +5630,12 @@ 
     }
 
     /**
-    *
-    * Used in order to manage ListView links and if they should
-    * links or not based on the ACL permissions of the user
-    *
-    * @return ARRAY of STRINGS
-    */
+     *
+     * Used in order to manage ListView links and if they should
+     * links or not based on the ACL permissions of the user
+     *
+     * @return ARRAY of STRINGS
+     */
     function listviewACLHelper()
     {
         $array_assign = array();
@@ -5651,10 +5651,10 @@ 
     }
 
     /**
-    * returns this bean as an array
-    *
-    * @return array of fields with id, name, access and category
-    */
+     * returns this bean as an array
+     *
+     * @return array of fields with id, name, access and category
+     */
     function toArray($dbOnly = false, $stringOnly = false, $upperKeys=false)
     {
         static $cache = array();
@@ -5684,10 +5684,10 @@ 
     }
 
     /**
-    * Converts an array into an acl mapping name value pairs into files
-    *
-    * @param Array $arr
-    */
+     * Converts an array into an acl mapping name value pairs into files
+     *
+     * @param Array $arr
+     */
     function fromArray($arr)
     {
         foreach($arr as $name=>$value)
@@ -5705,13 +5705,13 @@ 
     public function convertRow($row)
     {
         foreach($this->field_defs as $name => $fieldDef)
-		{
-		    // skip empty fields and non-db fields
+        {
+            // skip empty fields and non-db fields
             if (isset($name) && !empty($row[$name])) {
                 $row[$name] = $this->convertField($row[$name], $fieldDef);
             }
         }
-		return $row;
+        return $row;
     }
 
     /**
@@ -5759,18 +5759,18 @@ 
         return !empty($GLOBALS['dictionary'][$this->object_name]['custom_fields']);
     }
 
-   /**
-    * Ensure that fields within order by clauses are properly qualified with
-    * their tablename.  This qualification is a requirement for sql server support.
-    *
-    * @param string $order_by original order by from the query
-    * @param string $qualify prefix for columns in the order by list.
-    * @return  prefixed
-    *
-    * Internal function do not override.
-    */
-   function create_qualified_order_by( $order_by, $qualify)
-   {	// if the column is empty, but the sort order is defined, the value will throw an error, so do not proceed if no order by is given
+    /**
+     * Ensure that fields within order by clauses are properly qualified with
+     * their tablename.  This qualification is a requirement for sql server support.
+     *
+     * @param string $order_by original order by from the query
+     * @param string $qualify prefix for columns in the order by list.
+     * @return  prefixed
+     *
+     * Internal function do not override.
+     */
+    function create_qualified_order_by( $order_by, $qualify)
+    {	// if the column is empty, but the sort order is defined, the value will throw an error, so do not proceed if no order by is given
     if (empty($order_by))
     {
         return $order_by;
@@ -5785,17 +5785,17 @@ 
         $comma = ", ";
     }
     return $order_by_clause;
-   }
+    }
 
-   /**
-    * Combined the contents of street field 2 thru 4 into the main field
-    *
-    * @param string $street_field
-    */
+    /**
+     * Combined the contents of street field 2 thru 4 into the main field
+     *
+     * @param string $street_field
+     */
 
-   function add_address_streets(
-       $street_field
-       )
+    function add_address_streets(
+        $street_field
+        )
     {
         if (isset($this->$street_field)) {
             $street_field_2 = $street_field.'_2';
@@ -5849,9 +5849,9 @@ 
     }
 
     /**
-    * Moved from save() method, functionality is the same, but this is intended to handle
-    * Optimistic locking functionality.
-    */
+     * Moved from save() method, functionality is the same, but this is intended to handle
+     * Optimistic locking functionality.
+     */
     private function _checkOptimisticLocking($action, $isUpdate){
         if($this->optimistic_lock && !isset($_SESSION['o_lock_fs'])){
             if(isset($_SESSION['o_lock_id']) && $_SESSION['o_lock_id'] == $this->id && $_SESSION['o_lock_on'] == $this->object_name)
@@ -5890,8 +5890,8 @@ 
     }
 
     /**
-    * Send assignment notifications and invites for meetings and calls
-    */
+     * Send assignment notifications and invites for meetings and calls
+     */
     private function _sendNotifications($check_notify){
         if($check_notify || (isset($this->notify_inworkflow) && $this->notify_inworkflow == true) // cn: bug 5795 - no invites sent to Contacts, and also bug 25995, in workflow, it will set the notify_on_save=true.
            && !$this->isOwner($this->created_by) )  // cn: bug 42727 no need to send email to owner (within workflow)
@@ -5979,11 +5979,11 @@ 
         $result = sugar_cache_retrieve($cache_key);
         if(!empty($result))
         {
-        	// Use SugarCache::EXTERNAL_CACHE_NULL_VALUE to store null values in the cache.
-        	if($result == SugarCache::EXTERNAL_CACHE_NULL_VALUE)
-        	{
-        		return null;
-        	}
+            // Use SugarCache::EXTERNAL_CACHE_NULL_VALUE to store null values in the cache.
+            if($result == SugarCache::EXTERNAL_CACHE_NULL_VALUE)
+            {
+                return null;
+            }
 
             return $result;
         }
@@ -6000,7 +6000,7 @@ 
             if(empty($moduleDefs[$module]) || empty($moduleDefs[$module][$module][$key]))
             {
                 // It was not loaded....  Fail.  Cache null to prevent future repeats of this calculation
-				sugar_cache_put($cache_key, SugarCache::EXTERNAL_CACHE_NULL_VALUE);
+                sugar_cache_put($cache_key, SugarCache::EXTERNAL_CACHE_NULL_VALUE);
                 return  null;
             }
 
@@ -6011,8 +6011,8 @@ 
 
         // It was not loaded....  Fail.  Cache null to prevent future repeats of this calculation
         sugar_cache_put($cache_key, SugarCache::EXTERNAL_CACHE_NULL_VALUE);
-		return null;
-	}
+        return null;
+    }
 
     /**
      * Returns the ACL category for this module; defaults to the SugarBean::$acl_category if defined
@@ -6033,10 +6033,10 @@ 
      * @param string $where
      * @return string SQL query
      */
-	public function create_export_query($order_by, $where)
-	{
-		return $this->create_new_list_query($order_by, $where, array(), array(), 0, '', false, $this, true, true);
-	}
+    public function create_export_query($order_by, $where)
+    {
+        return $this->create_new_list_query($order_by, $where, array(), array(), 0, '', false, $this, true, true);
+    }
 
     /**
      * Determine whether the given field is a relate field

Spacing +837 added lines, -837 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.
@@ -129,7 +129,7 @@ 
 	 *
 	 * @var BOOL
 	 */
-	var $process_save_dates =true;
+	var $process_save_dates = true;
 
     /**
      * This signals to the bean that it is being saved in a mass mode.
@@ -210,7 +210,7 @@ 
     /** Set this to true if you query contains a sub-select and bean is converting both select statements
     * into count queries.
     */
-    var $ungreedy_count=false;
+    var $ungreedy_count = false;
 
     /**
     * The name of the module folder for this type of bean.
@@ -227,14 +227,14 @@ 
     var $additional_column_fields = array();
     var $relationship_fields = array();
     var $current_notify_user;
-    var $fetched_row=false;
+    var $fetched_row = false;
     var $fetched_rel_row = array();
     var $layout_def;
     var $force_load_details = false;
     var $optimistic_lock = false;
     var $disable_custom_fields = false;
     var $number_formatting_done = false;
-    var $process_field_encrypted=false;
+    var $process_field_encrypted = false;
     /*
     * The default ACL type
     */
@@ -317,7 +317,7 @@ 
         $this->db = DBManagerFactory::getInstance();
         if (empty($this->module_name))
             $this->module_name = $this->module_dir;
-        if((false == $this->disable_vardefs && empty($loaded_defs[$this->object_name])) || !empty($GLOBALS['reload_vardefs']))
+        if ((false == $this->disable_vardefs && empty($loaded_defs[$this->object_name])) || !empty($GLOBALS['reload_vardefs']))
         {
             VardefManager::loadVardef($this->module_dir, $this->object_name);
 
@@ -325,7 +325,7 @@ 
             if (!empty($dictionary[$this->object_name]['fields'])) {
                 foreach ($dictionary[$this->object_name]['fields'] as $key=>$value_array) {
                     $column_fields[] = $key;
-                    if(!empty($value_array['required']) && !empty($value_array['name'])) {
+                    if (!empty($value_array['required']) && !empty($value_array['name'])) {
                         $this->required_fields[$value_array['name']] = 1;
                     }
                 }
@@ -333,57 +333,57 @@ 
             }
 
             //setup custom fields
-            if(!isset($this->custom_fields) &&
+            if (!isset($this->custom_fields) &&
                 empty($this->disable_custom_fields))
             {
                 $this->setupCustomFields($this->module_dir);
             }
             //load up field_arrays from CacheHandler;
-            if(empty($this->list_fields))
+            if (empty($this->list_fields))
                 $this->list_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'list_fields');
-            if(empty($this->column_fields))
+            if (empty($this->column_fields))
                 $this->column_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'column_fields');
-            if(empty($this->required_fields))
+            if (empty($this->required_fields))
                 $this->required_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'required_fields');
 
-            if(isset($GLOBALS['dictionary'][$this->object_name]) && !$this->disable_vardefs)
+            if (isset($GLOBALS['dictionary'][$this->object_name]) && !$this->disable_vardefs)
             {
                 $this->field_name_map = $dictionary[$this->object_name]['fields'];
-                $this->field_defs =	$dictionary[$this->object_name]['fields'];
+                $this->field_defs = $dictionary[$this->object_name]['fields'];
 
-                if(!empty($dictionary[$this->object_name]['optimistic_locking']))
+                if (!empty($dictionary[$this->object_name]['optimistic_locking']))
                 {
-                    $this->optimistic_lock=true;
+                    $this->optimistic_lock = true;
                 }
             }
-            $loaded_defs[$this->object_name]['column_fields'] =& $this->column_fields;
-            $loaded_defs[$this->object_name]['list_fields'] =& $this->list_fields;
-            $loaded_defs[$this->object_name]['required_fields'] =& $this->required_fields;
-            $loaded_defs[$this->object_name]['field_name_map'] =& $this->field_name_map;
-            $loaded_defs[$this->object_name]['field_defs'] =& $this->field_defs;
+            $loaded_defs[$this->object_name]['column_fields'] = & $this->column_fields;
+            $loaded_defs[$this->object_name]['list_fields'] = & $this->list_fields;
+            $loaded_defs[$this->object_name]['required_fields'] = & $this->required_fields;
+            $loaded_defs[$this->object_name]['field_name_map'] = & $this->field_name_map;
+            $loaded_defs[$this->object_name]['field_defs'] = & $this->field_defs;
         }
         else
         {
-            $this->column_fields =& $loaded_defs[$this->object_name]['column_fields'] ;
-            $this->list_fields =& $loaded_defs[$this->object_name]['list_fields'];
-            $this->required_fields =& $loaded_defs[$this->object_name]['required_fields'];
-            $this->field_name_map =& $loaded_defs[$this->object_name]['field_name_map'];
-            $this->field_defs =& $loaded_defs[$this->object_name]['field_defs'];
+            $this->column_fields = & $loaded_defs[$this->object_name]['column_fields'];
+            $this->list_fields = & $loaded_defs[$this->object_name]['list_fields'];
+            $this->required_fields = & $loaded_defs[$this->object_name]['required_fields'];
+            $this->field_name_map = & $loaded_defs[$this->object_name]['field_name_map'];
+            $this->field_defs = & $loaded_defs[$this->object_name]['field_defs'];
             $this->added_custom_field_defs = true;
 
-            if(!isset($this->custom_fields) &&
+            if (!isset($this->custom_fields) &&
                 empty($this->disable_custom_fields))
             {
                 $this->setupCustomFields($this->module_dir, false);
             }
-            if(!empty($dictionary[$this->object_name]['optimistic_locking']))
+            if (!empty($dictionary[$this->object_name]['optimistic_locking']))
             {
-                $this->optimistic_lock=true;
+                $this->optimistic_lock = true;
             }
         }
 
-        if($this->bean_implements('ACL') && !empty($GLOBALS['current_user'])){
-            $this->acl_fields = (isset($dictionary[$this->object_name]['acl_fields']) && $dictionary[$this->object_name]['acl_fields'] === false)?false:true;
+        if ($this->bean_implements('ACL') && !empty($GLOBALS['current_user'])) {
+            $this->acl_fields = (isset($dictionary[$this->object_name]['acl_fields']) && $dictionary[$this->object_name]['acl_fields'] === false) ? false : true;
         }
         $this->populateDefaultValues();
     }
@@ -427,7 +427,7 @@ 
         if (!isset($this->audit_enabled_fields))
         {
 
-            $this->audit_enabled_fields=array();
+            $this->audit_enabled_fields = array();
             foreach ($this->field_defs as $field => $properties)
             {
 
@@ -437,7 +437,7 @@ 
                 )
                 {
 
-                    $this->audit_enabled_fields[$field]=$properties;
+                    $this->audit_enabled_fields[$field] = $properties;
                 }
             }
 
@@ -504,12 +504,12 @@ 
     function create_audit_table()
     {
         global $dictionary;
-        $table_name=$this->get_audit_table_name();
+        $table_name = $this->get_audit_table_name();
 
         require('metadata/audit_templateMetaData.php');
 
         // Bug: 52583 Need ability to customize template for audit tables
-        $custom = 'custom/metadata/audit_templateMetaData_' . $this->getTableName() . '.php';
+        $custom = 'custom/metadata/audit_templateMetaData_'.$this->getTableName().'.php';
         if (file_exists($custom))
         {
             require($custom);
@@ -519,14 +519,14 @@ 
         $indices = $dictionary['audit']['indices'];
 
         // Renaming template indexes to fit the particular audit table (removed the brittle hard coding)
-        foreach($indices as $nr => $properties){
-            $indices[$nr]['name'] = 'idx_' . strtolower($this->getTableName()) . '_' . $properties['name'];
+        foreach ($indices as $nr => $properties) {
+            $indices[$nr]['name'] = 'idx_'.strtolower($this->getTableName()).'_'.$properties['name'];
         }
 
         $engine = null;
-        if(isset($dictionary['audit']['engine'])) {
+        if (isset($dictionary['audit']['engine'])) {
             $engine = $dictionary['audit']['engine'];
-        } else if(isset($dictionary[$this->getObjectName()]['engine'])) {
+        } else if (isset($dictionary[$this->getObjectName()]['engine'])) {
             $engine = $dictionary[$this->getObjectName()]['engine'];
         }
 
@@ -545,7 +545,7 @@ 
      */
     public function getTableName()
     {
-        if(isset($this->table_name))
+        if (isset($this->table_name))
         {
             return $this->table_name;
         }
@@ -579,7 +579,7 @@ 
     function getIndices()
     {
         global $dictionary;
-        if(isset($dictionary[$this->getObjectName()]['indices']))
+        if (isset($dictionary[$this->getObjectName()]['indices']))
         {
             return $dictionary[$this->getObjectName()]['indices'];
         }
@@ -598,7 +598,7 @@ 
      */
     function getFieldDefinition($name)
     {
-        if ( !isset($this->field_defs[$name]) )
+        if (!isset($this->field_defs[$name]))
             return false;
 
         return $this->field_defs[$name];
@@ -616,7 +616,7 @@ 
     function getPrimaryFieldDefinition()
     {
         $def = $this->getFieldDefinition("id");
-        if(empty($def)) {
+        if (empty($def)) {
             $def = $this->getFieldDefinition(0);
         }
         if (empty($def)) {
@@ -639,13 +639,13 @@ 
      */
     function getFieldValue($name)
     {
-        if (!isset($this->$name)){
+        if (!isset($this->$name)) {
             return FALSE;
         }
-        if($this->$name === TRUE){
+        if ($this->$name === TRUE) {
             return 1;
         }
-        if($this->$name === FALSE){
+        if ($this->$name === FALSE) {
             return 0;
         }
         return $this->$name;
@@ -657,17 +657,17 @@ 
      */
     public function unPopulateDefaultValues()
     {
-        if ( !is_array($this->field_defs) )
+        if (!is_array($this->field_defs))
             return;
 
         foreach ($this->field_defs as $field => $value) {
-		    if( !empty($this->$field)
+		    if (!empty($this->$field)
                   && ((isset($value['default']) && $this->$field == $value['default']) || (!empty($value['display_default']) && $this->$field == $value['display_default']))
                     ) {
                 $this->$field = null;
                 continue;
             }
-            if(!empty($this->$field) && !empty($value['display_default']) && in_array($value['type'], array('date', 'datetime', 'datetimecombo')) &&
+            if (!empty($this->$field) && !empty($value['display_default']) && in_array($value['type'], array('date', 'datetime', 'datetimecombo')) &&
             $this->$field == $this->parseDateDefault($value['display_default'], ($value['type'] != 'date'))) {
                 $this->$field = null;
             }
@@ -684,10 +684,10 @@ 
     protected function parseDateDefault($value, $time = false)
     {
         global $timedate;
-        if($time) {
+        if ($time) {
             $dtAry = explode('&', $value, 2);
             $dateValue = $timedate->getNow(true)->modify($dtAry[0]);
-            if(!empty($dtAry[1])) {
+            if (!empty($dtAry[1])) {
                 $timeValue = $timedate->fromString($dtAry[1]);
                 $dateValue->setTime($timeValue->hour, $timeValue->min, $timeValue->sec);
             }
@@ -697,37 +697,37 @@ 
         }
     }
 
-    function populateDefaultValues($force=false){
-        if ( !is_array($this->field_defs) )
+    function populateDefaultValues($force = false) {
+        if (!is_array($this->field_defs))
             return;
-        foreach($this->field_defs as $field=>$value){
-            if((isset($value['default']) || !empty($value['display_default'])) && ($force || empty($this->$field))){
+        foreach ($this->field_defs as $field=>$value) {
+            if ((isset($value['default']) || !empty($value['display_default'])) && ($force || empty($this->$field))) {
                 $type = $value['type'];
 
-                switch($type){
+                switch ($type) {
                     case 'date':
-                        if(!empty($value['display_default'])){
+                        if (!empty($value['display_default'])) {
                             $this->$field = $this->parseDateDefault($value['display_default']);
                         }
                         break;
                    case 'datetime':
                    case 'datetimecombo':
-                        if(!empty($value['display_default'])){
+                        if (!empty($value['display_default'])) {
                             $this->$field = $this->parseDateDefault($value['display_default'], true);
                         }
                         break;
                     case 'multienum':
-                        if(empty($value['default']) && !empty($value['display_default']))
+                        if (empty($value['default']) && !empty($value['display_default']))
                             $this->$field = $value['display_default'];
                         else
                             $this->$field = $value['default'];
                         break;
                     case 'bool':
-                    	if(isset($this->$field)){
+                    	if (isset($this->$field)) {
                     		break;
                     	}
                     default:
-                        if ( isset($value['default']) && $value['default'] !== '' ) {
+                        if (isset($value['default']) && $value['default'] !== '') {
                             $this->$field = htmlentities($value['default'], ENT_QUOTES, 'UTF-8');
                         } else {
                             $this->$field = '';
@@ -755,20 +755,20 @@ 
      *
      * Internal function, do not override.
      */
-    static function removeRelationshipMeta($key,$db,$tablename,$dictionary,$module_dir)
+    static function removeRelationshipMeta($key, $db, $tablename, $dictionary, $module_dir)
     {
         //load the module dictionary if not supplied.
         if ((!isset($dictionary) or empty($dictionary)) && !empty($module_dir))
         {
-            $filename='modules/'. $module_dir . '/vardefs.php';
-            if(file_exists($filename))
+            $filename = 'modules/'.$module_dir.'/vardefs.php';
+            if (file_exists($filename))
             {
                 include($filename);
             }
         }
         if (!is_array($dictionary) or !array_key_exists($key, $dictionary))
         {
-            $GLOBALS['log']->fatal("removeRelationshipMeta: Metadata for table ".$tablename. " does not exist");
+            $GLOBALS['log']->fatal("removeRelationshipMeta: Metadata for table ".$tablename." does not exist");
             display_notice("meta data absent for table ".$tablename." keyed to $key ");
         }
         else
@@ -778,7 +778,7 @@ 
                 $RelationshipDefs = $dictionary[$key]['relationships'];
                 foreach ($RelationshipDefs as $rel_name)
                 {
-                    Relationship::delete($rel_name,$db);
+                    Relationship::delete($rel_name, $db);
                 }
             }
         }
@@ -792,9 +792,9 @@ 
      * @deprecated 4.5.1 - Nov 14, 2006
      * @static
     */
-    static function remove_relationship_meta($key,$db,$log,$tablename,$dictionary,$module_dir)
+    static function remove_relationship_meta($key, $db, $log, $tablename, $dictionary, $module_dir)
     {
-        SugarBean::removeRelationshipMeta($key,$db,$tablename,$dictionary,$module_dir);
+        SugarBean::removeRelationshipMeta($key, $db, $tablename, $dictionary, $module_dir);
     }
 
 
@@ -813,14 +813,14 @@ 
      *
      *  Internal function, do not override.
      */
-    static function createRelationshipMeta($key,$db,$tablename,$dictionary,$module_dir,$iscustom=false)
+    static function createRelationshipMeta($key, $db, $tablename, $dictionary, $module_dir, $iscustom = false)
     {
         //load the module dictionary if not supplied.
         if (empty($dictionary) && !empty($module_dir))
         {
-            if($iscustom)
+            if ($iscustom)
             {
-                $filename='custom/modules/' . $module_dir . '/Ext/Vardefs/vardefs.ext.php';
+                $filename = 'custom/modules/'.$module_dir.'/Ext/Vardefs/vardefs.ext.php';
             }
             else
             {
@@ -829,33 +829,33 @@ 
                     // a very special case for the Employees module
                     // this must be done because the Employees/vardefs.php does an include_once on
                     // Users/vardefs.php
-                    $filename='modules/Users/vardefs.php';
+                    $filename = 'modules/Users/vardefs.php';
                 }
                 else
                 {
-                    $filename='modules/'. $module_dir . '/vardefs.php';
+                    $filename = 'modules/'.$module_dir.'/vardefs.php';
                 }
             }
 
-            if(file_exists($filename))
+            if (file_exists($filename))
             {
                 include($filename);
                 // cn: bug 7679 - dictionary entries defined as $GLOBALS['name'] not found
-                if(empty($dictionary) || !empty($GLOBALS['dictionary'][$key]))
+                if (empty($dictionary) || !empty($GLOBALS['dictionary'][$key]))
                 {
                     $dictionary = $GLOBALS['dictionary'];
                 }
             }
             else
             {
-                $GLOBALS['log']->debug("createRelationshipMeta: no metadata file found" . $filename);
+                $GLOBALS['log']->debug("createRelationshipMeta: no metadata file found".$filename);
                 return;
             }
         }
 
         if (!is_array($dictionary) or !array_key_exists($key, $dictionary))
         {
-            $GLOBALS['log']->fatal("createRelationshipMeta: Metadata for table ".$tablename. " does not exist");
+            $GLOBALS['log']->fatal("createRelationshipMeta: Metadata for table ".$tablename." does not exist");
             display_notice("meta data absent for table ".$tablename." keyed to $key ");
         }
         else
@@ -865,23 +865,23 @@ 
 
                 $RelationshipDefs = $dictionary[$key]['relationships'];
 
-                $delimiter=',';
+                $delimiter = ',';
                 global $beanList;
-                $beanList_ucase=array_change_key_case  ( $beanList ,CASE_UPPER);
+                $beanList_ucase = array_change_key_case($beanList, CASE_UPPER);
                 foreach ($RelationshipDefs as $rel_name=>$rel_def)
                 {
                     if (isset($rel_def['lhs_module']) and !isset($beanList_ucase[strtoupper($rel_def['lhs_module'])])) {
-                        $GLOBALS['log']->debug('skipping orphaned relationship record ' . $rel_name . ' lhs module is missing ' . $rel_def['lhs_module']);
+                        $GLOBALS['log']->debug('skipping orphaned relationship record '.$rel_name.' lhs module is missing '.$rel_def['lhs_module']);
                         continue;
                     }
                     if (isset($rel_def['rhs_module']) and !isset($beanList_ucase[strtoupper($rel_def['rhs_module'])])) {
-                        $GLOBALS['log']->debug('skipping orphaned relationship record ' . $rel_name . ' rhs module is missing ' . $rel_def['rhs_module']);
+                        $GLOBALS['log']->debug('skipping orphaned relationship record '.$rel_name.' rhs module is missing '.$rel_def['rhs_module']);
                         continue;
                     }
 
 
                     //check whether relationship exists or not first.
-                    if (Relationship::exists($rel_name,$db))
+                    if (Relationship::exists($rel_name, $db))
                     {
                         $GLOBALS['log']->debug('Skipping, reltionship already exists '.$rel_name);
                     }
@@ -890,7 +890,7 @@ 
                         $seed = BeanFactory::getBean("Relationships");
                         $keys = array_keys($seed->field_defs);
                         $toInsert = array();
-                        foreach($keys as $key)
+                        foreach ($keys as $key)
                         {
                             if ($key == "id")
                             {
@@ -909,10 +909,10 @@ 
 
 
                         $column_list = implode(",", array_keys($toInsert));
-                        $value_list = "'" . implode("','", array_values($toInsert)) . "'";
+                        $value_list = "'".implode("','", array_values($toInsert))."'";
 
                         //create the record. todo add error check.
-                        $insert_string = "INSERT into relationships (" .$column_list. ") values (".$value_list.")";
+                        $insert_string = "INSERT into relationships (".$column_list.") values (".$value_list.")";
                         $db->query($insert_string, true);
                     }
                 }
@@ -931,9 +931,9 @@ 
      * @deprecated 4.5.1 - Nov 14, 2006
      * @static
     */
-    static function create_relationship_meta($key,&$db,&$log,$tablename,$dictionary,$module_dir)
+    static function create_relationship_meta($key, &$db, &$log, $tablename, $dictionary, $module_dir)
     {
-        SugarBean::createRelationshipMeta($key,$db,$tablename,$dictionary,$module_dir);
+        SugarBean::createRelationshipMeta($key, $db, $tablename, $dictionary, $module_dir);
     }
 
 
@@ -946,8 +946,8 @@ 
      */
     public function __clone()
     {
-        if(!empty($this->loaded_relationships)) {
-            foreach($this->loaded_relationships as $rel) {
+        if (!empty($this->loaded_relationships)) {
+            foreach ($this->loaded_relationships as $rel) {
                 unset($this->$rel);
             }
         }
@@ -1021,8 +1021,8 @@ 
     function load_relationships()
     {
         $GLOBALS['log']->debug("SugarBean.load_relationships, Loading all relationships of type link.");
-        $linked_fields=$this->get_linked_fields();
-        foreach($linked_fields as $name=>$properties)
+        $linked_fields = $this->get_linked_fields();
+        foreach ($linked_fields as $name=>$properties)
         {
             $this->load_relationship($name);
         }
@@ -1045,13 +1045,13 @@ 
      *
      * Internal function, do not override.
      */
-    function get_linked_beans($field_name,$bean_name = '', $order_by = '', $begin_index = 0, $end_index = -1, $deleted=0, $optional_where="")
+    function get_linked_beans($field_name, $bean_name = '', $order_by = '', $begin_index = 0, $end_index = -1, $deleted = 0, $optional_where = "")
     {
         //if bean_name is Case then use aCase
-        if($bean_name=="Case")
+        if ($bean_name == "Case")
             $bean_name = "aCase";
 
-        if($this->load_relationship($field_name)) {
+        if ($this->load_relationship($field_name)) {
             if ($this->$field_name instanceof Link) {
                 // some classes are still based on Link, e.g. TeamSetLink
                 return array_values($this->$field_name->getBeans(new $bean_name(), $order_by, $begin_index, $end_index, $deleted, $optional_where));
@@ -1082,7 +1082,7 @@ 
     function get_linked_fields()
     {
 
-        $linked_fields=array();
+        $linked_fields = array();
 
  //   	require_once('data/Link.php');
 
@@ -1093,9 +1093,9 @@ 
         {
             foreach ($fieldDefs as $name=>$properties)
             {
-                if (array_search('link',$properties) === 'type')
+                if (array_search('link', $properties) === 'type')
                 {
-                    $linked_fields[$name]=$properties;
+                    $linked_fields[$name] = $properties;
                 }
             }
         }
@@ -1115,38 +1115,38 @@ 
     {
         $importableFields = array();
 
-        $fieldDefs= $this->getFieldDefinitions();
+        $fieldDefs = $this->getFieldDefinitions();
 
         if (!empty($fieldDefs)) {
             foreach ($fieldDefs as $key=>$value_array) {
-                if ( (isset($value_array['importable'])
+                if ((isset($value_array['importable'])
                         && (is_string($value_array['importable']) && $value_array['importable'] == 'false'
                             || is_bool($value_array['importable']) && $value_array['importable'] == false))
                     || (isset($value_array['type']) && $value_array['type'] == 'link')
                     || (isset($value_array['auto_increment'])
-                        && ($value_array['type'] == true || $value_array['type'] == 'true')) ) {
+                        && ($value_array['type'] == true || $value_array['type'] == 'true'))) {
                     // only allow import if we force it
                     if (isset($value_array['importable'])
                         && (is_string($value_array['importable']) && $value_array['importable'] == 'true'
                            || is_bool($value_array['importable']) && $value_array['importable'] == true)) {
-                        $importableFields[$key]=$value_array;
+                        $importableFields[$key] = $value_array;
                     }
                 }
                 else {
 
                     //Expose the cooresponding id field of a relate field if it is only defined as a link so that users can relate records by id during import
-                    if( isset($value_array['type']) && ($value_array['type'] == 'relate') && isset($value_array['id_name']) )
+                    if (isset($value_array['type']) && ($value_array['type'] == 'relate') && isset($value_array['id_name']))
                     {
                         $idField = $value_array['id_name'];
-                        if( isset($fieldDefs[$idField]) && isset($fieldDefs[$idField]['type'] ) && $fieldDefs[$idField]['type'] == 'link' )
+                        if (isset($fieldDefs[$idField]) && isset($fieldDefs[$idField]['type']) && $fieldDefs[$idField]['type'] == 'link')
                         {
                             $tmpFieldDefs = $fieldDefs[$idField];
-                            $tmpFieldDefs['vname'] = translate($value_array['vname'], $this->module_dir) . " " . $GLOBALS['app_strings']['LBL_ID'];
-                            $importableFields[$idField]=$tmpFieldDefs;
+                            $tmpFieldDefs['vname'] = translate($value_array['vname'], $this->module_dir)." ".$GLOBALS['app_strings']['LBL_ID'];
+                            $importableFields[$idField] = $tmpFieldDefs;
                         }
                     }
 
-                    $importableFields[$key]=$value_array;
+                    $importableFields[$key] = $value_array;
                 }
             }
         }
@@ -1164,7 +1164,7 @@ 
     function get_related_fields()
     {
 
-        $related_fields=array();
+        $related_fields = array();
 
 //    	require_once('data/Link.php');
 
@@ -1175,9 +1175,9 @@ 
         {
             foreach ($fieldDefs as $name=>$properties)
             {
-                if (array_search('relate',$properties) === 'type')
+                if (array_search('relate', $properties) === 'type')
                 {
-                    $related_fields[$name]=$properties;
+                    $related_fields[$name] = $properties;
                 }
             }
         }
@@ -1195,8 +1195,8 @@ 
         $importable_fields = $this->get_importable_fields();
         $required_fields   = array();
 
-        foreach ( $importable_fields as $name => $properties ) {
-            if ( isset($properties['importable']) && is_string($properties['importable']) && $properties['importable'] == 'required' ) {
+        foreach ($importable_fields as $name => $properties) {
+            if (isset($properties['importable']) && is_string($properties['importable']) && $properties['importable'] == 'required') {
                 $required_fields[$name] = $properties;
             }
         }
@@ -1211,7 +1211,7 @@ 
      */
     function delete_linked($id)
     {
-        $linked_fields=$this->get_linked_fields();
+        $linked_fields = $this->get_linked_fields();
         foreach ($linked_fields as $name => $value)
         {
             if ($this->load_relationship($name))
@@ -1237,18 +1237,18 @@ 
         $key = $this->getObjectName();
         if (!array_key_exists($key, $dictionary))
         {
-            $GLOBALS['log']->fatal("create_tables: Metadata for table ".$this->table_name. " does not exist");
+            $GLOBALS['log']->fatal("create_tables: Metadata for table ".$this->table_name." does not exist");
             display_notice("meta data absent for table ".$this->table_name." keyed to $key ");
         }
         else
         {
-            if(!$this->db->tableExists($this->table_name))
+            if (!$this->db->tableExists($this->table_name))
             {
                 $this->db->createTable($this);
-                    if($this->bean_implements('ACL')){
-                        if(!empty($this->acltype)){
+                    if ($this->bean_implements('ACL')) {
+                        if (!empty($this->acltype)) {
                             ACLAction::addActions($this->getACLCategory(), $this->acltype);
-                        }else{
+                        } else {
                             ACLAction::addActions($this->getACLCategory());
                         }
                     }
@@ -1257,7 +1257,7 @@ 
             {
                 echo "Table already exists : $this->table_name<br>";
             }
-            if($this->is_AuditEnabled()){
+            if ($this->is_AuditEnabled()) {
                     if (!$this->db->tableExists($this->get_audit_table_name())) {
                         $this->create_audit_table();
                     }
@@ -1278,16 +1278,16 @@ 
         $key = $this->getObjectName();
         if (!array_key_exists($key, $dictionary))
         {
-            $GLOBALS['log']->fatal("drop_tables: Metadata for table ".$this->table_name. " does not exist");
+            $GLOBALS['log']->fatal("drop_tables: Metadata for table ".$this->table_name." does not exist");
             echo "meta data absent for table ".$this->table_name."<br>\n";
         } else {
-            if(empty($this->table_name))return;
+            if (empty($this->table_name))return;
             if ($this->db->tableExists($this->table_name))
 
                 $this->db->dropTable($this);
-            if ($this->db->tableExists($this->table_name. '_cstm'))
+            if ($this->db->tableExists($this->table_name.'_cstm'))
             {
-                $this->db->dropTableName($this->table_name. '_cstm');
+                $this->db->dropTableName($this->table_name.'_cstm');
                 DynamicField::deleteCache();
             }
             if ($this->db->tableExists($this->get_audit_table_name())) {
@@ -1306,7 +1306,7 @@ 
      * @param string $module_name setting up custom fields for this module.
      * @param boolean $clean_load Optional, default true, rebuilds the cache if set to true.
      */
-    function setupCustomFields($module_name, $clean_load=true)
+    function setupCustomFields($module_name, $clean_load = true)
     {
         $this->custom_fields = new DynamicField($module_name);
         $this->custom_fields->setup($this);
@@ -1317,17 +1317,17 @@ 
     * Cleans char, varchar, text, etc. fields of XSS type materials
     */
     function cleanBean() {
-        foreach($this->field_defs as $key => $def) {
+        foreach ($this->field_defs as $key => $def) {
 
             if (isset($def['type'])) {
-                $type=$def['type'];
+                $type = $def['type'];
             }
-            if(isset($def['dbType']))
+            if (isset($def['dbType']))
                 $type .= $def['dbType'];
 
-            if($def['type'] == 'html' || $def['type'] == 'longhtml') {
+            if ($def['type'] == 'html' || $def['type'] == 'longhtml') {
                 $this->$key = SugarCleaner::cleanHtml($this->$key, true);
-            } elseif((strpos($type, 'char') !== false ||
+            } elseif ((strpos($type, 'char') !== false ||
                 strpos($type, 'text') !== false ||
                 $type == 'enum') &&
                 !empty($this->$key)
@@ -1357,24 +1357,24 @@ 
         global $current_user, $action;
 
         $isUpdate = true;
-        if(empty($this->id))
+        if (empty($this->id))
         {
             $isUpdate = false;
         }
 
-		if ( $this->new_with_id == true )
+		if ($this->new_with_id == true)
 		{
 			$isUpdate = false;
 		}
-		if(empty($this->date_modified) || $this->update_date_modified)
+		if (empty($this->date_modified) || $this->update_date_modified)
 		{
 			$this->date_modified = $GLOBALS['timedate']->nowDb();
 		}
 
         $this->_checkOptimisticLocking($action, $isUpdate);
 
-        if(!empty($this->modified_by_name)) $this->old_modified_by_name = $this->modified_by_name;
-        if($this->update_modified_by)
+        if (!empty($this->modified_by_name)) $this->old_modified_by_name = $this->modified_by_name;
+        if ($this->update_modified_by)
         {
             $this->modified_user_id = 1;
 
@@ -1386,18 +1386,18 @@ 
         }
         if ($this->deleted != 1)
             $this->deleted = 0;
-        if(!$isUpdate)
+        if (!$isUpdate)
         {
             if (empty($this->date_entered))
             {
                 $this->date_entered = $this->date_modified;
             }
-            if($this->set_created_by == true)
+            if ($this->set_created_by == true)
             {
                 // created by should always be this user
                 $this->created_by = (isset($current_user)) ? $current_user->id : "";
             }
-            if( $this->new_with_id == false)
+            if ($this->new_with_id == false)
             {
                 $this->id = create_guid();
             }
@@ -1415,7 +1415,7 @@ 
             $this->save_relationship_changes($isUpdate);
             $GLOBALS['saving_relationships'] = false;
         }
-        if($isUpdate && !$this->update_date_entered)
+        if ($isUpdate && !$this->update_date_entered)
         {
             unset($this->date_entered);
         }
@@ -1437,7 +1437,7 @@ 
             $this->emailAddress->save($this->id, $this->module_dir);
         }
 
-        if(isset($this->custom_fields))
+        if (isset($this->custom_fields))
         {
             $this->custom_fields->bean = $this;
             $this->custom_fields->save($isUpdate);
@@ -1447,12 +1447,12 @@ 
         $this->preprocess_fields_on_save();
 
         //construct the SQL to create the audit record if auditing is enabled.
-        $auditDataChanges=array();
+        $auditDataChanges = array();
         if ($this->is_AuditEnabled()) {
             if ($isUpdate && !isset($this->fetched_row)) {
                 $GLOBALS['log']->debug('Auditing: Retrieve was not called, audit record will not be created.');
             } else {
-                $auditDataChanges=$this->db->getAuditDataChanges($this);
+                $auditDataChanges = $this->db->getAuditDataChanges($this);
             }
         }
 
@@ -1468,12 +1468,12 @@ 
         {
             foreach ($auditDataChanges as $change)
             {
-                $this->db->save_audit_records($this,$change);
+                $this->db->save_audit_records($this, $change);
             }
         }
 
 
-        if (empty($GLOBALS['resavingRelatedBeans'])){
+        if (empty($GLOBALS['resavingRelatedBeans'])) {
             SugarRelationship::resaveRelatedBeans();
         }
 
@@ -1485,10 +1485,10 @@ 
 
 		/* BEGIN - SECURITY GROUPS - inheritance */ 
 		require_once('modules/SecurityGroups/SecurityGroup.php');
-		SecurityGroup::inherit($this,$isUpdate);
+		SecurityGroup::inherit($this, $isUpdate);
 		/* END - SECURITY GROUPS */ 
         //If we aren't in setup mode and we have a current user and module, then we track
-        if(isset($GLOBALS['current_user']) && isset($this->module_dir))
+        if (isset($GLOBALS['current_user']) && isset($this->module_dir))
         {
             $this->track_view($current_user->id, $this->module_dir, 'save');
         }
@@ -1518,7 +1518,7 @@ 
             	AND (modified_user_id != '$modified_user_id' OR date_modified > $date)";
             $result = $this->db->query($query);
 
-            if($this->db->fetchByAssoc($result))
+            if ($this->db->fetchByAssoc($result))
             {
                 return true;
             }
@@ -1554,11 +1554,11 @@ 
     {
         global $current_user;
 
-        if(($this->object_name == 'Meeting' || $this->object_name == 'Call') || $notify_user->receive_notifications)
+        if (($this->object_name == 'Meeting' || $this->object_name == 'Call') || $notify_user->receive_notifications)
         {
             $sendToEmail = $notify_user->emailAddress->getPrimaryAddress($notify_user);
             $sendEmail = TRUE;
-            if(empty($sendToEmail)) {
+            if (empty($sendToEmail)) {
                 $GLOBALS['log']->warn("Notifications: no e-mail address set for user {$notify_user->user_name}, cancelling send");
                 $sendEmail = FALSE;
             }
@@ -1566,7 +1566,7 @@ 
             $notify_mail = $this->create_notification_email($notify_user);
             $notify_mail->setMailerForSystem();
 
-            if(empty($admin->settings['notify_send_from_assigning_user'])) {
+            if (empty($admin->settings['notify_send_from_assigning_user'])) {
                 $notify_mail->From = $admin->settings['notify_fromaddress'];
                 $notify_mail->FromName = (empty($admin->settings['notify_fromname'])) ? "" : $admin->settings['notify_fromname'];
             } else {
@@ -1583,31 +1583,31 @@ 
            $oe = new OutboundEmail();
             $oe = $oe->getUserMailerSettings($current_user);
             //only send if smtp server is defined
-            if($sendEmail){
+            if ($sendEmail) {
                 $smtpVerified = false;
 
                 //first check the user settings
-                if(!empty($oe->mail_smtpserver)){
+                if (!empty($oe->mail_smtpserver)) {
                     $smtpVerified = true;
                 }
 
                 //if still not verified, check against the system settings
-                if (!$smtpVerified){
+                if (!$smtpVerified) {
                     $oe = $oe->getSystemMailerSettings();
-                    if(!empty($oe->mail_smtpserver)){
+                    if (!empty($oe->mail_smtpserver)) {
                         $smtpVerified = true;
                     }
                 }
                 //if smtp was not verified against user or system, then do not send out email
-                if (!$smtpVerified){
+                if (!$smtpVerified) {
                     $GLOBALS['log']->fatal("Notifications: error sending e-mail, smtp server was not found ");
                     //break out
                     return;
                 }
 
-                if(!$notify_mail->Send()) {
+                if (!$notify_mail->Send()) {
                     $GLOBALS['log']->fatal("Notifications: error sending e-mail (method: {$notify_mail->Mailer}), (error: {$notify_mail->ErrorInfo})");
-                }else{
+                } else {
                     $GLOBALS['log']->info("Notifications: e-mail successfully sent");
                 }
             }
@@ -1636,15 +1636,15 @@ 
         $GLOBALS['log']->debug("Notifications: user has e-mail defined");
 
         $notify_mail = new SugarPHPMailer();
-        $notify_mail->AddAddress($notify_address,$locale->translateCharsetMIME(trim($notify_name), 'UTF-8', $OBCharset));
+        $notify_mail->AddAddress($notify_address, $locale->translateCharsetMIME(trim($notify_name), 'UTF-8', $OBCharset));
 
-        if(empty($_SESSION['authenticated_user_language'])) {
+        if (empty($_SESSION['authenticated_user_language'])) {
             $current_language = $sugar_config['default_language'];
         } else {
             $current_language = $_SESSION['authenticated_user_language'];
         }
         $xtpl = new XTemplate(get_notify_template_file($current_language));
-        if($this->module_dir == "Cases") {
+        if ($this->module_dir == "Cases") {
             $template_name = "Case"; //we should use Case, you can refer to the en_us.notify_template.html.
         }
         else {
@@ -1653,23 +1653,23 @@ 
 
         $this->current_notify_user = $notify_user;
 
-        if(in_array('set_notification_body', get_class_methods($this))) {
+        if (in_array('set_notification_body', get_class_methods($this))) {
             $xtpl = $this->set_notification_body($xtpl, $this);
         } else {
             $xtpl->assign("OBJECT", translate('LBL_MODULE_NAME'));
             $template_name = "Default";
         }
-        if(!empty($_SESSION["special_notification"]) && $_SESSION["special_notification"]) {
+        if (!empty($_SESSION["special_notification"]) && $_SESSION["special_notification"]) {
             $template_name = $beanList[$this->module_dir].'Special';
         }
-        if($this->special_notification) {
+        if ($this->special_notification) {
             $template_name = $beanList[$this->module_dir].'Special';
         }
         $xtpl->assign("ASSIGNED_USER", $this->new_assigned_user_name);
         $xtpl->assign("ASSIGNER", $current_user->name);
         $port = '';
 
-        if(isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
+        if (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
             $port = $_SERVER['SERVER_PORT'];
         }
 
@@ -1679,27 +1679,27 @@ 
 
         $httpHost = $_SERVER['HTTP_HOST'];
 
-        if($colon = strpos($httpHost, ':')) {
-            $httpHost    = substr($httpHost, 0, $colon);
+        if ($colon = strpos($httpHost, ':')) {
+            $httpHost = substr($httpHost, 0, $colon);
         }
 
         $parsedSiteUrl = parse_url($sugar_config['site_url']);
         $host = $parsedSiteUrl['host'];
-        if(!isset($parsedSiteUrl['port'])) {
+        if (!isset($parsedSiteUrl['port'])) {
             $parsedSiteUrl['port'] = 80;
         }
 
         $port		= ($parsedSiteUrl['port'] != 80) ? ":".$parsedSiteUrl['port'] : '';
         $path		= !empty($parsedSiteUrl['path']) ? $parsedSiteUrl['path'] : "";
-        $cleanUrl	= "{$parsedSiteUrl['scheme']}://{$host}{$port}{$path}";
+        $cleanUrl = "{$parsedSiteUrl['scheme']}://{$host}{$port}{$path}";
 
         $xtpl->assign("URL", $cleanUrl."/index.php?module={$this->module_dir}&action=DetailView&record={$this->id}");
         $xtpl->assign("SUGAR", "Sugar v{$sugar_version}");
         $xtpl->parse($template_name);
-        $xtpl->parse($template_name . "_Subject");
+        $xtpl->parse($template_name."_Subject");
 
         $notify_mail->Body = from_html(trim($xtpl->text($template_name)));
-        $notify_mail->Subject = from_html($xtpl->text($template_name . "_Subject"));
+        $notify_mail->Subject = from_html($xtpl->text($template_name."_Subject"));
 
         // cn: bug 8568 encode notify email in User's outbound email encoding
         $notify_mail->prepForOutbound();
@@ -1762,7 +1762,7 @@ 
             // $rel_id and $rel_link are not emty - request is from subpanel
             // $rel_link contains relationship name - checked by call load_relationship
             $isRelationshipLoaded = $this->load_relationship($rel_link);
-            if ($isRelationshipLoaded && !empty($this->$rel_link) && $this->$rel_link->getRelationshipObject() && $this->$rel_link->getRelationshipObject()->getLHSModule() == $this->$rel_link->getRelationshipObject()->getRHSModule() )
+            if ($isRelationshipLoaded && !empty($this->$rel_link) && $this->$rel_link->getRelationshipObject() && $this->$rel_link->getRelationshipObject()->getLHSModule() == $this->$rel_link->getRelationshipObject()->getRHSModule())
             {
                 $new_rel_link = $this->$rel_link->getRelationshipObject()->getLHSLink();
             }
@@ -1802,14 +1802,14 @@ 
 
                 if (in_array($id, $exclude)) continue;
 
-                if(!empty($this->$id))
+                if (!empty($this->$id))
                 {
                     // Bug #44930 We do not need to update main related field if it is changed from sub-panel.
                     if ($rel_name == $new_rel_link && $this->$id != $new_rel_id)
                     {
                         $new_rel_id = '';
                     }
-                    $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - adding a relationship record: '.$rel_name . ' = ' . $this->$id);
+                    $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - adding a relationship record: '.$rel_name.' = '.$this->$id);
                     //already related the new relationship id so let's set it to false so we don't add it again using the _REQUEST['relate_i'] mechanism in a later block
                     $this->load_relationship($rel_name);
                     $rel_add = $this->$rel_name->add($this->$id);
@@ -1820,7 +1820,7 @@ 
                 } else {
                     //if before value is not empty then attempt to delete relationship
                     if (!empty($this->rel_fields_before_value[$id])) {
-                        $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - attempting to remove the relationship record, using relationship attribute' . $rel_name);
+                        $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - attempting to remove the relationship record, using relationship attribute'.$rel_name);
                         $this->load_relationship($rel_name);
                         $this->$rel_name->delete($this->id, $this->rel_fields_before_value[$id]);
                     }
@@ -1863,30 +1863,30 @@ 
 
                         if (!empty($this->rel_fields_before_value[$idName]) && empty($this->$idName)) {
                             //if before value is not empty then attempt to delete relationship
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record: {$def [ 'link' ]} = {$this->rel_fields_before_value[$def [ 'id_name' ]]}");
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record: {$def ['link']} = {$this->rel_fields_before_value[$def ['id_name']]}");
                             $success = $this->$def ['link']->delete($this->id, $this->rel_fields_before_value[$def ['id_name']]);
                             // just need to make sure it's true and not an array as it's possible to return an array
-                            if($success == true) {
+                            if ($success == true) {
                                 $modified_relationships['remove']['success'][] = $def['link'];
                             } else {
                                 $modified_relationships['remove']['failure'][] = $def['link'];
                             }
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record returned " . var_export($success, true));
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record returned ".var_export($success, true));
                         }
 
                         if (!empty($this->$idName) && is_string($this->$idName)) {
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to add a relationship record - {$def [ 'link' ]} = {$this->$def [ 'id_name' ]}");
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to add a relationship record - {$def ['link']} = {$this->$def ['id_name']}");
 
                             $success = $this->$linkField->add($this->$idName);
 
                             // just need to make sure it's true and not an array as it's possible to return an array
-                            if($success == true) {
+                            if ($success == true) {
                                 $modified_relationships['add']['success'][] = $linkField;
                             } else {
                                 $modified_relationships['add']['failure'][] = $linkField;
                             }
 
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - add a relationship record returned " . var_export($success, true));
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - add a relationship record returned ".var_export($success, true));
                         }
                     } else {
                         $GLOBALS['log']->fatal("Failed to load relationship {$linkField} while saving {$this->module_dir}");
@@ -2040,48 +2040,48 @@ 
 		global $disable_date_format;
 		global $timedate;
 		if (empty($timedate))
-			$timedate=TimeDate::getInstance();
+			$timedate = TimeDate::getInstance();
 
-		if(empty($this->field_defs))
+		if (empty($this->field_defs))
 		{
 			return;
 		}
-		foreach($this->field_defs as $fieldDef)
+		foreach ($this->field_defs as $fieldDef)
 		{
 			$field = $fieldDef['name'];
-			if(!isset($this->processed_dates_times[$field]))
+			if (!isset($this->processed_dates_times[$field]))
 			{
 				$this->processed_dates_times[$field] = '1';
-				if(empty($this->$field)) continue;
-				if($field == 'date_modified' || $field == 'date_entered')
+				if (empty($this->$field)) continue;
+				if ($field == 'date_modified' || $field == 'date_entered')
 				{
 					$this->$field = $this->db->fromConvert($this->$field, 'datetime');
-					if(empty($disable_date_format)) {
+					if (empty($disable_date_format)) {
 						$this->$field = $timedate->to_display_date_time($this->$field);
 					}
 				}
-				elseif(isset($this->field_name_map[$field]['type']))
+				elseif (isset($this->field_name_map[$field]['type']))
 				{
 					$type = $this->field_name_map[$field]['type'];
 
-					if($type == 'relate'  && isset($this->field_name_map[$field]['custom_module']))
+					if ($type == 'relate' && isset($this->field_name_map[$field]['custom_module']))
 					{
 						$type = $this->field_name_map[$field]['type'];
 					}
 
-					if($type == 'date')
+					if ($type == 'date')
 					{
-						if($this->$field == '0000-00-00')
+						if ($this->$field == '0000-00-00')
 						{
 							$this->$field = '';
-						} elseif(!empty($this->field_name_map[$field]['rel_field']))
+						} elseif (!empty($this->field_name_map[$field]['rel_field']))
 						{
 							$rel_field = $this->field_name_map[$field]['rel_field'];
 
-							if(!empty($this->$rel_field))
+							if (!empty($this->$rel_field))
 							{
-								if(empty($disable_date_format)) {
-									$mergetime = $timedate->merge_date_time($this->$field,$this->$rel_field);
+								if (empty($disable_date_format)) {
+									$mergetime = $timedate->merge_date_time($this->$field, $this->$rel_field);
 									$this->$field = $timedate->to_display_date($mergetime);
 									$this->$rel_field = $timedate->to_display_time($mergetime);
 								}
@@ -2089,36 +2089,36 @@ 
 						}
 						else
 						{
-							if(empty($disable_date_format)) {
+							if (empty($disable_date_format)) {
 								$this->$field = $timedate->to_display_date($this->$field, false);
 							}
 						}
-					} elseif($type == 'datetime' || $type == 'datetimecombo')
+					} elseif ($type == 'datetime' || $type == 'datetimecombo')
 					{
-						if($this->$field == '0000-00-00 00:00:00')
+						if ($this->$field == '0000-00-00 00:00:00')
 						{
 							$this->$field = '';
 						}
 						else
 						{
-							if(empty($disable_date_format)) {
+							if (empty($disable_date_format)) {
 								$this->$field = $timedate->to_display_date_time($this->$field, true, true);
 							}
 						}
-					} elseif($type == 'time')
+					} elseif ($type == 'time')
 					{
-						if($this->$field == '00:00:00')
+						if ($this->$field == '00:00:00')
 						{
 							$this->$field = '';
 						} else
 						{
 							//$this->$field = from_db_convert($this->$field, 'time');
-							if(empty($this->field_name_map[$field]['rel_field']) && empty($disable_date_format))
+							if (empty($this->field_name_map[$field]['rel_field']) && empty($disable_date_format))
 							{
-								$this->$field = $timedate->to_display_time($this->$field,true, false);
+								$this->$field = $timedate->to_display_time($this->$field, true, false);
 							}
 						}
-					} elseif($type == 'encrypt' && empty($disable_date_format)){
+					} elseif ($type == 'encrypt' && empty($disable_date_format)) {
 						$this->$field = $this->decrypt_after_retrieve($this->$field);
 					}
 				}
@@ -2172,52 +2172,52 @@ 
         static $boolean_false_values = array('off', 'false', '0', 'no');
 
 
-        foreach($this->field_defs as $field=>$def)
+        foreach ($this->field_defs as $field=>$def)
             {
-            if ( !isset($this->$field) ) {
+            if (!isset($this->$field)) {
                 continue;
                 }
-            if ( (isset($def['source'])&&$def['source']=='non-db') || $field == 'deleted' ) {
+            if ((isset($def['source']) && $def['source'] == 'non-db') || $field == 'deleted') {
                 continue;
             }
-            if ( isset($this->fetched_row[$field]) && $this->$field == $this->fetched_row[$field] ) {
+            if (isset($this->fetched_row[$field]) && $this->$field == $this->fetched_row[$field]) {
                 // Don't hand out warnings because the field was untouched between retrieval and saving, most database drivers hand pretty much everything back as strings.
                 continue;
             }
             $reformatted = false;
-            switch($def['type']) {
+            switch ($def['type']) {
                 case 'datetime':
                 case 'datetimecombo':
-                    if(empty($this->$field)) break;
+                    if (empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
                     	$this->$field = '';
                     	break;
                     }
-                    if ( ! preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/',$this->$field) ) {
+                    if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->$field)) {
                         // This appears to be formatted in user date/time
                         $this->$field = $timedate->to_db($this->$field);
                         $reformatted = true;
                     }
                     break;
                 case 'date':
-                    if(empty($this->$field)) break;
+                    if (empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
                     	$this->$field = '';
                     	break;
                     }
-                    if ( ! preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/',$this->$field) ) {
+                    if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $this->$field)) {
                         // This date appears to be formatted in the user's format
                         $this->$field = $timedate->to_db_date($this->$field, false);
                         $reformatted = true;
                     }
                     break;
                 case 'time':
-                    if(empty($this->$field)) break;
+                    if (empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
                     	$this->$field = '';
                     	break;
                     }
-                    if ( preg_match('/(am|pm)/i',$this->$field) ) {
+                    if (preg_match('/(am|pm)/i', $this->$field)) {
                         // This time appears to be formatted in the user's format
                         $this->$field = $timedate->fromUserTime($this->$field)->format(TimeDate::DB_TIME_FORMAT);
                         $reformatted = true;
@@ -2227,10 +2227,10 @@ 
                 case 'decimal':
                 case 'currency':
                 case 'float':
-                    if ( $this->$field === '' || $this->$field == NULL || $this->$field == 'NULL') {
+                    if ($this->$field === '' || $this->$field == NULL || $this->$field == 'NULL') {
                         continue;
                     }
-                    if ( is_string($this->$field) ) {
+                    if (is_string($this->$field)) {
                         $this->$field = (float)unformat_number($this->$field);
                         $reformatted = true;
                     }
@@ -2241,10 +2241,10 @@ 
                case 'short':
                case 'tinyint':
                case 'int':
-                    if ( $this->$field === '' || $this->$field == NULL || $this->$field == 'NULL') {
+                    if ($this->$field === '' || $this->$field == NULL || $this->$field == 'NULL') {
                         continue;
                     }
-                    if ( is_string($this->$field) ) {
+                    if (is_string($this->$field)) {
                         $this->$field = (int)unformat_number($this->$field);
                         $reformatted = true;
                     }
@@ -2252,9 +2252,9 @@ 
                case 'bool':
                    if (empty($this->$field)) {
                        $this->$field = false;
-                   } else if(true === $this->$field || 1 == $this->$field) {
+                   } else if (true === $this->$field || 1 == $this->$field) {
                        $this->$field = true;
-                   } else if(in_array(strval($this->$field), $boolean_false_values)) {
+                   } else if (in_array(strval($this->$field), $boolean_false_values)) {
                        $this->$field = false;
                        $reformatted = true;
                    } else {
@@ -2266,7 +2266,7 @@ 
                     $this->$field = $this->encrpyt_before_save($this->$field);
                     break;
             }
-            if ( $reformatted ) {
+            if ($reformatted) {
                 $GLOBALS['log']->deprecated('Formatting correction: '.$this->module_dir.'->'.$field.' had formatting automatically corrected. This will be removed in the future, please upgrade your external code');
             }
         }
@@ -2285,7 +2285,7 @@ 
      *
      * Internal function, do not override.
     */
-    function retrieve($id = -1, $encode=true,$deleted=true)
+    function retrieve($id = -1, $encode = true, $deleted = true)
     {
 
         $custom_logic_arguments['id'] = $id;
@@ -2297,27 +2297,27 @@ 
         }
         $custom_join = $this->getCustomJoin();
 
-        $query = "SELECT $this->table_name.*". $custom_join['select']. " FROM $this->table_name ";
+        $query = "SELECT $this->table_name.*".$custom_join['select']." FROM $this->table_name ";
 
         $query .= $custom_join['join'];
         $query .= " WHERE $this->table_name.id = ".$this->db->quoted($id);
         if ($deleted) $query .= " AND $this->table_name.deleted=0";
         $GLOBALS['log']->debug("Retrieve $this->object_name : ".$query);
-        $result = $this->db->limitQuery($query,0,1,true, "Retrieving record by id $this->table_name:$id found ");
-        if(empty($result))
+        $result = $this->db->limitQuery($query, 0, 1, true, "Retrieving record by id $this->table_name:$id found ");
+        if (empty($result))
         {
             return null;
         }
 
         $row = $this->db->fetchByAssoc($result, $encode);
-        if(empty($row))
+        if (empty($row))
         {
             return null;
         }
 
         //make copy of the fetched row for construction of audit record and for business logic/workflow
         $row = $this->convertRow($row);
-        $this->fetched_row=$row;
+        $this->fetched_row = $row;
         $this->populateFromRow($row);
 
         // fix defect #52438. implement the same logic as sugar_currency_format
@@ -2326,16 +2326,16 @@ 
 
         global $module, $action;
         //Just to get optimistic locking working for this release
-        if($this->optimistic_lock && $module == $this->module_dir && $action =='EditView' )
+        if ($this->optimistic_lock && $module == $this->module_dir && $action == 'EditView')
         {
-            $_SESSION['o_lock_id']= $id;
-            $_SESSION['o_lock_dm']= $this->date_modified;
+            $_SESSION['o_lock_id'] = $id;
+            $_SESSION['o_lock_dm'] = $this->date_modified;
             $_SESSION['o_lock_on'] = $this->object_name;
         }
         $this->processed_dates_times = array();
         $this->check_date_relationships_load();
 
-        if(isset($this->custom_fields))
+        if (isset($this->custom_fields))
         {
             $this->custom_fields->fill_relationships();
         }
@@ -2346,23 +2346,23 @@ 
 // save related fields values for audit
          foreach ($this->get_related_fields() as $rel_field_name)
          {
-             if (! empty($this->$rel_field_name['name']))
+             if (!empty($this->$rel_field_name['name']))
              {
                  $this->fetched_rel_row[$rel_field_name['name']] = $this->$rel_field_name['name'];
              }
          }
         //make a copy of fields in the relationship_fields array. These field values will be used to
         //clear relationship.
-        foreach ( $this->field_defs as $key => $def )
+        foreach ($this->field_defs as $key => $def)
         {
-            if ($def [ 'type' ] == 'relate' && isset ( $def [ 'id_name'] ) && isset ( $def [ 'link'] ) && isset ( $def[ 'save' ])) {
+            if ($def ['type'] == 'relate' && isset ($def ['id_name']) && isset ($def ['link']) && isset ($def['save'])) {
                 if (isset($this->$key)) {
-                    $this->rel_fields_before_value[$key]=$this->$key;
-                    if (isset($this->$def [ 'id_name']))
-                        $this->rel_fields_before_value[$def [ 'id_name']]=$this->$def [ 'id_name'];
+                    $this->rel_fields_before_value[$key] = $this->$key;
+                    if (isset($this->$def ['id_name']))
+                        $this->rel_fields_before_value[$def ['id_name']] = $this->$def ['id_name'];
                 }
                 else
-                    $this->rel_fields_before_value[$key]=null;
+                    $this->rel_fields_before_value[$key] = null;
            }
         }
         if (isset($this->relationship_fields) && is_array($this->relationship_fields))
@@ -2370,9 +2370,9 @@ 
             foreach ($this->relationship_fields as $rel_id=>$rel_name)
             {
                 if (isset($this->$rel_id))
-                    $this->rel_fields_before_value[$rel_id]=$this->$rel_id;
+                    $this->rel_fields_before_value[$rel_id] = $this->$rel_id;
                 else
-                    $this->rel_fields_before_value[$rel_id]=null;
+                    $this->rel_fields_before_value[$rel_id] = null;
             }
         }
 
@@ -2395,16 +2395,16 @@ 
      */
     function populateFromRow($row)
     {
-        $nullvalue='';
-        foreach($this->field_defs as $field=>$field_value)
+        $nullvalue = '';
+        foreach ($this->field_defs as $field=>$field_value)
         {
-            if($field == 'user_preferences' && $this->module_dir == 'Users')
+            if ($field == 'user_preferences' && $this->module_dir == 'Users')
                 continue;
-            if(isset($row[$field]))
+            if (isset($row[$field]))
             {
                 $this->$field = $row[$field];
-                $owner = $field . '_owner';
-                if(!empty($row[$owner])){
+                $owner = $field.'_owner';
+                if (!empty($row[$owner])) {
                     $this->$owner = $row[$owner];
                 }
             }
@@ -2446,48 +2446,48 @@ 
     function create_list_count_query($query)
     {
         // remove the 'order by' clause which is expected to be at the end of the query
-        $pattern = '/\sORDER BY.*/is';  // ignores the case
+        $pattern = '/\sORDER BY.*/is'; // ignores the case
         $replacement = '';
         $query = preg_replace($pattern, $replacement, $query);
         //handle distinct clause
         $star = '*';
-        if(substr_count(strtolower($query), 'distinct')){
-            if (!empty($this->seed) && !empty($this->seed->table_name ))
-                $star = 'DISTINCT ' . $this->seed->table_name . '.id';
+        if (substr_count(strtolower($query), 'distinct')) {
+            if (!empty($this->seed) && !empty($this->seed->table_name))
+                $star = 'DISTINCT '.$this->seed->table_name.'.id';
             else
-                $star = 'DISTINCT ' . $this->table_name . '.id';
+                $star = 'DISTINCT '.$this->table_name.'.id';
 
         }
 
         // change the select expression to 'count(*)'
-        $pattern = '/SELECT(.*?)(\s){1}FROM(\s){1}/is';  // ignores the case
-        $replacement = 'SELECT count(' . $star . ') c FROM ';
+        $pattern = '/SELECT(.*?)(\s){1}FROM(\s){1}/is'; // ignores the case
+        $replacement = 'SELECT count('.$star.') c FROM ';
 
         //if the passed query has union clause then replace all instances of the pattern.
         //this is very rare. I have seen this happening only from projects module.
         //in addition to this added a condition that has  union clause and uses
         //sub-selects.
-        if (strstr($query," UNION ALL ") !== false) {
+        if (strstr($query, " UNION ALL ") !== false) {
 
             //separate out all the queries.
-            $union_qs=explode(" UNION ALL ", $query);
+            $union_qs = explode(" UNION ALL ", $query);
             foreach ($union_qs as $key=>$union_query) {
                 $star = '*';
                 preg_match($pattern, $union_query, $matches);
                 if (!empty($matches)) {
                     if (stristr($matches[0], "distinct")) {
-                        if (!empty($this->seed) && !empty($this->seed->table_name ))
-                            $star = 'DISTINCT ' . $this->seed->table_name . '.id';
+                        if (!empty($this->seed) && !empty($this->seed->table_name))
+                            $star = 'DISTINCT '.$this->seed->table_name.'.id';
                         else
-                            $star = 'DISTINCT ' . $this->table_name . '.id';
+                            $star = 'DISTINCT '.$this->table_name.'.id';
                     }
                 } // if
-                $replacement = 'SELECT count(' . $star . ') c FROM ';
-                $union_qs[$key] = preg_replace($pattern, $replacement, $union_query,1);
+                $replacement = 'SELECT count('.$star.') c FROM ';
+                $union_qs[$key] = preg_replace($pattern, $replacement, $union_query, 1);
             }
-            $modified_select_query=implode(" UNION ALL ",$union_qs);
+            $modified_select_query = implode(" UNION ALL ", $union_qs);
         } else {
-            $modified_select_query = preg_replace($pattern, $replacement, $query,1);
+            $modified_select_query = preg_replace($pattern, $replacement, $query, 1);
         }
 
 
@@ -2510,15 +2510,15 @@ 
     * Internal function, do not override.
     *
     */
-    function get_list($order_by = "", $where = "", $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0, $singleSelect=false, $select_fields = array())
+    function get_list($order_by = "", $where = "", $row_offset = 0, $limit = -1, $max = -1, $show_deleted = 0, $singleSelect = false, $select_fields = array())
     {
         $GLOBALS['log']->debug("get_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
-        if(isset($_SESSION['show_deleted']))
+        if (isset($_SESSION['show_deleted']))
         {
             $show_deleted = 1;
         }
 
-        if($this->bean_implements('ACL') && ACLController::requireOwner($this->module_dir, 'list') )
+        if ($this->bean_implements('ACL') && ACLController::requireOwner($this->module_dir, 'list'))
         {
             global $current_user;
             $owner_where = $this->getOwnerWhere($current_user->id);
@@ -2526,15 +2526,15 @@ 
             //rrs - because $this->getOwnerWhere() can return '' we need to be sure to check for it and
             //handle it properly else you could get into a situation where you are create a where stmt like
             //WHERE .. AND ''
-            if(!empty($owner_where)){
-                if(empty($where)){
+            if (!empty($owner_where)) {
+                if (empty($where)) {
                     $where = $owner_where;
-                }else{
-                    $where .= ' AND '.  $owner_where;
+                } else {
+                    $where .= ' AND '.$owner_where;
                 }
             }
         }
-        $query = $this->create_new_list_query($order_by, $where,$select_fields,array(), $show_deleted,'',false,null,$singleSelect);
+        $query = $this->create_new_list_query($order_by, $where, $select_fields, array(), $show_deleted, '', false, null, $singleSelect);
         return $this->process_list_query($query, $row_offset, $limit, $max, $where);
     }
 
@@ -2580,9 +2580,9 @@ 
 
                 if (empty($field_defs['table']) && !$suppress_table_name) {
                     if ($source == 'db') {
-                        $list_column[0] = $bean_queried->table_name . '.' . $list_column[0] ;
+                        $list_column[0] = $bean_queried->table_name.'.'.$list_column[0];
                     } elseif ($source == 'custom_fields') {
-                        $list_column[0] = $bean_queried->table_name . '_cstm.' . $list_column[0] ;
+                        $list_column[0] = $bean_queried->table_name.'_cstm.'.$list_column[0];
                     }
                 }
 
@@ -2636,49 +2636,49 @@ 
     *
     * Internal function, do not override.
     */
-    function get_detail($order_by = "", $where = "",  $offset = 0, $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0)
+    function get_detail($order_by = "", $where = "", $offset = 0, $row_offset = 0, $limit = -1, $max = -1, $show_deleted = 0)
     {
         $GLOBALS['log']->debug("get_detail:  order_by = '$order_by' and where = '$where' and limit = '$limit' and offset = '$offset'");
-        if(isset($_SESSION['show_deleted']))
+        if (isset($_SESSION['show_deleted']))
         {
             $show_deleted = 1;
         }
 
-        if($this->bean_implements('ACL') && ACLController::requireOwner($this->module_dir, 'list') )
+        if ($this->bean_implements('ACL') && ACLController::requireOwner($this->module_dir, 'list'))
         {
             global $current_user;
             $owner_where = $this->getOwnerWhere($current_user->id);
 
-            if(empty($where))
+            if (empty($where))
             {
                 $where = $owner_where;
             }
             else
             {
-                $where .= ' AND '.  $owner_where;
+                $where .= ' AND '.$owner_where;
             }
         }
 
 		/* BEGIN - SECURITY GROUPS */
-    	if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
+    	if ($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list'))
     	{
 			require_once('modules/SecurityGroups/SecurityGroup.php');
     		global $current_user;
     		$owner_where = $this->getOwnerWhere($current_user->id);
-    		$group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
-	    	if(!empty($owner_where)){
-				if(empty($where))
+    		$group_where = SecurityGroup::getGroupWhere($this->table_name, $this->module_dir, $current_user->id);
+	    	if (!empty($owner_where)) {
+				if (empty($where))
 	    		{
-	    			$where = " (".  $owner_where." or ".$group_where.") ";
+	    			$where = " (".$owner_where." or ".$group_where.") ";
 	    		} else {
-	    			$where .= " AND (".  $owner_where." or ".$group_where.") ";
+	    			$where .= " AND (".$owner_where." or ".$group_where.") ";
 	    		}
 			} else {
-				$where .= ' AND '.  $group_where;
+				$where .= ' AND '.$group_where;
 			}
     	}
     	/* END - SECURITY GROUPS */
-        $query = $this->create_new_list_query($order_by, $where,array(),array(), $show_deleted, $offset);
+        $query = $this->create_new_list_query($order_by, $where, array(), array(), $show_deleted, $offset);
 
         //Add Limit and Offset to query
         //$query .= " LIMIT 1 OFFSET $offset";
@@ -2697,13 +2697,13 @@ 
     *
     * Internal function, do not override.
     */
-    function get_related_list($child_seed,$related_field_name, $order_by = "", $where = "",
-    $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0)
+    function get_related_list($child_seed, $related_field_name, $order_by = "", $where = "",
+    $row_offset = 0, $limit = -1, $max = -1, $show_deleted = 0)
     {
         global $layout_edit_mode;
         $query_array = array();
 
-        if(isset($layout_edit_mode) && $layout_edit_mode)
+        if (isset($layout_edit_mode) && $layout_edit_mode)
         {
             $response = array();
             $child_seed->assign_display_fields($child_seed->module_dir);
@@ -2715,7 +2715,7 @@ 
             return $response;
         }
         $GLOBALS['log']->debug("get_related_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
-        if(isset($_SESSION['show_deleted']))
+        if (isset($_SESSION['show_deleted']))
         {
             $show_deleted = 1;
         }
@@ -2734,22 +2734,22 @@ 
         }
 
         $entire_where = $query_array['where'];
-        if(!empty($where))
+        if (!empty($where))
         {
-            if(empty($entire_where))
+            if (empty($entire_where))
             {
-                $entire_where = ' WHERE ' . $where;
+                $entire_where = ' WHERE '.$where;
             }
             else
             {
-                $entire_where .= ' AND ' . $where;
+                $entire_where .= ' AND '.$where;
             }
         }
 
-        $query = 'SELECT '.$child_seed->table_name.'.* ' . $query_array['from'] . ' ' . $entire_where;
-        if(!empty($order_by))
+        $query = 'SELECT '.$child_seed->table_name.'.* '.$query_array['from'].' '.$entire_where;
+        if (!empty($order_by))
         {
-            $query .= " ORDER BY " . $order_by;
+            $query .= " ORDER BY ".$order_by;
         }
 
         return $child_seed->process_list_query($query, $row_offset, $limit, $max, $where);
@@ -2760,27 +2760,27 @@ 
     {
         global $layout_edit_mode, $beanFiles, $beanList;
         $subqueries = array();
-        foreach($subpanel_list as $this_subpanel)
+        foreach ($subpanel_list as $this_subpanel)
         {
-            if(!$this_subpanel->isDatasourceFunction() || ($this_subpanel->isDatasourceFunction()
+            if (!$this_subpanel->isDatasourceFunction() || ($this_subpanel->isDatasourceFunction()
                 && isset($this_subpanel->_instance_properties['generate_select'])
-                && $this_subpanel->_instance_properties['generate_select']==true))
+                && $this_subpanel->_instance_properties['generate_select'] == true))
             {
                 //the custom query function must return an array with
                 if ($this_subpanel->isDatasourceFunction()) {
                     $shortcut_function_name = $this_subpanel->get_data_source_name();
-                    $parameters=$this_subpanel->get_function_parameters();
+                    $parameters = $this_subpanel->get_function_parameters();
                     if (!empty($parameters))
                     {
                         //if the import file function is set, then import the file to call the custom function from
-                        if (is_array($parameters)  && isset($parameters['import_function_file'])){
+                        if (is_array($parameters) && isset($parameters['import_function_file'])) {
                             //this call may happen multiple times, so only require if function does not exist
-                            if(!function_exists($shortcut_function_name)){
+                            if (!function_exists($shortcut_function_name)) {
                                 require_once($parameters['import_function_file']);
                             }
                             //call function from required file
                             $query_array = $shortcut_function_name($parameters);
-                        }else{
+                        } else {
                             //call function from parent bean
                             $query_array = $parentbean->$shortcut_function_name($parameters);
                         }
@@ -2789,9 +2789,9 @@ 
                     {
                         $query_array = $parentbean->$shortcut_function_name();
                     }
-                }  else {
+                } else {
                     $related_field_name = $this_subpanel->get_data_source_name();
-                    if (!$parentbean->load_relationship($related_field_name)){
+                    if (!$parentbean->load_relationship($related_field_name)) {
                         unset ($parentbean->$related_field_name);
                         continue;
                     }
@@ -2800,15 +2800,15 @@ 
                 $table_where = preg_replace('/^\s*WHERE/i', '', $this_subpanel->get_where());
                 $where_definition = preg_replace('/^\s*WHERE/i', '', $query_array['where']);
 
-                if(!empty($table_where))
+                if (!empty($table_where))
                 {
-                    if(empty($where_definition))
+                    if (empty($where_definition))
                     {
                         $where_definition = $table_where;
                     }
                     else
                     {
-                        $where_definition .= ' AND ' . $table_where;
+                        $where_definition .= ' AND '.$table_where;
                     }
                 }
 
@@ -2823,21 +2823,21 @@ 
 
 
                 $list_fields = $this_subpanel->get_list_fields();
-                foreach($list_fields as $list_key=>$list_field)
+                foreach ($list_fields as $list_key=>$list_field)
                 {
-                    if(isset($list_field['usage']) && $list_field['usage'] == 'display_only')
+                    if (isset($list_field['usage']) && $list_field['usage'] == 'display_only')
                     {
                         unset($list_fields[$list_key]);
                     }
                 }
 
 
-                if(!$subpanel_def->isCollection() && isset($list_fields[$order_by]) && isset($submodule->field_defs[$order_by])&& (!isset($submodule->field_defs[$order_by]['source']) || $submodule->field_defs[$order_by]['source'] == 'db'))
+                if (!$subpanel_def->isCollection() && isset($list_fields[$order_by]) && isset($submodule->field_defs[$order_by]) && (!isset($submodule->field_defs[$order_by]['source']) || $submodule->field_defs[$order_by]['source'] == 'db'))
                 {
-                    $order_by = $submodule->table_name .'.'. $order_by;
+                    $order_by = $submodule->table_name.'.'.$order_by;
                 }
                 $table_name = $this_subpanel->table_name;
-                $panel_name=$this_subpanel->name;
+                $panel_name = $this_subpanel->name;
                 $params = array();
                 $params['distinct'] = $this_subpanel->distinct_query();
 
@@ -2848,7 +2848,7 @@ 
                 // use single select in case when sorting by relate field
                 $singleSelect = $submodule->is_relate_field($order_by);
 
-                $subquery = $submodule->create_new_list_query('',$subwhere ,$list_fields,$params, 0,'', true,$parentbean, $singleSelect);
+                $subquery = $submodule->create_new_list_query('', $subwhere, $list_fields, $params, 0, '', true, $parentbean, $singleSelect);
 
                 $subquery['select'] = $subquery['select']." , '$panel_name' panel_name ";
                 $subquery['from'] = $subquery['from'].$query_array['join'];
@@ -2880,27 +2880,27 @@ 
      *
      * Internal Function, do not overide.
      */
-    static function get_union_related_list($parentbean, $order_by = "", $sort_order='', $where = "",
-    $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0, $subpanel_def)
+    static function get_union_related_list($parentbean, $order_by = "", $sort_order = '', $where = "",
+    $row_offset = 0, $limit = -1, $max = -1, $show_deleted = 0, $subpanel_def)
     {
         $secondary_queries = array();
         global $layout_edit_mode, $beanFiles, $beanList;
 
-        if(isset($_SESSION['show_deleted']))
+        if (isset($_SESSION['show_deleted']))
         {
             $show_deleted = 1;
         }
         $final_query = '';
         $final_query_rows = '';
-        $subpanel_list=array();
+        $subpanel_list = array();
         if ($subpanel_def->isCollection())
         {
             $subpanel_def->load_sub_subpanels();
-            $subpanel_list=$subpanel_def->sub_subpanels;
+            $subpanel_list = $subpanel_def->sub_subpanels;
         }
         else
         {
-            $subpanel_list[]=$subpanel_def;
+            $subpanel_list[] = $subpanel_def;
         }
 
         $first = true;
@@ -2909,36 +2909,36 @@ 
         //The second loop merges the queries and forces them to select the same number of columns
         //All columns in a sub-subpanel group must have the same aliases
         //If the subpanel is a datasource function, it can't be a collection so we just poll that function for the and return that
-        foreach($subpanel_list as $this_subpanel)
+        foreach ($subpanel_list as $this_subpanel)
         {
-            if($this_subpanel->isDatasourceFunction() && empty($this_subpanel->_instance_properties['generate_select']))
+            if ($this_subpanel->isDatasourceFunction() && empty($this_subpanel->_instance_properties['generate_select']))
             {
                 $shortcut_function_name = $this_subpanel->get_data_source_name();
-                $parameters=$this_subpanel->get_function_parameters();
+                $parameters = $this_subpanel->get_function_parameters();
                 if (!empty($parameters))
                 {
                     //if the import file function is set, then import the file to call the custom function from
-                    if (is_array($parameters)  && isset($parameters['import_function_file'])){
+                    if (is_array($parameters) && isset($parameters['import_function_file'])) {
                         //this call may happen multiple times, so only require if function does not exist
-                        if(!function_exists($shortcut_function_name)){
+                        if (!function_exists($shortcut_function_name)) {
                             require_once($parameters['import_function_file']);
                         }
                         //call function from required file
-                        $tmp_final_query =  $shortcut_function_name($parameters);
-                    }else{
+                        $tmp_final_query = $shortcut_function_name($parameters);
+                    } else {
                         //call function from parent bean
-                        $tmp_final_query =  $parentbean->$shortcut_function_name($parameters);
+                        $tmp_final_query = $parentbean->$shortcut_function_name($parameters);
                     }
                 } else {
                     $tmp_final_query = $parentbean->$shortcut_function_name();
                 }
-                if(!$first)
+                if (!$first)
                     {
-                        $final_query_rows .= ' UNION ALL ( '.$parentbean->create_list_count_query($tmp_final_query, $parameters) . ' )';
-                        $final_query .= ' UNION ALL ( '.$tmp_final_query . ' )';
+                        $final_query_rows .= ' UNION ALL ( '.$parentbean->create_list_count_query($tmp_final_query, $parameters).' )';
+                        $final_query .= ' UNION ALL ( '.$tmp_final_query.' )';
                     } else {
-                        $final_query_rows = '(' . $parentbean->create_list_count_query($tmp_final_query, $parameters) . ')';
-                        $final_query = '(' . $tmp_final_query . ')';
+                        $final_query_rows = '('.$parentbean->create_list_count_query($tmp_final_query, $parameters).')';
+                        $final_query = '('.$tmp_final_query.')';
                         $first = false;
                     }
                 }
@@ -2948,10 +2948,10 @@ 
         {
             $subqueries = SugarBean::build_sub_queries_for_union($subpanel_list, $subpanel_def, $parentbean, $order_by);
             $all_fields = array();
-            foreach($subqueries as $i => $subquery)
+            foreach ($subqueries as $i => $subquery)
             {
                 $query_fields = $GLOBALS['db']->getSelectFieldsFromQuery($subquery['select']);
-                foreach($query_fields as $field => $select)
+                foreach ($query_fields as $field => $select)
                 {
                     if (!in_array($field, $all_fields))
                         $all_fields[] = $field;
@@ -2960,10 +2960,10 @@ 
             }
             $first = true;
             //Now ensure the queries have the same set of fields in the same order.
-            foreach($subqueries as $subquery)
+            foreach ($subqueries as $subquery)
             {
                 $subquery['select'] = "SELECT";
-                foreach($all_fields as $field)
+                foreach ($all_fields as $field)
                 {
                     if (!isset($subquery['query_fields'][$field]))
                     {
@@ -2974,56 +2974,56 @@ 
                         $subquery['select'] .= " {$subquery['query_fields'][$field]},";
                     }
                 }
-                $subquery['select'] = substr($subquery['select'], 0 , strlen($subquery['select']) - 1);
+                $subquery['select'] = substr($subquery['select'], 0, strlen($subquery['select']) - 1);
                 //Put the query into the final_query
-                $query =  $subquery['select'] . " " . $subquery['from'] . " " . $subquery['where'];
-                if(!$first)
+                $query = $subquery['select']." ".$subquery['from']." ".$subquery['where'];
+                if (!$first)
                 {
-                    $query = ' UNION ALL ( '.$query . ' )';
+                    $query = ' UNION ALL ( '.$query.' )';
                     $final_query_rows .= " UNION ALL ";
                 } else {
-                    $query = '(' . $query . ')';
+                    $query = '('.$query.')';
                     $first = false;
                 }
                 $query_array = $subquery['query_array'];
-                $select_position=strpos($query_array['select'],"SELECT");
-                $distinct_position=strpos($query_array['select'],"DISTINCT");
+                $select_position = strpos($query_array['select'], "SELECT");
+                $distinct_position = strpos($query_array['select'], "DISTINCT");
                 if (!empty($subquery['params']['distinct']) && !empty($subpanel_def->table_name))
                 {
-                    $query_rows = "( SELECT count(DISTINCT ". $subpanel_def->table_name . ".id)".  $subquery['from_min'].$query_array['join']. $subquery['where'].' )';
+                    $query_rows = "( SELECT count(DISTINCT ".$subpanel_def->table_name.".id)".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 }
-                elseif ($select_position !== false && $distinct_position!= false)
+                elseif ($select_position !== false && $distinct_position != false)
                 {
-                    $query_rows = "( ".substr_replace($query_array['select'],"SELECT count(",$select_position,6). ")" .  $subquery['from_min'].$query_array['join']. $subquery['where'].' )';
+                    $query_rows = "( ".substr_replace($query_array['select'], "SELECT count(", $select_position, 6).")".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 }
                 else
                 {
                     //resort to default behavior.
-                    $query_rows = "( SELECT count(*)".  $subquery['from_min'].$query_array['join']. $subquery['where'].' )';
+                    $query_rows = "( SELECT count(*)".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 }
-                if(!empty($subquery['secondary_select']))
+                if (!empty($subquery['secondary_select']))
                 {
 
-                    $subquerystring= $subquery['secondary_select'] . $subquery['secondary_from'].$query_array['join']. $subquery['where'];
+                    $subquerystring = $subquery['secondary_select'].$subquery['secondary_from'].$query_array['join'].$subquery['where'];
                     if (!empty($subquery['secondary_where']))
                     {
                         if (empty($subquery['where']))
                         {
-                            $subquerystring.=" WHERE " .$subquery['secondary_where'];
+                            $subquerystring .= " WHERE ".$subquery['secondary_where'];
                         }
                         else
                         {
-                            $subquerystring.=" AND " .$subquery['secondary_where'];
+                            $subquerystring .= " AND ".$subquery['secondary_where'];
                         }
                     }
-                    $secondary_queries[]=$subquerystring;
+                    $secondary_queries[] = $subquerystring;
                 }
                 $final_query .= $query;
                 $final_query_rows .= $query_rows;
             }
         }
 
-        if(!empty($order_by))
+        if (!empty($order_by))
         {
             $isCollection = $subpanel_def->isCollection();
             if ($isCollection) {
@@ -3037,20 +3037,20 @@ 
             }
 
             if (!empty($sort_order)) {
-                $order_by .= ' ' . $sort_order;
+                $order_by .= ' '.$sort_order;
             }
 
             $order_by = $parentbean->process_order_by($order_by, $submodule, $suppress_table_name);
             if (!empty($order_by)) {
-                $final_query .= ' ORDER BY ' . $order_by;
+                $final_query .= ' ORDER BY '.$order_by;
             }
         }
 
 
-        if(isset($layout_edit_mode) && $layout_edit_mode)
+        if (isset($layout_edit_mode) && $layout_edit_mode)
         {
             $response = array();
-            if(!empty($submodule))
+            if (!empty($submodule))
             {
                 $submodule->assign_display_fields($submodule->module_dir);
                 $response['list'] = array($submodule);
@@ -3067,7 +3067,7 @@ 
             return $response;
         }
 
-        return $parentbean->process_union_list_query($parentbean, $final_query, $row_offset, $limit, $max, '',$subpanel_def, $final_query_rows, $secondary_queries);
+        return $parentbean->process_union_list_query($parentbean, $final_query, $row_offset, $limit, $max, '', $subpanel_def, $final_query_rows, $secondary_queries);
     }
 
 
@@ -3079,14 +3079,14 @@ 
     * @param boolean $check_dates. defaults to false
     * @param int $show_deleted show deleted records. defaults to 0
     */
-    function get_full_list($order_by = "", $where = "", $check_dates=false, $show_deleted = 0)
+    function get_full_list($order_by = "", $where = "", $check_dates = false, $show_deleted = 0)
     {
         $GLOBALS['log']->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
-        if(isset($_SESSION['show_deleted']))
+        if (isset($_SESSION['show_deleted']))
         {
             $show_deleted = 1;
         }
-        $query = $this->create_new_list_query($order_by, $where,array(),array(), $show_deleted);
+        $query = $this->create_new_list_query($order_by, $where, array(), array(), $show_deleted);
         return $this->process_full_list_query($query, $check_dates);
     }
 
@@ -3106,29 +3106,29 @@ 
      * @param boolean $singleSelect Optional, default false.
      * @return String select query string, optionally an array value will be returned if $return_array= true.
      */
-	function create_new_list_query($order_by, $where,$filter=array(),$params=array(), $show_deleted = 0,$join_type='', $return_array = false,$parentbean=null, $singleSelect = false, $ifListForExport = false)
+	function create_new_list_query($order_by, $where, $filter = array(), $params = array(), $show_deleted = 0, $join_type = '', $return_array = false, $parentbean = null, $singleSelect = false, $ifListForExport = false)
     {
         global $beanFiles, $beanList;
         $selectedFields = array();
         $secondarySelectedFields = array();
         $ret_array = array();
         $distinct = '';
-        if($this->bean_implements('ACL') && ACLController::requireOwner($this->module_dir, 'list') )
+        if ($this->bean_implements('ACL') && ACLController::requireOwner($this->module_dir, 'list'))
         {
             global $current_user;
             $owner_where = $this->getOwnerWhere($current_user->id);
-            if(empty($where))
+            if (empty($where))
             {
                 $where = $owner_where;
             }
             else
             {
-                $where .= ' AND '.  $owner_where;
+                $where .= ' AND '.$owner_where;
             }
         }
 		/* BEGIN - SECURITY GROUPS */
     	global $current_user, $sugar_config;
-    	if($this->module_dir == 'Users' && !is_admin($current_user)
+    	if ($this->module_dir == 'Users' && !is_admin($current_user)
 				&& isset($sugar_config['securitysuite_filter_user_list'])
 				&& $sugar_config['securitysuite_filter_user_list'] == true
     	) {
@@ -3136,36 +3136,36 @@ 
     		global $current_user;
     		$group_where = SecurityGroup::getGroupUsersWhere($current_user->id);
     		//$group_where = "user_name = 'admin'";
-    		if(empty($where))
+    		if (empty($where))
     		{
     			$where = " (".$group_where.") ";
     		} else {
     			$where .= " AND (".$group_where.") ";
     		}
     	} else
-    	if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
+    	if ($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list'))
     	{
 			require_once('modules/SecurityGroups/SecurityGroup.php');
     		global $current_user;
     		$owner_where = $this->getOwnerWhere($current_user->id);
-    		$group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
-	    	if(!empty($owner_where)){
-				if(empty($where))
+    		$group_where = SecurityGroup::getGroupWhere($this->table_name, $this->module_dir, $current_user->id);
+	    	if (!empty($owner_where)) {
+				if (empty($where))
 	    		{
-	    			$where = " (".  $owner_where." or ".$group_where.") ";
+	    			$where = " (".$owner_where." or ".$group_where.") ";
 	    		} else {
-	    			$where .= " AND (".  $owner_where." or ".$group_where.") ";
+	    			$where .= " AND (".$owner_where." or ".$group_where.") ";
 	    		}
 			} else {
-				$where .= ' AND '.  $group_where;
+				$where .= ' AND '.$group_where;
 			}
     	}
     	/* END - SECURITY GROUPS */
-        if(!empty($params['distinct']))
+        if (!empty($params['distinct']))
         {
             $distinct = ' DISTINCT ';
         }
-        if(empty($filter))
+        if (empty($filter))
         {
             $ret_array['select'] = " SELECT $distinct $this->table_name.* ";
         }
@@ -3175,21 +3175,21 @@ 
         }
         $ret_array['from'] = " FROM $this->table_name ";
         $ret_array['from_min'] = $ret_array['from'];
-        $ret_array['secondary_from'] = $ret_array['from'] ;
+        $ret_array['secondary_from'] = $ret_array['from'];
         $ret_array['where'] = '';
         $ret_array['order_by'] = '';
         //secondary selects are selects that need to be run after the primary query to retrieve additional info on main
-        if($singleSelect)
+        if ($singleSelect)
         {
-            $ret_array['secondary_select']=& $ret_array['select'];
+            $ret_array['secondary_select'] = & $ret_array['select'];
             $ret_array['secondary_from'] = & $ret_array['from'];
         }
         else
         {
             $ret_array['secondary_select'] = '';
         }
-        $custom_join = $this->getCustomJoin( empty($filter)? true: $filter );
-        if((!isset($params['include_custom_fields']) || $params['include_custom_fields']))
+        $custom_join = $this->getCustomJoin(empty($filter) ? true : $filter);
+        if ((!isset($params['include_custom_fields']) || $params['include_custom_fields']))
         {
             $ret_array['select'] .= $custom_join['select'];
         }
@@ -3205,43 +3205,43 @@ 
         }
 
         $joined_tables = array();
-        if(!empty($params['joined_tables']))
+        if (!empty($params['joined_tables']))
         {
-            foreach($params['joined_tables'] as $table)
+            foreach ($params['joined_tables'] as $table)
             {
                 $joined_tables[$table] = 1;
             }
         }
 
-        if(!empty($filter))
+        if (!empty($filter))
         {
             $filterKeys = array_keys($filter);
-            if(is_numeric($filterKeys[0]))
+            if (is_numeric($filterKeys[0]))
             {
                 $fields = array();
-                foreach($filter as $field)
+                foreach ($filter as $field)
                 {
                     $field = strtolower($field);
                     //remove out id field so we don't duplicate it
-                    if ( $field == 'id' && !empty($filter) ) {
+                    if ($field == 'id' && !empty($filter)) {
                         continue;
                     }
-                    if(isset($this->field_defs[$field]))
+                    if (isset($this->field_defs[$field]))
                     {
-                        $fields[$field]= $this->field_defs[$field];
+                        $fields[$field] = $this->field_defs[$field];
                     }
                     else
                     {
                         $fields[$field] = array('force_exists'=>true);
                     }
                 }
-            }else{
-                $fields = 	$filter;
+            } else {
+                $fields = $filter;
             }
         }
         else
         {
-            $fields = 	$this->field_defs;
+            $fields = $this->field_defs;
         }
 
         $used_join_key = array();
@@ -3249,7 +3249,7 @@ 
 	//walk through the fields and for every relationship field add their relationship_info field
 	//relationshipfield-aliases are resolved in SugarBean::create_new_list_query through their relationship_info field
 	$addrelate = array();
-	foreach($fields as $field=>$value)
+	foreach ($fields as $field=>$value)
 	{
 		if (isset($this->field_defs[$field]) && isset($this->field_defs[$field]['source']) && 
 			$this->field_defs[$field]['source'] == 'non-db')
@@ -3258,27 +3258,27 @@ 
 			if ($addrelatefield)
 				$addrelate[$addrelatefield] = true;
 		}
-		if(!empty($this->field_defs[$field]['id_name'])){
+		if (!empty($this->field_defs[$field]['id_name'])) {
 			$addrelate[$this->field_defs[$field]['id_name']] = true;
 		}
 	}
 
 	$fields = array_merge($addrelate, $fields);
 
-        foreach($fields as $field=>$value)
+        foreach ($fields as $field=>$value)
         {
             //alias is used to alias field names
-            $alias='';
-            if 	(isset($value['alias']))
+            $alias = '';
+            if (isset($value['alias']))
             {
-                $alias =' as ' . $value['alias'] . ' ';
+                $alias = ' as '.$value['alias'].' ';
             }
 
-            if(empty($this->field_defs[$field]) || !empty($value['force_blank']) )
+            if (empty($this->field_defs[$field]) || !empty($value['force_blank']))
             {
-                if(!empty($filter) && isset($filter[$field]['force_exists']) && $filter[$field]['force_exists'])
+                if (!empty($filter) && isset($filter[$field]['force_exists']) && $filter[$field]['force_exists'])
                 {
-                    if ( isset($filter[$field]['force_default']) )
+                    if (isset($filter[$field]['force_default']))
                         $ret_array['select'] .= ", {$filter[$field]['force_default']} $field ";
                     else
                     //spaces are a fix for length issue problem with unions.  The union only returns the maximum number of characters from the first select statement.
@@ -3310,14 +3310,14 @@ 
                 	continue;
             }
 
-            if(  (!isset($data['source']) || $data['source'] == 'db') && (!empty($alias) || !empty($filter) ))
+            if ((!isset($data['source']) || $data['source'] == 'db') && (!empty($alias) || !empty($filter)))
             {
                 $ret_array['select'] .= ", $this->table_name.$field $alias";
                 $selectedFields["$this->table_name.$field"] = true;
-            } else if(  (!isset($data['source']) || $data['source'] == 'custom_fields') && (!empty($alias) || !empty($filter) )) {
+            } else if ((!isset($data['source']) || $data['source'] == 'custom_fields') && (!empty($alias) || !empty($filter))) {
                 //add this column only if it has NOT already been added to select statement string
-                $colPos = strpos($ret_array['select'],"$this->table_name"."_cstm".".$field");
-                if(!$colPos || $colPos<0)
+                $colPos = strpos($ret_array['select'], "$this->table_name"."_cstm".".$field");
+                if (!$colPos || $colPos < 0)
                 {
                     $ret_array['select'] .= ", $this->table_name"."_cstm".".$field $alias";
                 }
@@ -3325,22 +3325,22 @@ 
                 $selectedFields["$this->table_name.$field"] = true;
             }
 
-            if($data['type'] != 'relate' && isset($data['db_concat_fields']))
+            if ($data['type'] != 'relate' && isset($data['db_concat_fields']))
             {
-                $ret_array['select'] .= ", " . $this->db->concat($this->table_name, $data['db_concat_fields']) . " as $field";
+                $ret_array['select'] .= ", ".$this->db->concat($this->table_name, $data['db_concat_fields'])." as $field";
                 $selectedFields[$this->db->concat($this->table_name, $data['db_concat_fields'])] = true;
             }
             //Custom relate field or relate fields built in module builder which have no link field associated.
             if ($data['type'] == 'relate' && (isset($data['custom_module']) || isset($data['ext2']))) {
-                $joinTableAlias = 'jt' . $jtcount;
+                $joinTableAlias = 'jt'.$jtcount;
                 $relateJoinInfo = $this->custom_fields->getRelateJoin($data, $joinTableAlias, false);
                 $ret_array['select'] .= $relateJoinInfo['select'];
                 $ret_array['from'] .= $relateJoinInfo['from'];
                 //Replace any references to the relationship in the where clause with the new alias
                 //If the link isn't set, assume that search used the local table for the field
                 $searchTable = isset($data['link']) ? $relateJoinInfo['rel_table'] : $this->table_name;
-                $field_name = $relateJoinInfo['rel_table'] . '.' . !empty($data['name'])?$data['name']:'name';
-                $where = preg_replace('/(^|[\s(])' . $field_name . '/' , '${1}' . $relateJoinInfo['name_field'], $where);
+                $field_name = $relateJoinInfo['rel_table'].'.'.!empty($data['name']) ? $data['name'] : 'name';
+                $where = preg_replace('/(^|[\s(])'.$field_name.'/', '${1}'.$relateJoinInfo['name_field'], $where);
                 $jtcount++;
             }
             //Parent Field
@@ -3348,7 +3348,7 @@ 
                 //See if we need to join anything by inspecting the where clause
                 $match = preg_match('/(^|[\s(])parent_(\w+)_(\w+)\.name/', $where, $matches);
                 if ($match) {
-                    $joinTableAlias = 'jt' . $jtcount;
+                    $joinTableAlias = 'jt'.$jtcount;
                     $joinModule = $matches[2];
                     $joinTable = $matches[3];
                     $localTable = $this->table_name;
@@ -3362,7 +3362,7 @@ 
                     if (isset($rel_mod->field_defs['name']))
                     {
                         $name_field_def = $rel_mod->field_defs['name'];
-                        if(isset($name_field_def['db_concat_fields']))
+                        if (isset($name_field_def['db_concat_fields']))
                         {
                             $nameField = $this->db->concat($joinTableAlias, $name_field_def['db_concat_fields']);
                         }
@@ -3371,7 +3371,7 @@ 
                     $ret_array['from'] .= " LEFT JOIN $joinTable $joinTableAlias
                         ON $localTable.{$data['id_name']} = $joinTableAlias.id";
                     //Replace any references to the relationship in the where clause with the new alias
-                    $where = preg_replace('/(^|[\s(])parent_' . $joinModule . '_' . $joinTable . '\.name/', '${1}' . $nameField, $where);
+                    $where = preg_replace('/(^|[\s(])parent_'.$joinModule.'_'.$joinTable.'\.name/', '${1}'.$nameField, $where);
                     $jtcount++;
                 }
             }
@@ -3379,10 +3379,10 @@ 
             if ($this->is_relate_field($field))
             {
                 $this->load_relationship($data['link']);
-                if(!empty($this->$data['link']))
+                if (!empty($this->$data['link']))
                 {
                     $params = array();
-                    if(empty($join_type))
+                    if (empty($join_type))
                     {
                         $params['join_type'] = ' LEFT JOIN ';
                     }
@@ -3390,22 +3390,22 @@ 
                     {
                         $params['join_type'] = $join_type;
                     }
-                    if(isset($data['join_name']))
+                    if (isset($data['join_name']))
                     {
                         $params['join_table_alias'] = $data['join_name'];
                     }
                     else
                     {
-                        $params['join_table_alias']	= 'jt' . $jtcount;
+                        $params['join_table_alias'] = 'jt'.$jtcount;
 
                     }
-                    if(isset($data['join_link_name']))
+                    if (isset($data['join_link_name']))
                     {
                         $params['join_table_link_alias'] = $data['join_link_name'];
                     }
                     else
                     {
-                        $params['join_table_link_alias'] = 'jtl' . $jtcount;
+                        $params['join_table_link_alias'] = 'jtl'.$jtcount;
                     }
                     $join_primary = !isset($data['join_primary']) || $data['join_primary'];
 
@@ -3418,126 +3418,126 @@ 
 					global $beanFiles, $beanList;
                     // °3/21/2014 FIX NS-TEAM - Relationship fields could not be displayed in subpanels
                     //if($data['rname'] && !empty($beanFiles[$beanList[$rel_module]])) {
-                    if(isset($data['rname']) && $data['rname'] == 'name' && !empty($beanFiles[$beanList[$rel_module]])) {
+                    if (isset($data['rname']) && $data['rname'] == 'name' && !empty($beanFiles[$beanList[$rel_module]])) {
 
 						//create an instance of the related bean
 						require_once($beanFiles[$beanList[$rel_module]]);
 						$rel_mod = new $beanList[$rel_module]();
 						//if bean has first and last name fields, then name should be concatenated
-						if(isset($rel_mod->field_name_map['first_name']) && isset($rel_mod->field_name_map['last_name'])){
+						if (isset($rel_mod->field_name_map['first_name']) && isset($rel_mod->field_name_map['last_name'])) {
 								$data['db_concat_fields'] = array(0=>'first_name', 1=>'last_name');
 						}
 					}
 
 
-    				if($join['type'] == 'many-to-many')
+    				if ($join['type'] == 'many-to-many')
     				{
-    					if(empty($ret_array['secondary_select']))
+    					if (empty($ret_array['secondary_select']))
     					{
     						$ret_array['secondary_select'] = " SELECT $this->table_name.id ref_id  ";
 
-                            if(!empty($beanFiles[$beanList[$rel_module]]) && $join_primary)
+                            if (!empty($beanFiles[$beanList[$rel_module]]) && $join_primary)
                             {
                                 require_once($beanFiles[$beanList[$rel_module]]);
                                 $rel_mod = new $beanList[$rel_module]();
-                                if(isset($rel_mod->field_defs['assigned_user_id']))
+                                if (isset($rel_mod->field_defs['assigned_user_id']))
                                 {
-                                    $ret_array['secondary_select'].= " , ".	$params['join_table_alias'] . ".assigned_user_id {$field}_owner, '$rel_module' {$field}_mod";
+                                    $ret_array['secondary_select'] .= " , ".$params['join_table_alias'].".assigned_user_id {$field}_owner, '$rel_module' {$field}_mod";
                                 }
                                 else
                                 {
-                                    if(isset($rel_mod->field_defs['created_by']))
+                                    if (isset($rel_mod->field_defs['created_by']))
                                     {
-                                        $ret_array['secondary_select'].= " , ".	$params['join_table_alias'] . ".created_by {$field}_owner , '$rel_module' {$field}_mod";
+                                        $ret_array['secondary_select'] .= " , ".$params['join_table_alias'].".created_by {$field}_owner , '$rel_module' {$field}_mod";
                                     }
                                 }
                             }
                         }
 
-                        if(isset($data['db_concat_fields']))
+                        if (isset($data['db_concat_fields']))
                         {
-                            $ret_array['secondary_select'] .= ' , ' . $this->db->concat($params['join_table_alias'], $data['db_concat_fields']) . ' ' . $field;
+                            $ret_array['secondary_select'] .= ' , '.$this->db->concat($params['join_table_alias'], $data['db_concat_fields']).' '.$field;
                         }
                         else
                         {
-                            if(!isset($data['relationship_fields']))
+                            if (!isset($data['relationship_fields']))
                             {
-                                $ret_array['secondary_select'] .= ' , ' . $params['join_table_alias'] . '.' . $data['rname'] . ' ' . $field;
+                                $ret_array['secondary_select'] .= ' , '.$params['join_table_alias'].'.'.$data['rname'].' '.$field;
                             }
                         }
-                        if(!$singleSelect)
+                        if (!$singleSelect)
                         {
                             $ret_array['select'] .= ", '                                                                                                                                                                                                                                                              ' $field ";
                         }
-                        $count_used =0;
-                        foreach($used_join_key as $used_key) {
-                            if($used_key == $join['rel_key']) $count_used++;
+                        $count_used = 0;
+                        foreach ($used_join_key as $used_key) {
+                            if ($used_key == $join['rel_key']) $count_used++;
                         }
-                        if($count_used <= 1) {//27416, the $ret_array['secondary_select'] should always generate, regardless the dbtype
+                        if ($count_used <= 1) {//27416, the $ret_array['secondary_select'] should always generate, regardless the dbtype
                             // add rel_key only if it was not aready added
-                            if(!$singleSelect)
+                            if (!$singleSelect)
                             {
-                                $ret_array['select'] .= ", '                                    '  " . $join['rel_key'] . ' ';
+                                $ret_array['select'] .= ", '                                    '  ".$join['rel_key'].' ';
                             }
-                            $ret_array['secondary_select'] .= ', ' . $params['join_table_link_alias'].'.'. $join['rel_key'] .' ' . $join['rel_key'];
+                            $ret_array['secondary_select'] .= ', '.$params['join_table_link_alias'].'.'.$join['rel_key'].' '.$join['rel_key'];
                         }
-                        if(isset($data['relationship_fields']))
+                        if (isset($data['relationship_fields']))
                         {
-                            foreach($data['relationship_fields'] as $r_name=>$alias_name)
+                            foreach ($data['relationship_fields'] as $r_name=>$alias_name)
                             {
-                                if(!empty( $secondarySelectedFields[$alias_name]))continue;
-                                $ret_array['secondary_select'] .= ', ' . $params['join_table_link_alias'].'.'. $r_name .' ' . $alias_name;
+                                if (!empty($secondarySelectedFields[$alias_name]))continue;
+                                $ret_array['secondary_select'] .= ', '.$params['join_table_link_alias'].'.'.$r_name.' '.$alias_name;
                                 $secondarySelectedFields[$alias_name] = true;
                             }
                         }
-                        if(!$table_joined)
+                        if (!$table_joined)
                         {
-                            $ret_array['secondary_from'] .= ' ' . $join['join']. ' AND ' . $params['join_table_alias'].'.deleted=0';
+                            $ret_array['secondary_from'] .= ' '.$join['join'].' AND '.$params['join_table_alias'].'.deleted=0';
                             if (isset($data['link_type']) && $data['link_type'] == 'relationship_info' && ($parentbean instanceOf SugarBean))
                             {
-                                $ret_array['secondary_where'] = $params['join_table_link_alias'] . '.' . $join['rel_key']. "='" .$parentbean->id . "'";
+                                $ret_array['secondary_where'] = $params['join_table_link_alias'].'.'.$join['rel_key']."='".$parentbean->id."'";
                             }
                         }
                     }
                     else
                     {
-                        if(isset($data['db_concat_fields']))
+                        if (isset($data['db_concat_fields']))
                         {
-                            $ret_array['select'] .= ' , ' . $this->db->concat($params['join_table_alias'], $data['db_concat_fields']) . ' ' . $field;
+                            $ret_array['select'] .= ' , '.$this->db->concat($params['join_table_alias'], $data['db_concat_fields']).' '.$field;
                         }
                         else
                         {
-                            $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.' . $data['rname'] . ' ' . $field;
+                            $ret_array['select'] .= ' , '.$params['join_table_alias'].'.'.$data['rname'].' '.$field;
                         }
-                        if(isset($data['additionalFields'])){
-                            foreach($data['additionalFields'] as $k=>$v){
+                        if (isset($data['additionalFields'])) {
+                            foreach ($data['additionalFields'] as $k=>$v) {
                                 if (!empty($data['id_name']) && $data['id_name'] == $v && !empty($fields[$data['id_name']])) {
                                     continue;
                                 }
-                                $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.' . $k . ' ' . $v;
+                                $ret_array['select'] .= ' , '.$params['join_table_alias'].'.'.$k.' '.$v;
                             }
                         }
-                        if(!$table_joined)
+                        if (!$table_joined)
                         {
-                            $ret_array['from'] .= ' ' . $join['join']. ' AND ' . $params['join_table_alias'].'.deleted=0';
-                            if(!empty($beanList[$rel_module]) && !empty($beanFiles[$beanList[$rel_module]]))
+                            $ret_array['from'] .= ' '.$join['join'].' AND '.$params['join_table_alias'].'.deleted=0';
+                            if (!empty($beanList[$rel_module]) && !empty($beanFiles[$beanList[$rel_module]]))
                             {
                                 require_once($beanFiles[$beanList[$rel_module]]);
                                 $rel_mod = new $beanList[$rel_module]();
-                                if(isset($value['target_record_key']) && !empty($filter))
+                                if (isset($value['target_record_key']) && !empty($filter))
                                 {
                                     $selectedFields[$this->table_name.'.'.$value['target_record_key']] = true;
                                     $ret_array['select'] .= " , $this->table_name.{$value['target_record_key']} ";
                                 }
-                                if(isset($rel_mod->field_defs['assigned_user_id']))
+                                if (isset($rel_mod->field_defs['assigned_user_id']))
                                 {
-                                    $ret_array['select'] .= ' , ' .$params['join_table_alias'] . '.assigned_user_id ' .  $field . '_owner';
+                                    $ret_array['select'] .= ' , '.$params['join_table_alias'].'.assigned_user_id '.$field.'_owner';
                                 }
                                 else
                                 {
-                                    $ret_array['select'] .= ' , ' .$params['join_table_alias'] . '.created_by ' .  $field . '_owner';
+                                    $ret_array['select'] .= ' , '.$params['join_table_alias'].'.created_by '.$field.'_owner';
                                 }
-                                $ret_array['select'] .= "  , '".$rel_module  ."' " .  $field . '_mod';
+                                $ret_array['select'] .= "  , '".$rel_module."' ".$field.'_mod';
 
                             }
                         }
@@ -3545,65 +3545,65 @@ 
                     // To fix SOAP stuff where we are trying to retrieve all the accounts data where accounts.id = ..
                     // and this code changes accounts to jt4 as there is a self join with the accounts table.
                     //Martin fix #27494
-                    if(isset($data['db_concat_fields'])){
+                    if (isset($data['db_concat_fields'])) {
                     	$buildWhere = false;
-                        if(in_array('first_name', $data['db_concat_fields']) && in_array('last_name', $data['db_concat_fields']))
+                        if (in_array('first_name', $data['db_concat_fields']) && in_array('last_name', $data['db_concat_fields']))
                     	{
                      	   $exp = '/\(\s*?'.$data['name'].'.*?\%\'\s*?\)/';
-                    	   if(preg_match($exp, $where, $matches))
+                    	   if (preg_match($exp, $where, $matches))
                     	   {
                     	   	  $search_expression = $matches[0];
                     	   	  //Create three search conditions - first + last, first, last
-                    	   	  $first_name_search = str_replace($data['name'], $params['join_table_alias'] . '.first_name', $search_expression);
-                    	   	  $last_name_search = str_replace($data['name'], $params['join_table_alias'] . '.last_name', $search_expression);
+                    	   	  $first_name_search = str_replace($data['name'], $params['join_table_alias'].'.first_name', $search_expression);
+                    	   	  $last_name_search = str_replace($data['name'], $params['join_table_alias'].'.last_name', $search_expression);
 							  $full_name_search = str_replace($data['name'], $this->db->concat($params['join_table_alias'], $data['db_concat_fields']), $search_expression);
 							  $buildWhere = true;
-							  $where = str_replace($search_expression, '(' . $full_name_search . ' OR ' . $first_name_search . ' OR ' . $last_name_search . ')', $where);
+							  $where = str_replace($search_expression, '('.$full_name_search.' OR '.$first_name_search.' OR '.$last_name_search.')', $where);
                     	   }
                     	}
 
-                    	if(!$buildWhere)
+                    	if (!$buildWhere)
                     	{
 	                       $db_field = $this->db->concat($params['join_table_alias'], $data['db_concat_fields']);
 	                       $where = preg_replace('/'.$data['name'].'/', $db_field, $where);
 
 				// For relationship fields replace their alias by the corresponsding link table and r_name
-				if(isset($data['relationship_fields']))
-					foreach($data['relationship_fields'] as $r_name=>$alias_name)
+				if (isset($data['relationship_fields']))
+					foreach ($data['relationship_fields'] as $r_name=>$alias_name)
 					{
 						$db_field = $this->db->concat($params['join_table_link_alias'], $r_name);
-						$where = preg_replace('/' . $alias_name . '/', $db_field, $where);
+						$where = preg_replace('/'.$alias_name.'/', $db_field, $where);
 					}
                     	}
-                    }else{
-                        $where = preg_replace('/(^|[\s(])' . $data['name'] . '/', '${1}' . $params['join_table_alias'] . '.'.$data['rname'], $where);
+                    } else {
+                        $where = preg_replace('/(^|[\s(])'.$data['name'].'/', '${1}'.$params['join_table_alias'].'.'.$data['rname'], $where);
 
 			// For relationship fields replace their alias by the corresponsding link table and r_name
-			if(isset($data['relationship_fields']))
-				foreach($data['relationship_fields'] as $r_name=>$alias_name)
-					$where = preg_replace('/(^|[\s(])' . $alias_name . '/', '${1}' . $params['join_table_link_alias'] . '.'.$r_name, $where);
+			if (isset($data['relationship_fields']))
+				foreach ($data['relationship_fields'] as $r_name=>$alias_name)
+					$where = preg_replace('/(^|[\s(])'.$alias_name.'/', '${1}'.$params['join_table_link_alias'].'.'.$r_name, $where);
                     }
-                    if(!$table_joined)
+                    if (!$table_joined)
                     {
-                        $joined_tables[$params['join_table_alias']]=1;
-                        $joined_tables[$params['join_table_link_alias']]=1;
+                        $joined_tables[$params['join_table_alias']] = 1;
+                        $joined_tables[$params['join_table_link_alias']] = 1;
                     }
 
                     $jtcount++;
                 }
             }
         }
-        if(!empty($filter))
+        if (!empty($filter))
         {
-            if(isset($this->field_defs['assigned_user_id']) && empty($selectedFields[$this->table_name.'.assigned_user_id']))
+            if (isset($this->field_defs['assigned_user_id']) && empty($selectedFields[$this->table_name.'.assigned_user_id']))
             {
                 $ret_array['select'] .= ", $this->table_name.assigned_user_id ";
             }
-            else if(isset($this->field_defs['created_by']) &&  empty($selectedFields[$this->table_name.'.created_by']))
+            else if (isset($this->field_defs['created_by']) && empty($selectedFields[$this->table_name.'.created_by']))
             {
                 $ret_array['select'] .= ", $this->table_name.created_by ";
             }
-            if(isset($this->field_defs['system_id']) && empty($selectedFields[$this->table_name.'.system_id']))
+            if (isset($this->field_defs['system_id']) && empty($selectedFields[$this->table_name.'.system_id']))
             {
                 $ret_array['select'] .= ", $this->table_name.system_id ";
             }
@@ -3611,21 +3611,21 @@ 
         }
 
 	if ($ifListForExport) {
-		if(isset($this->field_defs['email1'])) {
-			$ret_array['select'].= " ,email_addresses.email_address email1";
-			$ret_array['from'].= " LEFT JOIN email_addr_bean_rel on {$this->table_name}.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='{$this->module_dir}' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1 LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id ";
+		if (isset($this->field_defs['email1'])) {
+			$ret_array['select'] .= " ,email_addresses.email_address email1";
+			$ret_array['from'] .= " LEFT JOIN email_addr_bean_rel on {$this->table_name}.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='{$this->module_dir}' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1 LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id ";
 		}
 	}
 
         $where_auto = '1=1';
-        if($show_deleted == 0)
+        if ($show_deleted == 0)
         {
             $where_auto = "$this->table_name.deleted=0";
-        }else if($show_deleted == 1)
+        } else if ($show_deleted == 1)
         {
             $where_auto = "$this->table_name.deleted=1";
         }
-        if($where != "")
+        if ($where != "")
             $ret_array['where'] = " where ($where) AND $where_auto";
         else
             $ret_array['where'] = " where $where_auto";
@@ -3633,21 +3633,21 @@ 
         //make call to process the order by clause
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
-            $ret_array['order_by'] = " ORDER BY " . $order_by;
+            $ret_array['order_by'] = " ORDER BY ".$order_by;
         }
-        if($singleSelect)
+        if ($singleSelect)
         {
             unset($ret_array['secondary_where']);
             unset($ret_array['secondary_from']);
             unset($ret_array['secondary_select']);
         }
 
-        if($return_array)
+        if ($return_array)
         {
             return $ret_array;
         }
 
-        return  $ret_array['select'] . $ret_array['from'] . $ret_array['where']. $ret_array['order_by'];
+        return  $ret_array['select'].$ret_array['from'].$ret_array['where'].$ret_array['order_by'];
     }
 
 	// Check if field is defined through a relationship_info field, add this field when not present 
@@ -3656,7 +3656,7 @@ 
 		foreach ($this->field_defs as $field_def => $value)
 		{
 			if (isset($value['relationship_fields']) && 
-				in_array($field, $value['relationship_fields']) )
+				in_array($field, $value['relationship_fields']))
 				return $field_def;
 		}
 
@@ -3676,13 +3676,13 @@ 
         global $beanList, $beanFiles;
         $templates = array();
         $parent_child_map = array();
-        foreach($type_info as $children_info)
+        foreach ($type_info as $children_info)
         {
-            foreach($children_info as $child_info)
+            foreach ($children_info as $child_info)
             {
-                if($child_info['type'] == 'parent')
+                if ($child_info['type'] == 'parent')
                 {
-                    if(empty($templates[$child_info['parent_type']]))
+                    if (empty($templates[$child_info['parent_type']]))
                     {
                         //Test emails will have an invalid parent_type, don't try to load the non-existent parent bean
                         if ($child_info['parent_type'] == 'test') {
@@ -3690,7 +3690,7 @@ 
                         }
                         $class = $beanList[$child_info['parent_type']];
                         // Added to avoid error below; just silently fail and write message to log
-                        if ( empty($beanFiles[$class]) ) {
+                        if (empty($beanFiles[$class])) {
                             $GLOBALS['log']->error($this->object_name.'::retrieve_parent_fields() - cannot load class "'.$class.'", skip loading.');
                             continue;
                         }
@@ -3698,30 +3698,30 @@ 
                         $templates[$child_info['parent_type']] = new $class();
                     }
 
-                    if(empty($queries[$child_info['parent_type']]))
+                    if (empty($queries[$child_info['parent_type']]))
                     {
                         $queries[$child_info['parent_type']] = "SELECT id ";
                         $field_def = $templates[$child_info['parent_type']]->field_defs['name'];
-                        if(isset($field_def['db_concat_fields']))
+                        if (isset($field_def['db_concat_fields']))
                         {
-                            $queries[$child_info['parent_type']] .= ' , ' . $this->db->concat($templates[$child_info['parent_type']]->table_name, $field_def['db_concat_fields']) . ' parent_name';
+                            $queries[$child_info['parent_type']] .= ' , '.$this->db->concat($templates[$child_info['parent_type']]->table_name, $field_def['db_concat_fields']).' parent_name';
                         }
                         else
                         {
                             $queries[$child_info['parent_type']] .= ' , name parent_name';
                         }
-                        if(isset($templates[$child_info['parent_type']]->field_defs['assigned_user_id']))
+                        if (isset($templates[$child_info['parent_type']]->field_defs['assigned_user_id']))
                         {
-                            $queries[$child_info['parent_type']] .= ", assigned_user_id parent_name_owner , '{$child_info['parent_type']}' parent_name_mod";;
-                        }else if(isset($templates[$child_info['parent_type']]->field_defs['created_by']))
+                            $queries[$child_info['parent_type']] .= ", assigned_user_id parent_name_owner , '{$child_info['parent_type']}' parent_name_mod"; ;
+                        } else if (isset($templates[$child_info['parent_type']]->field_defs['created_by']))
                         {
                             $queries[$child_info['parent_type']] .= ", created_by parent_name_owner, '{$child_info['parent_type']}' parent_name_mod";
                         }
-                        $queries[$child_info['parent_type']] .= " FROM " . $templates[$child_info['parent_type']]->table_name ." WHERE id IN ('{$child_info['parent_id']}'";
+                        $queries[$child_info['parent_type']] .= " FROM ".$templates[$child_info['parent_type']]->table_name." WHERE id IN ('{$child_info['parent_id']}'";
                     }
                     else
                     {
-                        if(empty($parent_child_map[$child_info['parent_id']]))
+                        if (empty($parent_child_map[$child_info['parent_id']]))
                         $queries[$child_info['parent_type']] .= " ,'{$child_info['parent_id']}'";
                     }
                     $parent_child_map[$child_info['parent_id']][] = $child_info['child_id'];
@@ -3729,21 +3729,21 @@ 
             }
         }
         $results = array();
-        foreach($queries as $query)
+        foreach ($queries as $query)
         {
-            $result = $this->db->query($query . ')');
-            while($row = $this->db->fetchByAssoc($result))
+            $result = $this->db->query($query.')');
+            while ($row = $this->db->fetchByAssoc($result))
             {
                 $results[$row['id']] = $row;
             }
         }
 
         $child_results = array();
-        foreach($parent_child_map as $parent_key=>$parent_child)
+        foreach ($parent_child_map as $parent_key=>$parent_child)
         {
-            foreach($parent_child as $child)
+            foreach ($parent_child as $child)
             {
-                if(isset( $results[$parent_key]))
+                if (isset($results[$parent_key]))
                 {
                     $child_results[$child] = $results[$parent_key];
                 }
@@ -3763,7 +3763,7 @@ 
      * @param string $where Optional, additional filter criteria.
      * @return array Fetched data
      */
-    function process_list_query($query, $row_offset, $limit= -1, $max_per_page = -1, $where = '')
+    function process_list_query($query, $row_offset, $limit = -1, $max_per_page = -1, $where = '')
     {
         global $sugar_config;
         $db = DBManagerFactory::getInstance('listviews');
@@ -3772,33 +3772,33 @@ 
         */
         $toEnd = strval($row_offset) == 'end';
         $GLOBALS['log']->debug("process_list_query: ".$query);
-        if($max_per_page == -1)
+        if ($max_per_page == -1)
         {
-            $max_per_page 	= $sugar_config['list_max_entries_per_page'];
+            $max_per_page = $sugar_config['list_max_entries_per_page'];
         }
         // Check to see if we have a count query available.
-        if(empty($sugar_config['disable_count_query']) || $toEnd)
+        if (empty($sugar_config['disable_count_query']) || $toEnd)
         {
             $count_query = $this->create_list_count_query($query);
-            if(!empty($count_query) && (empty($limit) || $limit == -1))
+            if (!empty($count_query) && (empty($limit) || $limit == -1))
             {
                 // We have a count query.  Run it and get the results.
                 $result = $db->query($count_query, true, "Error running count query for $this->object_name List: ");
                 $assoc = $db->fetchByAssoc($result);
-                if(!empty($assoc['c']))
+                if (!empty($assoc['c']))
                 {
                     $rows_found = $assoc['c'];
                     $limit = $sugar_config['list_max_entries_per_page'];
                 }
-                if( $toEnd)
+                if ($toEnd)
                 {
-                    $row_offset = (floor(($rows_found -1) / $limit)) * $limit;
+                    $row_offset = (floor(($rows_found - 1) / $limit)) * $limit;
                 }
             }
         }
         else
         {
-            if((empty($limit) || $limit == -1))
+            if ((empty($limit) || $limit == -1))
             {
                 $limit = $max_per_page + 1;
                 $max_per_page = $limit;
@@ -3806,17 +3806,17 @@ 
 
         }
 
-        if(empty($row_offset))
+        if (empty($row_offset))
         {
             $row_offset = 0;
         }
-        if(!empty($limit) && $limit != -1 && $limit != -99)
+        if (!empty($limit) && $limit != -1 && $limit != -99)
         {
-            $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $this->object_name list: ");
+            $result = $db->limitQuery($query, $row_offset, $limit, true, "Error retrieving $this->object_name list: ");
         }
         else
         {
-            $result = $db->query($query,true,"Error retrieving $this->object_name list: ");
+            $result = $db->query($query, true, "Error retrieving $this->object_name list: ");
         }
 
         $list = Array();
@@ -3839,21 +3839,21 @@ 
                 /** @var SugarBean $temp */
                 $temp = new $class();
 
-                foreach($this->field_defs as $field=>$value)
+                foreach ($this->field_defs as $field=>$value)
                 {
                     if (isset($row[$field]))
                     {
                         $temp->$field = $row[$field];
-                        $owner_field = $field . '_owner';
-                        if(isset($row[$owner_field]))
+                        $owner_field = $field.'_owner';
+                        if (isset($row[$owner_field]))
                         {
                             $temp->$owner_field = $row[$owner_field];
                         }
 
                         $GLOBALS['log']->debug("$temp->object_name({$row['id']}): ".$field." = ".$temp->$field);
-                    }else if (isset($row[$this->table_name .'.'.$field]))
+                    } else if (isset($row[$this->table_name.'.'.$field]))
                     {
-                        $temp->$field = $row[$this->table_name .'.'.$field];
+                        $temp->$field = $row[$this->table_name.'.'.$field];
                     }
                     else
                     {
@@ -3863,7 +3863,7 @@ 
 
                 $temp->check_date_relationships_load();
                 $temp->fill_in_additional_list_fields();
-                if($temp->hasCustomFields()) $temp->custom_fields->fill_relationships();
+                if ($temp->hasCustomFields()) $temp->custom_fields->fill_relationships();
                 $temp->call_custom_logic("process_record");
 
                 // fix defect #44206. implement the same logic as sugar_currency_format
@@ -3873,17 +3873,17 @@ 
 
                 $index++;
             }
-        if(!empty($sugar_config['disable_count_query']) && !empty($limit))
+        if (!empty($sugar_config['disable_count_query']) && !empty($limit))
         {
 
             $rows_found = $row_offset + count($list);
 
-            if(!$toEnd)
+            if (!$toEnd)
             {
                 $next_offset--;
                 $previous_offset++;
             }
-        } else if(!isset($rows_found)){
+        } else if (!isset($rows_found)) {
             $rows_found = $row_offset + count($list);
         }
 
@@ -3892,7 +3892,7 @@ 
         $response['row_count'] = $rows_found;
         $response['next_offset'] = $next_offset;
         $response['previous_offset'] = $previous_offset;
-        $response['current_offset'] = $row_offset ;
+        $response['current_offset'] = $row_offset;
         return $response;
     }
 
@@ -3904,18 +3904,18 @@ 
      * @param boolean $is_count_query Optional, Default false, set to true if passed query is a count query.
      * @return int count of rows found
     */
-    function _get_num_rows_in_query($query, $is_count_query=false)
+    function _get_num_rows_in_query($query, $is_count_query = false)
     {
         $num_rows_in_query = 0;
         if (!$is_count_query)
         {
             $count_query = SugarBean::create_list_count_query($query);
         } else
-            $count_query=$query;
+            $count_query = $query;
 
         $result = $this->db->query($count_query, true, "Error running count query for $this->object_name List: ");
         $row_num = 0;
-        while($row = $this->db->fetchByAssoc($result, true))
+        while ($row = $this->db->fetchByAssoc($result, true))
         {
             $num_rows_in_query += current($row);
         }
@@ -3940,7 +3940,7 @@ 
      * @return array Fetched data.
      */
     function process_union_list_query($parent_bean, $query,
-    $row_offset, $limit= -1, $max_per_page = -1, $where = '', $subpanel_def, $query_row_count='', $secondary_queries = array())
+    $row_offset, $limit = -1, $max_per_page = -1, $where = '', $subpanel_def, $query_row_count = '', $secondary_queries = array())
 
     {
         $db = DBManagerFactory::getInstance('listviews');
@@ -3949,52 +3949,52 @@ 
         */
         $toEnd = strval($row_offset) == 'end';
         global $sugar_config;
-        $use_count_query=false;
-        $processing_collection=$subpanel_def->isCollection();
+        $use_count_query = false;
+        $processing_collection = $subpanel_def->isCollection();
 
         $GLOBALS['log']->debug("process_union_list_query: ".$query);
-        if($max_per_page == -1)
+        if ($max_per_page == -1)
         {
-            $max_per_page 	= $sugar_config['list_max_entries_per_subpanel'];
+            $max_per_page = $sugar_config['list_max_entries_per_subpanel'];
         }
-        if(empty($query_row_count))
+        if (empty($query_row_count))
         {
             $query_row_count = $query;
         }
-        $distinct_position=strpos($query_row_count,"DISTINCT");
+        $distinct_position = strpos($query_row_count, "DISTINCT");
 
-        if ($distinct_position!= false)
+        if ($distinct_position != false)
         {
-            $use_count_query=true;
+            $use_count_query = true;
         }
         $performSecondQuery = true;
-        if(empty($sugar_config['disable_count_query']) || $toEnd)
+        if (empty($sugar_config['disable_count_query']) || $toEnd)
         {
-            $rows_found = $this->_get_num_rows_in_query($query_row_count,$use_count_query);
-            if($rows_found < 1)
+            $rows_found = $this->_get_num_rows_in_query($query_row_count, $use_count_query);
+            if ($rows_found < 1)
             {
                 $performSecondQuery = false;
             }
-            if(!empty($rows_found) && (empty($limit) || $limit == -1))
+            if (!empty($rows_found) && (empty($limit) || $limit == -1))
             {
                 $limit = $sugar_config['list_max_entries_per_subpanel'];
             }
-            if( $toEnd)
+            if ($toEnd)
             {
-                $row_offset = (floor(($rows_found -1) / $limit)) * $limit;
+                $row_offset = (floor(($rows_found - 1) / $limit)) * $limit;
 
             }
         }
         else
         {
-            if((empty($limit) || $limit == -1))
+            if ((empty($limit) || $limit == -1))
             {
                 $limit = $max_per_page + 1;
                 $max_per_page = $limit;
             }
         }
 
-        if(empty($row_offset))
+        if (empty($row_offset))
         {
             $row_offset = 0;
         }
@@ -4002,15 +4002,15 @@ 
         $previous_offset = $row_offset - $max_per_page;
         $next_offset = $row_offset + $max_per_page;
 
-        if($performSecondQuery)
+        if ($performSecondQuery)
         {
-            if(!empty($limit) && $limit != -1 && $limit != -99)
+            if (!empty($limit) && $limit != -1 && $limit != -99)
             {
-                $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $parent_bean->object_name list: ");
+                $result = $db->limitQuery($query, $row_offset, $limit, true, "Error retrieving $parent_bean->object_name list: ");
             }
             else
             {
-                $result = $db->query($query,true,"Error retrieving $this->object_name list: ");
+                $result = $db->query($query, true, "Error retrieving $this->object_name list: ");
             }
                 //use -99 to return all
 
@@ -4020,22 +4020,22 @@ 
 
                 $post_retrieve = array();
                 $isFirstTime = true;
-                while($row)
+                while ($row)
                 {
                     $function_fields = array();
-                    if(($index < $row_offset + $max_per_page || $max_per_page == -99))
+                    if (($index < $row_offset + $max_per_page || $max_per_page == -99))
                     {
                         if ($processing_collection)
                         {
-                            $current_bean =$subpanel_def->sub_subpanels[$row['panel_name']]->template_instance;
-                            if(!$isFirstTime)
+                            $current_bean = $subpanel_def->sub_subpanels[$row['panel_name']]->template_instance;
+                            if (!$isFirstTime)
                             {
                                 $class = get_class($subpanel_def->sub_subpanels[$row['panel_name']]->template_instance);
                                 $current_bean = new $class();
                             }
                         } else {
-                            $current_bean=$subpanel_def->template_instance;
-                            if(!$isFirstTime)
+                            $current_bean = $subpanel_def->template_instance;
+                            if (!$isFirstTime)
                             {
                                 $class = get_class($subpanel_def->template_instance);
                                 $current_bean = new $class();
@@ -4045,9 +4045,9 @@ 
                         //set the panel name in the bean instance.
                         if (isset($row['panel_name']))
                         {
-                            $current_bean->panel_name=$row['panel_name'];
+                            $current_bean->panel_name = $row['panel_name'];
                         }
-                        foreach($current_bean->field_defs as $field=>$value)
+                        foreach ($current_bean->field_defs as $field=>$value)
                         {
 
                             if (isset($row[$field]))
@@ -4055,60 +4055,60 @@ 
                                 $current_bean->$field = $this->convertField($row[$field], $value);
                                 unset($row[$field]);
                             }
-                            else if (isset($row[$this->table_name .'.'.$field]))
+                            else if (isset($row[$this->table_name.'.'.$field]))
                             {
-                                $current_bean->$field = $this->convertField($row[$this->table_name .'.'.$field], $value);
-                                unset($row[$this->table_name .'.'.$field]);
+                                $current_bean->$field = $this->convertField($row[$this->table_name.'.'.$field], $value);
+                                unset($row[$this->table_name.'.'.$field]);
                             }
                             else
                             {
                                 $current_bean->$field = "";
                                 unset($row[$field]);
                             }
-                            if(isset($value['source']) && $value['source'] == 'function')
+                            if (isset($value['source']) && $value['source'] == 'function')
                             {
-                                $function_fields[]=$field;
+                                $function_fields[] = $field;
                             }
                         }
-                        foreach($row as $key=>$value)
+                        foreach ($row as $key=>$value)
                         {
                             $current_bean->$key = $value;
                         }
-                        foreach($function_fields as $function_field)
+                        foreach ($function_fields as $function_field)
                         {
                             $value = $current_bean->field_defs[$function_field];
                             $can_execute = true;
                             $execute_params = array();
                             $execute_function = array();
-                            if(!empty($value['function_class']))
+                            if (!empty($value['function_class']))
                             {
-                                $execute_function[] = 	$value['function_class'];
-                                $execute_function[] = 	$value['function_name'];
+                                $execute_function[] = $value['function_class'];
+                                $execute_function[] = $value['function_name'];
                             }
                             else
                             {
-                                $execute_function	= $value['function_name'];
+                                $execute_function = $value['function_name'];
                             }
-                            foreach($value['function_params'] as $param )
+                            foreach ($value['function_params'] as $param)
                             {
-                                if (empty($value['function_params_source']) or $value['function_params_source']=='parent')
+                                if (empty($value['function_params_source']) or $value['function_params_source'] == 'parent')
                                 {
-                                    if(empty($this->$param))
+                                    if (empty($this->$param))
                                     {
                                         $can_execute = false;
-                                    } else if($param == '$this') {
+                                    } else if ($param == '$this') {
                                         $execute_params[] = $this;
                                     }
                                     else
                                     {
                                         $execute_params[] = $this->$param;
                                     }
-                                } else if ($value['function_params_source']=='this')
+                                } else if ($value['function_params_source'] == 'this')
                                 {
-                                    if(empty($current_bean->$param))
+                                    if (empty($current_bean->$param))
                                     {
                                         $can_execute = false;
-                                    } else if($param == '$this') {
+                                    } else if ($param == '$this') {
                                         $execute_params[] = $current_bean;
                                     }
                                     else
@@ -4122,18 +4122,18 @@ 
                                 }
 
                             }
-                            if($can_execute)
+                            if ($can_execute)
                             {
-                                if(!empty($value['function_require']))
+                                if (!empty($value['function_require']))
                                 {
                                     require_once($value['function_require']);
                                 }
                                 $current_bean->$function_field = call_user_func_array($execute_function, $execute_params);
                             }
                         }
-                        if(!empty($current_bean->parent_type) && !empty($current_bean->parent_id))
+                        if (!empty($current_bean->parent_type) && !empty($current_bean->parent_id))
                         {
-                            if(!isset($post_retrieve[$current_bean->parent_type]))
+                            if (!isset($post_retrieve[$current_bean->parent_type]))
                             {
                                 $post_retrieve[$current_bean->parent_type] = array();
                             }
@@ -4147,22 +4147,22 @@ 
                     $row = $db->fetchByAssoc($result);
                 }
             //now handle retrieving many-to-many relationships
-            if(!empty($list))
+            if (!empty($list))
             {
-                foreach($secondary_queries as $query2)
+                foreach ($secondary_queries as $query2)
                 {
                     $result2 = $db->query($query2);
 
                     $row2 = $db->fetchByAssoc($result2);
-                    while($row2)
+                    while ($row2)
                     {
                         $id_ref = $row2['ref_id'];
 
-                        if(isset($list[$id_ref]))
+                        if (isset($list[$id_ref]))
                         {
-                            foreach($row2 as $r2key=>$r2value)
+                            foreach ($row2 as $r2key=>$r2value)
                             {
-                                if($r2key != 'ref_id')
+                                if ($r2key != 'ref_id')
                                 {
                                     $list[$id_ref]->$r2key = $r2value;
                                 }
@@ -4174,7 +4174,7 @@ 
 
             }
 
-            if(isset($post_retrieve))
+            if (isset($post_retrieve))
             {
                 $parent_fields = $this->retrieve_parent_fields($post_retrieve);
             }
@@ -4182,16 +4182,16 @@ 
             {
                 $parent_fields = array();
             }
-            if(!empty($sugar_config['disable_count_query']) && !empty($limit))
+            if (!empty($sugar_config['disable_count_query']) && !empty($limit))
             {
             	//C.L. Bug 43535 - Use the $index value to set the $rows_found value here
                 $rows_found = isset($index) ? $index : $row_offset + count($list);
 
-                if(count($list) >= $limit)
+                if (count($list) >= $limit)
                 {
                     array_pop($list);
                 }
-                if(!$toEnd)
+                if (!$toEnd)
                 {
                     $next_offset--;
                     $previous_offset++;
@@ -4200,7 +4200,7 @@ 
         }
         else
         {
-            $row_found 	= 0;
+            $row_found = 0;
             $parent_fields = array();
         }
         $response = array();
@@ -4209,7 +4209,7 @@ 
         $response['row_count'] = $rows_found;
         $response['next_offset'] = $next_offset;
         $response['previous_offset'] = $previous_offset;
-        $response['current_offset'] = $row_offset ;
+        $response['current_offset'] = $row_offset;
         $response['query'] = $query;
 
         return $response;
@@ -4229,35 +4229,35 @@ 
      * @return array Fetched data.
      *
      */
-    function process_detail_query($query, $row_offset, $limit= -1, $max_per_page = -1, $where = '', $offset = 0)
+    function process_detail_query($query, $row_offset, $limit = -1, $max_per_page = -1, $where = '', $offset = 0)
     {
         global $sugar_config;
         $GLOBALS['log']->debug("process_detail_query: ".$query);
-        if($max_per_page == -1)
+        if ($max_per_page == -1)
         {
-            $max_per_page 	= $sugar_config['list_max_entries_per_page'];
+            $max_per_page = $sugar_config['list_max_entries_per_page'];
         }
 
         // Check to see if we have a count query available.
         $count_query = $this->create_list_count_query($query);
 
-        if(!empty($count_query) && (empty($limit) || $limit == -1))
+        if (!empty($count_query) && (empty($limit) || $limit == -1))
         {
             // We have a count query.  Run it and get the results.
             $result = $this->db->query($count_query, true, "Error running count query for $this->object_name List: ");
             $assoc = $this->db->fetchByAssoc($result);
-            if(!empty($assoc['c']))
+            if (!empty($assoc['c']))
             {
                 $total_rows = $assoc['c'];
             }
         }
 
-        if(empty($row_offset))
+        if (empty($row_offset))
         {
             $row_offset = 0;
         }
 
-        $result = $this->db->limitQuery($query, $offset, 1, true,"Error retrieving $this->object_name list: ");
+        $result = $this->db->limitQuery($query, $offset, 1, true, "Error retrieving $this->object_name list: ");
 
         $previous_offset = $row_offset - $max_per_page;
         $next_offset = $row_offset + $max_per_page;
@@ -4268,7 +4268,7 @@ 
         $response = Array();
         $response['bean'] = $this;
         if (empty($total_rows))
-            $total_rows=0;
+            $total_rows = 0;
         $response['row_count'] = $total_rows;
         $response['next_offset'] = $next_offset;
         $response['previous_offset'] = $previous_offset;
@@ -4285,12 +4285,12 @@ 
      * @return array Fetched data.
      *
      */
-    function process_full_list_query($query, $check_date=false)
+    function process_full_list_query($query, $check_date = false)
     {
 
         $GLOBALS['log']->debug("process_full_list_query: query is ".$query);
         $result = $this->db->query($query, false);
-        $GLOBALS['log']->debug("process_full_list_query: result is ".print_r($result,true));
+        $GLOBALS['log']->debug("process_full_list_query: result is ".print_r($result, true));
         $class = get_class($this);
         $isFirstTime = true;
         $bean = new $class();
@@ -4299,13 +4299,13 @@ 
         while (($row = $bean->db->fetchByAssoc($result)) != null)
         {
             $row = $this->convertRow($row);
-            if(!$isFirstTime)
+            if (!$isFirstTime)
             {
                 $bean = new $class();
             }
             $isFirstTime = false;
 
-            foreach($bean->field_defs as $field=>$value)
+            foreach ($bean->field_defs as $field=>$value)
             {
                 if (isset($row[$field]))
                 {
@@ -4317,7 +4317,7 @@ 
                     $bean->$field = '';
                 }
             }
-            if($check_date)
+            if ($check_date)
             {
                 $bean->processed_dates_times = array();
                 $bean->check_date_relationships_load();
@@ -4342,10 +4342,10 @@ 
     * @param string $current_module - String value of the module being processed.
     * @param string $current_view - String value of the current view
 	*/
-	function track_view($user_id, $current_module, $current_view='')
+	function track_view($user_id, $current_module, $current_view = '')
 	{
 	    $trackerManager = TrackerManager::getInstance();
-		if($monitor = $trackerManager->getMonitor('tracker')){
+		if ($monitor = $trackerManager->getMonitor('tracker')) {
 	        $monitor->setValue('date_modified', $GLOBALS['timedate']->nowDb());
 	        $monitor->setValue('user_id', $user_id);
 	        $monitor->setValue('module_name', $current_module);
@@ -4374,8 +4374,8 @@ 
     * account for instance.  This method is only used for populating extra fields
     * in lists.
     */
-    function fill_in_additional_list_fields(){
-        if(!empty($this->field_defs['parent_name']) && empty($this->parent_name)){
+    function fill_in_additional_list_fields() {
+        if (!empty($this->field_defs['parent_name']) && empty($this->parent_name)) {
             $this->fill_in_additional_parent_fields();
         }
     }
@@ -4389,17 +4389,17 @@ 
     */
     function fill_in_additional_detail_fields()
     {
-        if(!empty($this->field_defs['assigned_user_name']) && !empty($this->assigned_user_id)){
+        if (!empty($this->field_defs['assigned_user_name']) && !empty($this->assigned_user_id)) {
 
             $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
 
         }
-		if(!empty($this->field_defs['created_by']) && !empty($this->created_by))
+		if (!empty($this->field_defs['created_by']) && !empty($this->created_by))
 		$this->created_by_name = get_assigned_user_name($this->created_by);
-		if(!empty($this->field_defs['modified_user_id']) && !empty($this->modified_user_id))
+		if (!empty($this->field_defs['modified_user_id']) && !empty($this->modified_user_id))
 		$this->modified_by_name = get_assigned_user_name($this->modified_user_id);
 
-		if(!empty($this->field_defs['parent_name'])){
+		if (!empty($this->field_defs['parent_name'])) {
 			$this->fill_in_additional_parent_fields();
 		}
     }
@@ -4410,17 +4410,17 @@ 
     */
     function fill_in_additional_parent_fields() {
 
-        if(!empty($this->parent_id) && !empty($this->last_parent_id) && $this->last_parent_id == $this->parent_id){
+        if (!empty($this->parent_id) && !empty($this->last_parent_id) && $this->last_parent_id == $this->parent_id) {
             return false;
-        }else{
+        } else {
             $this->parent_name = '';
         }
-        if(!empty($this->parent_type)) {
+        if (!empty($this->parent_type)) {
             $this->last_parent_id = $this->parent_id;
             $this->getRelatedFields($this->parent_type, $this->parent_id, array('name'=>'parent_name', 'document_name' => 'parent_document_name', 'first_name'=>'parent_first_name', 'last_name'=>'parent_last_name'));
-            if(!empty($this->parent_first_name) || !empty($this->parent_last_name) ){
+            if (!empty($this->parent_first_name) || !empty($this->parent_last_name)) {
                 $this->parent_name = $GLOBALS['locale']->getLocaleFormattedName($this->parent_first_name, $this->parent_last_name);
-            } else if(!empty($this->parent_document_name)){
+            } else if (!empty($this->parent_document_name)) {
                 $this->parent_name = $this->parent_document_name;
             }
         }
@@ -4430,7 +4430,7 @@ 
      * Fill in a link field
      */
 
-    function fill_in_link_field( $linkFieldName , $def)
+    function fill_in_link_field($linkFieldName, $def)
     {
         $idField = $linkFieldName;
         //If the id_name provided really was an ID, don't try to load it as a link. Use the normal link
@@ -4440,8 +4440,8 @@ 
         }
         if ($this->load_relationship($linkFieldName))
         {
-            $list=$this->$linkFieldName->get();
-            $this->$idField = '' ; // match up with null value in $this->populateFromRow()
+            $list = $this->$linkFieldName->get();
+            $this->$idField = ''; // match up with null value in $this->populateFromRow()
             if (!empty($list))
                 $this->$idField = $list[0];
         }
@@ -4450,22 +4450,22 @@ 
     /**
     * Fill in fields where type = relate
     */
-    function fill_in_relationship_fields(){
+    function fill_in_relationship_fields() {
         global $fill_in_rel_depth;
-        if(empty($fill_in_rel_depth) || $fill_in_rel_depth < 0)
+        if (empty($fill_in_rel_depth) || $fill_in_rel_depth < 0)
             $fill_in_rel_depth = 0;
 
-        if($fill_in_rel_depth > 1)
+        if ($fill_in_rel_depth > 1)
             return;
 
         $fill_in_rel_depth++;
 
-        foreach($this->field_defs as $field)
+        foreach ($this->field_defs as $field)
         {
-            if(0 == strcmp($field['type'],'relate') && !empty($field['module']))
+            if (0 == strcmp($field['type'], 'relate') && !empty($field['module']))
             {
                 $name = $field['name'];
-                if(empty($this->$name))
+                if (empty($this->$name))
                 {
                     // set the value of this relate field in this bean ($this->$field['name']) to the value of the 'name' field in the related module for the record identified by the value of $this->$field['id_name']
                     $related_module = $field['module'];
@@ -4475,11 +4475,11 @@ 
                     {
                        $this->fill_in_link_field($id_name, $field);
                     }
-                    if(!empty($this->$id_name) && ( $this->object_name != $related_module || ( $this->object_name == $related_module && $this->$id_name != $this->id ))){
-                        if(isset($GLOBALS['beanList'][ $related_module])){
+                    if (!empty($this->$id_name) && ($this->object_name != $related_module || ($this->object_name == $related_module && $this->$id_name != $this->id))) {
+                        if (isset($GLOBALS['beanList'][$related_module])) {
                             $class = $GLOBALS['beanList'][$related_module];
 
-                            if(!empty($this->$id_name) && file_exists($GLOBALS['beanFiles'][$class]) && isset($this->$name)){
+                            if (!empty($this->$id_name) && file_exists($GLOBALS['beanFiles'][$class]) && isset($this->$name)) {
                                 require_once($GLOBALS['beanFiles'][$class]);
                                 $mod = new $class();
 
@@ -4496,17 +4496,17 @@ 
                             }
                         }
                     }
-                    if(!empty($this->$id_name) && isset($this->$name))
+                    if (!empty($this->$id_name) && isset($this->$name))
                     {
-                        if(!isset($field['additionalFields']))
+                        if (!isset($field['additionalFields']))
                            $field['additionalFields'] = array();
-                        if(!empty($field['rname']))
+                        if (!empty($field['rname']))
                         {
-                            $field['additionalFields'][$field['rname']]= $name;
+                            $field['additionalFields'][$field['rname']] = $name;
                         }
                         else
                         {
-                            $field['additionalFields']['name']= $name;
+                            $field['additionalFields']['name'] = $name;
                         }
                         $this->getRelatedFields($related_module, $this->$id_name, $field['additionalFields']);
                     }
@@ -4536,7 +4536,7 @@ 
 		global $current_user;
 		$date_modified = $GLOBALS['timedate']->nowDb();
         $id = $this->db->quote($id);
-		if(isset($_SESSION['show_deleted']))
+		if (isset($_SESSION['show_deleted']))
 		{
 			$this->mark_undeleted($id);
 		}
@@ -4547,7 +4547,7 @@ 
 			$this->call_custom_logic("before_delete", $custom_logic_arguments);
             $this->deleted = 1;
             $this->mark_relationships_deleted($id);
-            if ( isset($this->field_defs['modified_user_id']) ) {
+            if (isset($this->field_defs['modified_user_id'])) {
                 if (!empty($current_user)) {
                     $this->modified_user_id = $current_user->id;
                 } else {
@@ -4557,7 +4557,7 @@ 
             } else {
                 $query = "UPDATE $this->table_name set deleted=1 , date_modified = '$date_modified' where id='$id'";
             }
-            $this->db->query($query, true,"Error marking record deleted: ");
+            $this->db->query($query, true, "Error marking record deleted: ");
 
             SugarRelationship::resaveRelatedBeans();
 
@@ -4585,8 +4585,8 @@ 
         $this->call_custom_logic("before_restore", $custom_logic_arguments);
 
 		$date_modified = $GLOBALS['timedate']->nowDb();
-		$query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='" . $this->db->quote($id) ."'";
-		$this->db->query($query, true,"Error marking record undeleted: ");
+		$query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='".$this->db->quote($id)."'";
+		$this->db->query($query, true, "Error marking record undeleted: ");
 
         $this->restoreFiles();
 
@@ -4639,19 +4639,19 @@ 
 
         $directory = $this->deleteFileDirectory();
 
-        $isCreated = sugar_is_dir('upload://deleted/' . $directory);
+        $isCreated = sugar_is_dir('upload://deleted/'.$directory);
         if (!$isCreated) {
-            sugar_mkdir('upload://deleted/' . $directory, 0777, true);
-            $isCreated = sugar_is_dir('upload://deleted/' . $directory);
+            sugar_mkdir('upload://deleted/'.$directory, 0777, true);
+            $isCreated = sugar_is_dir('upload://deleted/'.$directory);
         }
         if (!$isCreated) {
             return false;
         }
 
         foreach ($files as $file) {
-            if (file_exists('upload://' . $file)) {
-                if (!sugar_rename('upload://' . $file, 'upload://deleted/' . $directory . '/' . $file)) {
-                    $GLOBALS['log']->error('Could not move file ' . $file . ' to deleted directory');
+            if (file_exists('upload://'.$file)) {
+                if (!sugar_rename('upload://'.$file, 'upload://deleted/'.$directory.'/'.$file)) {
+                    $GLOBALS['log']->error('Could not move file '.$file.' to deleted directory');
                 }
             }
         }
@@ -4671,7 +4671,7 @@ 
         }
         if (empty($record['id'])) {
             $record['id'] = $db->quoted(create_guid());
-            $db->query('INSERT INTO cron_remove_documents (' . implode(', ', array_keys($record)) . ') VALUES(' . implode(', ', $record) . ')');
+            $db->query('INSERT INTO cron_remove_documents ('.implode(', ', array_keys($record)).') VALUES('.implode(', ', $record).')');
         } else {
             $db->query("UPDATE cron_remove_documents SET date_modified={$record['date_modified']} WHERE id={$record['id']}");
         }
@@ -4700,9 +4700,9 @@ 
         $directory = $this->deleteFileDirectory();
 
         foreach ($files as $file) {
-            if (sugar_is_file('upload://deleted/' . $directory . '/' . $file)) {
-                if (!sugar_rename('upload://deleted/' . $directory . '/' . $file, 'upload://' . $file)) {
-                    $GLOBALS['log']->error('Could not move file ' . $directory . '/' . $file . ' from deleted directory');
+            if (sugar_is_file('upload://deleted/'.$directory.'/'.$file)) {
+                if (!sugar_rename('upload://deleted/'.$directory.'/'.$file, 'upload://'.$file)) {
+                    $GLOBALS['log']->error('Could not move file '.$directory.'/'.$file.' from deleted directory');
                 }
             }
         }
@@ -4711,7 +4711,7 @@ 
          * @var DBManager $db
          */
         global $db;
-        $db->query('DELETE FROM cron_remove_documents WHERE bean_id=' . $db->quoted($this->id));
+        $db->query('DELETE FROM cron_remove_documents WHERE bean_id='.$db->quoted($this->id));
 
         return true;
     }
@@ -4799,9 +4799,9 @@ 
         $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
         $db = DBManagerFactory::getInstance('listviews');
 
-        if(!empty($row_offset) && $row_offset != 0 && !empty($limit) && $limit != -1)
+        if (!empty($row_offset) && $row_offset != 0 && !empty($limit) && $limit != -1)
         {
-            $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $template->object_name list: ");
+            $result = $db->limitQuery($query, $row_offset, $limit, true, "Error retrieving $template->object_name list: ");
         }
         else
         {
@@ -4811,16 +4811,16 @@ 
         $list = Array();
         $isFirstTime = true;
         $class = get_class($template);
-        while($row = $this->db->fetchByAssoc($result))
+        while ($row = $this->db->fetchByAssoc($result))
         {
-            if(!$isFirstTime)
+            if (!$isFirstTime)
             {
                 $template = new $class();
             }
             $isFirstTime = false;
             $record = $template->retrieve($row['id']);
 
-            if($record != null)
+            if ($record != null)
             {
                 // this copies the object into the array
                 $list[] = $template;
@@ -4838,12 +4838,12 @@ 
     * @param string $query - the query that should be executed to build the list
     * @param object $template - The object that should be used to copy the records.
     */
-  function build_related_list_where($query, &$template, $where='', $in='', $order_by, $limit='', $row_offset = 0)
+  function build_related_list_where($query, &$template, $where = '', $in = '', $order_by, $limit = '', $row_offset = 0)
   {
     $db = DBManagerFactory::getInstance('listviews');
     // No need to do an additional query
     $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
-    if(empty($in) && !empty($query))
+    if (empty($in) && !empty($query))
     {
         $idList = $this->build_related_in($query);
         $in = $idList['in'];
@@ -4859,19 +4859,19 @@ 
     $query .= $custom_join['join'];
 
     $query .= " WHERE deleted=0 AND id IN $in";
-    if(!empty($where))
+    if (!empty($where))
     {
         $query .= " AND $where";
     }
 
 
-    if(!empty($order_by))
+    if (!empty($order_by))
     {
         $query .= "ORDER BY $order_by";
     }
     if (!empty($limit))
     {
-        $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $this->object_name list: ");
+        $result = $db->limitQuery($query, $row_offset, $limit, true, "Error retrieving $this->object_name list: ");
     }
     else
     {
@@ -4883,16 +4883,16 @@ 
     $class = get_class($template);
 
     $disable_security_flag = ($template->disable_row_level_security) ? true : false;
-    while($row = $db->fetchByAssoc($result))
+    while ($row = $db->fetchByAssoc($result))
     {
-        if(!$isFirstTime)
+        if (!$isFirstTime)
         {
             $template = new $class();
             $template->disable_row_level_security = $disable_security_flag;
         }
         $isFirstTime = false;
         $record = $template->retrieve($row['id']);
-        if($record != null)
+        if ($record != null)
         {
             // this copies the object into the array
             $list[] = $template;
@@ -4913,22 +4913,22 @@ 
         $idList = array();
         $result = $this->db->query($query, true);
         $ids = '';
-        while($row = $this->db->fetchByAssoc($result))
+        while ($row = $this->db->fetchByAssoc($result))
         {
             $idList[] = $row['id'];
-            if(empty($ids))
+            if (empty($ids))
             {
-                $ids = "('" . $row['id'] . "'";
+                $ids = "('".$row['id']."'";
             }
             else
             {
-                $ids .= ",'" . $row['id'] . "'";
+                $ids .= ",'".$row['id']."'";
             }
         }
-        if(empty($ids))
+        if (empty($ids))
         {
             $ids = "('')";
-        }else{
+        } else {
             $ids .= ')';
         }
 
@@ -4954,16 +4954,16 @@ 
         $list = Array();
         $isFirstTime = true;
         $class = get_class($template);
-        while($row = $this->db->fetchByAssoc($result))
+        while ($row = $this->db->fetchByAssoc($result))
         {
             // Create a blank copy
             $copy = $template;
-            if(!$isFirstTime)
+            if (!$isFirstTime)
             {
                 $copy = new $class();
             }
             $isFirstTime = false;
-            foreach($field_list as $field)
+            foreach ($field_list as $field)
             {
                 // Copy the relevant fields
                 $copy->$field = $row[$field];
@@ -4995,14 +4995,14 @@ 
 
         $return_array = Array();
         global $app_list_strings, $mod_strings;
-        foreach($this->field_defs as $field=>$value){
+        foreach ($this->field_defs as $field=>$value) {
 
-            if(isset($this->$field)){
+            if (isset($this->$field)) {
 
                 // cn: bug 12270 - sensitive fields being passed arbitrarily in listViews
-                if(isset($sensitiveFields[$field]))
+                if (isset($sensitiveFields[$field]))
                     continue;
-                if(!isset($cache[$field]))
+                if (!isset($cache[$field]))
                     $cache[$field] = strtoupper($field);
 
                 //Fields hidden by Dependent Fields
@@ -5012,30 +5012,30 @@ 
                 }
                 //cn: if $field is a _dom, detect and return VALUE not KEY
                 //cl: empty function check for meta-data enum types that have values loaded from a function
-                else if (((!empty($value['type']) && ($value['type'] == 'enum' || $value['type'] == 'radioenum') ))  && empty($value['function'])){
-                    if(!empty($value['options']) && !empty($app_list_strings[$value['options']][$this->$field])){
+                else if (((!empty($value['type']) && ($value['type'] == 'enum' || $value['type'] == 'radioenum'))) && empty($value['function'])) {
+                    if (!empty($value['options']) && !empty($app_list_strings[$value['options']][$this->$field])) {
                         $return_array[$cache[$field]] = $app_list_strings[$value['options']][$this->$field];
                     }
                     //nsingh- bug 21672. some modules such as manufacturers, Releases do not have a listing for select fields in the $app_list_strings. Must also check $mod_strings to localize.
-                    elseif(!empty($value['options']) && !empty($mod_strings[$value['options']][$this->$field]))
+                    elseif (!empty($value['options']) && !empty($mod_strings[$value['options']][$this->$field]))
                     {
                         $return_array[$cache[$field]] = $mod_strings[$value['options']][$this->$field];
                     }
-                    else{
+                    else {
                         $return_array[$cache[$field]] = $this->$field;
                     }
                     //end bug 21672
 // tjy: no need to do this str_replace as the changes in 29994 for ListViewGeneric.tpl for translation handle this now
 //				}elseif(!empty($value['type']) && $value['type'] == 'multienum'&& empty($value['function'])){
 //					$return_array[strtoupper($field)] = str_replace('^,^', ', ', $this->$field );
-                }elseif(!empty($value['custom_module']) && $value['type'] != 'currency'){
+                }elseif (!empty($value['custom_module']) && $value['type'] != 'currency') {
 //					$this->format_field($value);
                     $return_array[$cache[$field]] = $this->$field;
-                }else{
+                } else {
                     $return_array[$cache[$field]] = $this->$field;
                 }
                 // handle "Assigned User Name"
-                if($field == 'assigned_user_name'){
+                if ($field == 'assigned_user_name') {
                     $return_array['ASSIGNED_USER_NAME'] = get_assigned_user_name($this->assigned_user_id);
                 }
             }
@@ -5057,7 +5057,7 @@ 
      * @param boolean $deleted Optional, default true, if set to false deleted filter will not be added.
      * @return string The WHERE clause
      */
-    function get_where($fields_array, $deleted=true)
+    function get_where($fields_array, $deleted = true)
     {
         $where_clause = "";
         foreach ($fields_array as $name=>$value)
@@ -5067,10 +5067,10 @@ 
             }
             $name = $this->db->getValidDBName($name);
 
-            $where_clause .= "$name = ".$this->db->quoted($value,false);
+            $where_clause .= "$name = ".$this->db->quoted($value, false);
         }
-        if(!empty($where_clause)) {
-            if($deleted) {
+        if (!empty($where_clause)) {
+            if ($deleted) {
                 return "WHERE $where_clause AND deleted=0";
             } else {
                 return "WHERE $where_clause";
@@ -5090,24 +5090,24 @@ 
      * @param boolean $deleted Optional, default true, if set to false deleted filter will not be added.
      * @return object Instance of this bean with fetched data.
      */
-    function retrieve_by_string_fields($fields_array, $encode=true, $deleted=true)
+    function retrieve_by_string_fields($fields_array, $encode = true, $deleted = true)
     {
         $where_clause = $this->get_where($fields_array, $deleted);
         $custom_join = $this->getCustomJoin();
-        $query = "SELECT $this->table_name.*". $custom_join['select']. " FROM $this->table_name " . $custom_join['join'];
+        $query = "SELECT $this->table_name.*".$custom_join['select']." FROM $this->table_name ".$custom_join['join'];
         $query .= " $where_clause";
         $GLOBALS['log']->debug("Retrieve $this->object_name: ".$query);
         //requireSingleResult has been deprecated.
         //$result = $this->db->requireSingleResult($query, true, "Retrieving record $where_clause:");
-        $result = $this->db->limitQuery($query,0,1,true, "Retrieving record $where_clause:");
+        $result = $this->db->limitQuery($query, 0, 1, true, "Retrieving record $where_clause:");
 
 
-        if( empty($result))
+        if (empty($result))
         {
             return null;
         }
         $row = $this->db->fetchByAssoc($result, $encode);
-        if(empty($row))
+        if (empty($row))
         {
             return null;
         }
@@ -5134,7 +5134,7 @@ 
     {
         foreach ($this->special_functions as $func_name)
         {
-            if ( method_exists($this,$func_name) )
+            if (method_exists($this, $func_name))
             {
                 $this->$func_name();
             }
@@ -5149,52 +5149,52 @@ 
     {
     }
 
-    function getRelatedFields($module, $id, $fields, $return_array = false){
-        if(empty($GLOBALS['beanList'][$module]))return '';
+    function getRelatedFields($module, $id, $fields, $return_array = false) {
+        if (empty($GLOBALS['beanList'][$module]))return '';
         $object = BeanFactory::getObjectName($module);
 
         VardefManager::loadVardef($module, $object);
-        if(empty($GLOBALS['dictionary'][$object]['table']))return '';
+        if (empty($GLOBALS['dictionary'][$object]['table']))return '';
         $table = $GLOBALS['dictionary'][$object]['table'];
-        $query  = 'SELECT id';
-        foreach($fields as $field=>$alias){
-            if(!empty($GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields'])){
-                $query .= ' ,' .$this->db->concat($table, $GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields']) .  ' as ' . $alias ;
-            }else if(!empty($GLOBALS['dictionary'][$object]['fields'][$field]) &&
+        $query = 'SELECT id';
+        foreach ($fields as $field=>$alias) {
+            if (!empty($GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields'])) {
+                $query .= ' ,'.$this->db->concat($table, $GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields']).' as '.$alias;
+            } else if (!empty($GLOBALS['dictionary'][$object]['fields'][$field]) &&
                 (empty($GLOBALS['dictionary'][$object]['fields'][$field]['source']) ||
                 $GLOBALS['dictionary'][$object]['fields'][$field]['source'] != "non-db"))
             {
-                $query .= ' ,' .$table . '.' . $field . ' as ' . $alias;
+                $query .= ' ,'.$table.'.'.$field.' as '.$alias;
             }
-            if(!$return_array)$this->$alias = '';
+            if (!$return_array)$this->$alias = '';
         }
-        if($query == 'SELECT id' || empty($id)){
+        if ($query == 'SELECT id' || empty($id)) {
             return '';
         }
 
 
-        if(isset($GLOBALS['dictionary'][$object]['fields']['assigned_user_id']))
+        if (isset($GLOBALS['dictionary'][$object]['fields']['assigned_user_id']))
         {
-            $query .= " , ".	$table  . ".assigned_user_id owner";
+            $query .= " , ".$table.".assigned_user_id owner";
 
         }
-        else if(isset($GLOBALS['dictionary'][$object]['fields']['created_by']))
+        else if (isset($GLOBALS['dictionary'][$object]['fields']['created_by']))
         {
-            $query .= " , ".	$table . ".created_by owner";
+            $query .= " , ".$table.".created_by owner";
 
         }
-        $query .=  ' FROM ' . $table . ' WHERE deleted=0 AND id=';
-        $result = $GLOBALS['db']->query($query . "'$id'" );
+        $query .= ' FROM '.$table.' WHERE deleted=0 AND id=';
+        $result = $GLOBALS['db']->query($query."'$id'");
         $row = $GLOBALS['db']->fetchByAssoc($result);
-        if($return_array){
+        if ($return_array) {
             return $row;
         }
-        $owner = (empty($row['owner']))?'':$row['owner'];
-        foreach($fields as $alias){
-            $this->$alias = (!empty($row[$alias]))? $row[$alias]: '';
-            $alias = $alias  .'_owner';
+        $owner = (empty($row['owner'])) ? '' : $row['owner'];
+        foreach ($fields as $alias) {
+            $this->$alias = (!empty($row[$alias])) ? $row[$alias] : '';
+            $alias = $alias.'_owner';
             $this->$alias = $owner;
-            $a_mod = $alias  .'_mod';
+            $a_mod = $alias.'_mod';
             $this->$a_mod = $module;
         }
 
@@ -5210,39 +5210,39 @@ 
     function assign_display_fields($currentModule)
     {
         global $timedate;
-        foreach($this->column_fields as $field)
+        foreach ($this->column_fields as $field)
         {
-            if(isset($this->field_name_map[$field]) && empty($this->$field))
+            if (isset($this->field_name_map[$field]) && empty($this->$field))
             {
-                if($this->field_name_map[$field]['type'] != 'date' && $this->field_name_map[$field]['type'] != 'enum')
+                if ($this->field_name_map[$field]['type'] != 'date' && $this->field_name_map[$field]['type'] != 'enum')
                 $this->$field = $field;
-                if($this->field_name_map[$field]['type'] == 'date')
+                if ($this->field_name_map[$field]['type'] == 'date')
                 {
                     $this->$field = $timedate->to_display_date('1980-07-09');
                 }
-                if($this->field_name_map[$field]['type'] == 'enum')
+                if ($this->field_name_map[$field]['type'] == 'enum')
                 {
                     $dom = $this->field_name_map[$field]['options'];
                     global $current_language, $app_list_strings;
                     $mod_strings = return_module_language($current_language, $currentModule);
 
-                    if(isset($mod_strings[$dom]))
+                    if (isset($mod_strings[$dom]))
                     {
                         $options = $mod_strings[$dom];
-                        foreach($options as $key=>$value)
+                        foreach ($options as $key=>$value)
                         {
-                            if(!empty($key) && empty($this->$field ))
+                            if (!empty($key) && empty($this->$field))
                             {
                                 $this->$field = $key;
                             }
                         }
                     }
-                    if(isset($app_list_strings[$dom]))
+                    if (isset($app_list_strings[$dom]))
                     {
                         $options = $app_list_strings[$dom];
-                        foreach($options as $key=>$value)
+                        foreach ($options as $key=>$value)
                         {
-                            if(!empty($key) && empty($this->$field ))
+                            if (!empty($key) && empty($this->$field))
                             {
                                 $this->$field = $key;
                             }
@@ -5259,61 +5259,61 @@ 
     * 	RELATIONSHIP HANDLING
     */
 
-    function set_relationship($table, $relate_values, $check_duplicates = true,$do_update=false,$data_values=null)
+    function set_relationship($table, $relate_values, $check_duplicates = true, $do_update = false, $data_values = null)
     {
         $where = '';
 
 		// make sure there is a date modified
 		$date_modified = $this->db->convert("'".$GLOBALS['timedate']->nowDb()."'", 'datetime');
 
-        $row=null;
-        if($check_duplicates)
+        $row = null;
+        if ($check_duplicates)
         {
             $query = "SELECT * FROM $table ";
             $where = "WHERE deleted = '0'  ";
-            foreach($relate_values as $name=>$value)
+            foreach ($relate_values as $name=>$value)
             {
                 $where .= " AND $name = '$value' ";
             }
             $query .= $where;
-            $result = $this->db->query($query, false, "Looking For Duplicate Relationship:" . $query);
-            $row=$this->db->fetchByAssoc($result);
+            $result = $this->db->query($query, false, "Looking For Duplicate Relationship:".$query);
+            $row = $this->db->fetchByAssoc($result);
         }
 
-        if(!$check_duplicates || empty($row) )
+        if (!$check_duplicates || empty($row))
         {
             unset($relate_values['id']);
-            if ( isset($data_values))
+            if (isset($data_values))
             {
-                $relate_values = array_merge($relate_values,$data_values);
+                $relate_values = array_merge($relate_values, $data_values);
             }
-            $query = "INSERT INTO $table (id, ". implode(',', array_keys($relate_values)) . ", date_modified) VALUES ('" . create_guid() . "', " . "'" . implode("', '", $relate_values) . "', ".$date_modified.")" ;
+            $query = "INSERT INTO $table (id, ".implode(',', array_keys($relate_values)).", date_modified) VALUES ('".create_guid()."', "."'".implode("', '", $relate_values)."', ".$date_modified.")";
 
-            $this->db->query($query, false, "Creating Relationship:" . $query);
+            $this->db->query($query, false, "Creating Relationship:".$query);
         }
         else if ($do_update)
         {
             $conds = array();
-            foreach($data_values as $key=>$value)
+            foreach ($data_values as $key=>$value)
             {
-                array_push($conds,$key."='".$this->db->quote($value)."'");
+                array_push($conds, $key."='".$this->db->quote($value)."'");
             }
-            $query = "UPDATE $table SET ". implode(',', $conds).",date_modified=".$date_modified." ".$where;
-            $this->db->query($query, false, "Updating Relationship:" . $query);
+            $query = "UPDATE $table SET ".implode(',', $conds).",date_modified=".$date_modified." ".$where;
+            $this->db->query($query, false, "Updating Relationship:".$query);
         }
     }
 
     function retrieve_relationships($table, $values, $select_id)
     {
         $query = "SELECT $select_id FROM $table WHERE deleted = 0  ";
-        foreach($values as $name=>$value)
+        foreach ($values as $name=>$value)
         {
             $query .= " AND $name = '$value' ";
         }
         $query .= " ORDER BY $select_id ";
-        $result = $this->db->query($query, false, "Retrieving Relationship:" . $query);
+        $result = $this->db->query($query, false, "Retrieving Relationship:".$query);
         $ids = array();
-        while($row = $this->db->fetchByAssoc($result))
+        while ($row = $this->db->fetchByAssoc($result))
         {
             $ids[] = $row;
         }
@@ -5324,16 +5324,16 @@ 
     function loadLayoutDefs()
     {
         global $layout_defs;
-        if(empty( $this->layout_def) && file_exists('modules/'. $this->module_dir . '/layout_defs.php'))
+        if (empty($this->layout_def) && file_exists('modules/'.$this->module_dir.'/layout_defs.php'))
         {
-            include_once('modules/'. $this->module_dir . '/layout_defs.php');
-            if(file_exists('custom/modules/'. $this->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php'))
+            include_once('modules/'.$this->module_dir.'/layout_defs.php');
+            if (file_exists('custom/modules/'.$this->module_dir.'/Ext/Layoutdefs/layoutdefs.ext.php'))
             {
-                include_once('custom/modules/'. $this->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php');
+                include_once('custom/modules/'.$this->module_dir.'/Ext/Layoutdefs/layoutdefs.ext.php');
             }
-            if ( empty( $layout_defs[get_class($this)]))
+            if (empty($layout_defs[get_class($this)]))
             {
-                echo "\$layout_defs[" . get_class($this) . "]; does not exist";
+                echo "\$layout_defs[".get_class($this)."]; does not exist";
             }
 
             $this->layout_def = $layout_defs[get_class($this)];
@@ -5367,12 +5367,12 @@ 
     */
     function call_custom_logic($event, $arguments = null)
     {
-        if(!isset($this->processed) || $this->processed == false){
+        if (!isset($this->processed) || $this->processed == false) {
             //add some logic to ensure we do not get into an infinite loop
-            if(!empty($this->logicHookDepth[$event])) {
-                if($this->logicHookDepth[$event] > $this->max_logic_depth)
+            if (!empty($this->logicHookDepth[$event])) {
+                if ($this->logicHookDepth[$event] > $this->max_logic_depth)
                     return;
-            }else
+            } else
                 $this->logicHookDepth[$event] = 0;
 
             //we have to put the increment operator here
@@ -5417,7 +5417,7 @@ 
             $GLOBALS['log']->fatal("SUGARBEAN: cannot find Real Key for custom field of type dropdown - cannot return Value.");
             return false;
         }
-        if(isset($realKey))
+        if (isset($realKey))
         {
             return $this->custom_fields->avail_fields[$name][$realKey];
         }
@@ -5436,17 +5436,17 @@ 
 	/**
     function ACLAccess($view,$is_owner='not_set')
 	*/
-    function ACLAccess($view,$is_owner='not_set',$in_group='not_set')
+    function ACLAccess($view, $is_owner = 'not_set', $in_group = 'not_set')
     {
         global $current_user;
-        if($current_user->isAdmin()) {
+        if ($current_user->isAdmin()) {
             return true;
         }
         $not_set = false;
 		/**
         if($is_owner == 'not_set')
 		*/
-    	if($is_owner === 'not_set') //eggsurplus: should be ===
+    	if ($is_owner === 'not_set') //eggsurplus: should be ===
         {
             $not_set = true;
             $is_owner = $this->isOwner($current_user->id);
@@ -5457,7 +5457,7 @@ 
 		$view = strtolower($view);
 		$action = '';
 		// DJM - OBS Customizations - END CHANGE
-    	if($in_group === 'not_set')
+    	if ($in_group === 'not_set')
     	{
 			require_once("modules/SecurityGroups/SecurityGroup.php");
 			// DJM - OBS Customizations - May 2009
@@ -5483,7 +5483,7 @@ 
  		   			$action = "view";
 					break;
  		   		case 'delete':
- 		   			$action = "delete" ;
+ 		   			$action = "delete";
 					break;
  		   		case 'export':
  		   			$action = "export";
@@ -5495,11 +5495,11 @@ 
 					$action = "";
 					break;
     			}
-			$in_group = SecurityGroup::groupHasAccess($this->module_dir,$this->id, $action); 
+			$in_group = SecurityGroup::groupHasAccess($this->module_dir, $this->id, $action); 
 			// DJM - OBS Customizations - END CHANGE
     	}
         //if we don't implent acls return true
-        if(!$this->bean_implements('ACL'))
+        if (!$this->bean_implements('ACL'))
         return true;
         $view = strtolower($view);
         switch ($view)
@@ -5510,15 +5510,15 @@ 
 				/**
                 return ACLController::checkAccess($this->module_dir,'list', true);
 				*/
-    			return ACLController::checkAccess($this->module_dir,'list', true, $this->acltype, $in_group);
+    			return ACLController::checkAccess($this->module_dir, 'list', true, $this->acltype, $in_group);
             case 'edit':
             case 'save':
-                if( !$is_owner && $not_set && !empty($this->id)){
+                if (!$is_owner && $not_set && !empty($this->id)) {
                     $class = get_class($this);
                     $temp = new $class();
-                    if(!empty($this->fetched_row) && !empty($this->fetched_row['id']) && !empty($this->fetched_row['assigned_user_id']) && !empty($this->fetched_row['created_by'])){
+                    if (!empty($this->fetched_row) && !empty($this->fetched_row['id']) && !empty($this->fetched_row['assigned_user_id']) && !empty($this->fetched_row['created_by'])) {
                         $temp->populateFromRow($this->fetched_row);
-                    }else{
+                    } else {
                         $temp->retrieve($this->id);
                     }
                     $is_owner = $temp->isOwner($current_user->id);
@@ -5528,29 +5528,29 @@ 
 				/**
                 return ACLController::checkAccess($this->module_dir,'edit', $is_owner, $this->acltype);
 				*/
-    			return ACLController::checkAccess($this->module_dir,'edit', $is_owner, $this->acltype, $in_group);
+    			return ACLController::checkAccess($this->module_dir, 'edit', $is_owner, $this->acltype, $in_group);
             case 'view':
             case 'detail':
             case 'detailview':
 				/**
                 return ACLController::checkAccess($this->module_dir,'view', $is_owner, $this->acltype);
 				*/
-    			return ACLController::checkAccess($this->module_dir,'view', $is_owner, $this->acltype, $in_group);
+    			return ACLController::checkAccess($this->module_dir, 'view', $is_owner, $this->acltype, $in_group);
             case 'delete':
 				/**
                 return ACLController::checkAccess($this->module_dir,'delete', $is_owner, $this->acltype);
 				*/
-    			return ACLController::checkAccess($this->module_dir,'delete', $is_owner, $this->acltype, $in_group);
+    			return ACLController::checkAccess($this->module_dir, 'delete', $is_owner, $this->acltype, $in_group);
             case 'export':
 				/**
                 return ACLController::checkAccess($this->module_dir,'export', $is_owner, $this->acltype);
 				*/
-    			return ACLController::checkAccess($this->module_dir,'export', $is_owner, $this->acltype, $in_group);
+    			return ACLController::checkAccess($this->module_dir, 'export', $is_owner, $this->acltype, $in_group);
             case 'import':
 				/**
                 return ACLController::checkAccess($this->module_dir,'import', true, $this->acltype);
 				*/
-    			return ACLController::checkAccess($this->module_dir,'import', true, $this->acltype, $in_group);
+    			return ACLController::checkAccess($this->module_dir, 'import', true, $this->acltype, $in_group);
         }
         //if it is not one of the above views then it should be implemented on the page level
         return true;
@@ -5566,12 +5566,12 @@ 
     {
         if (isset($this->field_defs['assigned_user_id']))
         {
-            return $returnFieldName? 'assigned_user_id': $this->assigned_user_id;
+            return $returnFieldName ? 'assigned_user_id' : $this->assigned_user_id;
         }
 
         if (isset($this->field_defs['created_by']))
         {
-            return $returnFieldName? 'created_by': $this->created_by;
+            return $returnFieldName ? 'created_by' : $this->created_by;
         }
 
         return '';
@@ -5586,7 +5586,7 @@ 
     function isOwner($user_id)
     {
         //if we don't have an id we must be the owner as we are creating it
-        if(!isset($this->id))
+        if (!isset($this->id))
         {
             return true;
         }
@@ -5597,13 +5597,13 @@ 
             }
             return false;
         } elseif (isset($this->assigned_user_id)) {
-            if($this->assigned_user_id == $user_id) return true;
+            if ($this->assigned_user_id == $user_id) return true;
             return false;
         }
         else
         {
             //other wise if there is a created_by that is the owner
-            if(isset($this->created_by) && $this->created_by == $user_id)
+            if (isset($this->created_by) && $this->created_by == $user_id)
             {
                 return true;
             }
@@ -5618,11 +5618,11 @@ 
     */
     function getOwnerWhere($user_id)
     {
-        if(isset($this->field_defs['assigned_user_id']))
+        if (isset($this->field_defs['assigned_user_id']))
         {
             return " $this->table_name.assigned_user_id ='$user_id' ";
         }
-        if(isset($this->field_defs['created_by']))
+        if (isset($this->field_defs['created_by']))
         {
             return " $this->table_name.created_by ='$user_id' ";
         }
@@ -5639,7 +5639,7 @@ 
     function listviewACLHelper()
     {
         $array_assign = array();
-        if($this->ACLAccess('DetailView'))
+        if ($this->ACLAccess('DetailView'))
         {
             $array_assign['MAIN'] = 'a';
         }
@@ -5655,27 +5655,27 @@ 
     *
     * @return array of fields with id, name, access and category
     */
-    function toArray($dbOnly = false, $stringOnly = false, $upperKeys=false)
+    function toArray($dbOnly = false, $stringOnly = false, $upperKeys = false)
     {
         static $cache = array();
         $arr = array();
 
-        foreach($this->field_defs as $field=>$data)
+        foreach ($this->field_defs as $field=>$data)
         {
-            if( !$dbOnly || !isset($data['source']) || $data['source'] == 'db')
-            if(!$stringOnly || is_string($this->$field))
-            if($upperKeys)
+            if (!$dbOnly || !isset($data['source']) || $data['source'] == 'db')
+            if (!$stringOnly || is_string($this->$field))
+            if ($upperKeys)
             {
-                                if(!isset($cache[$field])){
+                                if (!isset($cache[$field])) {
                                     $cache[$field] = strtoupper($field);
                                 }
                 $arr[$cache[$field]] = $this->$field;
             }
             else
             {
-                if(isset($this->$field)){
+                if (isset($this->$field)) {
                     $arr[$field] = $this->$field;
-                }else{
+                } else {
                     $arr[$field] = '';
                 }
             }
@@ -5690,7 +5690,7 @@ 
     */
     function fromArray($arr)
     {
-        foreach($arr as $name=>$value)
+        foreach ($arr as $name=>$value)
         {
             $this->$name = $value;
         }
@@ -5704,7 +5704,7 @@ 
      */
     public function convertRow($row)
     {
-        foreach($this->field_defs as $name => $fieldDef)
+        foreach ($this->field_defs as $name => $fieldDef)
 		{
 		    // skip empty fields and non-db fields
             if (isset($name) && !empty($row[$name])) {
@@ -5750,7 +5750,7 @@ 
 
         $this->fill_in_additional_list_fields();
 
-        if($this->hasCustomFields())$this->custom_fields->fill_relationships();
+        if ($this->hasCustomFields())$this->custom_fields->fill_relationships();
         $this->call_custom_logic("process_record");
     }
 
@@ -5769,7 +5769,7 @@ 
     *
     * Internal function do not override.
     */
-   function create_qualified_order_by( $order_by, $qualify)
+   function create_qualified_order_by($order_by, $qualify)
    {	// if the column is empty, but the sort order is defined, the value will throw an error, so do not proceed if no order by is given
     if (empty($order_by))
     {
@@ -5778,10 +5778,10 @@ 
     $order_by_clause = " ORDER BY ";
     $tmp = explode(",", $order_by);
     $comma = ' ';
-    foreach ( $tmp as $stmp)
+    foreach ($tmp as $stmp)
     {
-        $stmp = (substr_count($stmp, ".") > 0?trim($stmp):"$qualify." . trim($stmp));
-        $order_by_clause .= $comma . $stmp;
+        $stmp = (substr_count($stmp, ".") > 0 ? trim($stmp) : "$qualify.".trim($stmp));
+        $order_by_clause .= $comma.$stmp;
         $comma = ", ";
     }
     return $order_by_clause;
@@ -5801,16 +5801,16 @@ 
             $street_field_2 = $street_field.'_2';
             $street_field_3 = $street_field.'_3';
             $street_field_4 = $street_field.'_4';
-            if ( isset($this->$street_field_2)) {
-                $this->$street_field .= "\n". $this->$street_field_2;
+            if (isset($this->$street_field_2)) {
+                $this->$street_field .= "\n".$this->$street_field_2;
                 unset($this->$street_field_2);
             }
-            if ( isset($this->$street_field_3)) {
-                $this->$street_field .= "\n". $this->$street_field_3;
+            if (isset($this->$street_field_3)) {
+                $this->$street_field .= "\n".$this->$street_field_3;
                 unset($this->$street_field_3);
             }
-            if ( isset($this->$street_field_4)) {
-                $this->$street_field .= "\n". $this->$street_field_4;
+            if (isset($this->$street_field_4)) {
+                $this->$street_field .= "\n".$this->$street_field_4;
                 unset($this->$street_field_4);
             }
             $this->$street_field = trim($this->$street_field, "\n");
@@ -5819,7 +5819,7 @@ 
 
     protected function getEncryptKey()
     {
-        if(empty(self::$field_key)) {
+        if (empty(self::$field_key)) {
             self::$field_key = blowfishGetKey('encrypt_field');
         }
         return self::$field_key;
@@ -5843,7 +5843,7 @@ 
  */
     function decrypt_after_retrieve($value)
     {
-        if(empty($value)) return $value; // no need to decrypt empty
+        if (empty($value)) return $value; // no need to decrypt empty
         require_once("include/utils/encryption_utils.php");
         return blowfishDecode($this->getEncryptKey(), $value);
     }
@@ -5852,19 +5852,19 @@ 
     * Moved from save() method, functionality is the same, but this is intended to handle
     * Optimistic locking functionality.
     */
-    private function _checkOptimisticLocking($action, $isUpdate){
-        if($this->optimistic_lock && !isset($_SESSION['o_lock_fs'])){
-            if(isset($_SESSION['o_lock_id']) && $_SESSION['o_lock_id'] == $this->id && $_SESSION['o_lock_on'] == $this->object_name)
+    private function _checkOptimisticLocking($action, $isUpdate) {
+        if ($this->optimistic_lock && !isset($_SESSION['o_lock_fs'])) {
+            if (isset($_SESSION['o_lock_id']) && $_SESSION['o_lock_id'] == $this->id && $_SESSION['o_lock_on'] == $this->object_name)
             {
-                if($action == 'Save' && $isUpdate && isset($this->modified_user_id) && $this->has_been_modified_since($_SESSION['o_lock_dm'], $this->modified_user_id))
+                if ($action == 'Save' && $isUpdate && isset($this->modified_user_id) && $this->has_been_modified_since($_SESSION['o_lock_dm'], $this->modified_user_id))
                 {
                     $_SESSION['o_lock_class'] = get_class($this);
                     $_SESSION['o_lock_module'] = $this->module_dir;
                     $_SESSION['o_lock_object'] = $this->toArray();
                     $saveform = "<form name='save' id='save' method='POST'>";
-                    foreach($_POST as $key=>$arg)
+                    foreach ($_POST as $key=>$arg)
                     {
-                        $saveform .= "<input type='hidden' name='". addslashes($key) ."' value='". addslashes($arg) ."'>";
+                        $saveform .= "<input type='hidden' name='".addslashes($key)."' value='".addslashes($arg)."'>";
                     }
                     $saveform .= "</form><script>document.getElementById('save').submit();</script>";
                     $_SESSION['o_lock_save'] = $saveform;
@@ -5881,20 +5881,20 @@ 
         }
         else
         {
-            if(isset($_SESSION['o_lock_object']))	{ unset ($_SESSION['o_lock_object']); }
-            if(isset($_SESSION['o_lock_id']))		{ unset ($_SESSION['o_lock_id']); }
-            if(isset($_SESSION['o_lock_dm']))		{ unset ($_SESSION['o_lock_dm']); }
-            if(isset($_SESSION['o_lock_fs']))		{ unset ($_SESSION['o_lock_fs']); }
-            if(isset($_SESSION['o_lock_save']))		{ unset ($_SESSION['o_lock_save']); }
+            if (isset($_SESSION['o_lock_object'])) { unset ($_SESSION['o_lock_object']); }
+            if (isset($_SESSION['o_lock_id'])) { unset ($_SESSION['o_lock_id']); }
+            if (isset($_SESSION['o_lock_dm'])) { unset ($_SESSION['o_lock_dm']); }
+            if (isset($_SESSION['o_lock_fs'])) { unset ($_SESSION['o_lock_fs']); }
+            if (isset($_SESSION['o_lock_save'])) { unset ($_SESSION['o_lock_save']); }
         }
     }
 
     /**
     * Send assignment notifications and invites for meetings and calls
     */
-    private function _sendNotifications($check_notify){
-        if($check_notify || (isset($this->notify_inworkflow) && $this->notify_inworkflow == true) // cn: bug 5795 - no invites sent to Contacts, and also bug 25995, in workflow, it will set the notify_on_save=true.
-           && !$this->isOwner($this->created_by) )  // cn: bug 42727 no need to send email to owner (within workflow)
+    private function _sendNotifications($check_notify) {
+        if ($check_notify || (isset($this->notify_inworkflow) && $this->notify_inworkflow == true) // cn: bug 5795 - no invites sent to Contacts, and also bug 25995, in workflow, it will set the notify_on_save=true.
+           && !$this->isOwner($this->created_by))  // cn: bug 42727 no need to send email to owner (within workflow)
         {
             $admin = new Administration();
             $admin->retrieveSettings();
@@ -5905,7 +5905,7 @@ 
                 $GLOBALS['log']->info("Notifications: user assignment has changed, checking if user receives notifications");
                 $sendNotifications = true;
             }
-            elseif(isset($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == 1)
+            elseif (isset($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == 1)
             {
                 // cn: bug 5795 Send Invites failing for Contacts
                 $sendNotifications = true;
@@ -5916,7 +5916,7 @@ 
             }
 
 
-            if($sendNotifications == true)
+            if ($sendNotifications == true)
             {
                 $notify_list = $this->get_notification_recipients();
                 foreach ($notify_list as $notify_user)
@@ -5977,10 +5977,10 @@ 
 
         $cache_key = "load_cached_array.$module_dir.$module.$key";
         $result = sugar_cache_retrieve($cache_key);
-        if(!empty($result))
+        if (!empty($result))
         {
         	// Use SugarCache::EXTERNAL_CACHE_NULL_VALUE to store null values in the cache.
-        	if($result == SugarCache::EXTERNAL_CACHE_NULL_VALUE)
+        	if ($result == SugarCache::EXTERNAL_CACHE_NULL_VALUE)
         	{
         		return null;
         	}
@@ -5988,16 +5988,16 @@ 
             return $result;
         }
 
-        if(file_exists('modules/'.$module_dir.'/'.$fileName))
+        if (file_exists('modules/'.$module_dir.'/'.$fileName))
         {
             // If the data was not loaded, try loading again....
-            if(!isset($moduleDefs[$module]))
+            if (!isset($moduleDefs[$module]))
             {
                 include('modules/'.$module_dir.'/'.$fileName);
                 $moduleDefs[$module] = $fields_array;
             }
             // Now that we have tried loading, make sure it was loaded
-            if(empty($moduleDefs[$module]) || empty($moduleDefs[$module][$module][$key]))
+            if (empty($moduleDefs[$module]) || empty($moduleDefs[$module][$module][$key]))
             {
                 // It was not loaded....  Fail.  Cache null to prevent future repeats of this calculation
 				sugar_cache_put($cache_key, SugarCache::EXTERNAL_CACHE_NULL_VALUE);
@@ -6022,7 +6022,7 @@ 
      */
     public function getACLCategory()
     {
-        return !empty($this->acl_category)?$this->acl_category:$this->module_dir;
+        return !empty($this->acl_category) ? $this->acl_category : $this->module_dir;
     }
 
     /**
@@ -6071,7 +6071,7 @@ 
             'select' => '',
             'join' => ''
         );
-        if(isset($this->custom_fields))
+        if (isset($this->custom_fields))
         {
             $result = $this->custom_fields->getJOIN($expandedList, $includeRelates, $where);
         }
@@ -6093,7 +6093,7 @@ 
                 // walk through all currency-related fields
                 foreach ($this->field_defs as $this_field) {
                     if (isset($this_field['type']) && $this_field['type'] == 'relate'
-                        && isset($this_field['module'])  && $this_field['module'] == 'Currencies'
+                        && isset($this_field['module']) && $this_field['module'] == 'Currencies'
                         && isset($this_field['id_name']) && $this_field['id_name'] == 'currency_id') {
                         // populate related properties manually
                         $this_property = $this_field['name'];

Braces +338 added lines, -325 removed lines

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

Doc Comments +29 added lines, -19 removed lines

@@ -394,8 +394,7 @@ 
      *
      * All implementing classes must set a value for the object_name variable.
      *
-     * @param array $arr row of data fetched from the database.
-     * @return  nothing
+     * @return  string
      *
      */
     function getObjectName()
@@ -1036,7 +1035,6 @@ 
      * Method will load the relationship if not done so already.
      *
      * @param string $field_name relationship to be loaded.
-     * @param string $bean name  class name of the related bean.legacy
      * @param string $order_by, Optional, default empty.
      * @param int $begin_index Optional, default 0, unused.
      * @param int $end_index Optional, default -1
@@ -2279,7 +2277,7 @@ 
      * The fetched data is then set into the bean. The function also processes the fetched data by formattig
      * date/time and numeric values.
      *
-     * @param string $id Optional, default -1, is set to -1 id value from the bean is used, else, passed value is used
+     * @param integer $id Optional, default -1, is set to -1 id value from the bean is used, else, passed value is used
      * @param boolean $encode Optional, default true, encodes the values fetched from the database.
      * @param boolean $deleted Optional, default true, if set to false deleted filter will not be added.
      *
@@ -2502,9 +2500,9 @@ 
     * @param string $order_by
     * @param string $where Additional where clause
     * @param int $row_offset Optaional,default 0, starting row number
-    * @param init $limit Optional, default -1
+    * @param integer $limit Optional, default -1
     * @param int $max Optional, default -1
-    * @param boolean $show_deleted Optional, default 0, if set to 1 system will show deleted records.
+    * @param integer $show_deleted Optional, default 0, if set to 1 system will show deleted records.
     * @return array Fetched data.
     *
     * Internal function, do not override.
@@ -2629,9 +2627,9 @@ 
     * @param string $order_by
     * @param string $where Additional where clause
     * @param int $row_offset Optaional,default 0, starting row number
-    * @param init $limit Optional, default -1
+    * @param integer $limit Optional, default -1
     * @param int $max Optional, default -1
-    * @param boolean $show_deleted Optioanl, default 0, if set to 1 system will show deleted records.
+    * @param integer $show_deleted Optioanl, default 0, if set to 1 system will show deleted records.
     * @return array Fetched data.
     *
     * Internal function, do not override.
@@ -2756,6 +2754,11 @@ 
     }
 
 
+    /**
+     * @param aSubPanel $subpanel_def
+     * @param SugarBean $parentbean
+     * @param string $order_by
+     */
     protected static function build_sub_queries_for_union($subpanel_list, $subpanel_def, $parentbean, $order_by)
     {
         global $layout_edit_mode, $beanFiles, $beanList;
@@ -3928,15 +3931,15 @@ 
      * executes the query and returns fetched data.
      *
      * Internal function, do not override.
-     * @param object $parent_bean
+     * @param SugarBean $parent_bean
      * @param string $query query to be processed.
      * @param int $row_offset
      * @param int $limit optional, default -1
      * @param int $max_per_page Optional, default -1
      * @param string $where Custom where clause.
-     * @param array $subpanel_def definition of sub-panel to be processed
+     * @param aSubPanel $subpanel_def definition of sub-panel to be processed
      * @param string $query_row_count
-     * @param array $seconday_queries
+     * @param array $secondary_queries
      * @return array Fetched data.
      */
     function process_union_list_query($parent_bean, $query,
@@ -4577,6 +4580,7 @@ 
      * Restores data deleted by call to mark_deleted() function.
      *
      * Internal function, do not override.
+    * @param string $id
     */
     function mark_undeleted($id)
     {
@@ -4609,7 +4613,7 @@ 
     /**
      * Returns path for files of bean or false on error
      *
-     * @return bool|string
+     * @return false|string
      */
     public function deleteFileDirectory()
     {
@@ -4941,8 +4945,8 @@ 
     * Internal function, do not override.
     *
     * @param string $query - the query that should be executed to build the list
-    * @param object $template - The object that should be used to copy the records
-    * @param array $field_list List of  fields.
+    * @param Contact $template - The object that should be used to copy the records
+    * @param string[] $field_list List of  fields.
     * @return array
     */
     function build_related_list2($query, &$template, &$field_list)
@@ -5088,7 +5092,7 @@ 
      * @param array @fields_array  array of name value pairs used to construct query.
      * @param boolean $encode Optional, default true, encode fetched data.
      * @param boolean $deleted Optional, default true, if set to false deleted filter will not be added.
-     * @return object Instance of this bean with fetched data.
+     * @return null|SugarBean Instance of this bean with fetched data.
      */
     function retrieve_by_string_fields($fields_array, $encode=true, $deleted=true)
     {
@@ -5259,6 +5263,9 @@ 
     * 	RELATIONSHIP HANDLING
     */
 
+    /**
+     * @param string $table
+     */
     function set_relationship($table, $relate_values, $check_duplicates = true,$do_update=false,$data_values=null)
     {
         $where = '';
@@ -5364,6 +5371,7 @@ 
     * 		$bean - $this bean passed in by reference.
     *		$event - The string for the current event (i.e. before_save)
     * 		$arguments - An array of arguments that are specific to the event.
+    * @param string $event
     */
     function call_custom_logic($event, $arguments = null)
     {
@@ -5765,7 +5773,7 @@ 
     *
     * @param string $order_by original order by from the query
     * @param string $qualify prefix for columns in the order by list.
-    * @return  prefixed
+    * @return  string
     *
     * Internal function do not override.
     */
@@ -5851,6 +5859,7 @@ 
     /**
     * Moved from save() method, functionality is the same, but this is intended to handle
     * Optimistic locking functionality.
+    * @param boolean $isUpdate
     */
     private function _checkOptimisticLocking($action, $isUpdate){
         if($this->optimistic_lock && !isset($_SESSION['o_lock_fs'])){
@@ -5891,6 +5900,7 @@ 
 
     /**
     * Send assignment notifications and invites for meetings and calls
+    * @param boolean $check_notify
     */
     private function _sendNotifications($check_notify){
         if($check_notify || (isset($this->notify_inworkflow) && $this->notify_inworkflow == true) // cn: bug 5795 - no invites sent to Contacts, and also bug 25995, in workflow, it will set the notify_on_save=true.
@@ -5961,9 +5971,9 @@ 
      * bean files and have since been moved to separate files. Was previously in include/CacheHandler.php
      *
      * @deprecated
-     * @param $module_dir string the module directory
-     * @param $module string the name of the module
-     * @param $key string the type of field array we are referencing, i.e. list_fields, column_fields, required_fields
+     * @param string $module_dir string the module directory
+     * @param string $module string the name of the module
+     * @param string $key string the type of field array we are referencing, i.e. list_fields, column_fields, required_fields
      **/
     private function _loadCachedArray(
         $module_dir,