adamjakab / SuiteCRM

include/MVC/Controller/SugarController.php

Indentation +677 added lines, -677 removed lines

@@ -44,126 +44,126 @@ 
  * @api
  */
 class SugarController{
-	/**
-	 * remap actions in here
-	 * e.g. make all detail views go to edit views
-	 * $action_remap = array('detailview'=>'editview');
-	 */
-	protected $action_remap = array('index'=>'listview');
-	/**
-	 * The name of the current module.
-	 */
-	public $module = 'Home';
-	/**
-	 * The name of the target module.
-	 */
-	public $target_module = null;
-	/**
-	 * The name of the current action.
-	 */
-	public $action = 'index';
-	/**
-	 * The id of the current record.
-	 */
-	public $record = '';
-	/**
-	 * The name of the return module.
-	 */
-	public $return_module = null;
-	/**
-	 * The name of the return action.
-	 */
-	public $return_action = null;
-	/**
-	 * The id of the return record.
-	 */
-	public $return_id = null;
-	/**
-	 * If the action was remapped it will be set to do_action and then we will just
-	 * use do_action for the actual action to perform.
-	 */
-	protected $do_action = 'index';
-	/**
-	 * If a bean is present that set it.
-	 */
-	public $bean = null;
-	/**
-	 * url to redirect to
-	 */
-	public $redirect_url = '';
-	/**
-	 * any subcontroller can modify this to change the view
-	 */
-	public $view = 'classic';
-	/**
-	 * this array will hold the mappings between a key and an object for use within the view.
-	 */
-	public $view_object_map = array();
+    /**
+     * remap actions in here
+     * e.g. make all detail views go to edit views
+     * $action_remap = array('detailview'=>'editview');
+     */
+    protected $action_remap = array('index'=>'listview');
+    /**
+     * The name of the current module.
+     */
+    public $module = 'Home';
+    /**
+     * The name of the target module.
+     */
+    public $target_module = null;
+    /**
+     * The name of the current action.
+     */
+    public $action = 'index';
+    /**
+     * The id of the current record.
+     */
+    public $record = '';
+    /**
+     * The name of the return module.
+     */
+    public $return_module = null;
+    /**
+     * The name of the return action.
+     */
+    public $return_action = null;
+    /**
+     * The id of the return record.
+     */
+    public $return_id = null;
+    /**
+     * If the action was remapped it will be set to do_action and then we will just
+     * use do_action for the actual action to perform.
+     */
+    protected $do_action = 'index';
+    /**
+     * If a bean is present that set it.
+     */
+    public $bean = null;
+    /**
+     * url to redirect to
+     */
+    public $redirect_url = '';
+    /**
+     * any subcontroller can modify this to change the view
+     */
+    public $view = 'classic';
+    /**
+     * this array will hold the mappings between a key and an object for use within the view.
+     */
+    public $view_object_map = array();
 
-	/**
-	 * This array holds the methods that handleAction() will invoke, in sequence.
-	 */
-	protected $tasks = array(
-					   'pre_action',
-					   'do_action',
-					   'post_action'
-					   );
-	/**
-	 * List of options to run through within the process() method.
-	 * This list is meant to easily allow additions for new functionality as well as
-	 * the ability to add a controller's own handling.
-	 */
-	public $process_tasks = array(
-						'blockFileAccess',
-						'handleEntryPoint',
-						'callLegacyCode',
-						'remapAction',
-						'handle_action',
-						'handleActionMaps',
-					);
-	/**
-	 * Whether or not the action has been handled by $process_tasks
-	 *
-	 * @var bool
-	 */
-	protected $_processed = false;
-	/**
-	 * Map an action directly to a file
-	 */
-	/**
-	 * Map an action directly to a file. This will be loaded from action_file_map.php
-	 */
-	protected $action_file_map = array();
-	/**
-	 * Map an action directly to a view
-	 */
-	/**
-	 * Map an action directly to a view. This will be loaded from action_view_map.php
-	 */
-	protected $action_view_map = array();
+    /**
+     * This array holds the methods that handleAction() will invoke, in sequence.
+     */
+    protected $tasks = array(
+                        'pre_action',
+                        'do_action',
+                        'post_action'
+                        );
+    /**
+     * List of options to run through within the process() method.
+     * This list is meant to easily allow additions for new functionality as well as
+     * the ability to add a controller's own handling.
+     */
+    public $process_tasks = array(
+                        'blockFileAccess',
+                        'handleEntryPoint',
+                        'callLegacyCode',
+                        'remapAction',
+                        'handle_action',
+                        'handleActionMaps',
+                    );
+    /**
+     * Whether or not the action has been handled by $process_tasks
+     *
+     * @var bool
+     */
+    protected $_processed = false;
+    /**
+     * Map an action directly to a file
+     */
+    /**
+     * Map an action directly to a file. This will be loaded from action_file_map.php
+     */
+    protected $action_file_map = array();
+    /**
+     * Map an action directly to a view
+     */
+    /**
+     * Map an action directly to a view. This will be loaded from action_view_map.php
+     */
+    protected $action_view_map = array();
 
-	/**
-	 * This can be set from the application to tell us whether we have authorization to
-	 * process the action. If this is set we will default to the noaccess view.
-	 */
-	public $hasAccess = true;
+    /**
+     * This can be set from the application to tell us whether we have authorization to
+     * process the action. If this is set we will default to the noaccess view.
+     */
+    public $hasAccess = true;
 
-	/**
-	 * Map case sensitive filenames to action.  This is used for linux/unix systems
-	 * where filenames are case sensitive
-	 */
-	public static $action_case_file = array(
-										'editview'=>'EditView',
-										'detailview'=>'DetailView',
-										'listview'=>'ListView'
-									  );
-
-	/**
-	 * Constructor. This ie meant tot load up the module, action, record as well
-	 * as the mapping arrays.
-	 */
-	public function __construct(){
-	}
+    /**
+     * Map case sensitive filenames to action.  This is used for linux/unix systems
+     * where filenames are case sensitive
+     */
+    public static $action_case_file = array(
+                                        'editview'=>'EditView',
+                                        'detailview'=>'DetailView',
+                                        'listview'=>'ListView'
+                                        );
+
+    /**
+     * Constructor. This ie meant tot load up the module, action, record as well
+     * as the mapping arrays.
+     */
+    public function __construct(){
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
@@ -180,126 +180,126 @@ 
     }
 
 
-	/**
-	 * Called from SugarApplication and is meant to perform the setup operations
-	 * on the controller.
-	 *
-	 */
-	public function setup($module = ''){
-		if(empty($module) && !empty($_REQUEST['module']))
-			$module = $_REQUEST['module'];
-		//set the module
-		if(!empty($module))
-			$this->setModule($module);
-
-		if(!empty($_REQUEST['target_module']) && $_REQUEST['target_module'] != 'undefined') {
-			$this->target_module = $_REQUEST['target_module'];
-		}
-		//set properties on the controller from the $_REQUEST
-		$this->loadPropertiesFromRequest();
-		//load the mapping files
-		$this->loadMappings();
-	}
-	/**
-	 * Set the module on the Controller
-	 *
-	 * @param object $module
-	 */
-	public function setModule($module){
-		$this->module = $module;
-	}
+    /**
+     * Called from SugarApplication and is meant to perform the setup operations
+     * on the controller.
+     *
+     */
+    public function setup($module = ''){
+        if(empty($module) && !empty($_REQUEST['module']))
+            $module = $_REQUEST['module'];
+        //set the module
+        if(!empty($module))
+            $this->setModule($module);
+
+        if(!empty($_REQUEST['target_module']) && $_REQUEST['target_module'] != 'undefined') {
+            $this->target_module = $_REQUEST['target_module'];
+        }
+        //set properties on the controller from the $_REQUEST
+        $this->loadPropertiesFromRequest();
+        //load the mapping files
+        $this->loadMappings();
+    }
+    /**
+     * Set the module on the Controller
+     *
+     * @param object $module
+     */
+    public function setModule($module){
+        $this->module = $module;
+    }
 
-	/**
-	 * Set properties on the Controller from the $_REQUEST
-	 *
-	 */
-	private function loadPropertiesFromRequest(){
-		if(!empty($_REQUEST['action']))
-			$this->action = $_REQUEST['action'];
-		if(!empty($_REQUEST['record']))
-			$this->record = $_REQUEST['record'];
-		if(!empty($_REQUEST['view']))
-			$this->view = $_REQUEST['view'];
-		if(!empty($_REQUEST['return_module']))
-			$this->return_module = $_REQUEST['return_module'];
-		if(!empty($_REQUEST['return_action']))
-			$this->return_action = $_REQUEST['return_action'];
-		if(!empty($_REQUEST['return_id']))
-			$this->return_id = $_REQUEST['return_id'];
-	}
+    /**
+     * Set properties on the Controller from the $_REQUEST
+     *
+     */
+    private function loadPropertiesFromRequest(){
+        if(!empty($_REQUEST['action']))
+            $this->action = $_REQUEST['action'];
+        if(!empty($_REQUEST['record']))
+            $this->record = $_REQUEST['record'];
+        if(!empty($_REQUEST['view']))
+            $this->view = $_REQUEST['view'];
+        if(!empty($_REQUEST['return_module']))
+            $this->return_module = $_REQUEST['return_module'];
+        if(!empty($_REQUEST['return_action']))
+            $this->return_action = $_REQUEST['return_action'];
+        if(!empty($_REQUEST['return_id']))
+            $this->return_id = $_REQUEST['return_id'];
+    }
 
-	/**
-	 * Load map files for use within the Controller
-	 *
-	 */
-	private function loadMappings(){
-		$this->loadMapping('action_view_map');
-		$this->loadMapping('action_file_map');
-		$this->loadMapping('action_remap', true);
-	}
+    /**
+     * Load map files for use within the Controller
+     *
+     */
+    private function loadMappings(){
+        $this->loadMapping('action_view_map');
+        $this->loadMapping('action_file_map');
+        $this->loadMapping('action_remap', true);
+    }
 
-	/**
-	 * Given a record id load the bean. This bean is accessible from any sub controllers.
-	 */
-	public function loadBean()
-	{
-		if(!empty($GLOBALS['beanList'][$this->module])){
-			$class = $GLOBALS['beanList'][$this->module];
-			if(!empty($GLOBALS['beanFiles'][$class])){
-				require_once($GLOBALS['beanFiles'][$class]);
-				$this->bean = new $class();
-				if(!empty($this->record)){
-					$this->bean->retrieve($this->record);
-					if($this->bean)
-						$GLOBALS['FOCUS'] = $this->bean;
-				}
-			}
-		}
-	}
+    /**
+     * Given a record id load the bean. This bean is accessible from any sub controllers.
+     */
+    public function loadBean()
+    {
+        if(!empty($GLOBALS['beanList'][$this->module])){
+            $class = $GLOBALS['beanList'][$this->module];
+            if(!empty($GLOBALS['beanFiles'][$class])){
+                require_once($GLOBALS['beanFiles'][$class]);
+                $this->bean = new $class();
+                if(!empty($this->record)){
+                    $this->bean->retrieve($this->record);
+                    if($this->bean)
+                        $GLOBALS['FOCUS'] = $this->bean;
+                }
+            }
+        }
+    }
 
-	/**
-	 * Generic load method to load mapping arrays.
-	 */
-	private function loadMapping($var, $merge = false){
-		$$var = sugar_cache_retrieve("CONTROLLER_". $var . "_".$this->module);
-		if(!$$var){
-			if($merge && !empty($this->$var)){
-				$$var = $this->$var;
-			}else{
-				$$var = array();
-			}
-			if(file_exists('include/MVC/Controller/'. $var . '.php')){
-				require('include/MVC/Controller/'. $var . '.php');
-			}
-			if(file_exists('modules/'.$this->module.'/'. $var . '.php')){
-				require('modules/'.$this->module.'/'. $var . '.php');
-			}
-			if(file_exists('custom/modules/'.$this->module.'/'. $var . '.php')){
-				require('custom/modules/'.$this->module.'/'. $var . '.php');
-			}
-			if(file_exists('custom/include/MVC/Controller/'. $var . '.php')){
-				require('custom/include/MVC/Controller/'. $var . '.php');
-			}
+    /**
+     * Generic load method to load mapping arrays.
+     */
+    private function loadMapping($var, $merge = false){
+        $$var = sugar_cache_retrieve("CONTROLLER_". $var . "_".$this->module);
+        if(!$$var){
+            if($merge && !empty($this->$var)){
+                $$var = $this->$var;
+            }else{
+                $$var = array();
+            }
+            if(file_exists('include/MVC/Controller/'. $var . '.php')){
+                require('include/MVC/Controller/'. $var . '.php');
+            }
+            if(file_exists('modules/'.$this->module.'/'. $var . '.php')){
+                require('modules/'.$this->module.'/'. $var . '.php');
+            }
+            if(file_exists('custom/modules/'.$this->module.'/'. $var . '.php')){
+                require('custom/modules/'.$this->module.'/'. $var . '.php');
+            }
+            if(file_exists('custom/include/MVC/Controller/'. $var . '.php')){
+                require('custom/include/MVC/Controller/'. $var . '.php');
+            }
 
             // entry_point_registry -> EntryPointRegistry
 
-			$varname = str_replace(" ","",ucwords(str_replace("_"," ", $var)));
+            $varname = str_replace(" ","",ucwords(str_replace("_"," ", $var)));
             if(file_exists("custom/application/Ext/$varname/$var.ext.php")){
-				require("custom/application/Ext/$varname/$var.ext.php");
-	        }
-			if(file_exists("custom/modules/{$this->module}/Ext/$varname/$var.ext.php")){
-				require("custom/modules/{$this->module}/Ext/$varname/$var.ext.php");
-			}
-
-			sugar_cache_put("CONTROLLER_". $var . "_".$this->module, $$var);
-		}
-		$this->$var = $$var;
-	}
+                require("custom/application/Ext/$varname/$var.ext.php");
+            }
+            if(file_exists("custom/modules/{$this->module}/Ext/$varname/$var.ext.php")){
+                require("custom/modules/{$this->module}/Ext/$varname/$var.ext.php");
+            }
 
-	/**
-	 * This method is called from SugarApplication->execute and it will bootstrap the entire controller process
-	 */
-	final public function execute()
+            sugar_cache_put("CONTROLLER_". $var . "_".$this->module, $$var);
+        }
+        $this->$var = $$var;
+    }
+
+    /**
+     * This method is called from SugarApplication->execute and it will bootstrap the entire controller process
+     */
+    final public function execute()
     {
 
         try
@@ -311,7 +311,7 @@ 
             }
             elseif(!empty($this->redirect_url))
             {
-            			$this->redirect();
+                        $this->redirect();
             }
         }
         catch (Exception $e)
@@ -321,12 +321,12 @@ 
 
 
 
-	}
+    }
 
     /**
-      * Handle exception
-      * @param Exception $e
-      */
+     * Handle exception
+     * @param Exception $e
+     */
     protected function handleException(Exception $e)
     {
         $GLOBALS['log']->fatal('Exception in Controller: ' . $e->getMessage());
@@ -343,52 +343,52 @@ 
         }
     }
 
-	/**
-	 * Display the appropriate view.
-	 */
-	private function processView(){
-		if(!isset($this->view_object_map['remap_action']) && isset($this->action_view_map[strtolower($this->action)]))
-		{
-		  $this->view_object_map['remap_action'] = $this->action_view_map[strtolower($this->action)];
-		}
-		$view = ViewFactory::loadView($this->view, $this->module, $this->bean, $this->view_object_map, $this->target_module);
-		$GLOBALS['current_view'] = $view;
-		if(!empty($this->bean) && !$this->bean->ACLAccess($view->type) && $view->type != 'list'){
-			ACLController::displayNoAccess(true);
-			sugar_cleanup(true);
-		}
-		if(isset($this->errors)){
-		  $view->errors = $this->errors;
-		}
-		$view->process();
-	}
+    /**
+     * Display the appropriate view.
+     */
+    private function processView(){
+        if(!isset($this->view_object_map['remap_action']) && isset($this->action_view_map[strtolower($this->action)]))
+        {
+            $this->view_object_map['remap_action'] = $this->action_view_map[strtolower($this->action)];
+        }
+        $view = ViewFactory::loadView($this->view, $this->module, $this->bean, $this->view_object_map, $this->target_module);
+        $GLOBALS['current_view'] = $view;
+        if(!empty($this->bean) && !$this->bean->ACLAccess($view->type) && $view->type != 'list'){
+            ACLController::displayNoAccess(true);
+            sugar_cleanup(true);
+        }
+        if(isset($this->errors)){
+            $view->errors = $this->errors;
+        }
+        $view->process();
+    }
 
-	/**
-	 * Meant to be overridden by a subclass and allows for specific functionality to be
-	 * injected prior to the process() method being called.
-	 */
-	public function preProcess()
-	{}
-
-	/**
-	 * if we have a function to support the action use it otherwise use the default action
-	 *
-	 * 1) check for file
-	 * 2) check for action
-	 */
-	public function process(){
-		$GLOBALS['action'] = $this->action;
-		$GLOBALS['module'] = $this->module;
+    /**
+     * Meant to be overridden by a subclass and allows for specific functionality to be
+     * injected prior to the process() method being called.
+     */
+    public function preProcess()
+    {}
+
+    /**
+     * if we have a function to support the action use it otherwise use the default action
+     *
+     * 1) check for file
+     * 2) check for action
+     */
+    public function process(){
+        $GLOBALS['action'] = $this->action;
+        $GLOBALS['module'] = $this->module;
 
-		//check to ensure we have access to the module.
-		if($this->hasAccess){
-			$this->do_action = $this->action;
+        //check to ensure we have access to the module.
+        if($this->hasAccess){
+            $this->do_action = $this->action;
 
-			$file = self::getActionFilename($this->do_action);
+            $file = self::getActionFilename($this->do_action);
 
-			$this->loadBean();
+            $this->loadBean();
 
-			$processed = false;
+            $processed = false;
             if (!$this->_processed) {
                 foreach ($this->process_tasks as $process) {
                     $this->$process();
@@ -398,172 +398,172 @@ 
                 }
             }
 
-			$this->redirect();
-		}else{
-			$this->no_access();
-		}
-	}
+            $this->redirect();
+        }else{
+            $this->no_access();
+        }
+    }
 
-	/**
-	 * This method is called from the process method. I could also be called within an action_* method.
-	 * It allows a developer to override any one of these methods contained within,
-	 * or if the developer so chooses they can override the entire action_* method.
-	 *
-	 * @return true if any one of the pre_, do_, or post_ methods have been defined,
-	 * false otherwise.  This is important b/c if none of these methods exists, then we will run the
-	 * action_default() method.
-	 */
-	protected function handle_action(){
-		$processed = false;
-		foreach($this->tasks as $task){
-			$processed = ($this->$task() || $processed);
-		}
-		$this->_processed = $processed;
-	}
+    /**
+     * This method is called from the process method. I could also be called within an action_* method.
+     * It allows a developer to override any one of these methods contained within,
+     * or if the developer so chooses they can override the entire action_* method.
+     *
+     * @return true if any one of the pre_, do_, or post_ methods have been defined,
+     * false otherwise.  This is important b/c if none of these methods exists, then we will run the
+     * action_default() method.
+     */
+    protected function handle_action(){
+        $processed = false;
+        foreach($this->tasks as $task){
+            $processed = ($this->$task() || $processed);
+        }
+        $this->_processed = $processed;
+    }
 
-	/**
-	 * Perform an action prior to the specified action.
-	 * This can be overridde in a sub-class
-	 */
-	private function pre_action(){
-		$function = 'pre_' . $this->action;
-		if($this->hasFunction($function)){
-			$GLOBALS['log']->debug('Performing pre_action');
-			$this->$function();
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Perform an action prior to the specified action.
+     * This can be overridde in a sub-class
+     */
+    private function pre_action(){
+        $function = 'pre_' . $this->action;
+        if($this->hasFunction($function)){
+            $GLOBALS['log']->debug('Performing pre_action');
+            $this->$function();
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * Perform the specified action.
-	 * This can be overridde in a sub-class
-	 */
-	private function do_action(){
-		$function =  'action_'. strtolower($this->do_action);
-		if($this->hasFunction($function)){
-			$GLOBALS['log']->debug('Performing action: '.$function.' MODULE: '.$this->module);
-			$this->$function();
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Perform the specified action.
+     * This can be overridde in a sub-class
+     */
+    private function do_action(){
+        $function =  'action_'. strtolower($this->do_action);
+        if($this->hasFunction($function)){
+            $GLOBALS['log']->debug('Performing action: '.$function.' MODULE: '.$this->module);
+            $this->$function();
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * Perform an action after to the specified action has occurred.
-	 * This can be overridde in a sub-class
-	 */
-	private function post_action(){
-		$function = 'post_' . $this->action;
-		if($this->hasFunction($function)){
-			$GLOBALS['log']->debug('Performing post_action');
-			$this->$function();
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Perform an action after to the specified action has occurred.
+     * This can be overridde in a sub-class
+     */
+    private function post_action(){
+        $function = 'post_' . $this->action;
+        if($this->hasFunction($function)){
+            $GLOBALS['log']->debug('Performing post_action');
+            $this->$function();
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * If there is no action found then display an error to the user.
-	 */
-	protected function no_action(){
-		sugar_die($GLOBALS['app_strings']['LBL_NO_ACTION']);
-	}
+    /**
+     * If there is no action found then display an error to the user.
+     */
+    protected function no_action(){
+        sugar_die($GLOBALS['app_strings']['LBL_NO_ACTION']);
+    }
 
-	/**
-	 * The default action handler for instances where we do not have access to process.
-	 */
-	protected function no_access(){
-		$this->view = 'noaccess';
-	}
+    /**
+     * The default action handler for instances where we do not have access to process.
+     */
+    protected function no_access(){
+        $this->view = 'noaccess';
+    }
 
-	///////////////////////////////////////////////
-	/////// HELPER FUNCTIONS
-	///////////////////////////////////////////////
+    ///////////////////////////////////////////////
+    /////// HELPER FUNCTIONS
+    ///////////////////////////////////////////////
 
-	/**
-	 * Determine if a given function exists on the objects
-	 * @param function - the function to check
-	 * @return true if the method exists on the object, false otherwise
-	 */
-	protected function hasFunction($function){
-		return method_exists($this, $function);
-	}
+    /**
+     * Determine if a given function exists on the objects
+     * @param function - the function to check
+     * @return true if the method exists on the object, false otherwise
+     */
+    protected function hasFunction($function){
+        return method_exists($this, $function);
+    }
 
 
-	/**
-	 * Set the url to which we will want to redirect
-	 *
-	 * @param string url - the url to which we will want to redirect
-	 */
-	protected function set_redirect($url){
-		$this->redirect_url = $url;
-	}
+    /**
+     * Set the url to which we will want to redirect
+     *
+     * @param string url - the url to which we will want to redirect
+     */
+    protected function set_redirect($url){
+        $this->redirect_url = $url;
+    }
 
-	/**
-	 * Perform redirection based on the redirect_url
-	 *
-	 */
-	protected function redirect(){
+    /**
+     * Perform redirection based on the redirect_url
+     *
+     */
+    protected function redirect(){
 
-		if(!empty($this->redirect_url))
-			SugarApplication::redirect($this->redirect_url);
-	}
+        if(!empty($this->redirect_url))
+            SugarApplication::redirect($this->redirect_url);
+    }
 
-	////////////////////////////////////////////////////////
-	////// DEFAULT ACTIONS
-	///////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////
+    ////// DEFAULT ACTIONS
+    ///////////////////////////////////////////////////////
 
-	/*
+    /*
 	 * Save a bean
 	 */
 
-	/**
-	 * Do some processing before saving the bean to the database.
-	 */
-	public function pre_save(){
-		if(!empty($_POST['assigned_user_id']) && $_POST['assigned_user_id'] != $this->bean->assigned_user_id && $_POST['assigned_user_id'] != $GLOBALS['current_user']->id && empty($GLOBALS['sugar_config']['exclude_notifications'][$this->bean->module_dir])){
-			$this->bean->notify_on_save = true;
-		}
-		$GLOBALS['log']->debug("SugarController:: performing pre_save.");
+    /**
+     * Do some processing before saving the bean to the database.
+     */
+    public function pre_save(){
+        if(!empty($_POST['assigned_user_id']) && $_POST['assigned_user_id'] != $this->bean->assigned_user_id && $_POST['assigned_user_id'] != $GLOBALS['current_user']->id && empty($GLOBALS['sugar_config']['exclude_notifications'][$this->bean->module_dir])){
+            $this->bean->notify_on_save = true;
+        }
+        $GLOBALS['log']->debug("SugarController:: performing pre_save.");
         require_once('include/SugarFields/SugarFieldHandler.php');
         $sfh = new SugarFieldHandler();
-		foreach($this->bean->field_defs as $field => $properties) {
-			$type = !empty($properties['custom_type']) ? $properties['custom_type'] : $properties['type'];
-		    $sf = $sfh->getSugarField(ucfirst($type), true);
-			if(isset($_POST[$field])) {
-				if(is_array($_POST[$field]) && !empty($properties['isMultiSelect'])) {
-					if(empty($_POST[$field][0])) {
-						unset($_POST[$field][0]);
-					}
-					$_POST[$field] = encodeMultienumValue($_POST[$field]);
-				}
-				$this->bean->$field = $_POST[$field];
-			} else if(!empty($properties['isMultiSelect']) && !isset($_POST[$field]) && isset($_POST[$field . '_multiselect'])) {
-				$this->bean->$field = '';
-			}
+        foreach($this->bean->field_defs as $field => $properties) {
+            $type = !empty($properties['custom_type']) ? $properties['custom_type'] : $properties['type'];
+            $sf = $sfh->getSugarField(ucfirst($type), true);
+            if(isset($_POST[$field])) {
+                if(is_array($_POST[$field]) && !empty($properties['isMultiSelect'])) {
+                    if(empty($_POST[$field][0])) {
+                        unset($_POST[$field][0]);
+                    }
+                    $_POST[$field] = encodeMultienumValue($_POST[$field]);
+                }
+                $this->bean->$field = $_POST[$field];
+            } else if(!empty($properties['isMultiSelect']) && !isset($_POST[$field]) && isset($_POST[$field . '_multiselect'])) {
+                $this->bean->$field = '';
+            }
             if($sf != null){
                 $sf->save($this->bean, $_POST, $field, $properties);
             }
-		}
-
-		foreach($this->bean->relationship_fields as $field=>$link){
-			if(!empty($_POST[$field])){
-				$this->bean->$field = $_POST[$field];
-			}
-		}
-		if(!$this->bean->ACLAccess('save')){
-			ACLController::displayNoAccess(true);
-			sugar_cleanup(true);
-		}
-	}
+        }
 
-	/**
-	 * Perform the actual save
-	 */
-	public function action_save(){
-		$this->bean->save(!empty($this->bean->notify_on_save));
-	}
+        foreach($this->bean->relationship_fields as $field=>$link){
+            if(!empty($_POST[$field])){
+                $this->bean->$field = $_POST[$field];
+            }
+        }
+        if(!$this->bean->ACLAccess('save')){
+            ACLController::displayNoAccess(true);
+            sugar_cleanup(true);
+        }
+    }
+
+    /**
+     * Perform the actual save
+     */
+    public function action_save(){
+        $this->bean->save(!empty($this->bean->notify_on_save));
+    }
 
 
     public function action_spot()
@@ -572,43 +572,43 @@ 
     }
 
 
-	/**
-	 * Specify what happens after the save has occurred.
-	 */
-	protected function post_save(){
-		$module = (!empty($this->return_module) ? $this->return_module : $this->module);
-		$action = (!empty($this->return_action) ? $this->return_action : 'DetailView');
-		$id = (!empty($this->return_id) ? $this->return_id : $this->bean->id);
+    /**
+     * Specify what happens after the save has occurred.
+     */
+    protected function post_save(){
+        $module = (!empty($this->return_module) ? $this->return_module : $this->module);
+        $action = (!empty($this->return_action) ? $this->return_action : 'DetailView');
+        $id = (!empty($this->return_id) ? $this->return_id : $this->bean->id);
 
-		$url = "index.php?module=".$module."&action=".$action."&record=".$id;
-		$this->set_redirect($url);
-	}
+        $url = "index.php?module=".$module."&action=".$action."&record=".$id;
+        $this->set_redirect($url);
+    }
 
-	/*
+    /*
 	 * Delete a bean
 	 */
 
-	/**
-	 * Perform the actual deletion.
-	 */
-	protected function action_delete(){
-		//do any pre delete processing
-		//if there is some custom logic for deletion.
-		if(!empty($_REQUEST['record'])){
-			if(!$this->bean->ACLAccess('Delete')){
-				ACLController::displayNoAccess(true);
-				sugar_cleanup(true);
-			}
-			$this->bean->mark_deleted($_REQUEST['record']);
-		}else{
-			sugar_die("A record number must be specified to delete");
-		}
-	}
+    /**
+     * Perform the actual deletion.
+     */
+    protected function action_delete(){
+        //do any pre delete processing
+        //if there is some custom logic for deletion.
+        if(!empty($_REQUEST['record'])){
+            if(!$this->bean->ACLAccess('Delete')){
+                ACLController::displayNoAccess(true);
+                sugar_cleanup(true);
+            }
+            $this->bean->mark_deleted($_REQUEST['record']);
+        }else{
+            sugar_die("A record number must be specified to delete");
+        }
+    }
 
-	/**
-	 * Specify what happens after the deletion has occurred.
-	 */
-	protected function post_delete(){
+    /**
+     * Specify what happens after the deletion has occurred.
+     */
+    protected function post_delete(){
         if (empty($_REQUEST['return_url'])) {
             $return_module = isset($_REQUEST['return_module']) ?
                 $_REQUEST['return_module'] :
@@ -624,23 +624,23 @@ 
             $url = $_REQUEST['return_url'];
         }
 
-		//eggsurplus Bug 23816: maintain VCR after an edit/save. If it is a duplicate then don't worry about it. The offset is now worthless.
-		if(isset($_REQUEST['offset']) && empty($_REQUEST['duplicateSave'])) {
-		    $url .= "&offset=".$_REQUEST['offset'];
-		}
+        //eggsurplus Bug 23816: maintain VCR after an edit/save. If it is a duplicate then don't worry about it. The offset is now worthless.
+        if(isset($_REQUEST['offset']) && empty($_REQUEST['duplicateSave'])) {
+            $url .= "&offset=".$_REQUEST['offset'];
+        }
 
-		$this->set_redirect($url);
-	}
-	/**
-	 * Perform the actual massupdate.
-	 */
-	protected function action_massupdate(){
-		if(!empty($_REQUEST['massupdate']) && $_REQUEST['massupdate'] == 'true' && (!empty($_REQUEST['uid']) || !empty($_REQUEST['entire']))){
-			if(!empty($_REQUEST['Delete']) && $_REQUEST['Delete']=='true' && !$this->bean->ACLAccess('delete')
+        $this->set_redirect($url);
+    }
+    /**
+     * Perform the actual massupdate.
+     */
+    protected function action_massupdate(){
+        if(!empty($_REQUEST['massupdate']) && $_REQUEST['massupdate'] == 'true' && (!empty($_REQUEST['uid']) || !empty($_REQUEST['entire']))){
+            if(!empty($_REQUEST['Delete']) && $_REQUEST['Delete']=='true' && !$this->bean->ACLAccess('delete')
                 || (empty($_REQUEST['Delete']) || $_REQUEST['Delete']!='true') && !$this->bean->ACLAccess('save')){
-				ACLController::displayNoAccess(true);
-				sugar_cleanup(true);
-			}
+                ACLController::displayNoAccess(true);
+                sugar_cleanup(true);
+            }
 
             set_time_limit(0);//I'm wondering if we will set it never goes timeout here.
             // until we have more efficient way of handling MU, we have to disable the limit
@@ -666,35 +666,35 @@ 
             unset($_REQUEST[$seed->module_dir.'2_'.strtoupper($seed->object_name).'_offset']);//after massupdate, the page should redirect to no offset page
             $storeQuery->saveFromRequest($_REQUEST['module']);
             $_REQUEST = array('return_module' => $temp_req['return_module'], 'return_action' => $temp_req['return_action']);//for post_massupdate, to go back to original page.
-		}else{
-			sugar_die("You must massupdate at least one record");
-		}
-	}
-	/**
-	 * Specify what happens after the massupdate has occurred.
-	 */
-	protected function post_massupdate(){
-		$return_module = isset($_REQUEST['return_module']) ?
-			$_REQUEST['return_module'] :
-			$GLOBALS['sugar_config']['default_module'];
-		$return_action = isset($_REQUEST['return_action']) ?
-			$_REQUEST['return_action'] :
-			$GLOBALS['sugar_config']['default_action'];
-		$url = "index.php?module=".$return_module."&action=".$return_action;
-		if($return_module == 'Emails'){//specificly for My Achieves
-			if(!empty($this->req_for_email['type']) && !empty($this->req_for_email['ie_assigned_user_id'])) {
-				$url = $url . "&type=".$this->req_for_email['type']."&assigned_user_id=".$this->req_for_email['ie_assigned_user_id'];
-			}
-		}
-		$this->set_redirect($url);
-	}
-	/**
-	 * Perform the listview action
-	 */
-	protected function action_listview(){
-		$this->view_object_map['bean'] = $this->bean;
-		$this->view = 'list';
-	}
+        }else{
+            sugar_die("You must massupdate at least one record");
+        }
+    }
+    /**
+     * Specify what happens after the massupdate has occurred.
+     */
+    protected function post_massupdate(){
+        $return_module = isset($_REQUEST['return_module']) ?
+            $_REQUEST['return_module'] :
+            $GLOBALS['sugar_config']['default_module'];
+        $return_action = isset($_REQUEST['return_action']) ?
+            $_REQUEST['return_action'] :
+            $GLOBALS['sugar_config']['default_action'];
+        $url = "index.php?module=".$return_module."&action=".$return_action;
+        if($return_module == 'Emails'){//specificly for My Achieves
+            if(!empty($this->req_for_email['type']) && !empty($this->req_for_email['ie_assigned_user_id'])) {
+                $url = $url . "&type=".$this->req_for_email['type']."&assigned_user_id=".$this->req_for_email['ie_assigned_user_id'];
+            }
+        }
+        $this->set_redirect($url);
+    }
+    /**
+     * Perform the listview action
+     */
+    protected function action_listview(){
+        $this->view_object_map['bean'] = $this->bean;
+        $this->view = 'list';
+    }
 
 /*
 
@@ -703,63 +703,63 @@ 
 	}
 */
 
-	/**
-	 * Action to handle when using a file as was done in previous versions of Sugar.
-	 */
-	protected function action_default(){
-		$this->view = 'classic';
-	}
+    /**
+     * Action to handle when using a file as was done in previous versions of Sugar.
+     */
+    protected function action_default(){
+        $this->view = 'classic';
+    }
 
-	/**
-	 * this method id used within a Dashlet when performing an ajax call
-	 */
-	protected function action_callmethoddashlet(){
-		if(!empty($_REQUEST['id'])) {
-		    $id = $_REQUEST['id'];
-		    $requestedMethod = $_REQUEST['method'];
-		    $dashletDefs = $GLOBALS['current_user']->getPreference('dashlets', 'Home'); // load user's dashlets config
-		    if(!empty($dashletDefs[$id])) {
-		        require_once($dashletDefs[$id]['fileLocation']);
-
-		        $dashlet = new $dashletDefs[$id]['className']($id, (isset($dashletDefs[$id]['options']) ? $dashletDefs[$id]['options'] : array()));
-
-		        if(method_exists($dashlet, $requestedMethod) || method_exists($dashlet, '__call')) {
-		            echo $dashlet->$requestedMethod();
-		        }
-		        else {
-		            echo 'no method';
-		        }
-		    }
-		}
-	}
+    /**
+     * this method id used within a Dashlet when performing an ajax call
+     */
+    protected function action_callmethoddashlet(){
+        if(!empty($_REQUEST['id'])) {
+            $id = $_REQUEST['id'];
+            $requestedMethod = $_REQUEST['method'];
+            $dashletDefs = $GLOBALS['current_user']->getPreference('dashlets', 'Home'); // load user's dashlets config
+            if(!empty($dashletDefs[$id])) {
+                require_once($dashletDefs[$id]['fileLocation']);
+
+                $dashlet = new $dashletDefs[$id]['className']($id, (isset($dashletDefs[$id]['options']) ? $dashletDefs[$id]['options'] : array()));
+
+                if(method_exists($dashlet, $requestedMethod) || method_exists($dashlet, '__call')) {
+                    echo $dashlet->$requestedMethod();
+                }
+                else {
+                    echo 'no method';
+                }
+            }
+        }
+    }
 
-	/**
-	 * this method is used within a Dashlet when the options configuration is posted
-	 */
-	protected function action_configuredashlet(){
-		global $current_user, $mod_strings;
-
-		if(!empty($_REQUEST['id'])) {
-		    $id = $_REQUEST['id'];
-		    $dashletDefs = $current_user->getPreference('dashlets', $_REQUEST['module']); // load user's dashlets config
-		    require_once($dashletDefs[$id]['fileLocation']);
-
-		    $dashlet = new $dashletDefs[$id]['className']($id, (isset($dashletDefs[$id]['options']) ? $dashletDefs[$id]['options'] : array()));
-		    if(!empty($_REQUEST['configure']) && $_REQUEST['configure']) { // save settings
-		        $dashletDefs[$id]['options'] = $dashlet->saveOptions($_REQUEST);
-		        $current_user->setPreference('dashlets', $dashletDefs, 0, $_REQUEST['module']);
-		    }
-		    else { // display options
-		        $json = getJSONobj();
-		        return 'result = ' . $json->encode((array('header' => $dashlet->title . ' : ' . $mod_strings['LBL_OPTIONS'],
-		                                                 'body'  => $dashlet->displayOptions())));
-
-		    }
-		}
-		else {
-		    return '0';
-		}
-	}
+    /**
+     * this method is used within a Dashlet when the options configuration is posted
+     */
+    protected function action_configuredashlet(){
+        global $current_user, $mod_strings;
+
+        if(!empty($_REQUEST['id'])) {
+            $id = $_REQUEST['id'];
+            $dashletDefs = $current_user->getPreference('dashlets', $_REQUEST['module']); // load user's dashlets config
+            require_once($dashletDefs[$id]['fileLocation']);
+
+            $dashlet = new $dashletDefs[$id]['className']($id, (isset($dashletDefs[$id]['options']) ? $dashletDefs[$id]['options'] : array()));
+            if(!empty($_REQUEST['configure']) && $_REQUEST['configure']) { // save settings
+                $dashletDefs[$id]['options'] = $dashlet->saveOptions($_REQUEST);
+                $current_user->setPreference('dashlets', $dashletDefs, 0, $_REQUEST['module']);
+            }
+            else { // display options
+                $json = getJSONobj();
+                return 'result = ' . $json->encode((array('header' => $dashlet->title . ' : ' . $mod_strings['LBL_OPTIONS'],
+                                                            'body'  => $dashlet->displayOptions())));
+
+            }
+        }
+        else {
+            return '0';
+        }
+    }
 
     /**
      * Global method to delete an attachment
@@ -789,84 +789,84 @@ 
         sugar_cleanup(true);
     }
 
-	/**
-	 * getActionFilename
-	 */
-	public static function getActionFilename($action) {
-	   if(isset(self::$action_case_file[$action])) {
-	   	  return self::$action_case_file[$action];
-	   }
-	   return $action;
-	}
+    /**
+     * getActionFilename
+     */
+    public static function getActionFilename($action) {
+        if(isset(self::$action_case_file[$action])) {
+                return self::$action_case_file[$action];
+        }
+        return $action;
+    }
 
-	/********************************************************************/
-	// 				PROCESS TASKS
-	/********************************************************************/
+    /********************************************************************/
+    // 				PROCESS TASKS
+    /********************************************************************/
 
-	/**
-	 * Given the module and action, determine whether the super/admin has prevented access
-	 * to this url. In addition if any links specified for this module, load the links into
-	 * GLOBALS
-	 *
-	 * @return true if we want to stop processing, false if processing should continue
-	 */
-	private function blockFileAccess(){
-		//check if the we have enabled file_access_control and if so then check the mappings on the request;
-		if(!empty($GLOBALS['sugar_config']['admin_access_control']) && $GLOBALS['sugar_config']['admin_access_control']){
-			$this->loadMapping('file_access_control_map');
-			//since we have this turned on, check the mapping file
-			$module = strtolower($this->module);
-			$action = strtolower($this->do_action);
-			if(!empty($this->file_access_control_map['modules'][$module]['links'])){
-				$GLOBALS['admin_access_control_links'] = $this->file_access_control_map['modules'][$module]['links'];
-			}
-
-			if(!empty($this->file_access_control_map['modules'][$module]['actions']) && (in_array($action, $this->file_access_control_map['modules'][$module]['actions']) || !empty($this->file_access_control_map['modules'][$module]['actions'][$action]))){
-				//check params
-				if(!empty($this->file_access_control_map['modules'][$module]['actions'][$action]['params'])){
-					$block = true;
-					$params = $this->file_access_control_map['modules'][$module]['actions'][$action]['params'];
-					foreach($params as $param => $paramVals){
-						if(!empty($_REQUEST[$param])){
-							if(!in_array($_REQUEST[$param], $paramVals)){
-								$block = false;
-								break;
-							}
-						}
-					}
-					if($block){
-						$this->_processed = true;
-						$this->no_access();
-					}
-				}else{
-					$this->_processed = true;
-					$this->no_access();
-				}
-			}
-		}else
-			$this->_processed = false;
-	}
+    /**
+     * Given the module and action, determine whether the super/admin has prevented access
+     * to this url. In addition if any links specified for this module, load the links into
+     * GLOBALS
+     *
+     * @return true if we want to stop processing, false if processing should continue
+     */
+    private function blockFileAccess(){
+        //check if the we have enabled file_access_control and if so then check the mappings on the request;
+        if(!empty($GLOBALS['sugar_config']['admin_access_control']) && $GLOBALS['sugar_config']['admin_access_control']){
+            $this->loadMapping('file_access_control_map');
+            //since we have this turned on, check the mapping file
+            $module = strtolower($this->module);
+            $action = strtolower($this->do_action);
+            if(!empty($this->file_access_control_map['modules'][$module]['links'])){
+                $GLOBALS['admin_access_control_links'] = $this->file_access_control_map['modules'][$module]['links'];
+            }
 
-	/**
-	 * This code is part of the entry points reworking. We have consolidated all
-	 * entry points to go through index.php. Now in order to bring up an entry point
-	 * it will follow the format:
-	 * 'index.php?entryPoint=download'
-	 * the download entry point is mapped in the following file: entry_point_registry.php
-	 *
-	 */
-	private function handleEntryPoint(){
-		if(!empty($_REQUEST['entryPoint'])){
-			$this->loadMapping('entry_point_registry');
-			$entryPoint = $_REQUEST['entryPoint'];
-
-			if(!empty($this->entry_point_registry[$entryPoint])){
-				require_once($this->entry_point_registry[$entryPoint]['file']);
-				$this->_processed = true;
-				$this->view = '';
-			}
-		}
-	}
+            if(!empty($this->file_access_control_map['modules'][$module]['actions']) && (in_array($action, $this->file_access_control_map['modules'][$module]['actions']) || !empty($this->file_access_control_map['modules'][$module]['actions'][$action]))){
+                //check params
+                if(!empty($this->file_access_control_map['modules'][$module]['actions'][$action]['params'])){
+                    $block = true;
+                    $params = $this->file_access_control_map['modules'][$module]['actions'][$action]['params'];
+                    foreach($params as $param => $paramVals){
+                        if(!empty($_REQUEST[$param])){
+                            if(!in_array($_REQUEST[$param], $paramVals)){
+                                $block = false;
+                                break;
+                            }
+                        }
+                    }
+                    if($block){
+                        $this->_processed = true;
+                        $this->no_access();
+                    }
+                }else{
+                    $this->_processed = true;
+                    $this->no_access();
+                }
+            }
+        }else
+            $this->_processed = false;
+    }
+
+    /**
+     * This code is part of the entry points reworking. We have consolidated all
+     * entry points to go through index.php. Now in order to bring up an entry point
+     * it will follow the format:
+     * 'index.php?entryPoint=download'
+     * the download entry point is mapped in the following file: entry_point_registry.php
+     *
+     */
+    private function handleEntryPoint(){
+        if(!empty($_REQUEST['entryPoint'])){
+            $this->loadMapping('entry_point_registry');
+            $entryPoint = $_REQUEST['entryPoint'];
+
+            if(!empty($this->entry_point_registry[$entryPoint])){
+                require_once($this->entry_point_registry[$entryPoint]['file']);
+                $this->_processed = true;
+                $this->view = '';
+            }
+        }
+    }
 
     /**
      * Checks to see if the requested entry point requires auth
@@ -884,67 +884,67 @@ 
         return true;
     }
 
-	/**
-	 * Meant to handle old views e.g. DetailView.php.
-	 *
-	 */
-	protected function callLegacyCode()
-	{
-		$file = self::getActionFilename($this->do_action);
-		if ( isset($this->action_view_map[strtolower($this->do_action)]) ) {
-	        $action = $this->action_view_map[strtolower($this->do_action)];
-	    }
-	    else {
-	        $action = $this->do_action;
-	    }
-	    // index actions actually maps to the view.list.php view
-	    if ( $action == 'index' ) {
-	        $action = 'list';
-	    }
-
-		if ((file_exists('modules/' . $this->module . '/'. $file . '.php')
+    /**
+     * Meant to handle old views e.g. DetailView.php.
+     *
+     */
+    protected function callLegacyCode()
+    {
+        $file = self::getActionFilename($this->do_action);
+        if ( isset($this->action_view_map[strtolower($this->do_action)]) ) {
+            $action = $this->action_view_map[strtolower($this->do_action)];
+        }
+        else {
+            $action = $this->do_action;
+        }
+        // index actions actually maps to the view.list.php view
+        if ( $action == 'index' ) {
+            $action = 'list';
+        }
+
+        if ((file_exists('modules/' . $this->module . '/'. $file . '.php')
                 && !file_exists('modules/' . $this->module . '/views/view.'. $action . '.php'))
             || (file_exists('custom/modules/' . $this->module . '/'. $file . '.php')
                 && !file_exists('custom/modules/' . $this->module . '/views/view.'. $action . '.php'))
             ) {
-			// A 'classic' module, using the old pre-MVC display files
-			// We should now discard the bean we just obtained for tracking as the pre-MVC module will instantiate its own
-			unset($GLOBALS['FOCUS']);
-			$GLOBALS['log']->debug('Module:' . $this->module . ' using file: '. $file);
-			$this->action_default();
-			$this->_processed = true;
-		}
-	}
+            // A 'classic' module, using the old pre-MVC display files
+            // We should now discard the bean we just obtained for tracking as the pre-MVC module will instantiate its own
+            unset($GLOBALS['FOCUS']);
+            $GLOBALS['log']->debug('Module:' . $this->module . ' using file: '. $file);
+            $this->action_default();
+            $this->_processed = true;
+        }
+    }
 
-	/**
-	 * If the action has been remapped to a different action as defined in
-	 * action_file_map.php or action_view_map.php load those maps here.
-	 *
-	 */
-	private function handleActionMaps(){
-		if(!empty($this->action_file_map[strtolower($this->do_action)])){
-			$this->view = '';
-			$GLOBALS['log']->debug('Using Action File Map:' . $this->action_file_map[strtolower($this->do_action)]);
-			require_once($this->action_file_map[strtolower($this->do_action)]);
-			$this->_processed = true;
-		}elseif(!empty($this->action_view_map[strtolower($this->do_action)])){
-			$GLOBALS['log']->debug('Using Action View Map:' . $this->action_view_map[strtolower($this->do_action)]);
-			$this->view = $this->action_view_map[strtolower($this->do_action)];
-			$this->_processed = true;
-		}else
-			$this->no_action();
-	}
+    /**
+     * If the action has been remapped to a different action as defined in
+     * action_file_map.php or action_view_map.php load those maps here.
+     *
+     */
+    private function handleActionMaps(){
+        if(!empty($this->action_file_map[strtolower($this->do_action)])){
+            $this->view = '';
+            $GLOBALS['log']->debug('Using Action File Map:' . $this->action_file_map[strtolower($this->do_action)]);
+            require_once($this->action_file_map[strtolower($this->do_action)]);
+            $this->_processed = true;
+        }elseif(!empty($this->action_view_map[strtolower($this->do_action)])){
+            $GLOBALS['log']->debug('Using Action View Map:' . $this->action_view_map[strtolower($this->do_action)]);
+            $this->view = $this->action_view_map[strtolower($this->do_action)];
+            $this->_processed = true;
+        }else
+            $this->no_action();
+    }
 
-	/**
-	 * Actually remap the action if required.
-	 *
-	 */
-	protected function remapAction(){
-		if(!empty($this->action_remap[$this->do_action])){
-			$this->action = $this->action_remap[$this->do_action];
-			$this->do_action = $this->action;
-		}
-	}
+    /**
+     * Actually remap the action if required.
+     *
+     */
+    protected function remapAction(){
+        if(!empty($this->action_remap[$this->do_action])){
+            $this->action = $this->action_remap[$this->do_action];
+            $this->do_action = $this->action;
+        }
+    }
 
 }
 ?>

Spacing +148 added lines, -153 removed lines

@@ -43,7 +43,7 @@ 
  * Main SugarCRM controller
  * @api
  */
-class SugarController{
+class SugarController {
 	/**
 	 * remap actions in here
 	 * e.g. make all detail views go to edit views
@@ -162,15 +162,15 @@ 
 	 * Constructor. This ie meant tot load up the module, action, record as well
 	 * as the mapping arrays.
 	 */
-	public function __construct(){
+	public function __construct() {
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function SugarController(){
+    public function SugarController() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -185,14 +185,14 @@ 
 	 * on the controller.
 	 *
 	 */
-	public function setup($module = ''){
-		if(empty($module) && !empty($_REQUEST['module']))
+	public function setup($module = '') {
+		if (empty($module) && !empty($_REQUEST['module']))
 			$module = $_REQUEST['module'];
 		//set the module
-		if(!empty($module))
+		if (!empty($module))
 			$this->setModule($module);
 
-		if(!empty($_REQUEST['target_module']) && $_REQUEST['target_module'] != 'undefined') {
+		if (!empty($_REQUEST['target_module']) && $_REQUEST['target_module'] != 'undefined') {
 			$this->target_module = $_REQUEST['target_module'];
 		}
 		//set properties on the controller from the $_REQUEST
@@ -205,7 +205,7 @@ 
 	 *
 	 * @param object $module
 	 */
-	public function setModule($module){
+	public function setModule($module) {
 		$this->module = $module;
 	}
 
@@ -213,18 +213,18 @@ 
 	 * Set properties on the Controller from the $_REQUEST
 	 *
 	 */
-	private function loadPropertiesFromRequest(){
-		if(!empty($_REQUEST['action']))
+	private function loadPropertiesFromRequest() {
+		if (!empty($_REQUEST['action']))
 			$this->action = $_REQUEST['action'];
-		if(!empty($_REQUEST['record']))
+		if (!empty($_REQUEST['record']))
 			$this->record = $_REQUEST['record'];
-		if(!empty($_REQUEST['view']))
+		if (!empty($_REQUEST['view']))
 			$this->view = $_REQUEST['view'];
-		if(!empty($_REQUEST['return_module']))
+		if (!empty($_REQUEST['return_module']))
 			$this->return_module = $_REQUEST['return_module'];
-		if(!empty($_REQUEST['return_action']))
+		if (!empty($_REQUEST['return_action']))
 			$this->return_action = $_REQUEST['return_action'];
-		if(!empty($_REQUEST['return_id']))
+		if (!empty($_REQUEST['return_id']))
 			$this->return_id = $_REQUEST['return_id'];
 	}
 
@@ -232,7 +232,7 @@ 
 	 * Load map files for use within the Controller
 	 *
 	 */
-	private function loadMappings(){
+	private function loadMappings() {
 		$this->loadMapping('action_view_map');
 		$this->loadMapping('action_file_map');
 		$this->loadMapping('action_remap', true);
@@ -243,14 +243,14 @@ 
 	 */
 	public function loadBean()
 	{
-		if(!empty($GLOBALS['beanList'][$this->module])){
+		if (!empty($GLOBALS['beanList'][$this->module])) {
 			$class = $GLOBALS['beanList'][$this->module];
-			if(!empty($GLOBALS['beanFiles'][$class])){
+			if (!empty($GLOBALS['beanFiles'][$class])) {
 				require_once($GLOBALS['beanFiles'][$class]);
 				$this->bean = new $class();
-				if(!empty($this->record)){
+				if (!empty($this->record)) {
 					$this->bean->retrieve($this->record);
-					if($this->bean)
+					if ($this->bean)
 						$GLOBALS['FOCUS'] = $this->bean;
 				}
 			}
@@ -260,38 +260,38 @@ 
 	/**
 	 * Generic load method to load mapping arrays.
 	 */
-	private function loadMapping($var, $merge = false){
-		$$var = sugar_cache_retrieve("CONTROLLER_". $var . "_".$this->module);
-		if(!$$var){
-			if($merge && !empty($this->$var)){
+	private function loadMapping($var, $merge = false) {
+		$$var = sugar_cache_retrieve("CONTROLLER_".$var."_".$this->module);
+		if (!$$var) {
+			if ($merge && !empty($this->$var)) {
 				$$var = $this->$var;
-			}else{
+			} else {
 				$$var = array();
 			}
-			if(file_exists('include/MVC/Controller/'. $var . '.php')){
-				require('include/MVC/Controller/'. $var . '.php');
+			if (file_exists('include/MVC/Controller/'.$var.'.php')) {
+				require('include/MVC/Controller/'.$var.'.php');
 			}
-			if(file_exists('modules/'.$this->module.'/'. $var . '.php')){
-				require('modules/'.$this->module.'/'. $var . '.php');
+			if (file_exists('modules/'.$this->module.'/'.$var.'.php')) {
+				require('modules/'.$this->module.'/'.$var.'.php');
 			}
-			if(file_exists('custom/modules/'.$this->module.'/'. $var . '.php')){
-				require('custom/modules/'.$this->module.'/'. $var . '.php');
+			if (file_exists('custom/modules/'.$this->module.'/'.$var.'.php')) {
+				require('custom/modules/'.$this->module.'/'.$var.'.php');
 			}
-			if(file_exists('custom/include/MVC/Controller/'. $var . '.php')){
-				require('custom/include/MVC/Controller/'. $var . '.php');
+			if (file_exists('custom/include/MVC/Controller/'.$var.'.php')) {
+				require('custom/include/MVC/Controller/'.$var.'.php');
 			}
 
             // entry_point_registry -> EntryPointRegistry
 
-			$varname = str_replace(" ","",ucwords(str_replace("_"," ", $var)));
-            if(file_exists("custom/application/Ext/$varname/$var.ext.php")){
+			$varname = str_replace(" ", "", ucwords(str_replace("_", " ", $var)));
+            if (file_exists("custom/application/Ext/$varname/$var.ext.php")) {
 				require("custom/application/Ext/$varname/$var.ext.php");
 	        }
-			if(file_exists("custom/modules/{$this->module}/Ext/$varname/$var.ext.php")){
+			if (file_exists("custom/modules/{$this->module}/Ext/$varname/$var.ext.php")) {
 				require("custom/modules/{$this->module}/Ext/$varname/$var.ext.php");
 			}
 
-			sugar_cache_put("CONTROLLER_". $var . "_".$this->module, $$var);
+			sugar_cache_put("CONTROLLER_".$var."_".$this->module, $$var);
 		}
 		$this->$var = $$var;
 	}
@@ -305,11 +305,11 @@ 
         try
         {
             $this->process();
-            if(!empty($this->view))
+            if (!empty($this->view))
             {
                 $this->processView();
             }
-            elseif(!empty($this->redirect_url))
+            elseif (!empty($this->redirect_url))
             {
             			$this->redirect();
             }
@@ -329,7 +329,7 @@ 
       */
     protected function handleException(Exception $e)
     {
-        $GLOBALS['log']->fatal('Exception in Controller: ' . $e->getMessage());
+        $GLOBALS['log']->fatal('Exception in Controller: '.$e->getMessage());
         $logicHook = new LogicHook();
 
         if (isset($this->bean))
@@ -346,18 +346,18 @@ 
 	/**
 	 * Display the appropriate view.
 	 */
-	private function processView(){
-		if(!isset($this->view_object_map['remap_action']) && isset($this->action_view_map[strtolower($this->action)]))
+	private function processView() {
+		if (!isset($this->view_object_map['remap_action']) && isset($this->action_view_map[strtolower($this->action)]))
 		{
 		  $this->view_object_map['remap_action'] = $this->action_view_map[strtolower($this->action)];
 		}
 		$view = ViewFactory::loadView($this->view, $this->module, $this->bean, $this->view_object_map, $this->target_module);
 		$GLOBALS['current_view'] = $view;
-		if(!empty($this->bean) && !$this->bean->ACLAccess($view->type) && $view->type != 'list'){
+		if (!empty($this->bean) && !$this->bean->ACLAccess($view->type) && $view->type != 'list') {
 			ACLController::displayNoAccess(true);
 			sugar_cleanup(true);
 		}
-		if(isset($this->errors)){
+		if (isset($this->errors)) {
 		  $view->errors = $this->errors;
 		}
 		$view->process();
@@ -376,12 +376,12 @@ 
 	 * 1) check for file
 	 * 2) check for action
 	 */
-	public function process(){
+	public function process() {
 		$GLOBALS['action'] = $this->action;
 		$GLOBALS['module'] = $this->module;
 
 		//check to ensure we have access to the module.
-		if($this->hasAccess){
+		if ($this->hasAccess) {
 			$this->do_action = $this->action;
 
 			$file = self::getActionFilename($this->do_action);
@@ -399,7 +399,7 @@ 
             }
 
 			$this->redirect();
-		}else{
+		} else {
 			$this->no_access();
 		}
 	}
@@ -413,9 +413,9 @@ 
 	 * false otherwise.  This is important b/c if none of these methods exists, then we will run the
 	 * action_default() method.
 	 */
-	protected function handle_action(){
+	protected function handle_action() {
 		$processed = false;
-		foreach($this->tasks as $task){
+		foreach ($this->tasks as $task) {
 			$processed = ($this->$task() || $processed);
 		}
 		$this->_processed = $processed;
@@ -425,9 +425,9 @@ 
 	 * Perform an action prior to the specified action.
 	 * This can be overridde in a sub-class
 	 */
-	private function pre_action(){
-		$function = 'pre_' . $this->action;
-		if($this->hasFunction($function)){
+	private function pre_action() {
+		$function = 'pre_'.$this->action;
+		if ($this->hasFunction($function)) {
 			$GLOBALS['log']->debug('Performing pre_action');
 			$this->$function();
 			return true;
@@ -439,9 +439,9 @@ 
 	 * Perform the specified action.
 	 * This can be overridde in a sub-class
 	 */
-	private function do_action(){
-		$function =  'action_'. strtolower($this->do_action);
-		if($this->hasFunction($function)){
+	private function do_action() {
+		$function = 'action_'.strtolower($this->do_action);
+		if ($this->hasFunction($function)) {
 			$GLOBALS['log']->debug('Performing action: '.$function.' MODULE: '.$this->module);
 			$this->$function();
 			return true;
@@ -453,9 +453,9 @@ 
 	 * Perform an action after to the specified action has occurred.
 	 * This can be overridde in a sub-class
 	 */
-	private function post_action(){
-		$function = 'post_' . $this->action;
-		if($this->hasFunction($function)){
+	private function post_action() {
+		$function = 'post_'.$this->action;
+		if ($this->hasFunction($function)) {
 			$GLOBALS['log']->debug('Performing post_action');
 			$this->$function();
 			return true;
@@ -466,14 +466,14 @@ 
 	/**
 	 * If there is no action found then display an error to the user.
 	 */
-	protected function no_action(){
+	protected function no_action() {
 		sugar_die($GLOBALS['app_strings']['LBL_NO_ACTION']);
 	}
 
 	/**
 	 * The default action handler for instances where we do not have access to process.
 	 */
-	protected function no_access(){
+	protected function no_access() {
 		$this->view = 'noaccess';
 	}
 
@@ -486,7 +486,7 @@ 
 	 * @param function - the function to check
 	 * @return true if the method exists on the object, false otherwise
 	 */
-	protected function hasFunction($function){
+	protected function hasFunction($function) {
 		return method_exists($this, $function);
 	}
 
@@ -496,7 +496,7 @@ 
 	 *
 	 * @param string url - the url to which we will want to redirect
 	 */
-	protected function set_redirect($url){
+	protected function set_redirect($url) {
 		$this->redirect_url = $url;
 	}
 
@@ -504,9 +504,9 @@ 
 	 * Perform redirection based on the redirect_url
 	 *
 	 */
-	protected function redirect(){
+	protected function redirect() {
 
-		if(!empty($this->redirect_url))
+		if (!empty($this->redirect_url))
 			SugarApplication::redirect($this->redirect_url);
 	}
 
@@ -521,38 +521,38 @@ 
 	/**
 	 * Do some processing before saving the bean to the database.
 	 */
-	public function pre_save(){
-		if(!empty($_POST['assigned_user_id']) && $_POST['assigned_user_id'] != $this->bean->assigned_user_id && $_POST['assigned_user_id'] != $GLOBALS['current_user']->id && empty($GLOBALS['sugar_config']['exclude_notifications'][$this->bean->module_dir])){
+	public function pre_save() {
+		if (!empty($_POST['assigned_user_id']) && $_POST['assigned_user_id'] != $this->bean->assigned_user_id && $_POST['assigned_user_id'] != $GLOBALS['current_user']->id && empty($GLOBALS['sugar_config']['exclude_notifications'][$this->bean->module_dir])) {
 			$this->bean->notify_on_save = true;
 		}
 		$GLOBALS['log']->debug("SugarController:: performing pre_save.");
         require_once('include/SugarFields/SugarFieldHandler.php');
         $sfh = new SugarFieldHandler();
-		foreach($this->bean->field_defs as $field => $properties) {
+		foreach ($this->bean->field_defs as $field => $properties) {
 			$type = !empty($properties['custom_type']) ? $properties['custom_type'] : $properties['type'];
 		    $sf = $sfh->getSugarField(ucfirst($type), true);
-			if(isset($_POST[$field])) {
-				if(is_array($_POST[$field]) && !empty($properties['isMultiSelect'])) {
-					if(empty($_POST[$field][0])) {
+			if (isset($_POST[$field])) {
+				if (is_array($_POST[$field]) && !empty($properties['isMultiSelect'])) {
+					if (empty($_POST[$field][0])) {
 						unset($_POST[$field][0]);
 					}
 					$_POST[$field] = encodeMultienumValue($_POST[$field]);
 				}
 				$this->bean->$field = $_POST[$field];
-			} else if(!empty($properties['isMultiSelect']) && !isset($_POST[$field]) && isset($_POST[$field . '_multiselect'])) {
+			} else if (!empty($properties['isMultiSelect']) && !isset($_POST[$field]) && isset($_POST[$field.'_multiselect'])) {
 				$this->bean->$field = '';
 			}
-            if($sf != null){
+            if ($sf != null) {
                 $sf->save($this->bean, $_POST, $field, $properties);
             }
 		}
 
-		foreach($this->bean->relationship_fields as $field=>$link){
-			if(!empty($_POST[$field])){
+		foreach ($this->bean->relationship_fields as $field=>$link) {
+			if (!empty($_POST[$field])) {
 				$this->bean->$field = $_POST[$field];
 			}
 		}
-		if(!$this->bean->ACLAccess('save')){
+		if (!$this->bean->ACLAccess('save')) {
 			ACLController::displayNoAccess(true);
 			sugar_cleanup(true);
 		}
@@ -561,7 +561,7 @@ 
 	/**
 	 * Perform the actual save
 	 */
-	public function action_save(){
+	public function action_save() {
 		$this->bean->save(!empty($this->bean->notify_on_save));
 	}
 
@@ -575,7 +575,7 @@ 
 	/**
 	 * Specify what happens after the save has occurred.
 	 */
-	protected function post_save(){
+	protected function post_save() {
 		$module = (!empty($this->return_module) ? $this->return_module : $this->module);
 		$action = (!empty($this->return_action) ? $this->return_action : 'DetailView');
 		$id = (!empty($this->return_id) ? $this->return_id : $this->bean->id);
@@ -591,16 +591,16 @@ 
 	/**
 	 * Perform the actual deletion.
 	 */
-	protected function action_delete(){
+	protected function action_delete() {
 		//do any pre delete processing
 		//if there is some custom logic for deletion.
-		if(!empty($_REQUEST['record'])){
-			if(!$this->bean->ACLAccess('Delete')){
+		if (!empty($_REQUEST['record'])) {
+			if (!$this->bean->ACLAccess('Delete')) {
 				ACLController::displayNoAccess(true);
 				sugar_cleanup(true);
 			}
 			$this->bean->mark_deleted($_REQUEST['record']);
-		}else{
+		} else {
 			sugar_die("A record number must be specified to delete");
 		}
 	}
@@ -608,24 +608,21 @@ 
 	/**
 	 * Specify what happens after the deletion has occurred.
 	 */
-	protected function post_delete(){
+	protected function post_delete() {
         if (empty($_REQUEST['return_url'])) {
             $return_module = isset($_REQUEST['return_module']) ?
-                $_REQUEST['return_module'] :
-                $GLOBALS['sugar_config']['default_module'];
+                $_REQUEST['return_module'] : $GLOBALS['sugar_config']['default_module'];
             $return_action = isset($_REQUEST['return_action']) ?
-                $_REQUEST['return_action'] :
-                $GLOBALS['sugar_config']['default_action'];
+                $_REQUEST['return_action'] : $GLOBALS['sugar_config']['default_action'];
             $return_id = isset($_REQUEST['return_id']) ?
-                $_REQUEST['return_id'] :
-                '';
+                $_REQUEST['return_id'] : '';
             $url = "index.php?module=".$return_module."&action=".$return_action."&record=".$return_id;
         } else {
             $url = $_REQUEST['return_url'];
         }
 
 		//eggsurplus Bug 23816: maintain VCR after an edit/save. If it is a duplicate then don't worry about it. The offset is now worthless.
-		if(isset($_REQUEST['offset']) && empty($_REQUEST['duplicateSave'])) {
+		if (isset($_REQUEST['offset']) && empty($_REQUEST['duplicateSave'])) {
 		    $url .= "&offset=".$_REQUEST['offset'];
 		}
 
@@ -634,15 +631,15 @@ 
 	/**
 	 * Perform the actual massupdate.
 	 */
-	protected function action_massupdate(){
-		if(!empty($_REQUEST['massupdate']) && $_REQUEST['massupdate'] == 'true' && (!empty($_REQUEST['uid']) || !empty($_REQUEST['entire']))){
-			if(!empty($_REQUEST['Delete']) && $_REQUEST['Delete']=='true' && !$this->bean->ACLAccess('delete')
-                || (empty($_REQUEST['Delete']) || $_REQUEST['Delete']!='true') && !$this->bean->ACLAccess('save')){
+	protected function action_massupdate() {
+		if (!empty($_REQUEST['massupdate']) && $_REQUEST['massupdate'] == 'true' && (!empty($_REQUEST['uid']) || !empty($_REQUEST['entire']))) {
+			if (!empty($_REQUEST['Delete']) && $_REQUEST['Delete'] == 'true' && !$this->bean->ACLAccess('delete')
+                || (empty($_REQUEST['Delete']) || $_REQUEST['Delete'] != 'true') && !$this->bean->ACLAccess('save')) {
 				ACLController::displayNoAccess(true);
 				sugar_cleanup(true);
 			}
 
-            set_time_limit(0);//I'm wondering if we will set it never goes timeout here.
+            set_time_limit(0); //I'm wondering if we will set it never goes timeout here.
             // until we have more efficient way of handling MU, we have to disable the limit
             $GLOBALS['db']->setQueryLimit(0);
             require_once("include/MassUpdate.php");
@@ -650,40 +647,38 @@ 
             $seed = loadBean($_REQUEST['module']);
             $mass = new MassUpdate();
             $mass->setSugarBean($seed);
-            if(isset($_REQUEST['entire']) && empty($_POST['mass'])) {
+            if (isset($_REQUEST['entire']) && empty($_POST['mass'])) {
                 $mass->generateSearchWhere($_REQUEST['module'], $_REQUEST['current_query_by_page']);
             }
             $mass->handleMassUpdate();
-            $storeQuery = new StoreQuery();//restore the current search. to solve bug 24722 for multi tabs massupdate.
+            $storeQuery = new StoreQuery(); //restore the current search. to solve bug 24722 for multi tabs massupdate.
             $temp_req = array('current_query_by_page' => $_REQUEST['current_query_by_page'], 'return_module' => $_REQUEST['return_module'], 'return_action' => $_REQUEST['return_action']);
-            if($_REQUEST['return_module'] == 'Emails') {
-                if(!empty($_REQUEST['type']) && !empty($_REQUEST['ie_assigned_user_id'])) {
+            if ($_REQUEST['return_module'] == 'Emails') {
+                if (!empty($_REQUEST['type']) && !empty($_REQUEST['ie_assigned_user_id'])) {
                     $this->req_for_email = array('type' => $_REQUEST['type'], 'ie_assigned_user_id' => $_REQUEST['ie_assigned_user_id']); // Specifically for My Achieves
                 }
             }
             $_REQUEST = array();
             $_REQUEST = sugar_unserialize(base64_decode($temp_req['current_query_by_page']));
-            unset($_REQUEST[$seed->module_dir.'2_'.strtoupper($seed->object_name).'_offset']);//after massupdate, the page should redirect to no offset page
+            unset($_REQUEST[$seed->module_dir.'2_'.strtoupper($seed->object_name).'_offset']); //after massupdate, the page should redirect to no offset page
             $storeQuery->saveFromRequest($_REQUEST['module']);
-            $_REQUEST = array('return_module' => $temp_req['return_module'], 'return_action' => $temp_req['return_action']);//for post_massupdate, to go back to original page.
-		}else{
+            $_REQUEST = array('return_module' => $temp_req['return_module'], 'return_action' => $temp_req['return_action']); //for post_massupdate, to go back to original page.
+		} else {
 			sugar_die("You must massupdate at least one record");
 		}
 	}
 	/**
 	 * Specify what happens after the massupdate has occurred.
 	 */
-	protected function post_massupdate(){
+	protected function post_massupdate() {
 		$return_module = isset($_REQUEST['return_module']) ?
-			$_REQUEST['return_module'] :
-			$GLOBALS['sugar_config']['default_module'];
+			$_REQUEST['return_module'] : $GLOBALS['sugar_config']['default_module'];
 		$return_action = isset($_REQUEST['return_action']) ?
-			$_REQUEST['return_action'] :
-			$GLOBALS['sugar_config']['default_action'];
+			$_REQUEST['return_action'] : $GLOBALS['sugar_config']['default_action'];
 		$url = "index.php?module=".$return_module."&action=".$return_action;
-		if($return_module == 'Emails'){//specificly for My Achieves
-			if(!empty($this->req_for_email['type']) && !empty($this->req_for_email['ie_assigned_user_id'])) {
-				$url = $url . "&type=".$this->req_for_email['type']."&assigned_user_id=".$this->req_for_email['ie_assigned_user_id'];
+		if ($return_module == 'Emails') {//specificly for My Achieves
+			if (!empty($this->req_for_email['type']) && !empty($this->req_for_email['ie_assigned_user_id'])) {
+				$url = $url."&type=".$this->req_for_email['type']."&assigned_user_id=".$this->req_for_email['ie_assigned_user_id'];
 			}
 		}
 		$this->set_redirect($url);
@@ -691,7 +686,7 @@ 
 	/**
 	 * Perform the listview action
 	 */
-	protected function action_listview(){
+	protected function action_listview() {
 		$this->view_object_map['bean'] = $this->bean;
 		$this->view = 'list';
 	}
@@ -706,24 +701,24 @@ 
 	/**
 	 * Action to handle when using a file as was done in previous versions of Sugar.
 	 */
-	protected function action_default(){
+	protected function action_default() {
 		$this->view = 'classic';
 	}
 
 	/**
 	 * this method id used within a Dashlet when performing an ajax call
 	 */
-	protected function action_callmethoddashlet(){
-		if(!empty($_REQUEST['id'])) {
+	protected function action_callmethoddashlet() {
+		if (!empty($_REQUEST['id'])) {
 		    $id = $_REQUEST['id'];
 		    $requestedMethod = $_REQUEST['method'];
 		    $dashletDefs = $GLOBALS['current_user']->getPreference('dashlets', 'Home'); // load user's dashlets config
-		    if(!empty($dashletDefs[$id])) {
+		    if (!empty($dashletDefs[$id])) {
 		        require_once($dashletDefs[$id]['fileLocation']);
 
 		        $dashlet = new $dashletDefs[$id]['className']($id, (isset($dashletDefs[$id]['options']) ? $dashletDefs[$id]['options'] : array()));
 
-		        if(method_exists($dashlet, $requestedMethod) || method_exists($dashlet, '__call')) {
+		        if (method_exists($dashlet, $requestedMethod) || method_exists($dashlet, '__call')) {
 		            echo $dashlet->$requestedMethod();
 		        }
 		        else {
@@ -736,22 +731,22 @@ 
 	/**
 	 * this method is used within a Dashlet when the options configuration is posted
 	 */
-	protected function action_configuredashlet(){
+	protected function action_configuredashlet() {
 		global $current_user, $mod_strings;
 
-		if(!empty($_REQUEST['id'])) {
+		if (!empty($_REQUEST['id'])) {
 		    $id = $_REQUEST['id'];
 		    $dashletDefs = $current_user->getPreference('dashlets', $_REQUEST['module']); // load user's dashlets config
 		    require_once($dashletDefs[$id]['fileLocation']);
 
 		    $dashlet = new $dashletDefs[$id]['className']($id, (isset($dashletDefs[$id]['options']) ? $dashletDefs[$id]['options'] : array()));
-		    if(!empty($_REQUEST['configure']) && $_REQUEST['configure']) { // save settings
+		    if (!empty($_REQUEST['configure']) && $_REQUEST['configure']) { // save settings
 		        $dashletDefs[$id]['options'] = $dashlet->saveOptions($_REQUEST);
 		        $current_user->setPreference('dashlets', $dashletDefs, 0, $_REQUEST['module']);
 		    }
 		    else { // display options
 		        $json = getJSONobj();
-		        return 'result = ' . $json->encode((array('header' => $dashlet->title . ' : ' . $mod_strings['LBL_OPTIONS'],
+		        return 'result = '.$json->encode((array('header' => $dashlet->title.' : '.$mod_strings['LBL_OPTIONS'],
 		                                                 'body'  => $dashlet->displayOptions())));
 
 		    }
@@ -775,7 +770,7 @@ 
         ob_clean();
         $retval = false;
 
-        if(method_exists($this->bean, 'deleteAttachment')) {
+        if (method_exists($this->bean, 'deleteAttachment')) {
             $duplicate = "false";
             if (isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == "true") {
                 $duplicate = "true";
@@ -793,7 +788,7 @@ 
 	 * getActionFilename
 	 */
 	public static function getActionFilename($action) {
-	   if(isset(self::$action_case_file[$action])) {
+	   if (isset(self::$action_case_file[$action])) {
 	   	  return self::$action_case_file[$action];
 	   }
 	   return $action;
@@ -810,40 +805,40 @@ 
 	 *
 	 * @return true if we want to stop processing, false if processing should continue
 	 */
-	private function blockFileAccess(){
+	private function blockFileAccess() {
 		//check if the we have enabled file_access_control and if so then check the mappings on the request;
-		if(!empty($GLOBALS['sugar_config']['admin_access_control']) && $GLOBALS['sugar_config']['admin_access_control']){
+		if (!empty($GLOBALS['sugar_config']['admin_access_control']) && $GLOBALS['sugar_config']['admin_access_control']) {
 			$this->loadMapping('file_access_control_map');
 			//since we have this turned on, check the mapping file
 			$module = strtolower($this->module);
 			$action = strtolower($this->do_action);
-			if(!empty($this->file_access_control_map['modules'][$module]['links'])){
+			if (!empty($this->file_access_control_map['modules'][$module]['links'])) {
 				$GLOBALS['admin_access_control_links'] = $this->file_access_control_map['modules'][$module]['links'];
 			}
 
-			if(!empty($this->file_access_control_map['modules'][$module]['actions']) && (in_array($action, $this->file_access_control_map['modules'][$module]['actions']) || !empty($this->file_access_control_map['modules'][$module]['actions'][$action]))){
+			if (!empty($this->file_access_control_map['modules'][$module]['actions']) && (in_array($action, $this->file_access_control_map['modules'][$module]['actions']) || !empty($this->file_access_control_map['modules'][$module]['actions'][$action]))) {
 				//check params
-				if(!empty($this->file_access_control_map['modules'][$module]['actions'][$action]['params'])){
+				if (!empty($this->file_access_control_map['modules'][$module]['actions'][$action]['params'])) {
 					$block = true;
 					$params = $this->file_access_control_map['modules'][$module]['actions'][$action]['params'];
-					foreach($params as $param => $paramVals){
-						if(!empty($_REQUEST[$param])){
-							if(!in_array($_REQUEST[$param], $paramVals)){
+					foreach ($params as $param => $paramVals) {
+						if (!empty($_REQUEST[$param])) {
+							if (!in_array($_REQUEST[$param], $paramVals)) {
 								$block = false;
 								break;
 							}
 						}
 					}
-					if($block){
+					if ($block) {
 						$this->_processed = true;
 						$this->no_access();
 					}
-				}else{
+				} else {
 					$this->_processed = true;
 					$this->no_access();
 				}
 			}
-		}else
+		} else
 			$this->_processed = false;
 	}
 
@@ -855,12 +850,12 @@ 
 	 * the download entry point is mapped in the following file: entry_point_registry.php
 	 *
 	 */
-	private function handleEntryPoint(){
-		if(!empty($_REQUEST['entryPoint'])){
+	private function handleEntryPoint() {
+		if (!empty($_REQUEST['entryPoint'])) {
 			$this->loadMapping('entry_point_registry');
 			$entryPoint = $_REQUEST['entryPoint'];
 
-			if(!empty($this->entry_point_registry[$entryPoint])){
+			if (!empty($this->entry_point_registry[$entryPoint])) {
 				require_once($this->entry_point_registry[$entryPoint]['file']);
 				$this->_processed = true;
 				$this->view = '';
@@ -878,8 +873,8 @@ 
     {
         $this->loadMapping('entry_point_registry');
 
-        if ( isset($this->entry_point_registry[$entryPoint]['auth'])
-                && !$this->entry_point_registry[$entryPoint]['auth'] )
+        if (isset($this->entry_point_registry[$entryPoint]['auth'])
+                && !$this->entry_point_registry[$entryPoint]['auth'])
             return false;
         return true;
     }
@@ -891,26 +886,26 @@ 
 	protected function callLegacyCode()
 	{
 		$file = self::getActionFilename($this->do_action);
-		if ( isset($this->action_view_map[strtolower($this->do_action)]) ) {
+		if (isset($this->action_view_map[strtolower($this->do_action)])) {
 	        $action = $this->action_view_map[strtolower($this->do_action)];
 	    }
 	    else {
 	        $action = $this->do_action;
 	    }
 	    // index actions actually maps to the view.list.php view
-	    if ( $action == 'index' ) {
+	    if ($action == 'index') {
 	        $action = 'list';
 	    }
 
-		if ((file_exists('modules/' . $this->module . '/'. $file . '.php')
-                && !file_exists('modules/' . $this->module . '/views/view.'. $action . '.php'))
-            || (file_exists('custom/modules/' . $this->module . '/'. $file . '.php')
-                && !file_exists('custom/modules/' . $this->module . '/views/view.'. $action . '.php'))
+		if ((file_exists('modules/'.$this->module.'/'.$file.'.php')
+                && !file_exists('modules/'.$this->module.'/views/view.'.$action.'.php'))
+            || (file_exists('custom/modules/'.$this->module.'/'.$file.'.php')
+                && !file_exists('custom/modules/'.$this->module.'/views/view.'.$action.'.php'))
             ) {
 			// A 'classic' module, using the old pre-MVC display files
 			// We should now discard the bean we just obtained for tracking as the pre-MVC module will instantiate its own
 			unset($GLOBALS['FOCUS']);
-			$GLOBALS['log']->debug('Module:' . $this->module . ' using file: '. $file);
+			$GLOBALS['log']->debug('Module:'.$this->module.' using file: '.$file);
 			$this->action_default();
 			$this->_processed = true;
 		}
@@ -921,17 +916,17 @@ 
 	 * action_file_map.php or action_view_map.php load those maps here.
 	 *
 	 */
-	private function handleActionMaps(){
-		if(!empty($this->action_file_map[strtolower($this->do_action)])){
+	private function handleActionMaps() {
+		if (!empty($this->action_file_map[strtolower($this->do_action)])) {
 			$this->view = '';
-			$GLOBALS['log']->debug('Using Action File Map:' . $this->action_file_map[strtolower($this->do_action)]);
+			$GLOBALS['log']->debug('Using Action File Map:'.$this->action_file_map[strtolower($this->do_action)]);
 			require_once($this->action_file_map[strtolower($this->do_action)]);
 			$this->_processed = true;
-		}elseif(!empty($this->action_view_map[strtolower($this->do_action)])){
-			$GLOBALS['log']->debug('Using Action View Map:' . $this->action_view_map[strtolower($this->do_action)]);
+		}elseif (!empty($this->action_view_map[strtolower($this->do_action)])) {
+			$GLOBALS['log']->debug('Using Action View Map:'.$this->action_view_map[strtolower($this->do_action)]);
 			$this->view = $this->action_view_map[strtolower($this->do_action)];
 			$this->_processed = true;
-		}else
+		} else
 			$this->no_action();
 	}
 
@@ -939,8 +934,8 @@ 
 	 * Actually remap the action if required.
 	 *
 	 */
-	protected function remapAction(){
-		if(!empty($this->action_remap[$this->do_action])){
+	protected function remapAction() {
+		if (!empty($this->action_remap[$this->do_action])) {
 			$this->action = $this->action_remap[$this->do_action];
 			$this->do_action = $this->action;
 		}

Braces +53 added lines, -48 removed lines

@@ -172,8 +172,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -186,11 +185,13 @@ 
 	 *
 	 */
 	public function setup($module = ''){
-		if(empty($module) && !empty($_REQUEST['module']))
-			$module = $_REQUEST['module'];
+		if(empty($module) && !empty($_REQUEST['module'])) {
+					$module = $_REQUEST['module'];
+		}
 		//set the module
-		if(!empty($module))
-			$this->setModule($module);
+		if(!empty($module)) {
+					$this->setModule($module);
+		}
 
 		if(!empty($_REQUEST['target_module']) && $_REQUEST['target_module'] != 'undefined') {
 			$this->target_module = $_REQUEST['target_module'];
@@ -214,18 +215,24 @@ 
 	 *
 	 */
 	private function loadPropertiesFromRequest(){
-		if(!empty($_REQUEST['action']))
-			$this->action = $_REQUEST['action'];
-		if(!empty($_REQUEST['record']))
-			$this->record = $_REQUEST['record'];
-		if(!empty($_REQUEST['view']))
-			$this->view = $_REQUEST['view'];
-		if(!empty($_REQUEST['return_module']))
-			$this->return_module = $_REQUEST['return_module'];
-		if(!empty($_REQUEST['return_action']))
-			$this->return_action = $_REQUEST['return_action'];
-		if(!empty($_REQUEST['return_id']))
-			$this->return_id = $_REQUEST['return_id'];
+		if(!empty($_REQUEST['action'])) {
+					$this->action = $_REQUEST['action'];
+		}
+		if(!empty($_REQUEST['record'])) {
+					$this->record = $_REQUEST['record'];
+		}
+		if(!empty($_REQUEST['view'])) {
+					$this->view = $_REQUEST['view'];
+		}
+		if(!empty($_REQUEST['return_module'])) {
+					$this->return_module = $_REQUEST['return_module'];
+		}
+		if(!empty($_REQUEST['return_action'])) {
+					$this->return_action = $_REQUEST['return_action'];
+		}
+		if(!empty($_REQUEST['return_id'])) {
+					$this->return_id = $_REQUEST['return_id'];
+		}
 	}
 
 	/**
@@ -250,8 +257,9 @@ 
 				$this->bean = new $class();
 				if(!empty($this->record)){
 					$this->bean->retrieve($this->record);
-					if($this->bean)
-						$GLOBALS['FOCUS'] = $this->bean;
+					if($this->bean) {
+											$GLOBALS['FOCUS'] = $this->bean;
+					}
 				}
 			}
 		}
@@ -265,7 +273,7 @@ 
 		if(!$$var){
 			if($merge && !empty($this->$var)){
 				$$var = $this->$var;
-			}else{
+			} else{
 				$$var = array();
 			}
 			if(file_exists('include/MVC/Controller/'. $var . '.php')){
@@ -308,13 +316,11 @@ 
             if(!empty($this->view))
             {
                 $this->processView();
-            }
-            elseif(!empty($this->redirect_url))
+            } elseif(!empty($this->redirect_url))
             {
             			$this->redirect();
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->handleException($e);
         }
@@ -336,8 +342,7 @@ 
         {
             $logicHook->setBean($this->bean);
             $logicHook->call_custom_logic($this->bean->module_dir, "handle_exception", $e);
-        }
-        else
+        } else
         {
             $logicHook->call_custom_logic('', "handle_exception", $e);
         }
@@ -399,7 +404,7 @@ 
             }
 
 			$this->redirect();
-		}else{
+		} else{
 			$this->no_access();
 		}
 	}
@@ -506,8 +511,9 @@ 
 	 */
 	protected function redirect(){
 
-		if(!empty($this->redirect_url))
-			SugarApplication::redirect($this->redirect_url);
+		if(!empty($this->redirect_url)) {
+					SugarApplication::redirect($this->redirect_url);
+		}
 	}
 
 	////////////////////////////////////////////////////////
@@ -600,7 +606,7 @@ 
 				sugar_cleanup(true);
 			}
 			$this->bean->mark_deleted($_REQUEST['record']);
-		}else{
+		} else{
 			sugar_die("A record number must be specified to delete");
 		}
 	}
@@ -666,7 +672,7 @@ 
             unset($_REQUEST[$seed->module_dir.'2_'.strtoupper($seed->object_name).'_offset']);//after massupdate, the page should redirect to no offset page
             $storeQuery->saveFromRequest($_REQUEST['module']);
             $_REQUEST = array('return_module' => $temp_req['return_module'], 'return_action' => $temp_req['return_action']);//for post_massupdate, to go back to original page.
-		}else{
+		} else{
 			sugar_die("You must massupdate at least one record");
 		}
 	}
@@ -725,8 +731,7 @@ 
 
 		        if(method_exists($dashlet, $requestedMethod) || method_exists($dashlet, '__call')) {
 		            echo $dashlet->$requestedMethod();
-		        }
-		        else {
+		        } else {
 		            echo 'no method';
 		        }
 		    }
@@ -748,15 +753,13 @@ 
 		    if(!empty($_REQUEST['configure']) && $_REQUEST['configure']) { // save settings
 		        $dashletDefs[$id]['options'] = $dashlet->saveOptions($_REQUEST);
 		        $current_user->setPreference('dashlets', $dashletDefs, 0, $_REQUEST['module']);
-		    }
-		    else { // display options
+		    } else { // display options
 		        $json = getJSONobj();
 		        return 'result = ' . $json->encode((array('header' => $dashlet->title . ' : ' . $mod_strings['LBL_OPTIONS'],
 		                                                 'body'  => $dashlet->displayOptions())));
 
 		    }
-		}
-		else {
+		} else {
 		    return '0';
 		}
 	}
@@ -838,13 +841,14 @@ 
 						$this->_processed = true;
 						$this->no_access();
 					}
-				}else{
+				} else{
 					$this->_processed = true;
 					$this->no_access();
 				}
 			}
-		}else
-			$this->_processed = false;
+		} else {
+					$this->_processed = false;
+		}
 	}
 
 	/**
@@ -879,8 +883,9 @@ 
         $this->loadMapping('entry_point_registry');
 
         if ( isset($this->entry_point_registry[$entryPoint]['auth'])
-                && !$this->entry_point_registry[$entryPoint]['auth'] )
-            return false;
+                && !$this->entry_point_registry[$entryPoint]['auth'] ) {
+                    return false;
+        }
         return true;
     }
 
@@ -893,8 +898,7 @@ 
 		$file = self::getActionFilename($this->do_action);
 		if ( isset($this->action_view_map[strtolower($this->do_action)]) ) {
 	        $action = $this->action_view_map[strtolower($this->do_action)];
-	    }
-	    else {
+	    } else {
 	        $action = $this->do_action;
 	    }
 	    // index actions actually maps to the view.list.php view
@@ -927,12 +931,13 @@ 
 			$GLOBALS['log']->debug('Using Action File Map:' . $this->action_file_map[strtolower($this->do_action)]);
 			require_once($this->action_file_map[strtolower($this->do_action)]);
 			$this->_processed = true;
-		}elseif(!empty($this->action_view_map[strtolower($this->do_action)])){
+		} elseif(!empty($this->action_view_map[strtolower($this->do_action)])){
 			$GLOBALS['log']->debug('Using Action View Map:' . $this->action_view_map[strtolower($this->do_action)]);
 			$this->view = $this->action_view_map[strtolower($this->do_action)];
 			$this->_processed = true;
-		}else
-			$this->no_action();
+		} else {
+					$this->no_action();
+		}
 	}
 
 	/**

include/MVC/View/SugarView.php

Spacing +230 added lines, -231 removed lines

@@ -98,9 +98,9 @@ 
      */
     public function SugarView($bean = null,
         $view_object_map = array()
-        ){
+        ) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -141,9 +141,9 @@ 
         $this->_trackView();
 
         //For the ajaxUI, we need to use output buffering to return the page in an ajax friendly format
-        if ($this->_getOption('json_output')){
+        if ($this->_getOption('json_output')) {
 			ob_start();
-			if(!empty($_REQUEST['ajax_load']) && !empty($_REQUEST['loadLanguageJS'])) {
+			if (!empty($_REQUEST['ajax_load']) && !empty($_REQUEST['loadLanguageJS'])) {
 				echo $this->_getModLanguageJS();
 			}
 		}
@@ -158,7 +158,7 @@ 
         $this->preDisplay();
         $this->displayErrors();
         $this->display();
-        if ( !empty($this->module) ) {
+        if (!empty($this->module)) {
             $GLOBALS['logic_hook']->call_custom_logic($this->module, 'after_ui_frame');
         } else {
             $GLOBALS['logic_hook']->call_custom_logic('', 'after_ui_frame');
@@ -203,10 +203,10 @@ 
                 'favicon' => $this->getFavicon(),
             );
 
-            if(SugarThemeRegistry::current()->name == 'Classic' || SugarThemeRegistry::current()->classic)
+            if (SugarThemeRegistry::current()->name == 'Classic' || SugarThemeRegistry::current()->classic)
                 $ajax_ret['moduleList'] = $this->displayHeader(true);
 
-            if(empty($this->responseTime))
+            if (empty($this->responseTime))
                 $this->_calculateFooterMetrics();
             $ajax_ret['responseTime'] = $this->responseTime;
             $json = getJSONobj();
@@ -225,11 +225,11 @@ 
     {
         $errors = '';
 
-        foreach($this->errors as $error) {
-            $errors .= '<span class="error">' . $error . '</span><br>';
+        foreach ($this->errors as $error) {
+            $errors .= '<span class="error">'.$error.'</span><br>';
         }
 
-        if ( !$this->suppressDisplayErrors ) {
+        if (!$this->suppressDisplayErrors) {
             echo $errors;
         }
         else {
@@ -266,14 +266,14 @@ 
     {
         $action = strtolower($this->action);
         //Skip save, tracked in SugarBean instead
-        if($action == 'save') {
+        if ($action == 'save') {
         return;
         }
 
 
         $trackerManager = TrackerManager::getInstance();
         $timeStamp = TimeDate::getInstance()->nowDb();
-        if($monitor = $trackerManager->getMonitor('tracker')){
+        if ($monitor = $trackerManager->getMonitor('tracker')) {
             $monitor->setValue('action', $action);
             $monitor->setValue('user_id', $GLOBALS['current_user']->id);
             $monitor->setValue('module_name', $this->module);
@@ -288,7 +288,7 @@ 
 
             //If visible is true, but there is no bean, do not track (invalid/unauthorized reference)
             //Also, do not track save actions where there is no bean id
-            if($monitor->visible && empty($this->bean->id)) {
+            if ($monitor->visible && empty($this->bean->id)) {
             $trackerManager->unsetMonitor($monitor);
             return;
             }
@@ -300,7 +300,7 @@ 
     /**
      * Displays the header on section of the page; basically everything before the content
      */
-    public function displayHeader($retModTabs=false)
+    public function displayHeader($retModTabs = false)
     {
         global $theme;
         global $max_tabs;
@@ -320,7 +320,7 @@ 
         $ss->assign("APP", $app_strings);
         $ss->assign("THEME", $theme);
         $ss->assign("THEME_CONFIG", $themeObject->getConfig());
-        $ss->assign("THEME_IE6COMPAT", $themeObject->ie6compat ? 'true':'false');
+        $ss->assign("THEME_IE6COMPAT", $themeObject->ie6compat ? 'true' : 'false');
         $ss->assign("MODULE_NAME", $this->module);
         $ss->assign("langHeader", get_language_header());
 
@@ -336,17 +336,17 @@ 
         if ($this->_getOption('view_print')) {
             $css .= '<link rel="stylesheet" type="text/css" href="'.$themeObject->getCSSURL('print.css').'" media="all" />';
         }
-        $ss->assign("SUGAR_CSS",$css);
+        $ss->assign("SUGAR_CSS", $css);
 
         // get javascript
         ob_start();
         $this->renderJavascript();
 
-        $ss->assign("SUGAR_JS",ob_get_contents().$themeObject->getJS());
+        $ss->assign("SUGAR_JS", ob_get_contents().$themeObject->getJS());
         ob_end_clean();
 
         // get favicon
-        if(isset($GLOBALS['sugar_config']['default_module_favicon']))
+        if (isset($GLOBALS['sugar_config']['default_module_favicon']))
             $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
         else
             $module_favicon = false;
@@ -356,24 +356,24 @@ 
 
         // build the shortcut menu
         $shortcut_menu = array();
-        foreach ( $this->getMenu() as $key => $menu_item )
+        foreach ($this->getMenu() as $key => $menu_item)
             $shortcut_menu[$key] = array(
                 "URL"         => $menu_item[0],
                 "LABEL"       => $menu_item[1],
                 "MODULE_NAME" => $menu_item[2],
                 "IMAGE"       => $themeObject
-                    ->getImage($menu_item[2],"border='0' align='absmiddle'",null,null,'.gif',$menu_item[1]),
+                    ->getImage($menu_item[2], "border='0' align='absmiddle'", null, null, '.gif', $menu_item[1]),
                 );
-        $ss->assign("SHORTCUT_MENU",$shortcut_menu);
+        $ss->assign("SHORTCUT_MENU", $shortcut_menu);
 
         // handle rtl text direction
-        if(isset($_REQUEST['RTL']) && $_REQUEST['RTL'] == 'RTL'){
+        if (isset($_REQUEST['RTL']) && $_REQUEST['RTL'] == 'RTL') {
             $_SESSION['RTL'] = true;
         }
-        if(isset($_REQUEST['LTR']) && $_REQUEST['LTR'] == 'LTR'){
+        if (isset($_REQUEST['LTR']) && $_REQUEST['LTR'] == 'LTR') {
             unset($_SESSION['RTL']);
         }
-        if(isset($_SESSION['RTL']) && $_SESSION['RTL']){
+        if (isset($_SESSION['RTL']) && $_SESSION['RTL']) {
             $ss->assign("DIR", 'dir="RTL"');
         }
 
@@ -383,7 +383,7 @@ 
         $companyLogoURL = $companyLogoURL_arr[0];
 
         $company_logo_attributes = sugar_cache_retrieve('company_logo_attributes');
-        if(!empty($company_logo_attributes)) {
+        if (!empty($company_logo_attributes)) {
             $ss->assign("COMPANY_LOGO_MD5", $company_logo_attributes[0]);
             $ss->assign("COMPANY_LOGO_WIDTH", $company_logo_attributes[1]);
             $ss->assign("COMPANY_LOGO_HEIGHT", $company_logo_attributes[2]);
@@ -392,16 +392,16 @@ 
             // Always need to md5 the file
             $ss->assign("COMPANY_LOGO_MD5", md5_file($companyLogoURL));
 
-            list($width,$height) = getimagesize($companyLogoURL);
-            if ( $width > 212 || $height > 40 ) {
-                $resizePctWidth  = ($width - 212)/212;
-                $resizePctHeight = ($height - 40)/40;
-                if ( $resizePctWidth > $resizePctHeight )
+            list($width, $height) = getimagesize($companyLogoURL);
+            if ($width > 212 || $height > 40) {
+                $resizePctWidth  = ($width - 212) / 212;
+                $resizePctHeight = ($height - 40) / 40;
+                if ($resizePctWidth > $resizePctHeight)
                     $resizeAmount = $width / 212;
                 else
                     $resizeAmount = $height / 40;
-                $ss->assign("COMPANY_LOGO_WIDTH", round($width * (1/$resizeAmount)));
-                $ss->assign("COMPANY_LOGO_HEIGHT", round($height * (1/$resizeAmount)));
+                $ss->assign("COMPANY_LOGO_WIDTH", round($width * (1 / $resizeAmount)));
+                $ss->assign("COMPANY_LOGO_HEIGHT", round($height * (1 / $resizeAmount)));
             }
             else {
                 $ss->assign("COMPANY_LOGO_WIDTH", $width);
@@ -417,110 +417,110 @@ 
                                 )
             );
         }
-        $ss->assign("COMPANY_LOGO_URL",getJSPath($companyLogoURL)."&logo_md5=".$ss->get_template_vars("COMPANY_LOGO_MD5"));
+        $ss->assign("COMPANY_LOGO_URL", getJSPath($companyLogoURL)."&logo_md5=".$ss->get_template_vars("COMPANY_LOGO_MD5"));
 
         // get the global links
         $gcls = array();
         $global_control_links = array();
         require("include/globalControlLinks.php");
 
-        foreach($global_control_links as $key => $value) {
-            if ($key == 'users')  {   //represents logout link.
+        foreach ($global_control_links as $key => $value) {
+            if ($key == 'users') {   //represents logout link.
                 $ss->assign("LOGOUT_LINK", $value['linkinfo'][key($value['linkinfo'])]);
-                $ss->assign("LOGOUT_LABEL", key($value['linkinfo']));//key value for first element.
+                $ss->assign("LOGOUT_LABEL", key($value['linkinfo'])); //key value for first element.
                 continue;
             }
 
             foreach ($value as $linkattribute => $attributevalue) {
                 // get the main link info
-                if ( $linkattribute == 'linkinfo' ) {
+                if ($linkattribute == 'linkinfo') {
                     $gcls[$key] = array(
                         "LABEL" => key($attributevalue),
                         "URL"   => current($attributevalue),
                         "SUBMENU" => array(),
                         );
-                   if(substr($gcls[$key]["URL"], 0, 11) == "javascript:") {
-                       $gcls[$key]["ONCLICK"] = substr($gcls[$key]["URL"],11);
+                   if (substr($gcls[$key]["URL"], 0, 11) == "javascript:") {
+                       $gcls[$key]["ONCLICK"] = substr($gcls[$key]["URL"], 11);
                        $gcls[$key]["URL"] = "javascript:void(0)";
                    }
                 }
                 // and now the sublinks
-                if ( $linkattribute == 'submenu' && is_array($attributevalue) ) {
+                if ($linkattribute == 'submenu' && is_array($attributevalue)) {
                     foreach ($attributevalue as $submenulinkkey => $submenulinkinfo)
                         $gcls[$key]['SUBMENU'][$submenulinkkey] = array(
                             "LABEL" => key($submenulinkinfo),
                             "URL"   => current($submenulinkinfo),
                         );
-                       if(substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"], 0, 11) == "javascript:") {
-                           $gcls[$key]['SUBMENU'][$submenulinkkey]["ONCLICK"] = substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"],11);
+                       if (substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"], 0, 11) == "javascript:") {
+                           $gcls[$key]['SUBMENU'][$submenulinkkey]["ONCLICK"] = substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"], 11);
                            $gcls[$key]['SUBMENU'][$submenulinkkey]["URL"] = "javascript:void(0)";
                        }
                 }
             }
         }
-        $ss->assign("GCLS",$gcls);
+        $ss->assign("GCLS", $gcls);
 
         $ss->assign("SEARCH", isset($_REQUEST['query_string']) ? $_REQUEST['query_string'] : '');
 
         if ($this->action == "EditView" || $this->action == "Login")
             $ss->assign("ONLOAD", 'onload="set_focus()"');
 
-        $ss->assign("AUTHENTICATED",isset($_SESSION["authenticated_user_id"]));
+        $ss->assign("AUTHENTICATED", isset($_SESSION["authenticated_user_id"]));
 
         // get other things needed for page style popup
         if (isset($_SESSION["authenticated_user_id"])) {
             // get the current user name and id
             $ss->assign("CURRENT_USER", $current_user->full_name == '' || !showFullName()
-                ? $current_user->user_name : $current_user->full_name );
+                ? $current_user->user_name : $current_user->full_name);
             $ss->assign("CURRENT_USER_ID", $current_user->id);
 
             // get the last viewed records
             require_once("modules/Favorites/Favorites.php");
             $favorites = new Favorites();
             $favorite_records = $favorites->getCurrentUserSidebarFavorites();
-            $ss->assign("favoriteRecords",$favorite_records);
+            $ss->assign("favoriteRecords", $favorite_records);
 
             $tracker = new Tracker();
             $history = $tracker->get_recently_viewed($current_user->id);
-            $ss->assign("recentRecords",$this->processRecentRecords($history));
+            $ss->assign("recentRecords", $this->processRecentRecords($history));
         }
 
         $bakModStrings = $mod_strings;
-        if (isset($_SESSION["authenticated_user_id"]) ) {
+        if (isset($_SESSION["authenticated_user_id"])) {
             // get the module list
             $moduleTopMenu = array();
 
             $max_tabs = $current_user->getPreference('max_tabs');
             // Attempt to correct if max tabs count is extremely high.
-            if ( !isset($max_tabs) || $max_tabs <= 0 || $max_tabs > 10 ) {
+            if (!isset($max_tabs) || $max_tabs <= 0 || $max_tabs > 10) {
                 $max_tabs = $GLOBALS['sugar_config']['default_max_tabs'];
                 $current_user->setPreference('max_tabs', $max_tabs, 0, 'global');
             }
 
             $moduleTab = $this->_getModuleTab();
-            $ss->assign('MODULE_TAB',$moduleTab);
+            $ss->assign('MODULE_TAB', $moduleTab);
 
 
             // See if they are using grouped tabs or not (removed in 6.0, returned in 6.1)
             $user_navigation_paradigm = $current_user->getPreference('navigation_paradigm');
-            if ( !isset($user_navigation_paradigm) ) {
+            if (!isset($user_navigation_paradigm)) {
                 $user_navigation_paradigm = $GLOBALS['sugar_config']['default_navigation_paradigm'];
             }
 
 
             // Get the full module list for later use
-            foreach ( query_module_access_list($current_user) as $module ) {
+            foreach (query_module_access_list($current_user) as $module) {
                 // Bug 25948 - Check for the module being in the moduleList
-                if ( isset($app_list_strings['moduleList'][$module]) ) {
+                if (isset($app_list_strings['moduleList'][$module])) {
                     $fullModuleList[$module] = $app_list_strings['moduleList'][$module];
                 }
             }
 
 
-            if(!should_hide_iframes()) {
+            if (!should_hide_iframes()) {
                 $iFrame = new iFrame();
                 $frames = $iFrame->lookup_frames('tab');
-                foreach($frames as $key => $values){
+                foreach ($frames as $key => $values) {
                         $fullModuleList[$key] = $values;
                 }
             }
@@ -528,7 +528,7 @@ 
                 unset($fullModuleList['iFrames']);
             }
 
-            if ( $user_navigation_paradigm == 'gm' && isset($themeObject->group_tabs) && $themeObject->group_tabs) {
+            if ($user_navigation_paradigm == 'gm' && isset($themeObject->group_tabs) && $themeObject->group_tabs) {
                 // We are using grouped tabs
                 require_once('include/GroupedTabs/GroupedTabStructure.php');
                 $groupedTabsClass = new GroupedTabStructure();
@@ -536,12 +536,12 @@ 
                 //handle with submoremodules
                 $max_tabs = $current_user->getPreference('max_tabs');
                 // If the max_tabs isn't set incorrectly, set it within the range, to the default max sub tabs size
-                if ( !isset($max_tabs) || $max_tabs <= 0 || $max_tabs > 10){
+                if (!isset($max_tabs) || $max_tabs <= 0 || $max_tabs > 10) {
                     // We have a default value. Use it
-                    if(isset($GLOBALS['sugar_config']['default_max_tabs'])){
+                    if (isset($GLOBALS['sugar_config']['default_max_tabs'])) {
                         $max_tabs = $GLOBALS['sugar_config']['default_max_tabs'];
                     }
-                    else{
+                    else {
                         $max_tabs = 8;
                     }
                 }
@@ -554,22 +554,22 @@ 
 
                 // Setup the default group tab.
                 $allGroup = $app_strings['LBL_TABGROUP_ALL'];
-                $ss->assign('currentGroupTab',$allGroup);
+                $ss->assign('currentGroupTab', $allGroup);
                 $currentGroupTab = $allGroup;
                 $usersGroup = $current_user->getPreference('theme_current_group');
                 // Figure out which tab they currently have selected (stored as a user preference)
-                if ( !empty($usersGroup) && isset($groupTabs[$usersGroup]) ) {
+                if (!empty($usersGroup) && isset($groupTabs[$usersGroup])) {
                     $currentGroupTab = $usersGroup;
                 } else {
-                    $current_user->setPreference('theme_current_group',$currentGroupTab);
+                    $current_user->setPreference('theme_current_group', $currentGroupTab);
                 }
 
-                $ss->assign('currentGroupTab',$currentGroupTab);
+                $ss->assign('currentGroupTab', $currentGroupTab);
                 $usingGroupTabs = true;
 
             } else {
                 // Setup the default group tab.
-                $ss->assign('currentGroupTab',$app_strings['LBL_TABGROUP_ALL']);
+                $ss->assign('currentGroupTab', $app_strings['LBL_TABGROUP_ALL']);
 
                 $usingGroupTabs = false;
 
@@ -581,31 +581,31 @@ 
             $topTabList = array();
 
             // Now time to go through each of the tab sets and fix them up.
-            foreach ( $groupTabs as $tabIdx => $tabData ) {
+            foreach ($groupTabs as $tabIdx => $tabData) {
                 $topTabs = $tabData['modules'];
-                if ( ! is_array($topTabs) ) {
+                if (!is_array($topTabs)) {
                     $topTabs = array();
                 }
                 $extraTabs = array();
 
                 // Split it in to the tabs that go across the top, and the ones that are on the extra menu.
-                if ( count($topTabs) > $max_tabs ) {
-                    $extraTabs = array_splice($topTabs,$max_tabs);
+                if (count($topTabs) > $max_tabs) {
+                    $extraTabs = array_splice($topTabs, $max_tabs);
                 }
                 // Make sure the current module is accessable through one of the top tabs
-                if ( !isset($topTabs[$moduleTab]) ) {
+                if (!isset($topTabs[$moduleTab])) {
                     // Nope, we need to add it.
                     // First, take it out of the extra menu, if it's there
-                    if ( isset($extraTabs[$moduleTab]) ) {
+                    if (isset($extraTabs[$moduleTab])) {
                         unset($extraTabs[$moduleTab]);
                     }
-                    if ( count($topTabs) >= $max_tabs - 1 ) {
+                    if (count($topTabs) >= $max_tabs - 1) {
                         // We already have the maximum number of tabs, so we need to shuffle the last one
                         // from the top to the first one of the extras
-                        $lastElem = array_splice($topTabs,$max_tabs-1);
+                        $lastElem = array_splice($topTabs, $max_tabs - 1);
                         $extraTabs = $lastElem + $extraTabs;
                     }
-                    if ( !empty($moduleTab) ) {
+                    if (!empty($moduleTab)) {
                         $topTabs[$moduleTab] = $app_list_strings['moduleList'][$moduleTab];
                     }
                 }
@@ -624,7 +624,7 @@ 
                 */
 
                 // Get a unique list of the top tabs so we can build the popup menus for them
-                foreach ( $topTabs as $moduleKey => $module ) {
+                foreach ($topTabs as $moduleKey => $module) {
                     $topTabList[$moduleKey] = $module;
                 }
 
@@ -633,67 +633,67 @@ 
             }
         }
 
-        if ( isset($topTabList) && is_array($topTabList) ) {
+        if (isset($topTabList) && is_array($topTabList)) {
             // Adding shortcuts array to menu array for displaying shortcuts associated with each module
             $shortcutTopMenu = array();
-            foreach($topTabList as $module_key => $label) {
+            foreach ($topTabList as $module_key => $label) {
                 global $mod_strings;
                 $mod_strings = return_module_language($current_language, $module_key);
-                foreach ( $this->getMenu($module_key) as $key => $menu_item ) {
+                foreach ($this->getMenu($module_key) as $key => $menu_item) {
                     $shortcutTopMenu[$module_key][$key] = array(
                         "URL"         => $menu_item[0],
                         "LABEL"       => $menu_item[1],
                         "MODULE_NAME" => $menu_item[2],
                         "IMAGE"       => $themeObject
-                        ->getImage($menu_item[2],"border='0' align='absmiddle'",null,null,'.gif',$menu_item[1]),
+                        ->getImage($menu_item[2], "border='0' align='absmiddle'", null, null, '.gif', $menu_item[1]),
                         "ID"          => $menu_item[2]."_link",
                         );
                 }
             }
-            if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $ss->assign('lock_homepage', true);
-            $ss->assign("groupTabs",$groupTabs);
-            $ss->assign("shortcutTopMenu",$shortcutTopMenu);
-            $ss->assign('USE_GROUP_TABS',$usingGroupTabs);
+            if (!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $ss->assign('lock_homepage', true);
+            $ss->assign("groupTabs", $groupTabs);
+            $ss->assign("shortcutTopMenu", $shortcutTopMenu);
+            $ss->assign('USE_GROUP_TABS', $usingGroupTabs);
 
             // This is here for backwards compatibility, someday, somewhere, it will be able to be removed
-            $ss->assign("moduleTopMenu",$groupTabs[$app_strings['LBL_TABGROUP_ALL']]['modules']);
-            $ss->assign("moduleExtraMenu",$groupTabs[$app_strings['LBL_TABGROUP_ALL']]['extra']);
+            $ss->assign("moduleTopMenu", $groupTabs[$app_strings['LBL_TABGROUP_ALL']]['modules']);
+            $ss->assign("moduleExtraMenu", $groupTabs[$app_strings['LBL_TABGROUP_ALL']]['extra']);
 
 
         }
 
-        if ( isset($extraTabs) && is_array($extraTabs) ) {
+        if (isset($extraTabs) && is_array($extraTabs)) {
             // Adding shortcuts array to extra menu array for displaying shortcuts associated with each module
             $shortcutExtraMenu = array();
-            foreach($extraTabs as $module_key => $label) {
+            foreach ($extraTabs as $module_key => $label) {
                 global $mod_strings;
                 $mod_strings = return_module_language($current_language, $module_key);
-                foreach ( $this->getMenu($module_key) as $key => $menu_item ) {
+                foreach ($this->getMenu($module_key) as $key => $menu_item) {
                     $shortcutExtraMenu[$module_key][$key] = array(
                         "URL"         => $menu_item[0],
                         "LABEL"       => $menu_item[1],
                         "MODULE_NAME" => $menu_item[2],
                         "IMAGE"       => $themeObject
-                        ->getImage($menu_item[2],"border='0' align='absmiddle'",null,null,'.gif',$menu_item[1]),
+                        ->getImage($menu_item[2], "border='0' align='absmiddle'", null, null, '.gif', $menu_item[1]),
                         "ID"          => $menu_item[2]."_link",
                         );
                 }
             }
-            $ss->assign("shortcutExtraMenu",$shortcutExtraMenu);
+            $ss->assign("shortcutExtraMenu", $shortcutExtraMenu);
         }
 
-       if(!empty($current_user)){
+       if (!empty($current_user)) {
        	$ss->assign("max_tabs", $current_user->getPreference("max_tabs"));
        }
 
 
         $imageURL = SugarThemeRegistry::current()->getImageURL("dashboard.png");
         $homeImage = "<img src='$imageURL'>";
-		$ss->assign("homeImage",$homeImage);
+		$ss->assign("homeImage", $homeImage);
         global $mod_strings;
         $mod_strings = $bakModStrings;
         $headerTpl = $themeObject->getTemplate('header.tpl');
-        if (inDeveloperMode() )
+        if (inDeveloperMode())
             $ss->clear_compiled_tpl($headerTpl);
 
         if ($retModTabs)
@@ -705,9 +705,9 @@ 
             $this->includeClassicFile('modules/Administration/DisplayWarnings.php');
 
             $errorMessages = SugarApplication::getErrorMessages();
-            if ( !empty($errorMessages)) {
-                foreach ( $errorMessages as $error_message ) {
-                    echo('<p class="error">' . $error_message.'</p>');
+            if (!empty($errorMessages)) {
+                foreach ($errorMessages as $error_message) {
+                    echo('<p class="error">'.$error_message.'</p>');
                 }
             }
         }
@@ -742,13 +742,13 @@ 
     {
         global $sugar_config, $timedate;
 
-        if(isset($this->bean->module_dir)){
+        if (isset($this->bean->module_dir)) {
             echo "<script>var module_sugar_grp1 = '{$this->bean->module_dir}';</script>";
         }
-        if(isset($_REQUEST['action'])){
+        if (isset($_REQUEST['action'])) {
             echo "<script>var action_sugar_grp1 = '{$_REQUEST['action']}';</script>";
         }
-        echo '<script>jscal_today = 1000*' . $timedate->asUserTs($timedate->getNow()) . '; if(typeof app_strings == "undefined") app_strings = new Array();</script>';
+        echo '<script>jscal_today = 1000*'.$timedate->asUserTs($timedate->getNow()).'; if(typeof app_strings == "undefined") app_strings = new Array();</script>';
         if (!is_file(sugar_cached("include/javascript/sugar_grp1.js"))) {
             $_REQUEST['root_directory'] = ".";
             require_once("jssource/minify_utils.php");
@@ -764,7 +764,7 @@ 
             if ( typeof(SUGAR.themes) == 'undefined' ) SUGAR.themes = {};
         </script>
 EOQ;
-        if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client'])
+        if (isset($sugar_config['disc_client']) && $sugar_config['disc_client'])
             echo getVersionedScript('modules/Sync/headersync.js');
     }
 
@@ -793,13 +793,13 @@ 
         require_once ('modules/Currencies/Currency.php');
         list ($num_grp_sep, $dec_sep) = get_number_seperators();
 
-        $the_script = "<script type=\"text/javascript\">\n" . "\tvar time_reg_format = '" .
-             $timereg['format'] . "';\n" . "\tvar date_reg_format = '" .
-             $datereg['format'] . "';\n" . "\tvar date_reg_positions = { $date_pos };\n" .
-             "\tvar time_separator = '$time_separator';\n" .
-             "\tvar cal_date_format = '$cal_date_format';\n" .
-             "\tvar time_offset = $hour_offset;\n" . "\tvar num_grp_sep = '$num_grp_sep';\n" .
-             "\tvar dec_sep = '$dec_sep';\n" . "</script>";
+        $the_script = "<script type=\"text/javascript\">\n"."\tvar time_reg_format = '".
+             $timereg['format']."';\n"."\tvar date_reg_format = '".
+             $datereg['format']."';\n"."\tvar date_reg_positions = { $date_pos };\n".
+             "\tvar time_separator = '$time_separator';\n".
+             "\tvar cal_date_format = '$cal_date_format';\n".
+             "\tvar time_offset = $hour_offset;\n"."\tvar num_grp_sep = '$num_grp_sep';\n".
+             "\tvar dec_sep = '$dec_sep';\n"."</script>";
 
         return $the_script;
     }
@@ -827,13 +827,13 @@ 
                 "sugar_cache_dir" => "cache/",
                 );
 
-            if(isset($this->bean->module_dir)){
+            if (isset($this->bean->module_dir)) {
                 $js_vars['module_sugar_grp1'] = $this->bean->module_dir;
             }
-            if(isset($_REQUEST['action'])){
+            if (isset($_REQUEST['action'])) {
                 $js_vars['action_sugar_grp1'] = $_REQUEST['action'];
             }
-            echo '<script>jscal_today = 1000*' . $timedate->asUserTs($timedate->getNow()) . '; if(typeof app_strings == "undefined") app_strings = new Array();</script>';
+            echo '<script>jscal_today = 1000*'.$timedate->asUserTs($timedate->getNow()).'; if(typeof app_strings == "undefined") app_strings = new Array();</script>';
             if (!is_file(sugar_cached("include/javascript/sugar_grp1.js")) || !is_file(sugar_cached("include/javascript/sugar_grp1_yui.js")) || !is_file(sugar_cached("include/javascript/sugar_grp1_jquery.js"))) {
                 $_REQUEST['root_directory'] = ".";
                 require_once("jssource/minify_utils.php");
@@ -846,33 +846,33 @@ 
 
             // output necessary config js in the top of the page
             $config_js = $this->getSugarConfigJS();
-            if(!empty($config_js)){
+            if (!empty($config_js)) {
                 echo "<script>\n".implode("\n", $config_js)."</script>\n";
             }
 
-            if ( isset($sugar_config['email_sugarclient_listviewmaxselect']) ) {
+            if (isset($sugar_config['email_sugarclient_listviewmaxselect'])) {
                 echo "<script>SUGAR.config.email_sugarclient_listviewmaxselect = {$GLOBALS['sugar_config']['email_sugarclient_listviewmaxselect']};</script>";
             }
 
-            $image_server = (defined('TEMPLATE_URL'))?TEMPLATE_URL . '/':'';
-            echo '<script type="text/javascript">SUGAR.themes.image_server="' . $image_server . '";</script>'; // cn: bug 12274 - create session-stored key to defend against CSRF
-            echo '<script type="text/javascript">var name_format = "' . $locale->getLocaleFormatMacro() . '";</script>';
+            $image_server = (defined('TEMPLATE_URL')) ? TEMPLATE_URL.'/' : '';
+            echo '<script type="text/javascript">SUGAR.themes.image_server="'.$image_server.'";</script>'; // cn: bug 12274 - create session-stored key to defend against CSRF
+            echo '<script type="text/javascript">var name_format = "'.$locale->getLocaleFormatMacro().'";</script>';
             echo self::getJavascriptValidation();
-            if (!is_file(sugar_cached('jsLanguage/') . $GLOBALS['current_language'] . '.js')) {
+            if (!is_file(sugar_cached('jsLanguage/').$GLOBALS['current_language'].'.js')) {
                 require_once ('include/language/jsLanguage.php');
                 jsLanguage::createAppStringsCache($GLOBALS['current_language']);
             }
-            echo getVersionedScript('cache/jsLanguage/'. $GLOBALS['current_language'] . '.js', $GLOBALS['sugar_config']['js_lang_version']);
+            echo getVersionedScript('cache/jsLanguage/'.$GLOBALS['current_language'].'.js', $GLOBALS['sugar_config']['js_lang_version']);
 
 			echo $this->_getModLanguageJS();
 
-            if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client'])
+            if (isset($sugar_config['disc_client']) && $sugar_config['disc_client'])
                 echo getVersionedScript('modules/Sync/headersync.js');
 
 
             //echo out the $js_vars variables as javascript variables
             echo "<script type='text/javascript'>\n";
-            foreach($js_vars as $var=>$value)
+            foreach ($js_vars as $var=>$value)
             {
                 echo "var {$var} = '{$value}';\n";
             }
@@ -880,12 +880,12 @@ 
         }
     }
 
-	protected function _getModLanguageJS(){
-		if (!is_file(sugar_cached('jsLanguage/') . $this->module . '/' . $GLOBALS['current_language'] . '.js')) {
+	protected function _getModLanguageJS() {
+		if (!is_file(sugar_cached('jsLanguage/').$this->module.'/'.$GLOBALS['current_language'].'.js')) {
 			require_once ('include/language/jsLanguage.php');
 			jsLanguage::createModuleStringsCache($this->module, $GLOBALS['current_language']);
 		}
-		return getVersionedScript("cache/jsLanguage/{$this->module}/". $GLOBALS['current_language'] . '.js', $GLOBALS['sugar_config']['js_lang_version']);
+		return getVersionedScript("cache/jsLanguage/{$this->module}/".$GLOBALS['current_language'].'.js', $GLOBALS['sugar_config']['js_lang_version']);
 	}
 
     /**
@@ -907,8 +907,8 @@ 
         }
 
         $ss = new Sugar_Smarty();
-        $ss->assign("AUTHENTICATED",isset($_SESSION["authenticated_user_id"]));
-        $ss->assign('MOD',return_module_language($GLOBALS['current_language'], 'Users'));
+        $ss->assign("AUTHENTICATED", isset($_SESSION["authenticated_user_id"]));
+        $ss->assign('MOD', return_module_language($GLOBALS['current_language'], 'Users'));
 
 		$bottomLinkList = array();
 		 if (isset($this->action) && $this->action != "EditView") {
@@ -917,11 +917,11 @@ 
 		$bottomLinkList['backtotop'] = array($app_strings['LNK_BACKTOTOP'] => 'javascript:SUGAR.util.top();');
 
 		$bottomLinksStr = "";
-		foreach($bottomLinkList as $key => $value) {
-			foreach($value as $text => $link) {
+		foreach ($bottomLinkList as $key => $value) {
+			foreach ($value as $text => $link) {
 				   $href = $link;
-				   if(substr($link, 0, 11) == "javascript:") {
-                       $onclick = " onclick=\"".substr($link,11)."\"";
+				   if (substr($link, 0, 11) == "javascript:") {
+                       $onclick = " onclick=\"".substr($link, 11)."\"";
                        $href = "javascript:void(0)";
                    } else {
                    		$onclick = "";
@@ -933,9 +933,9 @@ 
 				$bottomLinksStr .= " ".$text."</a>";
 			}
 		}
-		$ss->assign("BOTTOMLINKS",$bottomLinksStr);
+		$ss->assign("BOTTOMLINKS", $bottomLinksStr);
         if (SugarConfig::getInstance()->get('calculate_response_time', false))
-            $ss->assign('STATISTICS',$this->_getStatistics());
+            $ss->assign('STATISTICS', $this->_getStatistics());
 
         // Under the License referenced above, you are required to leave in all copyright statements in both
         // the code and end-user application.
@@ -969,7 +969,7 @@ 
         $companyLogoURL = $companyLogoURL_arr[0];
 
         $company_logo_attributes = sugar_cache_retrieve('company_logo_attributes');
-        if(!empty($company_logo_attributes)) {
+        if (!empty($company_logo_attributes)) {
             $ss->assign("COMPANY_LOGO_MD5", $company_logo_attributes[0]);
             $ss->assign("COMPANY_LOGO_WIDTH", $company_logo_attributes[1]);
             $ss->assign("COMPANY_LOGO_HEIGHT", $company_logo_attributes[2]);
@@ -978,16 +978,16 @@ 
             // Always need to md5 the file
             $ss->assign("COMPANY_LOGO_MD5", md5_file($companyLogoURL));
 
-            list($width,$height) = getimagesize($companyLogoURL);
-            if ( $width > 212 || $height > 40 ) {
-                $resizePctWidth  = ($width - 212)/212;
-                $resizePctHeight = ($height - 40)/40;
-                if ( $resizePctWidth > $resizePctHeight )
+            list($width, $height) = getimagesize($companyLogoURL);
+            if ($width > 212 || $height > 40) {
+                $resizePctWidth  = ($width - 212) / 212;
+                $resizePctHeight = ($height - 40) / 40;
+                if ($resizePctWidth > $resizePctHeight)
                     $resizeAmount = $width / 212;
                 else
                     $resizeAmount = $height / 40;
-                $ss->assign("COMPANY_LOGO_WIDTH", round($width * (1/$resizeAmount)));
-                $ss->assign("COMPANY_LOGO_HEIGHT", round($height * (1/$resizeAmount)));
+                $ss->assign("COMPANY_LOGO_WIDTH", round($width * (1 / $resizeAmount)));
+                $ss->assign("COMPANY_LOGO_HEIGHT", round($height * (1 / $resizeAmount)));
             }
             else {
                 $ss->assign("COMPANY_LOGO_WIDTH", $width);
@@ -1003,28 +1003,28 @@ 
                                 )
             );
         }
-        $ss->assign("COMPANY_LOGO_URL",getJSPath($companyLogoURL)."&logo_md5=".$ss->get_template_vars("COMPANY_LOGO_MD5"));
+        $ss->assign("COMPANY_LOGO_URL", getJSPath($companyLogoURL)."&logo_md5=".$ss->get_template_vars("COMPANY_LOGO_MD5"));
 
         // Bug 38594 - Add in Trademark wording
         $copyright .= 'SugarCRM is a trademark of SugarCRM, Inc. All other company and product names may be trademarks of the respective companies with which they are associated.<br />';
 
         //rrs bug: 20923 - if this image does not exist as per the license, then the proper image will be displayed regardless, so no need
         //to display an empty image here.
-        if(file_exists('include/images/poweredby_sugarcrm_65.png')){
+        if (file_exists('include/images/poweredby_sugarcrm_65.png')) {
             $copyright .= $attribLinkImg;
         }
         // End Required Image
-        $ss->assign('COPYRIGHT',$copyright);
+        $ss->assign('COPYRIGHT', $copyright);
 
         // here we allocate the help link data
         $help_actions_blacklist = array('Login'); // we don't want to show a context help link here
-        if (!in_array($this->action,$help_actions_blacklist)) {
+        if (!in_array($this->action, $help_actions_blacklist)) {
             $url = 'javascript:void(window.open(\'index.php?module=Administration&action=SupportPortal&view=documentation&version='.$GLOBALS['sugar_version'].'&edition='.$GLOBALS['sugar_flavor'].'&lang='.$GLOBALS['current_language'].
                         '&help_module='.$this->module.'&help_action='.$this->action.'&key='.$GLOBALS['server_unique_key'].'\'))';
             $label = (isset($GLOBALS['app_list_strings']['moduleList'][$this->module]) ?
-                        $GLOBALS['app_list_strings']['moduleList'][$this->module] : $this->module). ' '.$app_strings['LNK_HELP'];
-            $ss->assign('HELP_LINK',SugarThemeRegistry::current()->getLink($url, $label, "id='help_link_two'",
-                'help-dashlet.png', 'class="icon"',null,null,'','left'));
+                        $GLOBALS['app_list_strings']['moduleList'][$this->module] : $this->module).' '.$app_strings['LNK_HELP'];
+            $ss->assign('HELP_LINK', SugarThemeRegistry::current()->getLink($url, $label, "id='help_link_two'",
+                'help-dashlet.png', 'class="icon"', null, null, '', 'left'));
         }
         // end
 
@@ -1037,7 +1037,7 @@ 
      */
     protected function _displaySubPanels()
     {
-        if (isset($this->bean) && !empty($this->bean->id) && (file_exists('modules/' . $this->module . '/metadata/subpaneldefs.php') || file_exists('custom/modules/' . $this->module . '/metadata/subpaneldefs.php') || file_exists('custom/modules/' . $this->module . '/Ext/Layoutdefs/layoutdefs.ext.php'))) {
+        if (isset($this->bean) && !empty($this->bean->id) && (file_exists('modules/'.$this->module.'/metadata/subpaneldefs.php') || file_exists('custom/modules/'.$this->module.'/metadata/subpaneldefs.php') || file_exists('custom/modules/'.$this->module.'/Ext/Layoutdefs/layoutdefs.ext.php'))) {
             $GLOBALS['focus'] = $this->bean;
             require_once ('include/SubPanel/SubPanelTiles.php');
             $subpanel = new SubPanelTiles($this->bean, $this->module);
@@ -1095,7 +1095,7 @@ 
      */
     protected function _checkModule()
     {
-        if(!empty($this->module) && !file_exists('modules/'.$this->module)){
+        if (!empty($this->module) && !file_exists('modules/'.$this->module)) {
             $error = str_replace("[module]", "$this->module", $GLOBALS['app_strings']['ERR_CANNOT_FIND_MODULE']);
             $GLOBALS['log']->fatal($error);
             echo $error;
@@ -1124,7 +1124,7 @@ 
     {
         $endTime = microtime(true);
         $deltaTime = $endTime - $GLOBALS['startTime'];
-        $response_time_string = $GLOBALS['app_strings']['LBL_SERVER_RESPONSE_TIME'] . ' ' . number_format(round($deltaTime, 2), 2) . ' ' . $GLOBALS['app_strings']['LBL_SERVER_RESPONSE_TIME_SECONDS'];
+        $response_time_string = $GLOBALS['app_strings']['LBL_SERVER_RESPONSE_TIME'].' '.number_format(round($deltaTime, 2), 2).' '.$GLOBALS['app_strings']['LBL_SERVER_RESPONSE_TIME_SECONDS'];
         $return = $response_time_string;
        // $return .= '<br />';
         if (!empty($GLOBALS['sugar_config']['show_page_resources'])) {
@@ -1135,16 +1135,16 @@ 
             // I believe the full get_include_files result set appears to have one entry for each file in real
             // case, and one entry in all lower case.
             $list_of_files_case_insensitive = array();
-            foreach($included_files as $key => $name) {
+            foreach ($included_files as $key => $name) {
                 // preserve the first capitalization encountered.
-                $list_of_files_case_insensitive[mb_strtolower($name) ] = $name;
+                $list_of_files_case_insensitive[mb_strtolower($name)] = $name;
             }
-            $return .= $GLOBALS['app_strings']['LBL_SERVER_RESPONSE_RESOURCES'] . '(' . DBManager::getQueryCount() . ',' . sizeof($list_of_files_case_insensitive) . ')<br>';
+            $return .= $GLOBALS['app_strings']['LBL_SERVER_RESPONSE_RESOURCES'].'('.DBManager::getQueryCount().','.sizeof($list_of_files_case_insensitive).')<br>';
             // Display performance of the internal and external caches....
             $cacheStats = SugarCache::instance()->getCacheStats();
-            $return .= "External cache (hits/total=ratio) local ({$cacheStats['localHits']}/{$cacheStats['requests']}=" . round($cacheStats['localHits']*100/$cacheStats['requests'], 0) . "%)";
-            $return .= " external ({$cacheStats['externalHits']}/{$cacheStats['requests']}=" . round($cacheStats['externalHits']*100/$cacheStats['requests'], 0) . "%)<br />";
-            $return .= " misses ({$cacheStats['misses']}/{$cacheStats['requests']}=" . round($cacheStats['misses']*100/$cacheStats['requests'], 0) . "%)<br />";
+            $return .= "External cache (hits/total=ratio) local ({$cacheStats['localHits']}/{$cacheStats['requests']}=".round($cacheStats['localHits'] * 100 / $cacheStats['requests'], 0)."%)";
+            $return .= " external ({$cacheStats['externalHits']}/{$cacheStats['requests']}=".round($cacheStats['externalHits'] * 100 / $cacheStats['requests'], 0)."%)<br />";
+            $return .= " misses ({$cacheStats['misses']}/{$cacheStats['requests']}=".round($cacheStats['misses'] * 100 / $cacheStats['requests'], 0)."%)<br />";
         }
 
         $return .= $this->logMemoryStatistics();
@@ -1161,37 +1161,36 @@ 
      * @param $newline String of newline character to use (defaults to </ br>)
      * @return $message String formatted message about memory statistics
      */
-    protected function logMemoryStatistics($newline='<br>')
+    protected function logMemoryStatistics($newline = '<br>')
     {
         $log_message = '';
 
-        if(!empty($GLOBALS['sugar_config']['log_memory_usage']))
+        if (!empty($GLOBALS['sugar_config']['log_memory_usage']))
         {
-            if(function_exists('memory_get_usage'))
+            if (function_exists('memory_get_usage'))
             {
                 $memory_usage = memory_get_usage();
                 $bytes = $GLOBALS['app_strings']['LBL_SERVER_MEMORY_BYTES'];
                 $data = array($memory_usage, $bytes);
-                $log_message = string_format($GLOBALS['app_strings']['LBL_SERVER_MEMORY_USAGE'], $data) . $newline;
+                $log_message = string_format($GLOBALS['app_strings']['LBL_SERVER_MEMORY_USAGE'], $data).$newline;
             }
 
-            if(function_exists('memory_get_peak_usage'))
+            if (function_exists('memory_get_peak_usage'))
             {
                 $memory_peak_usage = memory_get_peak_usage();
                 $bytes = $GLOBALS['app_strings']['LBL_SERVER_MEMORY_BYTES'];
                 $data = array($memory_peak_usage, $bytes);
-                $log_message .= string_format($GLOBALS['app_strings']['LBL_SERVER_PEAK_MEMORY_USAGE'], $data) . $newline;
+                $log_message .= string_format($GLOBALS['app_strings']['LBL_SERVER_PEAK_MEMORY_USAGE'], $data).$newline;
             }
 
-            if(!empty($log_message))
+            if (!empty($log_message))
             {
-                $data = array
-                (
+                $data = array(
                    !empty($this->module) ? $this->module : $GLOBALS['app_strings']['LBL_LINK_NONE'],
                    !empty($this->action) ? $this->action : $GLOBALS['app_strings']['LBL_LINK_NONE'],
                 );
 
-                $output = string_format($GLOBALS['app_strings']['LBL_SERVER_MEMORY_LOG_MESSAGE'], $data) . $newline;
+                $output = string_format($GLOBALS['app_strings']['LBL_SERVER_MEMORY_LOG_MESSAGE'], $data).$newline;
                 $output .= $log_message;
                 $fp = fopen("memory_usage.log", "ab");
                 fwrite($fp, $output);
@@ -1215,30 +1214,30 @@ 
     {
         global $current_language, $current_user, $mod_strings, $app_strings, $module_menu;
 
-        if ( empty($module) )
+        if (empty($module))
             $module = $this->module;
 
         //Need to make sure the mod_strings match the requested module or Menus may fail
         $curr_mod_strings = $mod_strings;
-        $mod_strings = return_module_language ( $current_language, $module ) ;
+        $mod_strings = return_module_language($current_language, $module);
 
         $module_menu = array();
 
-        if (file_exists('modules/' . $module . '/Menu.php')) {
-            require('modules/' . $module . '/Menu.php');
+        if (file_exists('modules/'.$module.'/Menu.php')) {
+            require('modules/'.$module.'/Menu.php');
         }
-        if (file_exists('custom/modules/' . $module . '/Ext/Menus/menu.ext.php')) {
-            require('custom/modules/' . $module . '/Ext/Menus/menu.ext.php');
+        if (file_exists('custom/modules/'.$module.'/Ext/Menus/menu.ext.php')) {
+            require('custom/modules/'.$module.'/Ext/Menus/menu.ext.php');
         }
-        if (!file_exists('modules/' . $module . '/Menu.php')
-                && !file_exists('custom/modules/' . $module . '/Ext/Menus/menu.ext.php')
+        if (!file_exists('modules/'.$module.'/Menu.php')
+                && !file_exists('custom/modules/'.$module.'/Ext/Menus/menu.ext.php')
                 && !empty($GLOBALS['mod_strings']['LNK_NEW_RECORD'])) {
             $module_menu[] = array("index.php?module=$module&action=EditView&return_module=$module&return_action=DetailView",
-                $GLOBALS['mod_strings']['LNK_NEW_RECORD'],"{$GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL']}$module" ,$module );
+                $GLOBALS['mod_strings']['LNK_NEW_RECORD'], "{$GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL']}$module", $module);
             $module_menu[] = array("index.php?module=$module&action=index", $GLOBALS['mod_strings']['LNK_LIST'],
                 $module, $module);
-            if ( ($this->bean instanceOf SugarBean) && !empty($this->bean->importable) )
-                if ( !empty($mod_strings['LNK_IMPORT_'.strtoupper($module)]) )
+            if (($this->bean instanceOf SugarBean) && !empty($this->bean->importable))
+                if (!empty($mod_strings['LNK_IMPORT_'.strtoupper($module)]))
                     $module_menu[] = array("index.php?module=Import&action=Step1&import_module=$module&return_module=$module&return_action=index",
                         $mod_strings['LNK_IMPORT_'.strtoupper($module)], "Import", $module);
                 else
@@ -1265,22 +1264,22 @@ 
 
 		$userTabs = query_module_access_list($current_user);
 		//If the home tab is in the user array use it as the default tab, otherwise use the first element in the tab array
-		$defaultTab = (in_array("Home",$userTabs)) ? "Home" : key($userTabs);
+		$defaultTab = (in_array("Home", $userTabs)) ? "Home" : key($userTabs);
 
         // Need to figure out what tab this module belongs to, most modules have their own tabs, but there are exceptions.
-        if ( !empty($_REQUEST['module_tab']) )
+        if (!empty($_REQUEST['module_tab']))
             return $_REQUEST['module_tab'];
-        elseif ( isset($moduleTabMap[$this->module]) )
+        elseif (isset($moduleTabMap[$this->module]))
             return $moduleTabMap[$this->module];
         // Special cases
-        elseif ( $this->module == 'MergeRecords' )
+        elseif ($this->module == 'MergeRecords')
             return !empty($_REQUEST['merge_module']) ? $_REQUEST['merge_module'] : $_REQUEST['return_module'];
-        elseif ( $this->module == 'Users' && $this->action == 'SetTimezone' )
+        elseif ($this->module == 'Users' && $this->action == 'SetTimezone')
             return $defaultTab;
         // Default anonymous pages to be under Home
-        elseif ( !isset($app_list_strings['moduleList'][$this->module]) )
+        elseif (!isset($app_list_strings['moduleList'][$this->module]))
             return $defaultTab;
-        elseif ( isset($_REQUEST['action']) && $_REQUEST['action'] == "ajaxui" )
+        elseif (isset($_REQUEST['action']) && $_REQUEST['action'] == "ajaxui")
         	return $defaultTab;
         else
             return $this->module;
@@ -1300,42 +1299,42 @@ 
 
         $theTitle = "<div class='moduleTitle'>\n";
 
-        $module = preg_replace("/ /","",$this->module);
+        $module = preg_replace("/ /", "", $this->module);
 
         $params = $this->_getModuleTitleParams();
         $index = 0;
 
-		if(SugarThemeRegistry::current()->directionality == "rtl") {
+		if (SugarThemeRegistry::current()->directionality == "rtl") {
 			$params = array_reverse($params);
 		}
-		if(count($params) > 1) {
+		if (count($params) > 1) {
 			array_shift($params);
 		}
 		$count = count($params);
         $paramString = '';
-        foreach($params as $parm){
+        foreach ($params as $parm) {
             $index++;
             $paramString .= $parm;
-            if($index < $count){
+            if ($index < $count) {
                 $paramString .= $this->getBreadCrumbSymbol();
             }
         }
 
-        if(!empty($paramString)){
+        if (!empty($paramString)) {
                $theTitle .= "<h2> $paramString </h2>";
 
-            if($this->type == "detail"){
-                $theTitle .= "<div class='favorite' record_id='" . $this->bean->id . "' module='" . $this->bean->module_dir . "'><div class='favorite_icon_outline'>" . SugarThemeRegistry::current()->getImage('favorite-star-outline','title="' . translate('LBL_DASHLET_EDIT', 'Home') . '" border="0"  align="absmiddle"', null,null,'.gif',translate('LBL_DASHLET_EDIT', 'Home')) . "</div>
-                                                    <div class='favorite_icon_fill'>" . SugarThemeRegistry::current()->getImage('favorite-star','title="' . translate('LBL_DASHLET_EDIT', 'Home') . '" border="0"  align="absmiddle"', null,null,'.gif',translate('LBL_DASHLET_EDIT', 'Home')) . "</div></div>";
+            if ($this->type == "detail") {
+                $theTitle .= "<div class='favorite' record_id='".$this->bean->id."' module='".$this->bean->module_dir."'><div class='favorite_icon_outline'>".SugarThemeRegistry::current()->getImage('favorite-star-outline', 'title="'.translate('LBL_DASHLET_EDIT', 'Home').'" border="0"  align="absmiddle"', null, null, '.gif', translate('LBL_DASHLET_EDIT', 'Home'))."</div>
+                                                    <div class='favorite_icon_fill'>" . SugarThemeRegistry::current()->getImage('favorite-star', 'title="'.translate('LBL_DASHLET_EDIT', 'Home').'" border="0"  align="absmiddle"', null, null, '.gif', translate('LBL_DASHLET_EDIT', 'Home'))."</div></div>";
             }
            }
 
         // bug 56131 - restore conditional so that link doesn't appear where it shouldn't
-        if($show_help || $this->type == 'list') {
+        if ($show_help || $this->type == 'list') {
             $theTitle .= "<span class='utils'>";
             $createImageURL = SugarThemeRegistry::current()->getImageURL('create-record.gif');
-            if($this->type == 'list') $theTitle .= '<a href="#" class="btn btn-success showsearch"><span class=" glyphicon glyphicon-search" aria-hidden="true"></span></a>';$url = ajaxLink("index.php?module=$module&action=EditView&return_module=$module&return_action=DetailView");
-            if($show_help) {
+            if ($this->type == 'list') $theTitle .= '<a href="#" class="btn btn-success showsearch"><span class=" glyphicon glyphicon-search" aria-hidden="true"></span></a>'; $url = ajaxLink("index.php?module=$module&action=EditView&return_module=$module&return_action=DetailView");
+            if ($show_help) {
                 $theTitle .= <<<EOHTML
 &nbsp;
 <a id="create_image" href="{$url}" class="utilsLink">
@@ -1361,31 +1360,31 @@ 
     {
         $metadataFile = null;
         $foundViewDefs = false;
-        $viewDef = strtolower($this->type) . 'viewdefs';
-        $coreMetaPath = 'modules/'.$this->module.'/metadata/' . $viewDef . '.php';
-        if(file_exists('custom/' .$coreMetaPath )){
-            $metadataFile = 'custom/' . $coreMetaPath;
+        $viewDef = strtolower($this->type).'viewdefs';
+        $coreMetaPath = 'modules/'.$this->module.'/metadata/'.$viewDef.'.php';
+        if (file_exists('custom/'.$coreMetaPath)) {
+            $metadataFile = 'custom/'.$coreMetaPath;
             $foundViewDefs = true;
-        }else{
-            if(file_exists('custom/modules/'.$this->module.'/metadata/metafiles.php')){
+        } else {
+            if (file_exists('custom/modules/'.$this->module.'/metadata/metafiles.php')) {
                 require_once('custom/modules/'.$this->module.'/metadata/metafiles.php');
-                if(!empty($metafiles[$this->module][$viewDef])){
+                if (!empty($metafiles[$this->module][$viewDef])) {
                     $metadataFile = $metafiles[$this->module][$viewDef];
                     $foundViewDefs = true;
                 }
-            }elseif(file_exists('modules/'.$this->module.'/metadata/metafiles.php')){
+            }elseif (file_exists('modules/'.$this->module.'/metadata/metafiles.php')) {
                 require_once('modules/'.$this->module.'/metadata/metafiles.php');
-                if(!empty($metafiles[$this->module][$viewDef])){
+                if (!empty($metafiles[$this->module][$viewDef])) {
                     $metadataFile = $metafiles[$this->module][$viewDef];
                     $foundViewDefs = true;
                 }
             }
         }
 
-        if(!$foundViewDefs && file_exists($coreMetaPath)){
+        if (!$foundViewDefs && file_exists($coreMetaPath)) {
                 $metadataFile = $coreMetaPath;
         }
-        $GLOBALS['log']->debug("metadatafile=". $metadataFile);
+        $GLOBALS['log']->debug("metadatafile=".$metadataFile);
 
         return $metadataFile;
     }
@@ -1402,10 +1401,10 @@ 
     {
         $params = array($this->_getModuleTitleListParam($browserTitle));
 		//$params = array();
-        if (isset($this->action)){
+        if (isset($this->action)) {
             switch ($this->action) {
             case 'EditView':
-                if(!empty($this->bean->id) && (empty($_REQUEST['isDuplicate']) || $_REQUEST['isDuplicate'] === 'false')) {
+                if (!empty($this->bean->id) && (empty($_REQUEST['isDuplicate']) || $_REQUEST['isDuplicate'] === 'false')) {
                     $params[] = "<a href='index.php?module={$this->module}&action=DetailView&record={$this->bean->id}'>".$this->bean->get_summary_text()."</a>";
                     $params[] = $GLOBALS['app_strings']['LBL_EDIT_BUTTON_LABEL'];
                 }
@@ -1429,18 +1428,18 @@ 
      *                           there should be no HTML in the string
      * @return string
      */
-    protected function _getModuleTitleListParam( $browserTitle = false )
+    protected function _getModuleTitleListParam($browserTitle = false)
     {
     	global $current_user;
     	global $app_strings;
 
-    	if(!empty($GLOBALS['app_list_strings']['moduleList'][$this->module]))
+    	if (!empty($GLOBALS['app_list_strings']['moduleList'][$this->module]))
     		$firstParam = $GLOBALS['app_list_strings']['moduleList'][$this->module];
     	else
     		$firstParam = $this->module;
 
     	$iconPath = $this->getModuleTitleIconPath($this->module);
-    	if($this->action == "ListView" || $this->action == "index") {
+    	if ($this->action == "ListView" || $this->action == "index") {
     	    if (!empty($iconPath) && !$browserTitle) {
     	    	if (SugarThemeRegistry::current()->directionality == "ltr") {
     	    		return $app_strings['LBL_SEARCH']."&nbsp;"
@@ -1466,10 +1465,10 @@ 
     protected function getModuleTitleIconPath($module)
     {
     	$iconPath = "";
-    	if(is_file(SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png',false))) {
+    	if (is_file(SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png', false))) {
     		$iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png');
     	}
-    	else if (is_file(SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png',false))) {
+    	else if (is_file(SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png', false))) {
     		$iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png');
     	}
     	return $iconPath;
@@ -1486,11 +1485,11 @@ 
         global $app_strings;
 
         $browserTitle = $app_strings['LBL_BROWSER_TITLE'];
-        if ( $this->module == 'Users' && ($this->action == 'SetTimezone' || $this->action == 'Login') )
+        if ($this->module == 'Users' && ($this->action == 'SetTimezone' || $this->action == 'Login'))
             return $browserTitle;
         $params = $this->_getModuleTitleParams(true);
-        foreach ($params as $value )
-            $browserTitle = strip_tags($value) . ' &raquo; ' . $browserTitle;
+        foreach ($params as $value)
+            $browserTitle = strip_tags($value).' &raquo; '.$browserTitle;
 
         return $browserTitle;
     }
@@ -1502,7 +1501,7 @@ 
      */
     public function getBreadCrumbSymbol()
     {
-    	if(SugarThemeRegistry::current()->directionality == "ltr") {
+    	if (SugarThemeRegistry::current()->directionality == "ltr") {
         	return "<span class='pointer'>&raquo;</span>";
         }
         else {
@@ -1515,29 +1514,29 @@ 
      *
      * @return array
      */
-    protected function getSugarConfigJS(){
+    protected function getSugarConfigJS() {
         global $sugar_config;
 
         // Set all the config parameters in the JS config as necessary
         $config_js = array();
         // AjaxUI stock banned modules
         $config_js[] = "SUGAR.config.stockAjaxBannedModules = ".json_encode(ajaxBannedModules()).";";
-        if ( isset($sugar_config['quicksearch_querydelay']) ) {
+        if (isset($sugar_config['quicksearch_querydelay'])) {
             $config_js[] = $this->prepareConfigVarForJs('quicksearch_querydelay', $sugar_config['quicksearch_querydelay']);
         }
-        if ( empty($sugar_config['disableAjaxUI']) ) {
+        if (empty($sugar_config['disableAjaxUI'])) {
             $config_js[] = "SUGAR.config.disableAjaxUI = false;";
         }
-        else{
+        else {
             $config_js[] = "SUGAR.config.disableAjaxUI = true;";
         }
-        if ( !empty($sugar_config['addAjaxBannedModules']) ){
+        if (!empty($sugar_config['addAjaxBannedModules'])) {
             $config_js[] = $this->prepareConfigVarForJs('addAjaxBannedModules', $sugar_config['addAjaxBannedModules']);
         }
-        if ( !empty($sugar_config['overrideAjaxBannedModules']) ){
+        if (!empty($sugar_config['overrideAjaxBannedModules'])) {
             $config_js[] = $this->prepareConfigVarForJs('overrideAjaxBannedModules', $sugar_config['overrideAjaxBannedModules']);
         }
-        if (!empty($sugar_config['js_available']) && is_array ($sugar_config['js_available']))
+        if (!empty($sugar_config['js_available']) && is_array($sugar_config['js_available']))
         {
             foreach ($sugar_config['js_available'] as $configKey)
             {
@@ -1598,7 +1597,7 @@ 
     protected function getFavicon()
     {
         // get favicon
-        if(isset($GLOBALS['sugar_config']['default_module_favicon']))
+        if (isset($GLOBALS['sugar_config']['default_module_favicon']))
             $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
         else
             $module_favicon = false;
@@ -1606,10 +1605,10 @@ 
         $themeObject = SugarThemeRegistry::current();
 
         $favicon = '';
-        if ( $module_favicon )
-            $favicon = $themeObject->getImageURL($this->module.'.gif',false);
-        if ( !sugar_is_file($favicon) || !$module_favicon )
-            $favicon = $themeObject->getImageURL('sugar_icon.ico',false);
+        if ($module_favicon)
+            $favicon = $themeObject->getImageURL($this->module.'.gif', false);
+        if (!sugar_is_file($favicon) || !$module_favicon)
+            $favicon = $themeObject->getImageURL('sugar_icon.ico', false);
 
         $extension = pathinfo($favicon, PATHINFO_EXTENSION);
         switch ($extension)
@@ -1666,10 +1665,10 @@ 
      * @return array augmented history with image link and shortened name
      */
     protected function processRecentRecords($history) {
-        foreach ( $history as $key => $row ) {
+        foreach ($history as $key => $row) {
             $history[$key]['item_summary_short'] = to_html(getTrackerSubstring($row['item_summary'])); //bug 56373 - need to re-HTML-encode
             $history[$key]['image'] = SugarThemeRegistry::current()
-                ->getImage($row['module_name'],'border="0" align="absmiddle"',null,null,'.gif',$row['item_summary']);
+                ->getImage($row['module_name'], 'border="0" align="absmiddle"', null, null, '.gif', $row['item_summary']);
         }
         return $history;
     }
@@ -1683,10 +1682,10 @@ 
      *
 	 * @return boolean indicating true or false
 	 */
-    public function checkPostMaxSizeError(){
+    public function checkPostMaxSizeError() {
          //if the referrer is post, and the post array is empty, then an error has occurred, most likely
          //while uploading a file that exceeds the post_max_size.
-         if(empty($_FILES) && empty($_POST) && isset($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'post'){
+         if (empty($_FILES) && empty($_POST) && isset($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'post') {
              $GLOBALS['log']->fatal($GLOBALS['app_strings']['UPLOAD_ERROR_HOME_TEXT']);
              return true;
         }

Braces +132 added lines, -107 removed lines

@@ -102,8 +102,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($bean, $view_object_map);
@@ -178,13 +177,17 @@ 
             echo $jsAlerts->getScript();
         }
 
-        if ($this->_getOption('show_subpanels') && !empty($_REQUEST['record'])) $this->_displaySubPanels();
+        if ($this->_getOption('show_subpanels') && !empty($_REQUEST['record'])) {
+            $this->_displaySubPanels();
+        }
 
         if ($this->action === 'Login') {
             //this is needed for a faster loading login page ie won't render unless the tables are closed
             ob_flush();
         }
-        if ($this->_getOption('show_footer')) $this->displayFooter();
+        if ($this->_getOption('show_footer')) {
+            $this->displayFooter();
+        }
         $GLOBALS['logic_hook']->call_custom_logic('', 'after_ui_footer');
         if ($this->_getOption('json_output'))
         {
@@ -203,11 +206,13 @@ 
                 'favicon' => $this->getFavicon(),
             );
 
-            if(SugarThemeRegistry::current()->name == 'Classic' || SugarThemeRegistry::current()->classic)
-                $ajax_ret['moduleList'] = $this->displayHeader(true);
+            if(SugarThemeRegistry::current()->name == 'Classic' || SugarThemeRegistry::current()->classic) {
+                            $ajax_ret['moduleList'] = $this->displayHeader(true);
+            }
 
-            if(empty($this->responseTime))
-                $this->_calculateFooterMetrics();
+            if(empty($this->responseTime)) {
+                            $this->_calculateFooterMetrics();
+            }
             $ajax_ret['responseTime'] = $this->responseTime;
             $json = getJSONobj();
             echo $json->encode($ajax_ret);
@@ -231,8 +236,7 @@ 
 
         if ( !$this->suppressDisplayErrors ) {
             echo $errors;
-        }
-        else {
+        } else {
             return $errors;
         }
     }
@@ -346,24 +350,26 @@ 
         ob_end_clean();
 
         // get favicon
-        if(isset($GLOBALS['sugar_config']['default_module_favicon']))
-            $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
-        else
-            $module_favicon = false;
+        if(isset($GLOBALS['sugar_config']['default_module_favicon'])) {
+                    $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
+        } else {
+                    $module_favicon = false;
+        }
 
         $favicon = $this->getFavicon();
         $ss->assign('FAVICON_URL', $favicon['url']);
 
         // build the shortcut menu
         $shortcut_menu = array();
-        foreach ( $this->getMenu() as $key => $menu_item )
-            $shortcut_menu[$key] = array(
+        foreach ( $this->getMenu() as $key => $menu_item ) {
+                    $shortcut_menu[$key] = array(
                 "URL"         => $menu_item[0],
                 "LABEL"       => $menu_item[1],
                 "MODULE_NAME" => $menu_item[2],
                 "IMAGE"       => $themeObject
                     ->getImage($menu_item[2],"border='0' align='absmiddle'",null,null,'.gif',$menu_item[1]),
                 );
+        }
         $ss->assign("SHORTCUT_MENU",$shortcut_menu);
 
         // handle rtl text direction
@@ -387,8 +393,7 @@ 
             $ss->assign("COMPANY_LOGO_MD5", $company_logo_attributes[0]);
             $ss->assign("COMPANY_LOGO_WIDTH", $company_logo_attributes[1]);
             $ss->assign("COMPANY_LOGO_HEIGHT", $company_logo_attributes[2]);
-        }
-        else {
+        } else {
             // Always need to md5 the file
             $ss->assign("COMPANY_LOGO_MD5", md5_file($companyLogoURL));
 
@@ -396,14 +401,14 @@ 
             if ( $width > 212 || $height > 40 ) {
                 $resizePctWidth  = ($width - 212)/212;
                 $resizePctHeight = ($height - 40)/40;
-                if ( $resizePctWidth > $resizePctHeight )
-                    $resizeAmount = $width / 212;
-                else
-                    $resizeAmount = $height / 40;
+                if ( $resizePctWidth > $resizePctHeight ) {
+                                    $resizeAmount = $width / 212;
+                } else {
+                                    $resizeAmount = $height / 40;
+                }
                 $ss->assign("COMPANY_LOGO_WIDTH", round($width * (1/$resizeAmount)));
                 $ss->assign("COMPANY_LOGO_HEIGHT", round($height * (1/$resizeAmount)));
-            }
-            else {
+            } else {
                 $ss->assign("COMPANY_LOGO_WIDTH", $width);
                 $ss->assign("COMPANY_LOGO_HEIGHT", $height);
             }
@@ -446,11 +451,12 @@ 
                 }
                 // and now the sublinks
                 if ( $linkattribute == 'submenu' && is_array($attributevalue) ) {
-                    foreach ($attributevalue as $submenulinkkey => $submenulinkinfo)
-                        $gcls[$key]['SUBMENU'][$submenulinkkey] = array(
+                    foreach ($attributevalue as $submenulinkkey => $submenulinkinfo) {
+                                            $gcls[$key]['SUBMENU'][$submenulinkkey] = array(
                             "LABEL" => key($submenulinkinfo),
                             "URL"   => current($submenulinkinfo),
                         );
+                    }
                        if(substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"], 0, 11) == "javascript:") {
                            $gcls[$key]['SUBMENU'][$submenulinkkey]["ONCLICK"] = substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"],11);
                            $gcls[$key]['SUBMENU'][$submenulinkkey]["URL"] = "javascript:void(0)";
@@ -462,8 +468,9 @@ 
 
         $ss->assign("SEARCH", isset($_REQUEST['query_string']) ? $_REQUEST['query_string'] : '');
 
-        if ($this->action == "EditView" || $this->action == "Login")
-            $ss->assign("ONLOAD", 'onload="set_focus()"');
+        if ($this->action == "EditView" || $this->action == "Login") {
+                    $ss->assign("ONLOAD", 'onload="set_focus()"');
+        }
 
         $ss->assign("AUTHENTICATED",isset($_SESSION["authenticated_user_id"]));
 
@@ -523,8 +530,7 @@ 
                 foreach($frames as $key => $values){
                         $fullModuleList[$key] = $values;
                 }
-            }
-            elseif (isset($fullModuleList['iFrames'])) {
+            } elseif (isset($fullModuleList['iFrames'])) {
                 unset($fullModuleList['iFrames']);
             }
 
@@ -540,8 +546,7 @@ 
                     // We have a default value. Use it
                     if(isset($GLOBALS['sugar_config']['default_max_tabs'])){
                         $max_tabs = $GLOBALS['sugar_config']['default_max_tabs'];
-                    }
-                    else{
+                    } else{
                         $max_tabs = 8;
                     }
                 }
@@ -650,7 +655,9 @@ 
                         );
                 }
             }
-            if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $ss->assign('lock_homepage', true);
+            if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) {
+                $ss->assign('lock_homepage', true);
+            }
             $ss->assign("groupTabs",$groupTabs);
             $ss->assign("shortcutTopMenu",$shortcutTopMenu);
             $ss->assign('USE_GROUP_TABS',$usingGroupTabs);
@@ -693,8 +700,9 @@ 
         global $mod_strings;
         $mod_strings = $bakModStrings;
         $headerTpl = $themeObject->getTemplate('header.tpl');
-        if (inDeveloperMode() )
-            $ss->clear_compiled_tpl($headerTpl);
+        if (inDeveloperMode() ) {
+                    $ss->clear_compiled_tpl($headerTpl);
+        }
 
         if ($retModTabs)
         {
@@ -733,8 +741,9 @@ 
         global $gridline, $request_string, $modListHeader, $dashletData, $authController, $locale, $currentModule, $import_bean_map, $image_path, $license;
         global $user_unique_key, $server_unique_key, $barChartColors, $modules_exempt_from_availability_check, $dictionary, $current_language, $beanList, $beanFiles, $sugar_build, $sugar_codename;
         global $timedate, $login_error; // cn: bug 13855 - timedate not available to classic views.
-        if (!empty($this->module))
-            $currentModule = $this->module;
+        if (!empty($this->module)) {
+                    $currentModule = $this->module;
+        }
         require_once ($file);
     }
 
@@ -764,8 +773,9 @@ 
             if ( typeof(SUGAR.themes) == 'undefined' ) SUGAR.themes = {};
         </script>
 EOQ;
-        if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client'])
-            echo getVersionedScript('modules/Sync/headersync.js');
+        if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client']) {
+                    echo getVersionedScript('modules/Sync/headersync.js');
+        }
     }
 
     /**
@@ -866,8 +876,9 @@ 
 
 			echo $this->_getModLanguageJS();
 
-            if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client'])
-                echo getVersionedScript('modules/Sync/headersync.js');
+            if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client']) {
+                            echo getVersionedScript('modules/Sync/headersync.js');
+            }
 
 
             //echo out the $js_vars variables as javascript variables
@@ -934,8 +945,9 @@ 
 			}
 		}
 		$ss->assign("BOTTOMLINKS",$bottomLinksStr);
-        if (SugarConfig::getInstance()->get('calculate_response_time', false))
-            $ss->assign('STATISTICS',$this->_getStatistics());
+        if (SugarConfig::getInstance()->get('calculate_response_time', false)) {
+                    $ss->assign('STATISTICS',$this->_getStatistics());
+        }
 
         // Under the License referenced above, you are required to leave in all copyright statements in both
         // the code and end-user application.
@@ -973,8 +985,7 @@ 
             $ss->assign("COMPANY_LOGO_MD5", $company_logo_attributes[0]);
             $ss->assign("COMPANY_LOGO_WIDTH", $company_logo_attributes[1]);
             $ss->assign("COMPANY_LOGO_HEIGHT", $company_logo_attributes[2]);
-        }
-        else {
+        } else {
             // Always need to md5 the file
             $ss->assign("COMPANY_LOGO_MD5", md5_file($companyLogoURL));
 
@@ -982,14 +993,14 @@ 
             if ( $width > 212 || $height > 40 ) {
                 $resizePctWidth  = ($width - 212)/212;
                 $resizePctHeight = ($height - 40)/40;
-                if ( $resizePctWidth > $resizePctHeight )
-                    $resizeAmount = $width / 212;
-                else
-                    $resizeAmount = $height / 40;
+                if ( $resizePctWidth > $resizePctHeight ) {
+                                    $resizeAmount = $width / 212;
+                } else {
+                                    $resizeAmount = $height / 40;
+                }
                 $ss->assign("COMPANY_LOGO_WIDTH", round($width * (1/$resizeAmount)));
                 $ss->assign("COMPANY_LOGO_HEIGHT", round($height * (1/$resizeAmount)));
-            }
-            else {
+            } else {
                 $ss->assign("COMPANY_LOGO_WIDTH", $width);
                 $ss->assign("COMPANY_LOGO_HEIGHT", $height);
             }
@@ -1047,8 +1058,9 @@ 
 
     protected function _buildModuleList()
     {
-        if (!empty($GLOBALS['current_user']) && empty($GLOBALS['modListHeader']))
-            $GLOBALS['modListHeader'] = query_module_access_list($GLOBALS['current_user']);
+        if (!empty($GLOBALS['current_user']) && empty($GLOBALS['modListHeader'])) {
+                    $GLOBALS['modListHeader'] = query_module_access_list($GLOBALS['current_user']);
+        }
     }
 
     /**
@@ -1068,7 +1080,9 @@ 
             return $this->options['show_all'];
         } elseif (!empty($this->options) && isset($this->options[$option])) {
             return $this->options[$option];
-        } else return $default;
+        } else {
+            return $default;
+        }
     }
 
     /**
@@ -1105,10 +1119,11 @@ 
 
     public function renderJavascript()
     {
-        if ($this->action !== 'Login')
-            $this->_displayJavascript();
-        else
-            $this->_displayLoginJS();
+        if ($this->action !== 'Login') {
+                    $this->_displayJavascript();
+        } else {
+                    $this->_displayLoginJS();
+        }
     }
 
     private function _calculateFooterMetrics()
@@ -1215,8 +1230,9 @@ 
     {
         global $current_language, $current_user, $mod_strings, $app_strings, $module_menu;
 
-        if ( empty($module) )
-            $module = $this->module;
+        if ( empty($module) ) {
+                    $module = $this->module;
+        }
 
         //Need to make sure the mod_strings match the requested module or Menus may fail
         $curr_mod_strings = $mod_strings;
@@ -1237,13 +1253,14 @@ 
                 $GLOBALS['mod_strings']['LNK_NEW_RECORD'],"{$GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL']}$module" ,$module );
             $module_menu[] = array("index.php?module=$module&action=index", $GLOBALS['mod_strings']['LNK_LIST'],
                 $module, $module);
-            if ( ($this->bean instanceOf SugarBean) && !empty($this->bean->importable) )
-                if ( !empty($mod_strings['LNK_IMPORT_'.strtoupper($module)]) )
+            if ( ($this->bean instanceOf SugarBean) && !empty($this->bean->importable) ) {
+                            if ( !empty($mod_strings['LNK_IMPORT_'.strtoupper($module)]) )
                     $module_menu[] = array("index.php?module=Import&action=Step1&import_module=$module&return_module=$module&return_action=index",
                         $mod_strings['LNK_IMPORT_'.strtoupper($module)], "Import", $module);
-                else
-                    $module_menu[] = array("index.php?module=Import&action=Step1&import_module=$module&return_module=$module&return_action=index",
+            } else {
+                                    $module_menu[] = array("index.php?module=Import&action=Step1&import_module=$module&return_module=$module&return_action=index",
                         $app_strings['LBL_IMPORT'], "Import", $module);
+                }
         }
         if (file_exists('custom/application/Ext/Menus/menu.ext.php')) {
             require('custom/application/Ext/Menus/menu.ext.php');
@@ -1268,22 +1285,25 @@ 
 		$defaultTab = (in_array("Home",$userTabs)) ? "Home" : key($userTabs);
 
         // Need to figure out what tab this module belongs to, most modules have their own tabs, but there are exceptions.
-        if ( !empty($_REQUEST['module_tab']) )
-            return $_REQUEST['module_tab'];
-        elseif ( isset($moduleTabMap[$this->module]) )
-            return $moduleTabMap[$this->module];
+        if ( !empty($_REQUEST['module_tab']) ) {
+                    return $_REQUEST['module_tab'];
+        } elseif ( isset($moduleTabMap[$this->module]) ) {
+                    return $moduleTabMap[$this->module];
+        }
         // Special cases
-        elseif ( $this->module == 'MergeRecords' )
-            return !empty($_REQUEST['merge_module']) ? $_REQUEST['merge_module'] : $_REQUEST['return_module'];
-        elseif ( $this->module == 'Users' && $this->action == 'SetTimezone' )
-            return $defaultTab;
+        elseif ( $this->module == 'MergeRecords' ) {
+                    return !empty($_REQUEST['merge_module']) ? $_REQUEST['merge_module'] : $_REQUEST['return_module'];
+        } elseif ( $this->module == 'Users' && $this->action == 'SetTimezone' ) {
+                    return $defaultTab;
+        }
         // Default anonymous pages to be under Home
-        elseif ( !isset($app_list_strings['moduleList'][$this->module]) )
-            return $defaultTab;
-        elseif ( isset($_REQUEST['action']) && $_REQUEST['action'] == "ajaxui" )
-        	return $defaultTab;
-        else
-            return $this->module;
+        elseif ( !isset($app_list_strings['moduleList'][$this->module]) ) {
+                    return $defaultTab;
+        } elseif ( isset($_REQUEST['action']) && $_REQUEST['action'] == "ajaxui" ) {
+                	return $defaultTab;
+        } else {
+                    return $this->module;
+        }
     }
 
    /**
@@ -1334,7 +1354,10 @@ 
         if($show_help || $this->type == 'list') {
             $theTitle .= "<span class='utils'>";
             $createImageURL = SugarThemeRegistry::current()->getImageURL('create-record.gif');
-            if($this->type == 'list') $theTitle .= '<a href="#" class="btn btn-success showsearch"><span class=" glyphicon glyphicon-search" aria-hidden="true"></span></a>';$url = ajaxLink("index.php?module=$module&action=EditView&return_module=$module&return_action=DetailView");
+            if($this->type == 'list') {
+                $theTitle .= '<a href="#" class="btn btn-success showsearch"><span class=" glyphicon glyphicon-search" aria-hidden="true"></span></a>';
+            }
+            $url = ajaxLink("index.php?module=$module&action=EditView&return_module=$module&return_action=DetailView");
             if($show_help) {
                 $theTitle .= <<<EOHTML
 &nbsp;
@@ -1366,14 +1389,14 @@ 
         if(file_exists('custom/' .$coreMetaPath )){
             $metadataFile = 'custom/' . $coreMetaPath;
             $foundViewDefs = true;
-        }else{
+        } else{
             if(file_exists('custom/modules/'.$this->module.'/metadata/metafiles.php')){
                 require_once('custom/modules/'.$this->module.'/metadata/metafiles.php');
                 if(!empty($metafiles[$this->module][$viewDef])){
                     $metadataFile = $metafiles[$this->module][$viewDef];
                     $foundViewDefs = true;
                 }
-            }elseif(file_exists('modules/'.$this->module.'/metadata/metafiles.php')){
+            } elseif(file_exists('modules/'.$this->module.'/metadata/metafiles.php')){
                 require_once('modules/'.$this->module.'/metadata/metafiles.php');
                 if(!empty($metafiles[$this->module][$viewDef])){
                     $metadataFile = $metafiles[$this->module][$viewDef];
@@ -1408,9 +1431,9 @@ 
                 if(!empty($this->bean->id) && (empty($_REQUEST['isDuplicate']) || $_REQUEST['isDuplicate'] === 'false')) {
                     $params[] = "<a href='index.php?module={$this->module}&action=DetailView&record={$this->bean->id}'>".$this->bean->get_summary_text()."</a>";
                     $params[] = $GLOBALS['app_strings']['LBL_EDIT_BUTTON_LABEL'];
+                } else {
+                                    $params[] = $GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL'];
                 }
-                else
-                    $params[] = $GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL'];
                 break;
             case 'DetailView':
                 $beanName = $this->bean->get_summary_text();
@@ -1434,10 +1457,11 @@ 
     	global $current_user;
     	global $app_strings;
 
-    	if(!empty($GLOBALS['app_list_strings']['moduleList'][$this->module]))
-    		$firstParam = $GLOBALS['app_list_strings']['moduleList'][$this->module];
-    	else
-    		$firstParam = $this->module;
+    	if(!empty($GLOBALS['app_list_strings']['moduleList'][$this->module])) {
+    	    		$firstParam = $GLOBALS['app_list_strings']['moduleList'][$this->module];
+    	} else {
+    	    		$firstParam = $this->module;
+    	}
 
     	$iconPath = $this->getModuleTitleIconPath($this->module);
     	if($this->action == "ListView" || $this->action == "index") {
@@ -1453,8 +1477,7 @@ 
 			} else {
 				return $firstParam;
 			}
-    	}
-    	else {
+    	} else {
 		    if (!empty($iconPath) && !$browserTitle) {
 				//return "<a href='index.php?module={$this->module}&action=index'>$this->module</a>";
 			} else {
@@ -1468,8 +1491,7 @@ 
     	$iconPath = "";
     	if(is_file(SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png',false))) {
     		$iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png');
-    	}
-    	else if (is_file(SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png',false))) {
+    	} else if (is_file(SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png',false))) {
     		$iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png');
     	}
     	return $iconPath;
@@ -1486,11 +1508,13 @@ 
         global $app_strings;
 
         $browserTitle = $app_strings['LBL_BROWSER_TITLE'];
-        if ( $this->module == 'Users' && ($this->action == 'SetTimezone' || $this->action == 'Login') )
-            return $browserTitle;
+        if ( $this->module == 'Users' && ($this->action == 'SetTimezone' || $this->action == 'Login') ) {
+                    return $browserTitle;
+        }
         $params = $this->_getModuleTitleParams(true);
-        foreach ($params as $value )
-            $browserTitle = strip_tags($value) . ' &raquo; ' . $browserTitle;
+        foreach ($params as $value ) {
+                    $browserTitle = strip_tags($value) . ' &raquo; ' . $browserTitle;
+        }
 
         return $browserTitle;
     }
@@ -1504,8 +1528,7 @@ 
     {
     	if(SugarThemeRegistry::current()->directionality == "ltr") {
         	return "<span class='pointer'>&raquo;</span>";
-        }
-        else {
+        } else {
         	return "<span class='pointer'>&laquo;</span>";
         }
     }
@@ -1527,8 +1550,7 @@ 
         }
         if ( empty($sugar_config['disableAjaxUI']) ) {
             $config_js[] = "SUGAR.config.disableAjaxUI = false;";
-        }
-        else{
+        } else{
             $config_js[] = "SUGAR.config.disableAjaxUI = true;";
         }
         if ( !empty($sugar_config['addAjaxBannedModules']) ){
@@ -1598,18 +1620,21 @@ 
     protected function getFavicon()
     {
         // get favicon
-        if(isset($GLOBALS['sugar_config']['default_module_favicon']))
-            $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
-        else
-            $module_favicon = false;
+        if(isset($GLOBALS['sugar_config']['default_module_favicon'])) {
+                    $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
+        } else {
+                    $module_favicon = false;
+        }
 
         $themeObject = SugarThemeRegistry::current();
 
         $favicon = '';
-        if ( $module_favicon )
-            $favicon = $themeObject->getImageURL($this->module.'.gif',false);
-        if ( !sugar_is_file($favicon) || !$module_favicon )
-            $favicon = $themeObject->getImageURL('sugar_icon.ico',false);
+        if ( $module_favicon ) {
+                    $favicon = $themeObject->getImageURL($this->module.'.gif',false);
+        }
+        if ( !sugar_is_file($favicon) || !$module_favicon ) {
+                    $favicon = $themeObject->getImageURL('sugar_icon.ico',false);
+        }
 
         $extension = pathinfo($favicon, PATHINFO_EXTENSION);
         switch ($extension)

include/ListView/ListViewData.php

Indentation +249 added lines, -249 removed lines

@@ -46,9 +46,9 @@ 
  */
 class ListViewData {
 
-	var $additionalDetails = true;
+    var $additionalDetails = true;
     var $listviewName = null;
-	var $additionalDetailsAllow = null;
+    var $additionalDetailsAllow = null;
     var $additionalDetailsAjax = true; // leave this true when using filter fields
     var $additionalDetailsFieldToAdd = 'NAME'; // where the span will be attached to
     var $base_url = null;
@@ -58,15 +58,15 @@ 
      */
     var $count_query = '';
 
-	/**
-	 * Constructor sets the limitName to look up the limit in $sugar_config
-	 *
-	 * @return ListViewData
-	 */
-	public function __construct() {
-		$this->limitName = 'list_max_entries_per_page';
-		$this->db = DBManagerFactory::getInstance('listviews');
-	}
+    /**
+     * Constructor sets the limitName to look up the limit in $sugar_config
+     *
+     * @return ListViewData
+     */
+    public function __construct() {
+        $this->limitName = 'list_max_entries_per_page';
+        $this->db = DBManagerFactory::getInstance('listviews');
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
@@ -83,72 +83,72 @@ 
     }
 
 
-	/**
-	 * checks the request for the order by and if that is not set then it checks the session for it
-	 *
-	 * @return array containing the keys orderBy => field being ordered off of and sortOrder => the sort order of that field
-	 */
-	function getOrderBy($orderBy = '', $direction = '') {
-		if (!empty($orderBy) || !empty($_REQUEST[$this->var_order_by])) {
+    /**
+     * checks the request for the order by and if that is not set then it checks the session for it
+     *
+     * @return array containing the keys orderBy => field being ordered off of and sortOrder => the sort order of that field
+     */
+    function getOrderBy($orderBy = '', $direction = '') {
+        if (!empty($orderBy) || !empty($_REQUEST[$this->var_order_by])) {
             if(!empty($_REQUEST[$this->var_order_by])) {
-    			$direction = 'ASC';
-    			$orderBy = $_REQUEST[$this->var_order_by];
-    			if(!empty($_REQUEST['lvso']) && (empty($_SESSION['lvd']['last_ob']) || strcmp($orderBy, $_SESSION['lvd']['last_ob']) == 0) ){
-    				$direction = $_REQUEST['lvso'];
-    			}
+                $direction = 'ASC';
+                $orderBy = $_REQUEST[$this->var_order_by];
+                if(!empty($_REQUEST['lvso']) && (empty($_SESSION['lvd']['last_ob']) || strcmp($orderBy, $_SESSION['lvd']['last_ob']) == 0) ){
+                    $direction = $_REQUEST['lvso'];
+                }
             }
             $_SESSION[$this->var_order_by] = array('orderBy'=>$orderBy, 'direction'=> $direction);
             $_SESSION['lvd']['last_ob'] = $orderBy;
         }
-		else {
+        else {
             $userPreferenceOrder = $GLOBALS['current_user']->getPreference('listviewOrder', $this->var_name);
-			if(!empty($_SESSION[$this->var_order_by])) {
-				$orderBy = $_SESSION[$this->var_order_by]['orderBy'];
-				$direction = $_SESSION[$this->var_order_by]['direction'];
+            if(!empty($_SESSION[$this->var_order_by])) {
+                $orderBy = $_SESSION[$this->var_order_by]['orderBy'];
+                $direction = $_SESSION[$this->var_order_by]['direction'];
             } elseif (!empty($userPreferenceOrder)) {
                 $orderBy = $userPreferenceOrder['orderBy'];
                 $direction = $userPreferenceOrder['sortOrder'];
             } else {
-				$orderBy = 'date_entered';
-				$direction = 'DESC';
-			}
-		}
-		if(!empty($direction)) {
-    		if(strtolower($direction) == "desc") {
-    		    $direction = 'DESC';
-    		} else {
-    		    $direction = 'ASC';
-    		}
-		}
-		return array('orderBy' => $orderBy, 'sortOrder' => $direction);
-	}
-
-	/**
-	 * gets the reverse of the sort order for use on links to reverse a sort order from what is currently used
-	 *
-	 * @param STRING (ASC or DESC) $current_order
-	 * @return  STRING (ASC or DESC)
-	 */
-	function getReverseSortOrder($current_order){
-		return (strcmp(strtolower($current_order), 'asc') == 0)?'DESC':'ASC';
-	}
-	/**
-	 * gets the limit of how many rows to show per page
-	 *
-	 * @return INT (the limit)
-	 */
-	function getLimit() {
-		return $GLOBALS['sugar_config'][$this->limitName];
-	}
-
-	/**
-	 * returns the current offset
-	 *
-	 * @return INT (current offset)
-	 */
-	function getOffset() {
-		return (!empty($_REQUEST[$this->var_offset])) ? $_REQUEST[$this->var_offset] : 0;
-	}
+                $orderBy = 'date_entered';
+                $direction = 'DESC';
+            }
+        }
+        if(!empty($direction)) {
+            if(strtolower($direction) == "desc") {
+                $direction = 'DESC';
+            } else {
+                $direction = 'ASC';
+            }
+        }
+        return array('orderBy' => $orderBy, 'sortOrder' => $direction);
+    }
+
+    /**
+     * gets the reverse of the sort order for use on links to reverse a sort order from what is currently used
+     *
+     * @param STRING (ASC or DESC) $current_order
+     * @return  STRING (ASC or DESC)
+     */
+    function getReverseSortOrder($current_order){
+        return (strcmp(strtolower($current_order), 'asc') == 0)?'DESC':'ASC';
+    }
+    /**
+     * gets the limit of how many rows to show per page
+     *
+     * @return INT (the limit)
+     */
+    function getLimit() {
+        return $GLOBALS['sugar_config'][$this->limitName];
+    }
+
+    /**
+     * returns the current offset
+     *
+     * @return INT (current offset)
+     */
+    function getOffset() {
+        return (!empty($_REQUEST[$this->var_offset])) ? $_REQUEST[$this->var_offset] : 0;
+    }
 
     /**
      * generates the base url without
@@ -174,18 +174,18 @@ 
         return $params;
     }
 
-	/**
-	 * based off of a base name it sets base, offset, and order by variable names to retrieve them from requests and sessions
-	 *
-	 * @param unknown_type $baseName
-	 */
-	function setVariableName($baseName, $where, $listviewName = null){
+    /**
+     * based off of a base name it sets base, offset, and order by variable names to retrieve them from requests and sessions
+     *
+     * @param unknown_type $baseName
+     */
+    function setVariableName($baseName, $where, $listviewName = null){
         global $timedate;
         $module = (!empty($listviewName)) ? $listviewName: $_REQUEST['module'];
         $this->var_name = $module .'2_'. strtoupper($baseName);
 
-		$this->var_order_by = $this->var_name .'_ORDER_BY';
-		$this->var_offset = $this->var_name . '_offset';
+        $this->var_order_by = $this->var_name .'_ORDER_BY';
+        $this->var_offset = $this->var_name . '_offset';
         $timestamp = sugar_microtime();
         $this->stamp = $timestamp;
 
@@ -193,58 +193,58 @@ 
 
         $_SESSION[strtoupper($baseName) . "_FROM_LIST_VIEW"] = $timestamp;
         $_SESSION[strtoupper($baseName) . "_DETAIL_NAV_HISTORY"] = false;
-	}
-
-	function getTotalCount($main_query){
-		if(!empty($this->count_query)){
-		    $count_query = $this->count_query;
-		}else{
-	        $count_query = $this->seed->create_list_count_query($main_query);
-	    }
-		$result = $this->db->query($count_query);
-		if($row = $this->db->fetchByAssoc($result)){
-			return $row['c'];
-		}
-		return 0;
-	}
-
-	/**
-	 * takes in a seed and creates the list view query based off of that seed
-	 * if the $limit value is set to -1 then it will use the default limit and offset values
-	 *
-	 * it will return an array with two key values
-	 * 	1. 'data'=> this is an array of row data
-	 *  2. 'pageData'=> this is an array containg three values
-	 * 			a.'ordering'=> array('orderBy'=> the field being ordered by , 'sortOrder'=> 'ASC' or 'DESC')
-	 * 			b.'urls'=>array('baseURL'=>url used to generate other urls ,
-	 * 							'orderBy'=> the base url for order by
-	 * 							//the following may not be set (so check empty to see if they are set)
-	 * 							'nextPage'=> the url for the next group of results,
-	 * 							'prevPage'=> the url for the prev group of results,
-	 * 							'startPage'=> the url for the start of the group,
-	 * 							'endPage'=> the url for the last set of results in the group
-	 * 			c.'offsets'=>array(
-	 * 								'current'=>current offset
-	 * 								'next'=> next group offset
-	 * 								'prev'=> prev group offset
-	 * 								'end'=> the offset of the last group
-	 * 								'total'=> the total count (only accurate if totalCounted = true otherwise it is either the total count if less than the limit or the total count + 1 )
-	 * 								'totalCounted'=> if a count query was used to get the total count
-	 *
-	 * @param SugarBean $seed
-	 * @param string $where
-	 * @param int:0 $offset
-	 * @param int:-1 $limit
-	 * @param string[]:array() $filter_fields
-	 * @param array:array() $params
-	 * 	Potential $params are
+    }
+
+    function getTotalCount($main_query){
+        if(!empty($this->count_query)){
+            $count_query = $this->count_query;
+        }else{
+            $count_query = $this->seed->create_list_count_query($main_query);
+        }
+        $result = $this->db->query($count_query);
+        if($row = $this->db->fetchByAssoc($result)){
+            return $row['c'];
+        }
+        return 0;
+    }
+
+    /**
+     * takes in a seed and creates the list view query based off of that seed
+     * if the $limit value is set to -1 then it will use the default limit and offset values
+     *
+     * it will return an array with two key values
+     * 	1. 'data'=> this is an array of row data
+     *  2. 'pageData'=> this is an array containg three values
+     * 			a.'ordering'=> array('orderBy'=> the field being ordered by , 'sortOrder'=> 'ASC' or 'DESC')
+     * 			b.'urls'=>array('baseURL'=>url used to generate other urls ,
+     * 							'orderBy'=> the base url for order by
+     * 							//the following may not be set (so check empty to see if they are set)
+     * 							'nextPage'=> the url for the next group of results,
+     * 							'prevPage'=> the url for the prev group of results,
+     * 							'startPage'=> the url for the start of the group,
+     * 							'endPage'=> the url for the last set of results in the group
+     * 			c.'offsets'=>array(
+     * 								'current'=>current offset
+     * 								'next'=> next group offset
+     * 								'prev'=> prev group offset
+     * 								'end'=> the offset of the last group
+     * 								'total'=> the total count (only accurate if totalCounted = true otherwise it is either the total count if less than the limit or the total count + 1 )
+     * 								'totalCounted'=> if a count query was used to get the total count
+     *
+     * @param SugarBean $seed
+     * @param string $where
+     * @param int:0 $offset
+     * @param int:-1 $limit
+     * @param string[]:array() $filter_fields
+     * @param array:array() $params
+     * 	Potential $params are
 		$params['distinct'] = use distinct key word
 		$params['include_custom_fields'] = (on by default)
         $params['custom_XXXX'] = append custom statements to query
-	 * @param string:'id' $id_field
-	 * @return array('data'=> row data, 'pageData' => page data information, 'query' => original query string)
-	 */
-	function getListViewData($seed, $where, $offset=-1, $limit = -1, $filter_fields=array(),$params=array(),$id_field = 'id',$singleSelect=true) {
+     * @param string:'id' $id_field
+     * @return array('data'=> row data, 'pageData' => page data information, 'query' => original query string)
+     */
+    function getListViewData($seed, $where, $offset=-1, $limit = -1, $filter_fields=array(),$params=array(),$id_field = 'id',$singleSelect=true) {
         global $current_user;
         SugarVCR::erase($seed->module_dir);
         $this->seed =& $seed;
@@ -256,7 +256,7 @@ 
 
         $this->setVariableName($seed->object_name, $where, $this->listviewName);
 
-		$this->seed->id = '[SELECT_ID_LIST]';
+        $this->seed->id = '[SELECT_ID_LIST]';
 
         // if $params tell us to override all ordering
         if(!empty($params['overrideOrder']) && !empty($params['orderBy'])) {
@@ -280,11 +280,11 @@ 
             $orderby = substr($order['orderBy'],strpos($order['orderBy'],'.')+1);
         }
         if ($orderby != 'date_entered' && !in_array($orderby, array_keys($filter_fields))) {
-        	$order['orderBy'] = '';
-        	$order['sortOrder'] = '';
+            $order['orderBy'] = '';
+            $order['sortOrder'] = '';
         }
 
-		if (empty($order['orderBy'])) {
+        if (empty($order['orderBy'])) {
             $orderBy = '';
         } else {
             $orderBy = $order['orderBy'] . ' ' . $order['sortOrder'];
@@ -297,40 +297,40 @@ 
             $current_user->setPreference('listviewOrder', $order, 0, $this->var_name); // save preference
         }
 
-		// If $params tells us to override for the special last_name, first_name sorting
-		if (!empty($params['overrideLastNameOrder']) && $order['orderBy'] == 'last_name') {
-			$orderBy = 'last_name '.$order['sortOrder'].', first_name '.$order['sortOrder'];
-		}
+        // If $params tells us to override for the special last_name, first_name sorting
+        if (!empty($params['overrideLastNameOrder']) && $order['orderBy'] == 'last_name') {
+            $orderBy = 'last_name '.$order['sortOrder'].', first_name '.$order['sortOrder'];
+        }
 
-		$ret_array = $seed->create_new_list_query($orderBy, $where, $filter_fields, $params, 0, '', true, $seed, $singleSelect);
+        $ret_array = $seed->create_new_list_query($orderBy, $where, $filter_fields, $params, 0, '', true, $seed, $singleSelect);
         $ret_array['inner_join'] = '';
         if (!empty($this->seed->listview_inner_join)) {
             $ret_array['inner_join'] = ' ' . implode(' ', $this->seed->listview_inner_join) . ' ';
         }
 
-		if(!is_array($params)) $params = array();
+        if(!is_array($params)) $params = array();
         if(!isset($params['custom_select'])) $params['custom_select'] = '';
         if(!isset($params['custom_from'])) $params['custom_from'] = '';
         if(!isset($params['custom_where'])) $params['custom_where'] = '';
         if(!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
-		$main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['inner_join']. $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
-		//C.L. - Fix for 23461
-		if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
-          	   $_SESSION['export_where'] = $ret_array['where'];
-		}
-   		if($limit < -1) {
-			$result = $this->db->query($main_query);
-		}
-		else {
-			if($limit == -1) {
-				$limit = $this->getLimit();
+        $main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['inner_join']. $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
+        //C.L. - Fix for 23461
+        if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
+                    $_SESSION['export_where'] = $ret_array['where'];
+        }
+            if($limit < -1) {
+            $result = $this->db->query($main_query);
+        }
+        else {
+            if($limit == -1) {
+                $limit = $this->getLimit();
             }
-			$dyn_offset = $this->getOffset();
-			if($dyn_offset > 0 || !is_int($dyn_offset))$offset = $dyn_offset;
+            $dyn_offset = $this->getOffset();
+            if($dyn_offset > 0 || !is_int($dyn_offset))$offset = $dyn_offset;
 
             if(strcmp($offset, 'end') == 0){
-            	$totalCount = $this->getTotalCount($main_query);
-            	$offset = (floor(($totalCount -1) / $limit)) * $limit;
+                $totalCount = $this->getTotalCount($main_query);
+                $offset = (floor(($totalCount -1) / $limit)) * $limit;
             }
             if($this->seed->ACLAccess('ListView')) {
                 $result = $this->db->limitQuery($main_query, $offset, $limit + 1);
@@ -339,27 +339,27 @@ 
                 $result = array();
             }
 
-		}
+        }
 
-		$data = array();
+        $data = array();
 
-		$temp = clone $seed;
+        $temp = clone $seed;
 
-		$rows = array();
-		$count = 0;
+        $rows = array();
+        $count = 0;
         $idIndex = array();
         $id_list = '';
 
-   		while(($row = $this->db->fetchByAssoc($result)) != null)
+            while(($row = $this->db->fetchByAssoc($result)) != null)
         {
-   			if($count < $limit)
+                if($count < $limit)
             {
-   				$id_list .= ',\''.$row[$id_field].'\'';
-   				$idIndex[$row[$id_field]][] = count($rows);
-   				$rows[] = $seed->convertRow($row);
-   			}
-   			$count++;
-   		}
+                    $id_list .= ',\''.$row[$id_field].'\'';
+                    $idIndex[$row[$id_field]][] = count($rows);
+                    $rows[] = $seed->convertRow($row);
+                }
+                $count++;
+            }
 
         if (!empty($id_list))
         {
@@ -367,10 +367,10 @@ 
         }
 
         SugarVCR::store($this->seed->module_dir,  $main_query);
-		if($count != 0) {
-			//NOW HANDLE SECONDARY QUERIES
-			if(!empty($ret_array['secondary_select'])) {
-				$secondary_query = $ret_array['secondary_select'] . $ret_array['secondary_from'] . ' WHERE '.$this->seed->table_name.'.id IN ' .$id_list;
+        if($count != 0) {
+            //NOW HANDLE SECONDARY QUERIES
+            if(!empty($ret_array['secondary_select'])) {
+                $secondary_query = $ret_array['secondary_select'] . $ret_array['secondary_from'] . ' WHERE '.$this->seed->table_name.'.id IN ' .$id_list;
                 if(isset($ret_array['order_by']))
                 {
                     $secondary_query .= ' ' . $ret_array['order_by'];
@@ -379,23 +379,23 @@ 
                 $secondary_result = $this->db->query($secondary_query);
 
                 $ref_id_count = array();
-				while($row = $this->db->fetchByAssoc($secondary_result)) {
+                while($row = $this->db->fetchByAssoc($secondary_result)) {
 
                     $ref_id_count[$row['ref_id']][] = true;
-					foreach($row as $name=>$value) {
-						//add it to every row with the given id
-						foreach($idIndex[$row['ref_id']] as $index){
-						    $rows[$index][$name]=$value;
-						}
-					}
-				}
+                    foreach($row as $name=>$value) {
+                        //add it to every row with the given id
+                        foreach($idIndex[$row['ref_id']] as $index){
+                            $rows[$index][$name]=$value;
+                        }
+                    }
+                }
 
                 $rows_keys = array_keys($rows);
                 foreach($rows_keys as $key)
                 {
                     $rows[$key]['secondary_select_count'] = count($ref_id_count[$rows[$key]['ref_id']]);
                 }
-			}
+            }
 
             // retrieve parent names
             if(!empty($filter_fields['parent_name']) && !empty($filter_fields['parent_id']) && !empty($filter_fields['parent_type'])) {
@@ -409,47 +409,47 @@ 
                     $parent_fields = $seed->retrieve_parent_fields($post_retrieve);
                     foreach($parent_fields as $child_id => $parent_data) {
                         //add it to every row with the given id
-						foreach($idIndex[$child_id] as $index){
-						    $rows[$index]['parent_name']= $parent_data['parent_name'];
-						}
+                        foreach($idIndex[$child_id] as $index){
+                            $rows[$index]['parent_name']= $parent_data['parent_name'];
+                        }
                     }
                 }
             }
 
-			$pageData = array();
+            $pageData = array();
 
-			reset($rows);
-			while($row = current($rows)){
+            reset($rows);
+            while($row = current($rows)){
 
                 $temp = clone $seed;
-			    $dataIndex = count($data);
-
-			    $temp->setupCustomFields($temp->module_dir);
-				$temp->loadFromRow($row);
-				if (empty($this->seed->assigned_user_id) && !empty($temp->assigned_user_id)) {
-				    $this->seed->assigned_user_id = $temp->assigned_user_id;
-				}
-				if($idIndex[$row[$id_field]][0] == $dataIndex){
-				    $pageData['tag'][$dataIndex] = $temp->listviewACLHelper();
-				}else{
-				    $pageData['tag'][$dataIndex] = $pageData['tag'][$idIndex[$row[$id_field]][0]];
-				}
-				$data[$dataIndex] = $temp->get_list_view_data($filter_fields);
+                $dataIndex = count($data);
+
+                $temp->setupCustomFields($temp->module_dir);
+                $temp->loadFromRow($row);
+                if (empty($this->seed->assigned_user_id) && !empty($temp->assigned_user_id)) {
+                    $this->seed->assigned_user_id = $temp->assigned_user_id;
+                }
+                if($idIndex[$row[$id_field]][0] == $dataIndex){
+                    $pageData['tag'][$dataIndex] = $temp->listviewACLHelper();
+                }else{
+                    $pageData['tag'][$dataIndex] = $pageData['tag'][$idIndex[$row[$id_field]][0]];
+                }
+                $data[$dataIndex] = $temp->get_list_view_data($filter_fields);
                 $detailViewAccess = $temp->ACLAccess('DetailView');
                 $editViewAccess = $temp->ACLAccess('EditView');
                 $pageData['rowAccess'][$dataIndex] = array('view' => $detailViewAccess, 'edit' => $editViewAccess);
                 $additionalDetailsAllow = $this->additionalDetails && $detailViewAccess && (file_exists(
-                         'modules/' . $temp->module_dir . '/metadata/additionalDetails.php'
-                     ) || file_exists('custom/modules/' . $temp->module_dir . '/metadata/additionalDetails.php'));
+                            'modules/' . $temp->module_dir . '/metadata/additionalDetails.php'
+                        ) || file_exists('custom/modules/' . $temp->module_dir . '/metadata/additionalDetails.php'));
                 $additionalDetailsEdit = $editViewAccess;
                 if($additionalDetailsAllow) {
                     if($this->additionalDetailsAjax) {
-					   $ar = $this->getAdditionalDetailsAjax($data[$dataIndex]['ID']);
+                        $ar = $this->getAdditionalDetailsAjax($data[$dataIndex]['ID']);
                     }
                     else {
                         $additionalDetailsFile = 'modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
                         if(file_exists('custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php')){
-                        	$additionalDetailsFile = 'custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
+                            $additionalDetailsFile = 'custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
                         }
                         require_once($additionalDetailsFile);
                         $ar = $this->getAdditionalDetails($data[$dataIndex],
@@ -458,42 +458,42 @@ 
                     }
                     $pageData['additionalDetails'][$dataIndex] = $ar['string'];
                     $pageData['additionalDetails']['fieldToAddTo'] = $ar['fieldToAddTo'];
-				}
-				next($rows);
-			}
-		}
-		$nextOffset = -1;
-		$prevOffset = -1;
-		$endOffset = -1;
-		if($count > $limit) {
-			$nextOffset = $offset + $limit;
-		}
-
-		if($offset > 0) {
-			$prevOffset = $offset - $limit;
-			if($prevOffset < 0)$prevOffset = 0;
-		}
-		$totalCount = $count + $offset;
-
-		if( $count >= $limit && $totalCounted){
-			$totalCount  = $this->getTotalCount($main_query);
-		}
-		SugarVCR::recordIDs($this->seed->module_dir, array_keys($idIndex), $offset, $totalCount);
+                }
+                next($rows);
+            }
+        }
+        $nextOffset = -1;
+        $prevOffset = -1;
+        $endOffset = -1;
+        if($count > $limit) {
+            $nextOffset = $offset + $limit;
+        }
+
+        if($offset > 0) {
+            $prevOffset = $offset - $limit;
+            if($prevOffset < 0)$prevOffset = 0;
+        }
+        $totalCount = $count + $offset;
+
+        if( $count >= $limit && $totalCounted){
+            $totalCount  = $this->getTotalCount($main_query);
+        }
+        SugarVCR::recordIDs($this->seed->module_dir, array_keys($idIndex), $offset, $totalCount);
         $module_names = array(
             'Prospects' => 'Targets'
         );
-		$endOffset = (floor(($totalCount - 1) / $limit)) * $limit;
-		$pageData['ordering'] = $order;
-		$pageData['ordering']['sortOrder'] = $this->getReverseSortOrder($pageData['ordering']['sortOrder']);
+        $endOffset = (floor(($totalCount - 1) / $limit)) * $limit;
+        $pageData['ordering'] = $order;
+        $pageData['ordering']['sortOrder'] = $this->getReverseSortOrder($pageData['ordering']['sortOrder']);
         //get url parameters as an array
         $pageData['queries'] = $this->generateQueries($pageData['ordering']['sortOrder'], $offset, $prevOffset, $nextOffset,  $endOffset, $totalCounted);
         //join url parameters from array to a string
         $pageData['urls'] = $this->generateURLS($pageData['queries']);
-		$pageData['offsets'] = array( 'current'=>$offset, 'next'=>$nextOffset, 'prev'=>$prevOffset, 'end'=>$endOffset, 'total'=>$totalCount, 'totalCounted'=>$totalCounted);
-		$pageData['bean'] = array('objectName' => $seed->object_name, 'moduleDir' => $seed->module_dir, 'moduleName' => strtr($seed->module_dir, $module_names));
+        $pageData['offsets'] = array( 'current'=>$offset, 'next'=>$nextOffset, 'prev'=>$prevOffset, 'end'=>$endOffset, 'total'=>$totalCount, 'totalCounted'=>$totalCounted);
+        $pageData['bean'] = array('objectName' => $seed->object_name, 'moduleDir' => $seed->module_dir, 'moduleName' => strtr($seed->module_dir, $module_names));
         $pageData['stamp'] = $this->stamp;
         $pageData['access'] = array('view' => $this->seed->ACLAccess('DetailView'), 'edit' => $this->seed->ACLAccess('EditView'));
-		$pageData['idIndex'] = $idIndex;
+        $pageData['idIndex'] = $idIndex;
         if(!$this->seed->ACLAccess('ListView')) {
             $pageData['error'] = 'ACL restricted access';
         }
@@ -501,8 +501,8 @@ 
         $queryString = '';
 
         if( isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "advanced_search" ||
-        	isset($_REQUEST["type_basic"]) && (count($_REQUEST["type_basic"] > 1) || $_REQUEST["type_basic"][0] != "") ||
-        	isset($_REQUEST["module"]) && $_REQUEST["module"] == "MergeRecords")
+            isset($_REQUEST["type_basic"]) && (count($_REQUEST["type_basic"] > 1) || $_REQUEST["type_basic"][0] != "") ||
+            isset($_REQUEST["module"]) && $_REQUEST["module"] == "MergeRecords")
         {
             $queryString = "-advanced_search";
         }
@@ -529,8 +529,8 @@ 
             }
         }
 
-		return array('data'=>$data , 'pageData'=>$pageData, 'query' => $queryString);
-	}
+        return array('data'=>$data , 'pageData'=>$pageData, 'query' => $queryString);
+    }
 
 
     /**
@@ -597,13 +597,13 @@ 
         return $queries;
     }
 
-	/**
-	 * generates the additional details span to be retrieved via ajax
-	 *
-	 * @param GUID id id of the record
-	 * @return array string to attach to field
-	 */
-	function getAdditionalDetailsAjax($id)
+    /**
+     * generates the additional details span to be retrieved via ajax
+     *
+     * @param GUID id id of the record
+     * @return array string to attach to field
+     */
+    function getAdditionalDetailsAjax($id)
     {
         global $app_strings;
 
@@ -611,10 +611,10 @@ 
 
         $extra = "<span id='adspan_" . $id . "' "
                 . "onclick=\"lvg_dtails('$id')\" "
-				. " style='position: relative;'><!--not_in_theme!--><img vertical-align='middle' class='info' border='0' alt='".$app_strings['LBL_ADDITIONAL_DETAILS']."' src='$jscalendarImage'></span>";
+                . " style='position: relative;'><!--not_in_theme!--><img vertical-align='middle' class='info' border='0' alt='".$app_strings['LBL_ADDITIONAL_DETAILS']."' src='$jscalendarImage'></span>";
 
         return array('fieldToAddTo' => $this->additionalDetailsFieldToAdd, 'string' => $extra);
-	}
+    }
 
     /**
      * generates the additional details values
@@ -637,25 +637,25 @@ 
         {
             $results['string'] = $app_strings['LBL_NONE'];
         }
-         	$close = false;
+                $close = false;
             $extra = "<img alt='{$app_strings['LBL_INFOINLINE']}' style='padding: 0px 5px 0px 2px' border='0' onclick=\"SUGAR.util.getStaticAdditionalDetails(this,'";
 
             $extra .= str_replace(array("\rn", "\r", "\n"), array('','','<br />'), $results['string']) ;
             $extra .= "','<div style=\'float:left\'>{$app_strings['LBL_ADDITIONAL_DETAILS']}</div><div style=\'float: right\'>";
 
-	        if($editAccess && !empty($results['editLink']))
-	        {
-	            $extra .=  "<a title=\'{$app_strings['LBL_EDIT_BUTTON']}\' href={$results['editLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('edit_inline.png')."\'></a>";
-	            $close = true;
-	        }
-	        $close = (!empty($results['viewLink'])) ? true : $close;
-	        $extra .= (!empty($results['viewLink']) ? "<a title=\'{$app_strings['LBL_VIEW_BUTTON']}\' href={$results['viewLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=".SugarThemeRegistry::current()->getImageURL('view_inline.png')."></a>" : '');
+            if($editAccess && !empty($results['editLink']))
+            {
+                $extra .=  "<a title=\'{$app_strings['LBL_EDIT_BUTTON']}\' href={$results['editLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('edit_inline.png')."\'></a>";
+                $close = true;
+            }
+            $close = (!empty($results['viewLink'])) ? true : $close;
+            $extra .= (!empty($results['viewLink']) ? "<a title=\'{$app_strings['LBL_VIEW_BUTTON']}\' href={$results['viewLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=".SugarThemeRegistry::current()->getImageURL('view_inline.png')."></a>" : '');
 
             if($close == true) {
-            	$closeVal = "true";
-            	$extra .=  "<a title=\'{$app_strings['LBL_ADDITIONAL_DETAILS_CLOSE_TITLE']}\' href=\'javascript: SUGAR.util.closeStaticAdditionalDetails();\'><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('close.png')."\'></a>";
+                $closeVal = "true";
+                $extra .=  "<a title=\'{$app_strings['LBL_ADDITIONAL_DETAILS_CLOSE_TITLE']}\' href=\'javascript: SUGAR.util.closeStaticAdditionalDetails();\'><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('close.png')."\'></a>";
             } else {
-            	$closeVal = "false";
+                $closeVal = "false";
             }
             $extra .= "',".$closeVal.")\" src='".SugarThemeRegistry::current()->getImageURL('info_inline.png')."' class='info'>";
 

Spacing +106 added lines, -106 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.
@@ -71,9 +71,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function ListViewData(){
+    public function ListViewData() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -90,10 +90,10 @@ 
 	 */
 	function getOrderBy($orderBy = '', $direction = '') {
 		if (!empty($orderBy) || !empty($_REQUEST[$this->var_order_by])) {
-            if(!empty($_REQUEST[$this->var_order_by])) {
+            if (!empty($_REQUEST[$this->var_order_by])) {
     			$direction = 'ASC';
     			$orderBy = $_REQUEST[$this->var_order_by];
-    			if(!empty($_REQUEST['lvso']) && (empty($_SESSION['lvd']['last_ob']) || strcmp($orderBy, $_SESSION['lvd']['last_ob']) == 0) ){
+    			if (!empty($_REQUEST['lvso']) && (empty($_SESSION['lvd']['last_ob']) || strcmp($orderBy, $_SESSION['lvd']['last_ob']) == 0)) {
     				$direction = $_REQUEST['lvso'];
     			}
             }
@@ -102,7 +102,7 @@ 
         }
 		else {
             $userPreferenceOrder = $GLOBALS['current_user']->getPreference('listviewOrder', $this->var_name);
-			if(!empty($_SESSION[$this->var_order_by])) {
+			if (!empty($_SESSION[$this->var_order_by])) {
 				$orderBy = $_SESSION[$this->var_order_by]['orderBy'];
 				$direction = $_SESSION[$this->var_order_by]['direction'];
             } elseif (!empty($userPreferenceOrder)) {
@@ -113,8 +113,8 @@ 
 				$direction = 'DESC';
 			}
 		}
-		if(!empty($direction)) {
-    		if(strtolower($direction) == "desc") {
+		if (!empty($direction)) {
+    		if (strtolower($direction) == "desc") {
     		    $direction = 'DESC';
     		} else {
     		    $direction = 'ASC';
@@ -129,8 +129,8 @@ 
 	 * @param STRING (ASC or DESC) $current_order
 	 * @return  STRING (ASC or DESC)
 	 */
-	function getReverseSortOrder($current_order){
-		return (strcmp(strtolower($current_order), 'asc') == 0)?'DESC':'ASC';
+	function getReverseSortOrder($current_order) {
+		return (strcmp(strtolower($current_order), 'asc') == 0) ? 'DESC' : 'ASC';
 	}
 	/**
 	 * gets the limit of how many rows to show per page
@@ -160,8 +160,8 @@ 
     {
         global $beanList;
 
-        $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount',$this->var_order_by, $this->var_offset, 'lvso', 'sortOrder', 'orderBy', 'request_data', 'current_query_by_page');
-        foreach($beanList as $bean)
+        $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount', $this->var_order_by, $this->var_offset, 'lvso', 'sortOrder', 'orderBy', 'request_data', 'current_query_by_page');
+        foreach ($beanList as $bean)
         {
             $blockVariables[] = 'Home2_'.strtoupper($bean).'_ORDER_BY';
         }
@@ -179,30 +179,30 @@ 
 	 *
 	 * @param unknown_type $baseName
 	 */
-	function setVariableName($baseName, $where, $listviewName = null){
+	function setVariableName($baseName, $where, $listviewName = null) {
         global $timedate;
-        $module = (!empty($listviewName)) ? $listviewName: $_REQUEST['module'];
-        $this->var_name = $module .'2_'. strtoupper($baseName);
+        $module = (!empty($listviewName)) ? $listviewName : $_REQUEST['module'];
+        $this->var_name = $module.'2_'.strtoupper($baseName);
 
-		$this->var_order_by = $this->var_name .'_ORDER_BY';
-		$this->var_offset = $this->var_name . '_offset';
+		$this->var_order_by = $this->var_name.'_ORDER_BY';
+		$this->var_offset = $this->var_name.'_offset';
         $timestamp = sugar_microtime();
         $this->stamp = $timestamp;
 
-        $_SESSION[$module .'2_QUERY_QUERY'] = $where;
+        $_SESSION[$module.'2_QUERY_QUERY'] = $where;
 
-        $_SESSION[strtoupper($baseName) . "_FROM_LIST_VIEW"] = $timestamp;
-        $_SESSION[strtoupper($baseName) . "_DETAIL_NAV_HISTORY"] = false;
+        $_SESSION[strtoupper($baseName)."_FROM_LIST_VIEW"] = $timestamp;
+        $_SESSION[strtoupper($baseName)."_DETAIL_NAV_HISTORY"] = false;
 	}
 
-	function getTotalCount($main_query){
-		if(!empty($this->count_query)){
+	function getTotalCount($main_query) {
+		if (!empty($this->count_query)) {
 		    $count_query = $this->count_query;
-		}else{
+		} else {
 	        $count_query = $this->seed->create_list_count_query($main_query);
 	    }
 		$result = $this->db->query($count_query);
-		if($row = $this->db->fetchByAssoc($result)){
+		if ($row = $this->db->fetchByAssoc($result)) {
 			return $row['c'];
 		}
 		return 0;
@@ -244,13 +244,13 @@ 
 	 * @param string:'id' $id_field
 	 * @return array('data'=> row data, 'pageData' => page data information, 'query' => original query string)
 	 */
-	function getListViewData($seed, $where, $offset=-1, $limit = -1, $filter_fields=array(),$params=array(),$id_field = 'id',$singleSelect=true) {
+	function getListViewData($seed, $where, $offset = -1, $limit = -1, $filter_fields = array(), $params = array(), $id_field = 'id', $singleSelect = true) {
         global $current_user;
         SugarVCR::erase($seed->module_dir);
-        $this->seed =& $seed;
+        $this->seed = & $seed;
         $totalCounted = empty($GLOBALS['sugar_config']['disable_count_query']);
         $_SESSION['MAILMERGE_MODULE_FROM_LISTVIEW'] = $seed->module_dir;
-        if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup'){
+        if (empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
             $_SESSION['MAILMERGE_MODULE'] = $seed->module_dir;
         }
 
@@ -259,7 +259,7 @@ 
 		$this->seed->id = '[SELECT_ID_LIST]';
 
         // if $params tell us to override all ordering
-        if(!empty($params['overrideOrder']) && !empty($params['orderBy'])) {
+        if (!empty($params['overrideOrder']) && !empty($params['orderBy'])) {
             $order = $this->getOrderBy(strtolower($params['orderBy']), (empty($params['sortOrder']) ? '' : $params['sortOrder'])); // retreive from $_REQUEST
         }
         else {
@@ -267,17 +267,17 @@ 
         }
 
         // still empty? try to use settings passed in $param
-        if(empty($order['orderBy']) && !empty($params['orderBy'])) {
+        if (empty($order['orderBy']) && !empty($params['orderBy'])) {
             $order['orderBy'] = $params['orderBy'];
-            $order['sortOrder'] =  (empty($params['sortOrder']) ? '' : $params['sortOrder']);
+            $order['sortOrder'] = (empty($params['sortOrder']) ? '' : $params['sortOrder']);
         }
 
         //rrs - bug: 21788. Do not use Order by stmts with fields that are not in the query.
         // Bug 22740 - Tweak this check to strip off the table name off the order by parameter.
         // Samir Gandhi : Do not remove the report_cache.date_modified condition as the report list view is broken
         $orderby = $order['orderBy'];
-        if (strpos($order['orderBy'],'.') && ($order['orderBy'] != "report_cache.date_modified")) {
-            $orderby = substr($order['orderBy'],strpos($order['orderBy'],'.')+1);
+        if (strpos($order['orderBy'], '.') && ($order['orderBy'] != "report_cache.date_modified")) {
+            $orderby = substr($order['orderBy'], strpos($order['orderBy'], '.') + 1);
         }
         if ($orderby != 'date_entered' && !in_array($orderby, array_keys($filter_fields))) {
         	$order['orderBy'] = '';
@@ -287,10 +287,10 @@ 
 		if (empty($order['orderBy'])) {
             $orderBy = '';
         } else {
-            $orderBy = $order['orderBy'] . ' ' . $order['sortOrder'];
+            $orderBy = $order['orderBy'].' '.$order['sortOrder'];
             //wdong, Bug 25476, fix the sorting problem of Oracle.
             if (isset($params['custom_order_by_override']['ori_code']) && $order['orderBy'] == $params['custom_order_by_override']['ori_code'])
-                $orderBy = $params['custom_order_by_override']['custom_code'] . ' ' . $order['sortOrder'];
+                $orderBy = $params['custom_order_by_override']['custom_code'].' '.$order['sortOrder'];
         }
 
         if (empty($params['skipOrderSave'])) { // don't save preferences if told so
@@ -305,34 +305,34 @@ 
 		$ret_array = $seed->create_new_list_query($orderBy, $where, $filter_fields, $params, 0, '', true, $seed, $singleSelect);
         $ret_array['inner_join'] = '';
         if (!empty($this->seed->listview_inner_join)) {
-            $ret_array['inner_join'] = ' ' . implode(' ', $this->seed->listview_inner_join) . ' ';
+            $ret_array['inner_join'] = ' '.implode(' ', $this->seed->listview_inner_join).' ';
         }
 
-		if(!is_array($params)) $params = array();
-        if(!isset($params['custom_select'])) $params['custom_select'] = '';
-        if(!isset($params['custom_from'])) $params['custom_from'] = '';
-        if(!isset($params['custom_where'])) $params['custom_where'] = '';
-        if(!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
-		$main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['inner_join']. $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
+		if (!is_array($params)) $params = array();
+        if (!isset($params['custom_select'])) $params['custom_select'] = '';
+        if (!isset($params['custom_from'])) $params['custom_from'] = '';
+        if (!isset($params['custom_where'])) $params['custom_where'] = '';
+        if (!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
+		$main_query = $ret_array['select'].$params['custom_select'].$ret_array['from'].$params['custom_from'].$ret_array['inner_join'].$ret_array['where'].$params['custom_where'].$ret_array['order_by'].$params['custom_order_by'];
 		//C.L. - Fix for 23461
-		if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
+		if (empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
           	   $_SESSION['export_where'] = $ret_array['where'];
 		}
-   		if($limit < -1) {
+   		if ($limit < -1) {
 			$result = $this->db->query($main_query);
 		}
 		else {
-			if($limit == -1) {
+			if ($limit == -1) {
 				$limit = $this->getLimit();
             }
 			$dyn_offset = $this->getOffset();
-			if($dyn_offset > 0 || !is_int($dyn_offset))$offset = $dyn_offset;
+			if ($dyn_offset > 0 || !is_int($dyn_offset))$offset = $dyn_offset;
 
-            if(strcmp($offset, 'end') == 0){
+            if (strcmp($offset, 'end') == 0) {
             	$totalCount = $this->getTotalCount($main_query);
-            	$offset = (floor(($totalCount -1) / $limit)) * $limit;
+            	$offset = (floor(($totalCount - 1) / $limit)) * $limit;
             }
-            if($this->seed->ACLAccess('ListView')) {
+            if ($this->seed->ACLAccess('ListView')) {
                 $result = $this->db->limitQuery($main_query, $offset, $limit + 1);
             }
             else {
@@ -350,9 +350,9 @@ 
         $idIndex = array();
         $id_list = '';
 
-   		while(($row = $this->db->fetchByAssoc($result)) != null)
+   		while (($row = $this->db->fetchByAssoc($result)) != null)
         {
-   			if($count < $limit)
+   			if ($count < $limit)
             {
    				$id_list .= ',\''.$row[$id_field].'\'';
    				$idIndex[$row[$id_field]][] = count($rows);
@@ -366,51 +366,51 @@ 
             $id_list = '('.substr($id_list, 1).')';
         }
 
-        SugarVCR::store($this->seed->module_dir,  $main_query);
-		if($count != 0) {
+        SugarVCR::store($this->seed->module_dir, $main_query);
+		if ($count != 0) {
 			//NOW HANDLE SECONDARY QUERIES
-			if(!empty($ret_array['secondary_select'])) {
-				$secondary_query = $ret_array['secondary_select'] . $ret_array['secondary_from'] . ' WHERE '.$this->seed->table_name.'.id IN ' .$id_list;
-                if(isset($ret_array['order_by']))
+			if (!empty($ret_array['secondary_select'])) {
+				$secondary_query = $ret_array['secondary_select'].$ret_array['secondary_from'].' WHERE '.$this->seed->table_name.'.id IN '.$id_list;
+                if (isset($ret_array['order_by']))
                 {
-                    $secondary_query .= ' ' . $ret_array['order_by'];
+                    $secondary_query .= ' '.$ret_array['order_by'];
                 }
 
                 $secondary_result = $this->db->query($secondary_query);
 
                 $ref_id_count = array();
-				while($row = $this->db->fetchByAssoc($secondary_result)) {
+				while ($row = $this->db->fetchByAssoc($secondary_result)) {
 
                     $ref_id_count[$row['ref_id']][] = true;
-					foreach($row as $name=>$value) {
+					foreach ($row as $name=>$value) {
 						//add it to every row with the given id
-						foreach($idIndex[$row['ref_id']] as $index){
-						    $rows[$index][$name]=$value;
+						foreach ($idIndex[$row['ref_id']] as $index) {
+						    $rows[$index][$name] = $value;
 						}
 					}
 				}
 
                 $rows_keys = array_keys($rows);
-                foreach($rows_keys as $key)
+                foreach ($rows_keys as $key)
                 {
                     $rows[$key]['secondary_select_count'] = count($ref_id_count[$rows[$key]['ref_id']]);
                 }
 			}
 
             // retrieve parent names
-            if(!empty($filter_fields['parent_name']) && !empty($filter_fields['parent_id']) && !empty($filter_fields['parent_type'])) {
-                foreach($idIndex as $id => $rowIndex) {
-                    if(!isset($post_retrieve[$rows[$rowIndex[0]]['parent_type']])) {
+            if (!empty($filter_fields['parent_name']) && !empty($filter_fields['parent_id']) && !empty($filter_fields['parent_type'])) {
+                foreach ($idIndex as $id => $rowIndex) {
+                    if (!isset($post_retrieve[$rows[$rowIndex[0]]['parent_type']])) {
                         $post_retrieve[$rows[$rowIndex[0]]['parent_type']] = array();
                     }
-                    if(!empty($rows[$rowIndex[0]]['parent_id'])) $post_retrieve[$rows[$rowIndex[0]]['parent_type']][] = array('child_id' => $id , 'parent_id'=> $rows[$rowIndex[0]]['parent_id'], 'parent_type' => $rows[$rowIndex[0]]['parent_type'], 'type' => 'parent');
+                    if (!empty($rows[$rowIndex[0]]['parent_id'])) $post_retrieve[$rows[$rowIndex[0]]['parent_type']][] = array('child_id' => $id, 'parent_id'=> $rows[$rowIndex[0]]['parent_id'], 'parent_type' => $rows[$rowIndex[0]]['parent_type'], 'type' => 'parent');
                 }
-                if(isset($post_retrieve)) {
+                if (isset($post_retrieve)) {
                     $parent_fields = $seed->retrieve_parent_fields($post_retrieve);
-                    foreach($parent_fields as $child_id => $parent_data) {
+                    foreach ($parent_fields as $child_id => $parent_data) {
                         //add it to every row with the given id
-						foreach($idIndex[$child_id] as $index){
-						    $rows[$index]['parent_name']= $parent_data['parent_name'];
+						foreach ($idIndex[$child_id] as $index) {
+						    $rows[$index]['parent_name'] = $parent_data['parent_name'];
 						}
                     }
                 }
@@ -419,7 +419,7 @@ 
 			$pageData = array();
 
 			reset($rows);
-			while($row = current($rows)){
+			while ($row = current($rows)) {
 
                 $temp = clone $seed;
 			    $dataIndex = count($data);
@@ -429,9 +429,9 @@ 
 				if (empty($this->seed->assigned_user_id) && !empty($temp->assigned_user_id)) {
 				    $this->seed->assigned_user_id = $temp->assigned_user_id;
 				}
-				if($idIndex[$row[$id_field]][0] == $dataIndex){
+				if ($idIndex[$row[$id_field]][0] == $dataIndex) {
 				    $pageData['tag'][$dataIndex] = $temp->listviewACLHelper();
-				}else{
+				} else {
 				    $pageData['tag'][$dataIndex] = $pageData['tag'][$idIndex[$row[$id_field]][0]];
 				}
 				$data[$dataIndex] = $temp->get_list_view_data($filter_fields);
@@ -439,21 +439,21 @@ 
                 $editViewAccess = $temp->ACLAccess('EditView');
                 $pageData['rowAccess'][$dataIndex] = array('view' => $detailViewAccess, 'edit' => $editViewAccess);
                 $additionalDetailsAllow = $this->additionalDetails && $detailViewAccess && (file_exists(
-                         'modules/' . $temp->module_dir . '/metadata/additionalDetails.php'
-                     ) || file_exists('custom/modules/' . $temp->module_dir . '/metadata/additionalDetails.php'));
+                         'modules/'.$temp->module_dir.'/metadata/additionalDetails.php'
+                     ) || file_exists('custom/modules/'.$temp->module_dir.'/metadata/additionalDetails.php'));
                 $additionalDetailsEdit = $editViewAccess;
-                if($additionalDetailsAllow) {
-                    if($this->additionalDetailsAjax) {
+                if ($additionalDetailsAllow) {
+                    if ($this->additionalDetailsAjax) {
 					   $ar = $this->getAdditionalDetailsAjax($data[$dataIndex]['ID']);
                     }
                     else {
-                        $additionalDetailsFile = 'modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
-                        if(file_exists('custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php')){
-                        	$additionalDetailsFile = 'custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
+                        $additionalDetailsFile = 'modules/'.$this->seed->module_dir.'/metadata/additionalDetails.php';
+                        if (file_exists('custom/modules/'.$this->seed->module_dir.'/metadata/additionalDetails.php')) {
+                        	$additionalDetailsFile = 'custom/modules/'.$this->seed->module_dir.'/metadata/additionalDetails.php';
                         }
                         require_once($additionalDetailsFile);
                         $ar = $this->getAdditionalDetails($data[$dataIndex],
-                                    (empty($this->additionalDetailsFunction) ? 'additionalDetails' : $this->additionalDetailsFunction) . $this->seed->object_name,
+                                    (empty($this->additionalDetailsFunction) ? 'additionalDetails' : $this->additionalDetailsFunction).$this->seed->object_name,
                                     $additionalDetailsEdit);
                     }
                     $pageData['additionalDetails'][$dataIndex] = $ar['string'];
@@ -465,18 +465,18 @@ 
 		$nextOffset = -1;
 		$prevOffset = -1;
 		$endOffset = -1;
-		if($count > $limit) {
+		if ($count > $limit) {
 			$nextOffset = $offset + $limit;
 		}
 
-		if($offset > 0) {
+		if ($offset > 0) {
 			$prevOffset = $offset - $limit;
-			if($prevOffset < 0)$prevOffset = 0;
+			if ($prevOffset < 0)$prevOffset = 0;
 		}
 		$totalCount = $count + $offset;
 
-		if( $count >= $limit && $totalCounted){
-			$totalCount  = $this->getTotalCount($main_query);
+		if ($count >= $limit && $totalCounted) {
+			$totalCount = $this->getTotalCount($main_query);
 		}
 		SugarVCR::recordIDs($this->seed->module_dir, array_keys($idIndex), $offset, $totalCount);
         $module_names = array(
@@ -486,21 +486,21 @@ 
 		$pageData['ordering'] = $order;
 		$pageData['ordering']['sortOrder'] = $this->getReverseSortOrder($pageData['ordering']['sortOrder']);
         //get url parameters as an array
-        $pageData['queries'] = $this->generateQueries($pageData['ordering']['sortOrder'], $offset, $prevOffset, $nextOffset,  $endOffset, $totalCounted);
+        $pageData['queries'] = $this->generateQueries($pageData['ordering']['sortOrder'], $offset, $prevOffset, $nextOffset, $endOffset, $totalCounted);
         //join url parameters from array to a string
         $pageData['urls'] = $this->generateURLS($pageData['queries']);
-		$pageData['offsets'] = array( 'current'=>$offset, 'next'=>$nextOffset, 'prev'=>$prevOffset, 'end'=>$endOffset, 'total'=>$totalCount, 'totalCounted'=>$totalCounted);
+		$pageData['offsets'] = array('current'=>$offset, 'next'=>$nextOffset, 'prev'=>$prevOffset, 'end'=>$endOffset, 'total'=>$totalCount, 'totalCounted'=>$totalCounted);
 		$pageData['bean'] = array('objectName' => $seed->object_name, 'moduleDir' => $seed->module_dir, 'moduleName' => strtr($seed->module_dir, $module_names));
         $pageData['stamp'] = $this->stamp;
         $pageData['access'] = array('view' => $this->seed->ACLAccess('DetailView'), 'edit' => $this->seed->ACLAccess('EditView'));
 		$pageData['idIndex'] = $idIndex;
-        if(!$this->seed->ACLAccess('ListView')) {
+        if (!$this->seed->ACLAccess('ListView')) {
             $pageData['error'] = 'ACL restricted access';
         }
 
         $queryString = '';
 
-        if( isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "advanced_search" ||
+        if (isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "advanced_search" ||
         	isset($_REQUEST["type_basic"]) && (count($_REQUEST["type_basic"] > 1) || $_REQUEST["type_basic"][0] != "") ||
         	isset($_REQUEST["module"]) && $_REQUEST["module"] == "MergeRecords")
         {
@@ -508,19 +508,19 @@ 
         }
         else if (isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "basic_search")
         {
-            if($seed->module_dir == "Reports") $searchMetaData = SearchFormReports::retrieveReportsSearchDefs();
+            if ($seed->module_dir == "Reports") $searchMetaData = SearchFormReports::retrieveReportsSearchDefs();
             else $searchMetaData = SearchForm::retrieveSearchDefs($seed->module_dir);
 
             $basicSearchFields = array();
 
-            if( isset($searchMetaData['searchdefs']) && isset($searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search']) )
+            if (isset($searchMetaData['searchdefs']) && isset($searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search']))
                 $basicSearchFields = $searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search'];
 
-            foreach( $basicSearchFields as $basicSearchField)
+            foreach ($basicSearchFields as $basicSearchField)
             {
                 $field_name = (is_array($basicSearchField) && isset($basicSearchField['name'])) ? $basicSearchField['name'] : $basicSearchField;
                 $field_name .= "_basic";
-                if( isset($_REQUEST[$field_name])  && ( !is_array($basicSearchField) || !isset($basicSearchField['type']) || $basicSearchField['type'] == 'text' || $basicSearchField['type'] == 'name') )
+                if (isset($_REQUEST[$field_name]) && (!is_array($basicSearchField) || !isset($basicSearchField['type']) || $basicSearchField['type'] == 'text' || $basicSearchField['type'] == 'name'))
                 {
                     // Ensure the encoding is UTF-8
                     $queryString = htmlentities($_REQUEST[$field_name], null, 'UTF-8');
@@ -529,7 +529,7 @@ 
             }
         }
 
-		return array('data'=>$data , 'pageData'=>$pageData, 'query' => $queryString);
+		return array('data'=>$data, 'pageData'=>$pageData, 'query' => $queryString);
 	}
 
 
@@ -543,7 +543,7 @@ 
     {
         foreach ($queries as $name => $value)
         {
-            $queries[$name] = 'index.php?' . http_build_query($value);
+            $queries[$name] = 'index.php?'.http_build_query($value);
         }
         $this->base_url = $queries['baseURL'];
         return $queries;
@@ -569,22 +569,22 @@ 
         $queries['orderBy'] = $queries['baseURL'];
         $queries['orderBy'][$this->var_order_by] = '';
 
-        if($nextOffset > -1)
+        if ($nextOffset > -1)
         {
             $queries['nextPage'] = $queries['baseURL'];
             $queries['nextPage'][$this->var_offset] = $nextOffset;
         }
-        if($offset > 0)
+        if ($offset > 0)
         {
             $queries['startPage'] = $queries['baseURL'];
             $queries['startPage'][$this->var_offset] = 0;
         }
-        if($prevOffset > -1)
+        if ($prevOffset > -1)
         {
             $queries['prevPage'] = $queries['baseURL'];
             $queries['prevPage'][$this->var_offset] = $prevOffset;
         }
-        if($totalCounted)
+        if ($totalCounted)
         {
             $queries['endPage'] = $queries['baseURL'];
             $queries['endPage'][$this->var_offset] = $endOffset;
@@ -609,7 +609,7 @@ 
 
         $jscalendarImage = SugarThemeRegistry::current()->getImageURL('info_inline.gif');
 
-        $extra = "<span id='adspan_" . $id . "' "
+        $extra = "<span id='adspan_".$id."' "
                 . "onclick=\"lvg_dtails('$id')\" "
 				. " style='position: relative;'><!--not_in_theme!--><img vertical-align='middle' class='info' border='0' alt='".$app_strings['LBL_ADDITIONAL_DETAILS']."' src='$jscalendarImage'></span>";
 
@@ -633,27 +633,27 @@ 
 
         $results['string'] = str_replace(array("&#039", "'"), '\&#039', $results['string']); // no xss!
 
-        if(trim($results['string']) == '')
+        if (trim($results['string']) == '')
         {
             $results['string'] = $app_strings['LBL_NONE'];
         }
          	$close = false;
             $extra = "<img alt='{$app_strings['LBL_INFOINLINE']}' style='padding: 0px 5px 0px 2px' border='0' onclick=\"SUGAR.util.getStaticAdditionalDetails(this,'";
 
-            $extra .= str_replace(array("\rn", "\r", "\n"), array('','','<br />'), $results['string']) ;
+            $extra .= str_replace(array("\rn", "\r", "\n"), array('', '', '<br />'), $results['string']);
             $extra .= "','<div style=\'float:left\'>{$app_strings['LBL_ADDITIONAL_DETAILS']}</div><div style=\'float: right\'>";
 
-	        if($editAccess && !empty($results['editLink']))
+	        if ($editAccess && !empty($results['editLink']))
 	        {
-	            $extra .=  "<a title=\'{$app_strings['LBL_EDIT_BUTTON']}\' href={$results['editLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('edit_inline.png')."\'></a>";
+	            $extra .= "<a title=\'{$app_strings['LBL_EDIT_BUTTON']}\' href={$results['editLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('edit_inline.png')."\'></a>";
 	            $close = true;
 	        }
 	        $close = (!empty($results['viewLink'])) ? true : $close;
 	        $extra .= (!empty($results['viewLink']) ? "<a title=\'{$app_strings['LBL_VIEW_BUTTON']}\' href={$results['viewLink']}><img style=\'margin-left: 2px;\' border=\'0\' src=".SugarThemeRegistry::current()->getImageURL('view_inline.png')."></a>" : '');
 
-            if($close == true) {
+            if ($close == true) {
             	$closeVal = "true";
-            	$extra .=  "<a title=\'{$app_strings['LBL_ADDITIONAL_DETAILS_CLOSE_TITLE']}\' href=\'javascript: SUGAR.util.closeStaticAdditionalDetails();\'><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('close.png')."\'></a>";
+            	$extra .= "<a title=\'{$app_strings['LBL_ADDITIONAL_DETAILS_CLOSE_TITLE']}\' href=\'javascript: SUGAR.util.closeStaticAdditionalDetails();\'><img style=\'margin-left: 2px;\' border=\'0\' src=\'".SugarThemeRegistry::current()->getImageURL('close.png')."\'></a>";
             } else {
             	$closeVal = "false";
             }

Braces +48 added lines, -33 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.
@@ -75,8 +77,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -99,8 +100,7 @@ 
             }
             $_SESSION[$this->var_order_by] = array('orderBy'=>$orderBy, 'direction'=> $direction);
             $_SESSION['lvd']['last_ob'] = $orderBy;
-        }
-		else {
+        } else {
             $userPreferenceOrder = $GLOBALS['current_user']->getPreference('listviewOrder', $this->var_name);
 			if(!empty($_SESSION[$this->var_order_by])) {
 				$orderBy = $_SESSION[$this->var_order_by]['orderBy'];
@@ -198,7 +198,7 @@ 
 	function getTotalCount($main_query){
 		if(!empty($this->count_query)){
 		    $count_query = $this->count_query;
-		}else{
+		} else{
 	        $count_query = $this->seed->create_list_count_query($main_query);
 	    }
 		$result = $this->db->query($count_query);
@@ -261,8 +261,7 @@ 
         // if $params tell us to override all ordering
         if(!empty($params['overrideOrder']) && !empty($params['orderBy'])) {
             $order = $this->getOrderBy(strtolower($params['orderBy']), (empty($params['sortOrder']) ? '' : $params['sortOrder'])); // retreive from $_REQUEST
-        }
-        else {
+        } else {
             $order = $this->getOrderBy(); // retreive from $_REQUEST
         }
 
@@ -289,8 +288,9 @@ 
         } else {
             $orderBy = $order['orderBy'] . ' ' . $order['sortOrder'];
             //wdong, Bug 25476, fix the sorting problem of Oracle.
-            if (isset($params['custom_order_by_override']['ori_code']) && $order['orderBy'] == $params['custom_order_by_override']['ori_code'])
-                $orderBy = $params['custom_order_by_override']['custom_code'] . ' ' . $order['sortOrder'];
+            if (isset($params['custom_order_by_override']['ori_code']) && $order['orderBy'] == $params['custom_order_by_override']['ori_code']) {
+                            $orderBy = $params['custom_order_by_override']['custom_code'] . ' ' . $order['sortOrder'];
+            }
         }
 
         if (empty($params['skipOrderSave'])) { // don't save preferences if told so
@@ -308,11 +308,21 @@ 
             $ret_array['inner_join'] = ' ' . implode(' ', $this->seed->listview_inner_join) . ' ';
         }
 
-		if(!is_array($params)) $params = array();
-        if(!isset($params['custom_select'])) $params['custom_select'] = '';
-        if(!isset($params['custom_from'])) $params['custom_from'] = '';
-        if(!isset($params['custom_where'])) $params['custom_where'] = '';
-        if(!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
+		if(!is_array($params)) {
+		    $params = array();
+		}
+        if(!isset($params['custom_select'])) {
+            $params['custom_select'] = '';
+        }
+        if(!isset($params['custom_from'])) {
+            $params['custom_from'] = '';
+        }
+        if(!isset($params['custom_where'])) {
+            $params['custom_where'] = '';
+        }
+        if(!isset($params['custom_order_by'])) {
+            $params['custom_order_by'] = '';
+        }
 		$main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['inner_join']. $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
 		//C.L. - Fix for 23461
 		if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
@@ -320,13 +330,14 @@ 
 		}
    		if($limit < -1) {
 			$result = $this->db->query($main_query);
-		}
-		else {
+		} else {
 			if($limit == -1) {
 				$limit = $this->getLimit();
             }
 			$dyn_offset = $this->getOffset();
-			if($dyn_offset > 0 || !is_int($dyn_offset))$offset = $dyn_offset;
+			if($dyn_offset > 0 || !is_int($dyn_offset)) {
+			    $offset = $dyn_offset;
+			}
 
             if(strcmp($offset, 'end') == 0){
             	$totalCount = $this->getTotalCount($main_query);
@@ -334,8 +345,7 @@ 
             }
             if($this->seed->ACLAccess('ListView')) {
                 $result = $this->db->limitQuery($main_query, $offset, $limit + 1);
-            }
-            else {
+            } else {
                 $result = array();
             }
 
@@ -403,7 +413,9 @@ 
                     if(!isset($post_retrieve[$rows[$rowIndex[0]]['parent_type']])) {
                         $post_retrieve[$rows[$rowIndex[0]]['parent_type']] = array();
                     }
-                    if(!empty($rows[$rowIndex[0]]['parent_id'])) $post_retrieve[$rows[$rowIndex[0]]['parent_type']][] = array('child_id' => $id , 'parent_id'=> $rows[$rowIndex[0]]['parent_id'], 'parent_type' => $rows[$rowIndex[0]]['parent_type'], 'type' => 'parent');
+                    if(!empty($rows[$rowIndex[0]]['parent_id'])) {
+                        $post_retrieve[$rows[$rowIndex[0]]['parent_type']][] = array('child_id' => $id , 'parent_id'=> $rows[$rowIndex[0]]['parent_id'], 'parent_type' => $rows[$rowIndex[0]]['parent_type'], 'type' => 'parent');
+                    }
                 }
                 if(isset($post_retrieve)) {
                     $parent_fields = $seed->retrieve_parent_fields($post_retrieve);
@@ -431,7 +443,7 @@ 
 				}
 				if($idIndex[$row[$id_field]][0] == $dataIndex){
 				    $pageData['tag'][$dataIndex] = $temp->listviewACLHelper();
-				}else{
+				} else{
 				    $pageData['tag'][$dataIndex] = $pageData['tag'][$idIndex[$row[$id_field]][0]];
 				}
 				$data[$dataIndex] = $temp->get_list_view_data($filter_fields);
@@ -445,8 +457,7 @@ 
                 if($additionalDetailsAllow) {
                     if($this->additionalDetailsAjax) {
 					   $ar = $this->getAdditionalDetailsAjax($data[$dataIndex]['ID']);
-                    }
-                    else {
+                    } else {
                         $additionalDetailsFile = 'modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
                         if(file_exists('custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php')){
                         	$additionalDetailsFile = 'custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
@@ -471,7 +482,9 @@ 
 
 		if($offset > 0) {
 			$prevOffset = $offset - $limit;
-			if($prevOffset < 0)$prevOffset = 0;
+			if($prevOffset < 0) {
+			    $prevOffset = 0;
+			}
 		}
 		$totalCount = $count + $offset;
 
@@ -505,16 +518,19 @@ 
         	isset($_REQUEST["module"]) && $_REQUEST["module"] == "MergeRecords")
         {
             $queryString = "-advanced_search";
-        }
-        else if (isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "basic_search")
+        } else if (isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "basic_search")
         {
-            if($seed->module_dir == "Reports") $searchMetaData = SearchFormReports::retrieveReportsSearchDefs();
-            else $searchMetaData = SearchForm::retrieveSearchDefs($seed->module_dir);
+            if($seed->module_dir == "Reports") {
+                $searchMetaData = SearchFormReports::retrieveReportsSearchDefs();
+            } else {
+                $searchMetaData = SearchForm::retrieveSearchDefs($seed->module_dir);
+            }
 
             $basicSearchFields = array();
 
-            if( isset($searchMetaData['searchdefs']) && isset($searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search']) )
-                $basicSearchFields = $searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search'];
+            if( isset($searchMetaData['searchdefs']) && isset($searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search']) ) {
+                            $basicSearchFields = $searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search'];
+            }
 
             foreach( $basicSearchFields as $basicSearchField)
             {
@@ -588,8 +604,7 @@ 
         {
             $queries['endPage'] = $queries['baseURL'];
             $queries['endPage'][$this->var_offset] = $endOffset;
-        }
-        else
+        } else
         {
             $queries['endPage'] = $queries['baseURL'];
             $queries['endPage'][$this->var_offset] = 'end';

include/ListView/ListView.php

Spacing +375 added lines, -375 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -45,8 +45,8 @@ 
  */
 class ListView
 {
-    var $local_theme= null;
-    var $local_app_strings= null;
+    var $local_theme = null;
+    var $local_app_strings = null;
     var $local_image_path = null;
     var $local_current_module = null;
     var $local_mod_strings = null;
@@ -81,12 +81,12 @@ 
     var $child_focus = '';
     var $layout_manager = null;
     var $process_for_popups = false;
-    var $multi_select_popup=false;
+    var $multi_select_popup = false;
     var $_additionalDetails = false;
     var $additionalDetailsFunction = null;
     var $sort_order = '';
-    var $force_mass_update=false;
-    var $keep_mass_update_form_open=false;
+    var $force_mass_update = false;
+    var $keep_mass_update_form_open = false;
     var $ignorePopulateOnly = false;
 
 function setDataArray($value) {
@@ -100,7 +100,7 @@ 
     echo "<form name='MassUpdate' method='post' action='index.php'>";
     $this->processListViewTwo($seed, $xTemplateSection, $html_varName);
 
-    echo "<a href='javascript:" . ((!$this->multi_select_popup) ? 'sListView.' : ''). "check_all(document.MassUpdate, \"mass[]\", true)'>".translate('LBL_CHECKALL')."</a> - <a href='javascript:sListView.check_all(document.MassUpdate, \"mass[]\", false);'>".translate('LBL_CLEARALL')."</a>";
+    echo "<a href='javascript:".((!$this->multi_select_popup) ? 'sListView.' : '')."check_all(document.MassUpdate, \"mass[]\", true)'>".translate('LBL_CHECKALL')."</a> - <a href='javascript:sListView.check_all(document.MassUpdate, \"mass[]\", false);'>".translate('LBL_CLEARALL')."</a>";
     echo '<br><br>';
 }
 
@@ -110,109 +110,109 @@ 
     global $sugar_config;
 
     $populateOnly = $this->ignorePopulateOnly ? FALSE : (!empty($sugar_config['save_query']) && $sugar_config['save_query'] == 'populate_only');
-    if(isset($seed->module_dir) && $populateOnly) {
-        if(empty($GLOBALS['displayListView']) && strcmp(strtolower($_REQUEST['action']), 'popup') != 0 && (!empty($_REQUEST['clear_query']) || $_REQUEST['module'] == $seed->module_dir && ((empty($_REQUEST['query']) || $_REQUEST['query'] == 'MSI')&& (empty($_SESSION['last_search_mod']) || $_SESSION['last_search_mod'] != $seed->module_dir)))) {
-            $_SESSION['last_search_mod'] = $_REQUEST['module'] ;
+    if (isset($seed->module_dir) && $populateOnly) {
+        if (empty($GLOBALS['displayListView']) && strcmp(strtolower($_REQUEST['action']), 'popup') != 0 && (!empty($_REQUEST['clear_query']) || $_REQUEST['module'] == $seed->module_dir && ((empty($_REQUEST['query']) || $_REQUEST['query'] == 'MSI') && (empty($_SESSION['last_search_mod']) || $_SESSION['last_search_mod'] != $seed->module_dir)))) {
+            $_SESSION['last_search_mod'] = $_REQUEST['module'];
             return;
         }
     }
-    if(strcmp(strtolower($_REQUEST['action']), 'popup') != 0){
-        $_SESSION['last_search_mod'] = $_REQUEST['module'] ;
+    if (strcmp(strtolower($_REQUEST['action']), 'popup') != 0) {
+        $_SESSION['last_search_mod'] = $_REQUEST['module'];
     }
     //following session variable will track the detail view navigation history.
     //needs to the reset after each search.
-    $this->setLocalSessionVariable($html_varName,"DETAIL_NAV_HISTORY",false);
+    $this->setLocalSessionVariable($html_varName, "DETAIL_NAV_HISTORY", false);
 
     require_once('include/MassUpdate.php');
     $mass = new MassUpdate();
     $add_acl_javascript = false;
-    if(!isset($_REQUEST['action'])) {
-        $this->shouldProcess=false;
+    if (!isset($_REQUEST['action'])) {
+        $this->shouldProcess = false;
     } else {
     $this->shouldProcess = is_subclass_of($seed, "SugarBean")
-        && (($_REQUEST['action'] == 'index') || ('ListView' == substr($_REQUEST['action'],0,8)) /* cn: to include all ListViewXXX.php type views */)
+        && (($_REQUEST['action'] == 'index') || ('ListView' == substr($_REQUEST['action'], 0, 8)) /* cn: to include all ListViewXXX.php type views */)
         && ($_REQUEST['module'] == $seed->module_dir);
     }
 
     //when processing a multi-select popup.
-    if($this->process_for_popups && $this->multi_select_popup)  $this->shouldProcess =true;
+    if ($this->process_for_popups && $this->multi_select_popup)  $this->shouldProcess = true;
     //mass update turned off?
-    if(!$this->show_mass_update) $this->shouldProcess = false;
-    if(is_subclass_of($seed, "SugarBean")) {
-        if($seed->bean_implements('ACL')) {
-            if(!ACLController::checkAccess($seed->module_dir,'list',true)) {
-                if($_REQUEST['module'] != 'Home') {
+    if (!$this->show_mass_update) $this->shouldProcess = false;
+    if (is_subclass_of($seed, "SugarBean")) {
+        if ($seed->bean_implements('ACL')) {
+            if (!ACLController::checkAccess($seed->module_dir, 'list', true)) {
+                if ($_REQUEST['module'] != 'Home') {
                     ACLController::displayNoAccess();
                 }
                 return;
             }
-            if(!ACLController::checkAccess($seed->module_dir,'export',true)) {
-                $sugar_config['disable_export']= true;
+            if (!ACLController::checkAccess($seed->module_dir, 'export', true)) {
+                $sugar_config['disable_export'] = true;
             }
 
         }
     }
 
     //force mass update form if requested.
-    if($this->force_mass_update) {
+    if ($this->force_mass_update) {
         $this->shouldProcess = true;
     }
 
-    if($this->shouldProcess) {
+    if ($this->shouldProcess) {
         echo $mass->getDisplayMassUpdateForm(true, $this->multi_select_popup);
         echo $mass->getMassUpdateFormHeader($this->multi_select_popup);
         $mass->setSugarBean($seed);
 
         //C.L. Fix for 10048, do not process handleMassUpdate for multi select popups
-        if(!$this->multi_select_popup) {
+        if (!$this->multi_select_popup) {
             $mass->handleMassUpdate();
         }
     }
 
-    $this->processListViewTwo($seed,$xTemplateSection, $html_varName);
+    $this->processListViewTwo($seed, $xTemplateSection, $html_varName);
 
-    if($this->shouldProcess && empty($this->process_for_popups)) {
+    if ($this->shouldProcess && empty($this->process_for_popups)) {
         //echo "<a href='javascript:sListView.clear_all(document.MassUpdate, \"mass[]\");'>".translate('LBL_CLEARALL')."</a>";
         // cn: preserves current functionality, exception is InboundEmail
-        if($this->show_mass_update_form) {
+        if ($this->show_mass_update_form) {
             echo $mass->getMassUpdateForm();
         }
-        if(!$this->keep_mass_update_form_open) {
+        if (!$this->keep_mass_update_form_open) {
             echo $mass->endMassUpdateForm();
         }
     }
 }
 
 
-function process_dynamic_listview($source_module, $sugarbean,$subpanel_def)
+function process_dynamic_listview($source_module, $sugarbean, $subpanel_def)
 {
         $this->source_module = $source_module;
         $this->subpanel_module = $subpanel_def->name;
-        if(!isset($this->xTemplate))
+        if (!isset($this->xTemplate))
             $this->createXTemplate();
 
-        $html_var = $this->subpanel_module . "_CELL";
+        $html_var = $this->subpanel_module."_CELL";
 
-        $list_data = $this->processUnionBeans($sugarbean,$subpanel_def, $html_var);
+        $list_data = $this->processUnionBeans($sugarbean, $subpanel_def, $html_var);
 
         $list = $list_data['list'];
         $parent_data = $list_data['parent_data'];
 
-        if($subpanel_def->isCollection()) {
-            $thepanel=$subpanel_def->get_header_panel_def();
+        if ($subpanel_def->isCollection()) {
+            $thepanel = $subpanel_def->get_header_panel_def();
         } else {
-            $thepanel=$subpanel_def;
+            $thepanel = $subpanel_def;
         }
 
 
 
         $this->process_dynamic_listview_header($thepanel->get_module_name(), $thepanel, $html_var);
-        $this->process_dynamic_listview_rows($list,$parent_data, 'dyn_list_view', $html_var,$subpanel_def);
+        $this->process_dynamic_listview_rows($list, $parent_data, 'dyn_list_view', $html_var, $subpanel_def);
 
-        if($this->display_header_and_footer)
+        if ($this->display_header_and_footer)
         {
             $this->getAdditionalHeader();
-            if(!empty($this->header_title))
+            if (!empty($this->header_title))
             {
                 echo get_form_header($this->header_title, $this->header_text, false);
             }
@@ -220,11 +220,11 @@ 
 
         $this->xTemplate->out('dyn_list_view');
 
-        if(isset($_SESSION['validation']))
+        if (isset($_SESSION['validation']))
         {
             print base64_decode('PGEgaHJlZj0naHR0cDovL3d3dy5zdWdhcmNybS5jb20nPlBPV0VSRUQmbmJzcDtCWSZuYnNwO1NVR0FSQ1JNPC9hPg==');
         }
-        if(isset($list_data['query'])) {
+        if (isset($list_data['query'])) {
             return ($list_data['query']);
         }
     }
@@ -236,7 +236,7 @@ 
  * @param unknown $html_varName
  * @desc INTERNAL FUNCTION handles the rows
  */
- function process_dynamic_listview_rows($data,$parent_data, $xtemplateSection, $html_varName, $subpanel_def)
+ function process_dynamic_listview_rows($data, $parent_data, $xtemplateSection, $html_varName, $subpanel_def)
  {
     global $subpanel_item_count;
     global $odd_bg;
@@ -261,37 +261,37 @@ 
     //Either retrieve the is_fill_in_additional_fields property from the lone
     //subpanel or visit each subpanel's subpanels to retrieve the is_fill_in_addition_fields
     //property
-    $subpanel_list=array();
-    if($subpanel_def->isCollection()) {
-        $subpanel_list=$subpanel_def->sub_subpanels;
+    $subpanel_list = array();
+    if ($subpanel_def->isCollection()) {
+        $subpanel_list = $subpanel_def->sub_subpanels;
     } else {
-        $subpanel_list[]= $subpanel_def;
+        $subpanel_list[] = $subpanel_def;
     }
 
-    foreach($subpanel_list as $this_subpanel)
+    foreach ($subpanel_list as $this_subpanel)
     {
-        if($this_subpanel->is_fill_in_additional_fields())
+        if ($this_subpanel->is_fill_in_additional_fields())
         {
             $fill_additional_fields[] = $this_subpanel->bean_name;
             $fill_additional_fields[$this_subpanel->bean_name] = true;
         }
     }
 
-    if ( empty($data) ) {
+    if (empty($data)) {
         $this->xTemplate->assign("ROW_COLOR", 'oddListRow');
-        $thepanel=$subpanel_def;
-        if($subpanel_def->isCollection())
-            $thepanel=$subpanel_def->get_header_panel_def();
+        $thepanel = $subpanel_def;
+        if ($subpanel_def->isCollection())
+            $thepanel = $subpanel_def->get_header_panel_def();
         $this->xTemplate->assign("COL_COUNT", count($thepanel->get_list_fields()));
         $this->xTemplate->parse($xtemplateSection.".nodata");
     }
-    while(list($aVal, $aItem) = each($data))
+    while (list($aVal, $aItem) = each($data))
     {
         $subpanel_item_count++;
         $aItem->check_date_relationships_load();
         // TODO: expensive and needs to be removed and done better elsewhere
 
-        if(!empty($fill_additional_fields[$aItem->object_name])
+        if (!empty($fill_additional_fields[$aItem->object_name])
         || ($aItem->object_name == 'Case' && !empty($fill_additional_fields['aCase']))
         )
         {
@@ -301,15 +301,15 @@ 
         //rrs bug: 25343
         $aItem->call_custom_logic("process_record");
 
-        if(isset($parent_data[$aItem->id])) {
+        if (isset($parent_data[$aItem->id])) {
 
             $aItem->parent_name = $parent_data[$aItem->id]['parent_name'];
-            if(!empty($parent_data[$aItem->id]['parent_name_owner'])) {
-            $aItem->parent_name_owner =  $parent_data[$aItem->id]['parent_name_owner'];
-            $aItem->parent_name_mod =  $parent_data[$aItem->id]['parent_name_mod'];
+            if (!empty($parent_data[$aItem->id]['parent_name_owner'])) {
+            $aItem->parent_name_owner = $parent_data[$aItem->id]['parent_name_owner'];
+            $aItem->parent_name_mod = $parent_data[$aItem->id]['parent_name_mod'];
         }}
         $fields = $aItem->get_list_view_data();
-        if(isset($processed_ids[$aItem->id])) {
+        if (isset($processed_ids[$aItem->id])) {
             continue;
 
         } else {
@@ -320,50 +320,50 @@ 
         //ADD OFFSET TO ARRAY
         $fields['OFFSET'] = ($offset + $count + 1);
 
-        if($this->shouldProcess) {
-            if($aItem->ACLAccess('EditView')) {
-            $this->xTemplate->assign('PREROW', "<input type='checkbox' class='checkbox' name='mass[]' value='". $fields['ID']. "' />");
+        if ($this->shouldProcess) {
+            if ($aItem->ACLAccess('EditView')) {
+            $this->xTemplate->assign('PREROW', "<input type='checkbox' class='checkbox' name='mass[]' value='".$fields['ID']."' />");
             } else {
                 $this->xTemplate->assign('PREROW', '');
 
             }
-            if($aItem->ACLAccess('DetailView')) {
-                $this->xTemplate->assign('TAG_NAME','a');
+            if ($aItem->ACLAccess('DetailView')) {
+                $this->xTemplate->assign('TAG_NAME', 'a');
             } else {
-                $this->xTemplate->assign('TAG_NAME','span');
+                $this->xTemplate->assign('TAG_NAME', 'span');
             }
             $this->xTemplate->assign('CHECKALL', "<input type='checkbox'  title='".$GLOBALS['app_strings']['LBL_SELECT_ALL_TITLE']."' class='checkbox' name='massall' id='massall' value='' onclick='sListView.check_all(document.MassUpdate, \"mass[]\", this.checked);' />");
         }
 
-        if($oddRow)
+        if ($oddRow)
         {
             $ROW_COLOR = 'oddListRow';
-            $BG_COLOR =  $odd_bg;
+            $BG_COLOR = $odd_bg;
         }
         else
         {
             $ROW_COLOR = 'evenListRow';
-            $BG_COLOR =  $even_bg;
+            $BG_COLOR = $even_bg;
         }
         $oddRow = !$oddRow;
 		$button_contents = array();
         $this->xTemplate->assign("ROW_COLOR", $ROW_COLOR);
         $this->xTemplate->assign("BG_COLOR", $BG_COLOR);
         $layout_manager = $this->getLayoutManager();
-        $layout_manager->setAttribute('context','List');
-        $layout_manager->setAttribute('image_path',$this->local_image_path);
+        $layout_manager->setAttribute('context', 'List');
+        $layout_manager->setAttribute('image_path', $this->local_image_path);
         $layout_manager->setAttribute('module_name', $subpanel_def->_instance_properties['module']);
-        if(!empty($this->child_focus))
-            $layout_manager->setAttribute('related_module_name',$this->child_focus->module_dir);
+        if (!empty($this->child_focus))
+            $layout_manager->setAttribute('related_module_name', $this->child_focus->module_dir);
 
         //AG$subpanel_data = $this->list_field_defs;
         //$bla = array_pop($subpanel_data);
         //select which sub-panel to display here, the decision will be made based on the type of
         //the sub-panel and panel in the bean being processed.
-        if($subpanel_def->isCollection()) {
-            $thepanel=$subpanel_def->sub_subpanels[$aItem->panel_name];
+        if ($subpanel_def->isCollection()) {
+            $thepanel = $subpanel_def->sub_subpanels[$aItem->panel_name];
         } else {
-            $thepanel=$subpanel_def;
+            $thepanel = $subpanel_def;
         }
 
 		/* BEGIN - SECURITY GROUPS */
@@ -374,22 +374,22 @@ 
 		$aclaccess_in_group = false;
 
 		global $current_user;
-		if(is_admin($current_user)) {
+		if (is_admin($current_user)) {
 			$aclaccess_is_owner = true;
 		} else {
 			$aclaccess_is_owner = $aItem->isOwner($current_user->id);
 		}
 
 		require_once("modules/SecurityGroups/SecurityGroup.php");
-		$aclaccess_in_group = SecurityGroup::groupHasAccess($aItem->module_dir,$aItem->id);
+		$aclaccess_in_group = SecurityGroup::groupHasAccess($aItem->module_dir, $aItem->id);
 
     	/* END - SECURITY GROUPS */
 
         //get data source name
-        $linked_field=$thepanel->get_data_source_name();
-        $linked_field_set=$thepanel->get_data_source_name(true);
+        $linked_field = $thepanel->get_data_source_name();
+        $linked_field_set = $thepanel->get_data_source_name(true);
         static $count;
-        if(!isset($count))$count = 0;
+        if (!isset($count))$count = 0;
 		/* BEGIN - SECURITY GROUPS */
 		/**
         $field_acl['DetailView'] = $aItem->ACLAccess('DetailView');
@@ -398,19 +398,19 @@ 
         $field_acl['Delete'] = $aItem->ACLAccess('Delete');
 		*/
 		//pass is_owner, in_group...vars defined above
-        $field_acl['DetailView'] = $aItem->ACLAccess('DetailView',$aclaccess_is_owner,$aclaccess_in_group);
-        $field_acl['ListView'] = $aItem->ACLAccess('ListView',$aclaccess_is_owner,$aclaccess_in_group);
-        $field_acl['EditView'] = $aItem->ACLAccess('EditView',$aclaccess_is_owner,$aclaccess_in_group);
-        $field_acl['Delete'] = $aItem->ACLAccess('Delete',$aclaccess_is_owner,$aclaccess_in_group);
+        $field_acl['DetailView'] = $aItem->ACLAccess('DetailView', $aclaccess_is_owner, $aclaccess_in_group);
+        $field_acl['ListView'] = $aItem->ACLAccess('ListView', $aclaccess_is_owner, $aclaccess_in_group);
+        $field_acl['EditView'] = $aItem->ACLAccess('EditView', $aclaccess_is_owner, $aclaccess_in_group);
+        $field_acl['Delete'] = $aItem->ACLAccess('Delete', $aclaccess_is_owner, $aclaccess_in_group);
 		/* END - SECURITY GROUPS */
-        foreach($thepanel->get_list_fields() as $field_name=>$list_field)
+        foreach ($thepanel->get_list_fields() as $field_name=>$list_field)
         {
             //add linked field attribute to the array.
-            $list_field['linked_field']=$linked_field;
-            $list_field['linked_field_set']=$linked_field_set;
+            $list_field['linked_field'] = $linked_field;
+            $list_field['linked_field_set'] = $linked_field_set;
 
             $usage = empty($list_field['usage']) ? '' : $list_field['usage'];
-            if($usage == 'query_only' && !empty($list_field['force_query_only_display'])){
+            if ($usage == 'query_only' && !empty($list_field['force_query_only_display'])) {
                 //if you are here you have column that is query only but needs to be displayed as blank.  This is helpful
                 //for collections such as Activities where you have a field in only one object and wish to show it in the subpanel list
                 $count++;
@@ -420,13 +420,13 @@ 
                 $this->xTemplate->assign('CELL', $widget_contents);
                 $this->xTemplate->parse($xtemplateSection.".row.cell");
 
-            }else if($usage != 'query_only')
+            } else if ($usage != 'query_only')
             {
-                $list_field['name']=$field_name;
+                $list_field['name'] = $field_name;
 
                 $module_field = $field_name.'_mod';
                 $owner_field = $field_name.'_owner';
-                if(!empty($aItem->$module_field)) {
+                if (!empty($aItem->$module_field)) {
 
                     $list_field['owner_id'] = $aItem->$owner_field;
                     $list_field['owner_module'] = $aItem->$module_field;
@@ -435,71 +435,71 @@ 
                     $list_field['owner_id'] = false;
                     $list_field['owner_module'] = false;
                 }
-                if(isset($list_field['alias'])) $list_field['name'] = $list_field['alias'];
-                else $list_field['name']=$field_name;
+                if (isset($list_field['alias'])) $list_field['name'] = $list_field['alias'];
+                else $list_field['name'] = $field_name;
                 $list_field['fields'] = $fields;
                 $list_field['module'] = $aItem->module_dir;
                 $list_field['start_link_wrapper'] = $this->start_link_wrapper;
                 $list_field['end_link_wrapper'] = $this->end_link_wrapper;
                 $list_field['subpanel_id'] = $this->subpanel_id;
                 $list_field += $field_acl;
-                if ( isset($aItem->field_defs[strtolower($list_field['name'])])) {
+                if (isset($aItem->field_defs[strtolower($list_field['name'])])) {
                     require_once('include/SugarFields/SugarFieldHandler.php');
                     // We need to see if a sugar field exists for this field type first,
                     // if it doesn't, toss it at the old sugarWidgets. This is for
                     // backwards compatibility and will be removed in a future release
                     $vardef = $aItem->field_defs[strtolower($list_field['name'])];
-                    if ( isset($vardef['type']) ) {
-                        $fieldType = isset($vardef['custom_type'])?$vardef['custom_type']:$vardef['type'];
-                        $tmpField = SugarFieldHandler::getSugarField($fieldType,true);
+                    if (isset($vardef['type'])) {
+                        $fieldType = isset($vardef['custom_type']) ? $vardef['custom_type'] : $vardef['type'];
+                        $tmpField = SugarFieldHandler::getSugarField($fieldType, true);
                     } else {
                         $tmpField = NULL;
                     }
 
-                    if ( $tmpField != NULL ) {
-                        $widget_contents = SugarFieldHandler::displaySmarty($list_field['fields'],$vardef,'ListView',$list_field);
+                    if ($tmpField != NULL) {
+                        $widget_contents = SugarFieldHandler::displaySmarty($list_field['fields'], $vardef, 'ListView', $list_field);
                     } else {
                         // No SugarField for this particular type
                         // Use the old, icky, SugarWidget for now
                         $widget_contents = $layout_manager->widgetDisplay($list_field);
                     }
 
-                    if ( isset($list_field['widget_class']) && $list_field['widget_class'] == 'SubPanelDetailViewLink' ) {
+                    if (isset($list_field['widget_class']) && $list_field['widget_class'] == 'SubPanelDetailViewLink') {
                         // We need to call into the old SugarWidgets for the time being, so it can generate a proper link with all the various corner-cases handled
                         // So we'll populate the field data with the pre-rendered display for the field
                         $list_field['fields'][$field_name] = $widget_contents;
-                        if('full_name' == $field_name){//bug #32465
+                        if ('full_name' == $field_name) {//bug #32465
                            $list_field['fields'][strtoupper($field_name)] = $widget_contents;
                         }
 
                         //vardef source is non db, assign the field name to varname for processing of column.
-                        if(!empty($vardef['source']) && $vardef['source']=='non-db'){
+                        if (!empty($vardef['source']) && $vardef['source'] == 'non-db') {
                             $list_field['varname'] = $field_name;
 
                         }
                         $widget_contents = $layout_manager->widgetDisplay($list_field);
-                    } else if(isset($list_field['widget_class']) && $list_field['widget_class'] == 'SubPanelEmailLink' ) {
+                    } else if (isset($list_field['widget_class']) && $list_field['widget_class'] == 'SubPanelEmailLink') {
                         $widget_contents = $layout_manager->widgetDisplay($list_field);
                     }
 
                  $count++;
                 $this->xTemplate->assign('CELL_COUNT', $count);
                 $this->xTemplate->assign('CLASS', "");
-                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+                if (empty($widget_contents)) $widget_contents = '&nbsp;';
                 $this->xTemplate->assign('CELL', $widget_contents);
                 $this->xTemplate->parse($xtemplateSection.".row.cell");
                 } else {
                     // This handles the edit and remove buttons and icon widget
-                	if( isset($list_field['widget_class']) && $list_field['widget_class'] == "SubPanelIcon") {
+                	if (isset($list_field['widget_class']) && $list_field['widget_class'] == "SubPanelIcon") {
 		                $count++;
 		                $widget_contents = $layout_manager->widgetDisplay($list_field);
 		                $this->xTemplate->assign('CELL_COUNT', $count);
 		                $this->xTemplate->assign('CLASS', "");
-		                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+		                if (empty($widget_contents)) $widget_contents = '&nbsp;';
 		                $this->xTemplate->assign('CELL', $widget_contents);
 		                $this->xTemplate->parse($xtemplateSection.".row.cell");
                 	} elseif (preg_match("/button/i", $list_field['name'])) {
-                        if ((($list_field['name'] === 'edit_button' && $field_acl['EditView']) || ($list_field['name'] === 'close_button' && $field_acl['EditView']) || ($list_field['name'] === 'remove_button' && $field_acl['Delete'])) && '' != ($_content = $layout_manager->widgetDisplay($list_field)) )
+                        if ((($list_field['name'] === 'edit_button' && $field_acl['EditView']) || ($list_field['name'] === 'close_button' && $field_acl['EditView']) || ($list_field['name'] === 'remove_button' && $field_acl['Delete'])) && '' != ($_content = $layout_manager->widgetDisplay($list_field)))
                         {
                             $button_contents[] = $_content;
                             unset($_content);
@@ -513,7 +513,7 @@ 
                			$this->xTemplate->assign('CLASS', "");
                			$widget_contents = $layout_manager->widgetDisplay($list_field);
 		                $this->xTemplate->assign('CELL_COUNT', $count);
-		                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+		                if (empty($widget_contents)) $widget_contents = '&nbsp;';
 		                $this->xTemplate->assign('CELL', $widget_contents);
 		                $this->xTemplate->parse($xtemplateSection.".row.cell");
                 	}
@@ -525,7 +525,7 @@ 
 
         // Make sure we have at least one button before rendering a column for
         // the action buttons in a list view. Relevant bugs: #51647 and #51640.
-        if(!empty($button_contents))
+        if (!empty($button_contents))
         {
             $button_contents = array_filter($button_contents);
             if (!empty($button_contents))
@@ -534,7 +534,7 @@ 
             // bug#51275: smarty widget to help provide the action menu functionality as it is currently sprinkled throughout the app with html
                 require_once('include/Smarty/plugins/function.sugar_action_menu.php');
                 $tempid = create_guid();
-                array_unshift($button_contents, "<div style='display: inline' id='$tempid'>" . array_shift($button_contents) . "</div>");
+                array_unshift($button_contents, "<div style='display: inline' id='$tempid'>".array_shift($button_contents)."</div>");
                 $action_button = smarty_function_sugar_action_menu(array(
                     'id' => $tempid,
                     'buttons' => $button_contents,
@@ -550,7 +550,7 @@ 
             $this->xTemplate->assign('CELL_COUNT', ++$count);
             //Bug#51275 for beta3 pre_script is not required any more
             $this->xTemplate->assign('CELL', $action_button);
-            $this->xTemplate->parse($xtemplateSection . ".row.cell");
+            $this->xTemplate->parse($xtemplateSection.".row.cell");
         }
 
 
@@ -582,13 +582,13 @@ 
  function __construct() {
 
 
-    if(!$this->initialized) {
+    if (!$this->initialized) {
         global $sugar_config;
         $this->records_per_page = $sugar_config['list_max_entries_per_page'] + 0;
         $this->initialized = true;
         global $app_strings, $currentModule;
         $this->local_theme = SugarThemeRegistry::current()->__toString();
-        $this->local_app_strings =$app_strings;
+        $this->local_app_strings = $app_strings;
         $this->local_image_path = SugarThemeRegistry::current()->getImagePath();
         $this->local_current_module = $currentModule;
     }
@@ -598,9 +598,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function ListView(){
+    function ListView() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -635,7 +635,7 @@ 
  * Contributor(s): ______________________________________.
 */
  function setXTemplatePath($value) {
-    $this->xTemplatePath= $value;
+    $this->xTemplatePath = $value;
 }
 
 /**this is a helper function for allowing ListView to create a new XTemplate it groups parameters that should be set into a single function
@@ -645,22 +645,22 @@ 
 */
  function initNewXTemplate($XTemplatePath, $modString, $imagePath = null) {
     $this->setXTemplatePath($XTemplatePath);
-    if(isset($modString))
+    if (isset($modString))
         $this->setModStrings($modString);
-    if(isset($imagePath))
+    if (isset($imagePath))
         $this->setImagePath($imagePath);
 }
 
 
-function getOrderBy($varName, $defaultOrderBy='', $force_sortorder='') {
-    $sortBy = $this->getSessionVariable($varName, "ORDER_BY") ;
+function getOrderBy($varName, $defaultOrderBy = '', $force_sortorder = '') {
+    $sortBy = $this->getSessionVariable($varName, "ORDER_BY");
 
     $orderByDirection = $this->getSessionVariableName($varName, "order_by_direction");
     $orderByColumn = $this->getSessionVariableName($varName, "ORDER_BY");
     $lastEqualsSortBy = false;
     $defaultOrder = false; //ascending
 
-    if(empty($sortBy)) {
+    if (empty($sortBy)) {
         $this->setUserVariable($varName, "ORDER_BY", $defaultOrderBy);
         $sortBy = $defaultOrderBy;
     } else {
@@ -698,7 +698,7 @@ 
         }
         $desc = $orderByValue == 'desc';
         $orderByDirectionValue = false;
-        $this->setSessionVariable($varName, $sortBy . "S", $desc);
+        $this->setSessionVariable($varName, $sortBy."S", $desc);
         if (!empty($sortBy))
         {
             if (empty($force_sortorder))
@@ -709,11 +709,11 @@ 
                     {
                         $orderByDirectionValue = $desc ? 'asc' : 'desc';
                     }
-                    $this->query_orderby = $sortBy . ' ' . $orderByValue;
+                    $this->query_orderby = $sortBy.' '.$orderByValue;
                 }
             } else
             {
-                $this->query_orderby = $sortBy . ' ' . $force_sortorder;
+                $this->query_orderby = $sortBy.' '.$force_sortorder;
             }
             if (!isset($this->appendToBaseUrl))
             {
@@ -730,7 +730,7 @@ 
             }
             //Just clear from url...
             $this->appendToBaseUrl[$orderByColumn] = false;
-    }else {
+    } else {
         $this->query_orderby = "";
     }
     $this->sortby = $sortBy;
@@ -744,15 +744,15 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setQuery($where, $limit, $orderBy, $varName, $allowOrderByOveride=true) {
+ function setQuery($where, $limit, $orderBy, $varName, $allowOrderByOveride = true) {
     $this->query_where = $where;
-    if($this->getSessionVariable("query", "where") != $where) {
+    if ($this->getSessionVariable("query", "where") != $where) {
         $this->query_where_has_changed = true;
         $this->setSessionVariable("query", "where", $where);
     }
 
     $this->query_limit = $limit;
-    if(!$allowOrderByOveride) {
+    if (!$allowOrderByOveride) {
         $this->query_orderby = $orderBy;
         return;
     }
@@ -775,7 +775,7 @@ 
 */
  function setTheme($theme) {
     $this->local_theme = $theme;
-    if(isset($this->xTemplate))$this->xTemplate->assign("THEME", $this->local_theme);
+    if (isset($this->xTemplate))$this->xTemplate->assign("THEME", $this->local_theme);
 }
 
 /**sets the AppStrings used only use if it is different from the global
@@ -786,7 +786,7 @@ 
  function setAppStrings($app_strings) {
     unset($this->local_app_strings);
     $this->local_app_strings = $app_strings;
-    if(isset($this->xTemplate))$this->xTemplate->assign("APP", $this->local_app_strings);
+    if (isset($this->xTemplate))$this->xTemplate->assign("APP", $this->local_app_strings);
 }
 
 /**sets the ModStrings used
@@ -797,7 +797,7 @@ 
  function setModStrings($mod_strings) {
     unset($this->local_module_strings);
     $this->local_mod_strings = $mod_strings;
-    if(isset($this->xTemplate))$this->xTemplate->assign("MOD", $this->local_mod_strings);
+    if (isset($this->xTemplate))$this->xTemplate->assign("MOD", $this->local_mod_strings);
 }
 
 /**sets the ImagePath used
@@ -807,10 +807,10 @@ 
 */
  function setImagePath($image_path) {
     $this->local_image_path = $image_path;
-    if(empty($this->local_image_path)) {
+    if (empty($this->local_image_path)) {
         $this->local_image_path = SugarThemeRegistry::get($this->local_theme)->getImagePath();
     }
-    if(isset($this->xTemplate))$this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
+    if (isset($this->xTemplate))$this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
 }
 
 /**sets the currentModule only use if this is different from the global
@@ -821,7 +821,7 @@ 
  function setCurrentModule($currentModule) {
     unset($this->local_current_module);
     $this->local_current_module = $currentModule;
-    if(isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
+    if (isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
 }
 
 /**INTERNAL FUNCTION creates an XTemplate DO NOT CALL THIS THIS IS AN INTERNAL FUNCTION
@@ -830,12 +830,12 @@ 
  * Contributor(s): ______________________________________.
 */
  function createXTemplate() {
-    if(!isset($this->xTemplate)) {
-        if(isset($this->xTemplatePath)) {
+    if (!isset($this->xTemplate)) {
+        if (isset($this->xTemplatePath)) {
 
             $this->xTemplate = new XTemplate($this->xTemplatePath);
             $this->xTemplate->assign("APP", $this->local_app_strings);
-            if(isset($this->local_mod_strings))$this->xTemplate->assign("MOD", $this->local_mod_strings);
+            if (isset($this->local_mod_strings))$this->xTemplate->assign("MOD", $this->local_mod_strings);
             $this->xTemplate->assign("THEME", $this->local_theme);
             $this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
             $this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
@@ -870,7 +870,7 @@ 
 */
  function xTemplateAssign($name, $value) {
 
-        if(!isset($this->xTemplate)) {
+        if (!isset($this->xTemplate)) {
             $this->createXTemplate();
         }
         $this->xTemplate->assign($name, $value);
@@ -883,11 +883,11 @@ 
  * Contributor(s): ______________________________________.
 */
  function getOffset($localVarName) {
- 	if($this->query_where_has_changed || isset($GLOBALS['record_has_changed'])) {
- 		$this->setSessionVariable($localVarName,"offset", 0);
+ 	if ($this->query_where_has_changed || isset($GLOBALS['record_has_changed'])) {
+ 		$this->setSessionVariable($localVarName, "offset", 0);
  	}
-	$offset = $this->getSessionVariable($localVarName,"offset");
-	if(isset($offset)) {
+	$offset = $this->getSessionVariable($localVarName, "offset");
+	if (isset($offset)) {
 		return $offset;
 	}
 	return 0;
@@ -907,12 +907,12 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setSessionVariable($localVarName,$varName, $value) {
+ function setSessionVariable($localVarName, $varName, $value) {
     $_SESSION[$this->local_current_module."_".$localVarName."_".$varName] = $value;
 }
 
-function setUserVariable($localVarName,$varName, $value) {
-        if($this->is_dynamic ||  $localVarName == 'CELL')return;
+function setUserVariable($localVarName, $varName, $value) {
+        if ($this->is_dynamic || $localVarName == 'CELL')return;
         global $current_user;
         $current_user->setPreference($this->local_current_module."_".$localVarName."_".$varName, $value);
 }
@@ -922,13 +922,13 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function getSessionVariable($localVarName,$varName) {
+ function getSessionVariable($localVarName, $varName) {
     //Set any variables pass in through request first
-    if(isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
-        $this->setSessionVariable($localVarName,$varName,$_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
+    if (isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
+        $this->setSessionVariable($localVarName, $varName, $_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
     }
 
-    if(isset($_SESSION[$this->getSessionVariableName($localVarName, $varName)])) {
+    if (isset($_SESSION[$this->getSessionVariableName($localVarName, $varName)])) {
         return $_SESSION[$this->getSessionVariableName($localVarName, $varName)];
     }
     return "";
@@ -936,10 +936,10 @@ 
 
 function getUserVariable($localVarName, $varName) {
     global $current_user;
-    if($this->is_dynamic ||  $localVarName == 'CELL')return;
-    if(isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
+    if ($this->is_dynamic || $localVarName == 'CELL')return;
+    if (isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
 
-            $this->setUserVariable($localVarName,$varName,$_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
+            $this->setUserVariable($localVarName, $varName, $_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
     }
     return $current_user->getPreference($this->getSessionVariableName($localVarName, $varName));
 }
@@ -963,7 +963,7 @@ 
           'default',
         );
 
-        foreach($priority_map as $p) {
+        foreach ($priority_map as $p) {
             if (key_exists($p, $sortOrderList)) {
                 $order = strtolower($sortOrderList[$p]);
                 if (in_array($order, array('asc', 'desc'))) {
@@ -985,7 +985,7 @@ 
     * All Rights Reserved.
     * Contributor(s): ______________________________________..
     */
-    function getSessionVariableName($localVarName,$varName) {
+    function getSessionVariableName($localVarName, $varName) {
         return $this->local_current_module."_".$localVarName."_".$varName;
     }
 
@@ -1013,22 +1013,22 @@ 
         SugarVCR::erase($seed->module_dir);
         $params = array();
         //$filter = array('id', 'full_name');
-        $filter=array();
+        $filter = array();
         $ret_array = $seed->create_new_list_query($this->query_orderby, $this->query_where, $filter, $params, 0, '', true, $seed, true);
-        if(!is_array($params)) $params = array();
-        if(!isset($params['custom_select'])) $params['custom_select'] = '';
-        if(!isset($params['custom_from'])) $params['custom_from'] = '';
-        if(!isset($params['custom_where'])) $params['custom_where'] = '';
-        if(!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
-        $main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
-        SugarVCR::store($seed->module_dir,  $main_query);
+        if (!is_array($params)) $params = array();
+        if (!isset($params['custom_select'])) $params['custom_select'] = '';
+        if (!isset($params['custom_from'])) $params['custom_from'] = '';
+        if (!isset($params['custom_where'])) $params['custom_where'] = '';
+        if (!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
+        $main_query = $ret_array['select'].$params['custom_select'].$ret_array['from'].$params['custom_from'].$ret_array['where'].$params['custom_where'].$ret_array['order_by'].$params['custom_order_by'];
+        SugarVCR::store($seed->module_dir, $main_query);
         //ADDING VCR CONTROL
 
-        if(empty($this->related_field_name)) {
+        if (empty($this->related_field_name)) {
             $response = $seed->get_list($this->query_orderby, $this->query_where, $current_offset, $this->query_limit);
         } else {
             $related_field_name = $this->related_field_name;
-            $response = $seed->get_related_list($this->child_focus,$related_field_name, $this->query_orderby,
+            $response = $seed->get_related_list($this->child_focus, $related_field_name, $this->query_orderby,
             $this->query_where, $current_offset, $this->query_limit);
         }
 
@@ -1037,12 +1037,12 @@ 
         $next_offset = $response['next_offset'];
         $previous_offset = $response['previous_offset'];
 
-        if(!empty($response['current_offset'])) {
+        if (!empty($response['current_offset'])) {
             $current_offset = $response['current_offset'];
         }
 
         $list_view_row_count = $row_count;
-        $this->processListNavigation($xtemplateSection,$html_varName, $current_offset, $next_offset, $previous_offset, $row_count, null, null, empty($seed->column_fields) ? null : count($seed->column_fields));
+        $this->processListNavigation($xtemplateSection, $html_varName, $current_offset, $next_offset, $previous_offset, $row_count, null, null, empty($seed->column_fields) ? null : count($seed->column_fields));
 
         return $list;
     }
@@ -1052,7 +1052,7 @@ 
     function processUnionBeans($sugarbean, $subpanel_def, $html_var = 'CELL') {
 
 		$last_detailview_record = $this->getSessionVariable("detailview", "record");
-		if(!empty($last_detailview_record) && $last_detailview_record != $sugarbean->id){
+		if (!empty($last_detailview_record) && $last_detailview_record != $sugarbean->id) {
 			$GLOBALS['record_has_changed'] = true;
 		}
 		$this->setSessionVariable("detailview", "record", $sugarbean->id);
@@ -1069,14 +1069,14 @@ 
         $sort_order['request'] = isset($_REQUEST['sort_order']) ? $_REQUEST['sort_order'] : null;
 
         // see if the session data has a sort order
-        if (isset($_SESSION['last_sub' . $this->subpanel_module . '_order']))
+        if (isset($_SESSION['last_sub'.$this->subpanel_module.'_order']))
         {
-            $sort_order['session'] = $_SESSION['last_sub' . $this->subpanel_module . '_order'];
+            $sort_order['session'] = $_SESSION['last_sub'.$this->subpanel_module.'_order'];
 
             // We swap the order when the request contains an offset (indicating a column sort issued);
             // otherwise we do not sort.  If we don't make this check, then the subpanel listview will
             // swap ordering each time a new record is entered via quick create forms
-            if (isset($_REQUEST[$module . '_' . $html_var . '_offset']))
+            if (isset($_REQUEST[$module.'_'.$html_var.'_offset']))
             {
                 $sort_order['session'] = $sort_order['session'] == 'asc' ? 'desc' : 'asc';
             }
@@ -1099,10 +1099,10 @@ 
             $this->query_orderby = 'id';
         }
 
-        $this->getOrderBy($html_var,$this->query_orderby, $this->sort_order);
+        $this->getOrderBy($html_var, $this->query_orderby, $this->sort_order);
 
-        $_SESSION['last_sub' .$this->subpanel_module. '_order'] = $this->sort_order;
-        $_SESSION['last_sub' .$this->subpanel_module. '_url'] = $this->getBaseURL($html_var);
+        $_SESSION['last_sub'.$this->subpanel_module.'_order'] = $this->sort_order;
+        $_SESSION['last_sub'.$this->subpanel_module.'_url'] = $this->getBaseURL($html_var);
 
 		// Bug 8139 - Correct Subpanel sorting on 'name', when subpanel sorting default is 'last_name, first_name'
 		if (($this->sortby == 'name' || $this->sortby == 'last_name') &&
@@ -1110,21 +1110,21 @@ 
 			$this->sortby = 'last_name '.$this->sort_order.', first_name ';
 		}
 
-        if(!empty($this->response)){
-            $response =& $this->response;
+        if (!empty($this->response)) {
+            $response = & $this->response;
             echo 'cached';
-        }else{
-            $response = SugarBean::get_union_related_list($sugarbean,$this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page,$this->query_limit,$subpanel_def);
-            $this->response =& $response;
+        } else {
+            $response = SugarBean::get_union_related_list($sugarbean, $this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page, $this->query_limit, $subpanel_def);
+            $this->response = & $response;
         }
         $list = $response['list'];
         $row_count = $response['row_count'];
         $next_offset = $response['next_offset'];
         $previous_offset = $response['previous_offset'];
-        if(!empty($response['current_offset']))$current_offset = $response['current_offset'];
+        if (!empty($response['current_offset']))$current_offset = $response['current_offset'];
         global $list_view_row_count;
         $list_view_row_count = $row_count;
-        $this->processListNavigation('dyn_list_view', $html_var, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean,$subpanel_def);
+        $this->processListNavigation('dyn_list_view', $html_var, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean, $subpanel_def);
 
         return array('list'=>$list, 'parent_data'=>$response['parent_data'], 'query'=>$response['query']);
     }
@@ -1132,34 +1132,34 @@ 
     function getBaseURL($html_varName) {
         static $cache = array();
 
-        if(!empty($cache[$html_varName]))return $cache[$html_varName];
-        $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount','current_query_by_page');
-        if(!empty($this->base_URL)) {
+        if (!empty($cache[$html_varName]))return $cache[$html_varName];
+        $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount', 'current_query_by_page');
+        if (!empty($this->base_URL)) {
             return $this->base_URL;
         }
 
             $baseurl = $_SERVER['PHP_SELF'];
-            if(empty($baseurl)) {
+            if (empty($baseurl)) {
                 $baseurl = 'index.php';
             }
 
             /*fixes an issue with deletes when doing a search*/
-            foreach(array_merge($_GET, $_POST) as $name=>$value) {
+            foreach (array_merge($_GET, $_POST) as $name=>$value) {
                 //echo ("$name = $value <br/>");
-                if(!empty($value) && $name != 'sort_order' //&& $name != ListView::getSessionVariableName($html_varName,"ORDER_BY")
-                        && $name != ListView::getSessionVariableName($html_varName,"offset")
+                if (!empty($value) && $name != 'sort_order' //&& $name != ListView::getSessionVariableName($html_varName,"ORDER_BY")
+                        && $name != ListView::getSessionVariableName($html_varName, "offset")
                         /*&& substr_count($name, "ORDER_BY")==0*/ && !in_array($name, $blockVariables))
                 {
-                    if(is_array($value)) {
-                        foreach($value as $valuename=>$valuevalue) {
-                            if(substr_count($baseurl, '?') > 0)
+                    if (is_array($value)) {
+                        foreach ($value as $valuename=>$valuevalue) {
+                            if (substr_count($baseurl, '?') > 0)
                                 $baseurl	.= "&{$name}[]=".$valuevalue;
                             else
                                 $baseurl	.= "?{$name}[]=".$valuevalue;
                         }
                     } else {
                         $value = urlencode($value);
-                        if(substr_count($baseurl, '?') > 0) {
+                        if (substr_count($baseurl, '?') > 0) {
                             $baseurl	.= "&$name=$value";
                         } else {
                             $baseurl	.= "?$name=$value";
@@ -1169,17 +1169,17 @@ 
             }
 
 
-            if($_SERVER['REQUEST_METHOD'] == 'POST') {
+            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                 // at this point it is possible that the above foreach already executed resulting in double ?'s in the url
-                if(substr_count($baseurl, '?') == 0) {
+                if (substr_count($baseurl, '?') == 0) {
                     $baseurl .= '?';
                 }
-                if(isset($_REQUEST['action'])) $baseurl.= '&action='.$_REQUEST['action'];
-                if(isset($_REQUEST['record'])) $baseurl .= '&record='.$_REQUEST['record'];
-                if(isset($_REQUEST['module'])) $baseurl .= '&module='.$_REQUEST['module'];
+                if (isset($_REQUEST['action'])) $baseurl .= '&action='.$_REQUEST['action'];
+                if (isset($_REQUEST['record'])) $baseurl .= '&record='.$_REQUEST['record'];
+                if (isset($_REQUEST['module'])) $baseurl .= '&module='.$_REQUEST['module'];
             }
 
-            $baseurl .= "&".ListView::getSessionVariableName($html_varName,"offset")."=";
+            $baseurl .= "&".ListView::getSessionVariableName($html_varName, "offset")."=";
             $cache[$html_varName] = $baseurl;
             return $baseurl;
     }
@@ -1193,7 +1193,7 @@ 
     * All Rights Reserved.
     * Contributor(s): ______________________________________..
     */
-    function processListNavigation($xtemplateSection, $html_varName, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean=null, $subpanel_def=null, $col_count = 20) {
+    function processListNavigation($xtemplateSection, $html_varName, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean = null, $subpanel_def = null, $col_count = 20) {
 
         global $export_module;
         global $sugar_config;
@@ -1203,40 +1203,40 @@ 
 
         $start_record = $current_offset + 1;
 
-        if(!is_numeric($col_count))
+        if (!is_numeric($col_count))
             $col_count = 20;
 
-        if($row_count == 0)
+        if ($row_count == 0)
             $start_record = 0;
 
         $end_record = $start_record + $this->records_per_page;
         // back up the the last page.
-        if($end_record > $row_count+1) {
-            $end_record = $row_count+1;
+        if ($end_record > $row_count + 1) {
+            $end_record = $row_count + 1;
         }
         // Determine the start location of the last page
-        if($row_count == 0)
+        if ($row_count == 0)
             $number_pages = 0;
         else
             $number_pages = floor(($row_count - 1) / $this->records_per_page);
 
         $last_offset = $number_pages * $this->records_per_page;
 
-        if(empty($this->query_limit)  || $this->query_limit > $this->records_per_page) {
+        if (empty($this->query_limit) || $this->query_limit > $this->records_per_page) {
             $this->base_URL = $this->getBaseURL($html_varName);
             $dynamic_url = '';
 
-            if($this->is_dynamic) {
-                $dynamic_url .='&'. $this->getSessionVariableName($html_varName,'ORDER_BY') . '='. $this->getSessionVariable($html_varName,'ORDER_BY').'&sort_order='.$this->sort_order.'&to_pdf=true&action=SubPanelViewer&subpanel=' . $this->subpanel_module;
+            if ($this->is_dynamic) {
+                $dynamic_url .= '&'.$this->getSessionVariableName($html_varName, 'ORDER_BY').'='.$this->getSessionVariable($html_varName, 'ORDER_BY').'&sort_order='.$this->sort_order.'&to_pdf=true&action=SubPanelViewer&subpanel='.$this->subpanel_module;
             }
 
             $current_URL = htmlentities($this->base_URL.$current_offset.$dynamic_url);
             $start_URL = htmlentities($this->base_URL."0".$dynamic_url);
-            $previous_URL  = htmlentities($this->base_URL.$previous_offset.$dynamic_url);
+            $previous_URL = htmlentities($this->base_URL.$previous_offset.$dynamic_url);
             $next_URL  = htmlentities($this->base_URL.$next_offset.$dynamic_url);
-            $end_URL  = htmlentities($this->base_URL.'end'.$dynamic_url);
+            $end_URL = htmlentities($this->base_URL.'end'.$dynamic_url);
 
-            if(!empty($this->start_link_wrapper)) {
+            if (!empty($this->start_link_wrapper)) {
                 $current_URL = $this->start_link_wrapper.$current_URL.$this->end_link_wrapper;
                 $start_URL = $this->start_link_wrapper.$start_URL.$this->end_link_wrapper;
                 $previous_URL = $this->start_link_wrapper.$previous_URL.$this->end_link_wrapper;
@@ -1246,7 +1246,7 @@ 
 
             $moduleString = htmlspecialchars("{$currentModule}_{$html_varName}_offset");
             $moduleStringOrder = htmlspecialchars("{$currentModule}_{$html_varName}_ORDER_BY");
-            if($this->shouldProcess && !$this->multi_select_popup) {
+            if ($this->shouldProcess && !$this->multi_select_popup) {
                 // check the checkboxes onload
                 echo "<script>YAHOO.util.Event.addListener(window, \"load\", sListView.check_boxes);</script>\n";
 
@@ -1254,7 +1254,7 @@ 
                 $uids = empty($_REQUEST['uid']) || $massUpdateRun ? '' : $_REQUEST['uid'];
                 $select_entire_list = ($massUpdateRun) ? 0 : (isset($_POST['select_entire_list']) ? $_POST['select_entire_list'] : (isset($_REQUEST['select_entire_list']) ? htmlspecialchars($_REQUEST['select_entire_list']) : 0));
 
-                echo "<textarea style='display: none' name='uid'>{$uids}</textarea>\n" .
+                echo "<textarea style='display: none' name='uid'>{$uids}</textarea>\n".
                     "<input type='hidden' name='select_entire_list' value='{$select_entire_list}'>\n".
                     "<input type='hidden' name='{$moduleString}' value='0'>\n".
                     "<input type='hidden' name='{$moduleStringOrder}' value='0'>\n";
@@ -1264,64 +1264,64 @@ 
 
             $GLOBALS['log']->debug("Offsets: (start, previous, next, last)(0, $previous_offset, $next_offset, $last_offset)");
 
-            if(0 == $current_offset) {
-                $start_link = "<button type='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("start_off","aborder='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
-                $previous_link = "<button type='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("previous_off","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
+            if (0 == $current_offset) {
+                $start_link = "<button type='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("start_off", "aborder='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
+                $previous_link = "<button type='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("previous_off", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
             } else {
-                if($this->multi_select_popup) {// nav links for multiselect popup, submit form to save checks.
-                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='javascript:save_checks(0, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("start","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
-                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='javascript:save_checks($previous_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("previous","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
-                } elseif($this->shouldProcess) {
-                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='location.href=\"$start_URL\"; sListView.save_checks(0, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("start","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
-                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='location.href=\"$previous_URL\"; sListView.save_checks($previous_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("previous","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
+                if ($this->multi_select_popup) {// nav links for multiselect popup, submit form to save checks.
+                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='javascript:save_checks(0, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
+                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='javascript:save_checks($previous_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
+                } elseif ($this->shouldProcess) {
+                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='location.href=\"$start_URL\"; sListView.save_checks(0, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
+                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='location.href=\"$previous_URL\"; sListView.save_checks($previous_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
                 } else {
                     $onClick = '';
-                    if(0 != preg_match('/javascript.*/', $start_URL)){
+                    if (0 != preg_match('/javascript.*/', $start_URL)) {
                         $onClick = "\"$start_URL;\"";
-                    }else{
-                        $onClick ="'location.href=\"$start_URL\";'";
+                    } else {
+                        $onClick = "'location.href=\"$start_URL\";'";
                     }
-                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("start","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
+                    $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
 
                     $onClick = '';
-                    if(0 != preg_match('/javascript.*/', $previous_URL)){
+                    if (0 != preg_match('/javascript.*/', $previous_URL)) {
                         $onClick = "\"$previous_URL;\"";
-                    }else{
+                    } else {
                         $onClick = "'location.href=\"$previous_URL\";'";
                     }
-                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("previous","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
+                    $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
                 }
             }
 
-            if($last_offset <= $current_offset) {
-                $end_link = "<button type='button' name='listViewEndButton' title='{$this->local_app_strings['LNK_LIST_END']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("end_off","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
-                $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("next_off","aborder='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
+            if ($last_offset <= $current_offset) {
+                $end_link = "<button type='button' name='listViewEndButton' title='{$this->local_app_strings['LNK_LIST_END']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("end_off", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
+                $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("next_off", "aborder='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
             } else {
-                if($this->multi_select_popup) { // nav links for multiselect popup, submit form to save checks.
-                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='javascript:save_checks($last_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("end","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
-                    if(!empty($sugar_config['disable_count_query'])) {
+                if ($this->multi_select_popup) { // nav links for multiselect popup, submit form to save checks.
+                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='javascript:save_checks($last_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
+                    if (!empty($sugar_config['disable_count_query'])) {
                         $end_link = '';
                     }
-                    $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' onClick='javascript:save_checks($next_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("next","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
-                } elseif($this->shouldProcess) {
-                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='location.href=\"$end_URL\"; sListView.save_checks(\"end\", \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("end","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
-                    $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick='location.href=\"$next_URL\"; sListView.save_checks($next_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("next","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
+                    $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' onClick='javascript:save_checks($next_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
+                } elseif ($this->shouldProcess) {
+                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='location.href=\"$end_URL\"; sListView.save_checks(\"end\", \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
+                    $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick='location.href=\"$next_URL\"; sListView.save_checks($next_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
                 } else {
                     $onClick = '';
-                    if(0 != preg_match('/javascript.*/', $next_URL)){
+                    if (0 != preg_match('/javascript.*/', $next_URL)) {
                         $onClick = "\"$next_URL;\"";
-                    }else{
-                        $onClick ="'location.href=\"$next_URL\";'";
+                    } else {
+                        $onClick = "'location.href=\"$next_URL\";'";
                     }
-                    $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("next","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
+                    $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
 
                     $onClick = '';
-                    if(0 != preg_match('/javascript.*/', $end_URL)){
+                    if (0 != preg_match('/javascript.*/', $end_URL)) {
                         $onClick = "\"$end_URL;\"";
-                    }else{
+                    } else {
                         $onClick = "'location.href=\"$end_URL\";'";
                     }
-                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("end","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
+                    $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
 
                 }
             }
@@ -1329,7 +1329,7 @@ 
             $GLOBALS['log']->info("Offset (next, current, prev)($next_offset, $current_offset, $previous_offset)");
             $GLOBALS['log']->info("Start/end records ($start_record, $end_record)");
 
-            $end_record = $end_record-1;
+            $end_record = $end_record - 1;
 
 $script_href = "<a style=\'width: 150px\' name=\"thispage\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'if (document.MassUpdate.select_entire_list.value==1){document.MassUpdate.select_entire_list.value=0;sListView.check_all(document.MassUpdate, \"mass[]\", true, $this->records_per_page)}else {sListView.check_all(document.MassUpdate, \"mass[]\", true)};\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_CURRENT']}&nbsp;&#x28;{$this->records_per_page}&#x29;&#x200E;</a>"
  . "<a style=\'width: 150px\' name=\"selectall\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.check_entire_list(document.MassUpdate, \"mass[]\",true,{$row_count});\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}&nbsp;&#x28;{$row_count}&#x29;&#x200E;</a>"
@@ -1352,14 +1352,14 @@ 
                 }
                 </script>";
 
-            if($this->show_select_menu)
+            if ($this->show_select_menu)
             {
                 $total_label = "";
                 $total = $row_count;
                 $pageTotal = ($row_count > 0) ? $end_record - $start_record + 1 : 0;
                 if (!empty($GLOBALS['sugar_config']['disable_count_query']) && $GLOBALS['sugar_config']['disable_count_query'] === true && $total > $pageTotal) {
                     $this->show_plus = true;
-                    $total =  $pageTotal;
+                    $total = $pageTotal;
                     $total_label = $total.'+';
                 } else {
                     $this->show_plus = false;
@@ -1381,16 +1381,16 @@ 
                     'id' => 'selectLink',
                     'buttons' => $menuItems,
                     'flat' => false,
-                ),$this->xTemplate);
+                ), $this->xTemplate);
 
             } else {
                 $select_link = "&nbsp;";
             }
 
-            $export_link = '<input class="button" type="button" value="'.$this->local_app_strings['LBL_EXPORT'].'" ' .
+            $export_link = '<input class="button" type="button" value="'.$this->local_app_strings['LBL_EXPORT'].'" '.
                     'onclick="return sListView.send_form(true, \''.$_REQUEST['module'].'\', \'index.php?entryPoint=export\',\''.$this->local_app_strings['LBL_LISTVIEW_NO_SELECTED'].'\')">';
 
-            if($this->show_delete_button) {
+            if ($this->show_delete_button) {
                 $delete_link = '<input class="button" type="button" id="delete_button" name="Delete" value="'.$this->local_app_strings['LBL_DELETE_BUTTON_LABEL'].'" onclick="return sListView.send_mass_update(\'selected\',\''.$this->local_app_strings['LBL_LISTVIEW_NO_SELECTED'].'\', 1)">';
             } else {
                 $delete_link = '&nbsp;';
@@ -1400,7 +1400,7 @@ 
             $admin->retrieveSettings('system');
 
             $user_merge = $current_user->getPreference('mailmerge_on');
-            if($user_merge == 'on' && isset($admin->settings['system_mailmerge_on']) && $admin->settings['system_mailmerge_on']) {
+            if ($user_merge == 'on' && isset($admin->settings['system_mailmerge_on']) && $admin->settings['system_mailmerge_on']) {
                 echo "<script>
                 function mailmerge_dialog(el) {
                    	var \$dialog = \$('<div></div>')
@@ -1409,7 +1409,7 @@ 
                         . "<a style=\'width: 150px\' class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' href=\'index.php?action=index&module=MailMerge&entire=true\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}</a>')
 					.dialog({
 						autoOpen: false,
-						title: '". $this->local_app_strings['LBL_MAILMERGE']."',
+						title: '".$this->local_app_strings['LBL_MAILMERGE']."',
 						width: 150,
 						position: {
 						    my: myPos,
@@ -1425,16 +1425,16 @@ 
                 $merge_link = "&nbsp;";
             }
 
-            $selected_objects_span = "&nbsp;|&nbsp;{$this->local_app_strings['LBL_LISTVIEW_SELECTED_OBJECTS']}<input  style='border: 0px; background: transparent; font-size: inherit; color: inherit' type='text' readonly name='selectCount[]' value='" . ((isset($_POST['mass'])) ? count($_POST['mass']): 0) . "' />";
+            $selected_objects_span = "&nbsp;|&nbsp;{$this->local_app_strings['LBL_LISTVIEW_SELECTED_OBJECTS']}<input  style='border: 0px; background: transparent; font-size: inherit; color: inherit' type='text' readonly name='selectCount[]' value='".((isset($_POST['mass'])) ? count($_POST['mass']) : 0)."' />";
 
-            if($_REQUEST['module'] == 'Home' || $this->local_current_module == 'Import'
+            if ($_REQUEST['module'] == 'Home' || $this->local_current_module == 'Import'
                 || $this->show_export_button == false
                 || (!empty($sugar_config['disable_export']))
                 || (!empty($sugar_config['admin_export_only'])
                 && !(
                         is_admin($current_user)
                         || (ACLController::moduleSupportsACL($_REQUEST['module'])
-                            && ACLAction::getUserAccessLevel($current_user->id,$_REQUEST['module'], 'access') == ACL_ALLOW_ENABLED
+                            && ACLAction::getUserAccessLevel($current_user->id, $_REQUEST['module'], 'access') == ACL_ALLOW_ENABLED
                             && (ACLAction::getUserAccessLevel($current_user->id, $_REQUEST['module'], 'admin') == ACL_ALLOW_ADMIN ||
                                 ACLAction::getUserAccessLevel($current_user->id, $_REQUEST['module'], 'admin') == ACL_ALLOW_ADMIN_DEV)))))
             {
@@ -1443,13 +1443,13 @@ 
                 }
                 $export_link = "&nbsp;";
                 $merge_link = "&nbsp;";
-            } elseif($_REQUEST['module'] != "Accounts" && $_REQUEST['module'] != "Cases" && $_REQUEST['module'] != "Contacts" && $_REQUEST['module'] != "Leads" && $_REQUEST['module'] != "Opportunities") {
+            } elseif ($_REQUEST['module'] != "Accounts" && $_REQUEST['module'] != "Cases" && $_REQUEST['module'] != "Contacts" && $_REQUEST['module'] != "Leads" && $_REQUEST['module'] != "Opportunities") {
                 $merge_link = "&nbsp;";
             }
 
-            if($this->show_paging == true) {
-                if(!empty($sugar_config['disable_count_query'])) {
-                    if($row_count > $end_record) {
+            if ($this->show_paging == true) {
+                if (!empty($sugar_config['disable_count_query'])) {
+                    if ($row_count > $end_record) {
                         $row_count .= '+';
                     }
                 }
@@ -1465,16 +1465,16 @@ 
                     $html_text .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr><td align=\"left\"  >";
 
                     //attempt to get the query to recreate this subpanel
-                    if(!empty($this->response)){
-                        $response =& $this->response;
-                    }else{
-                        $response = SugarBean::get_union_related_list($sugarbean,$this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page,$this->query_limit,$subpanel_def);
+                    if (!empty($this->response)) {
+                        $response = & $this->response;
+                    } else {
+                        $response = SugarBean::get_union_related_list($sugarbean, $this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page, $this->query_limit, $subpanel_def);
                         $this->response = $response;
                     }
                     //if query is present, then pass it in as parameter
-                    if (isset($response['query']) && !empty($response['query'])){
+                    if (isset($response['query']) && !empty($response['query'])) {
                         $html_text .= $subpanelTiles->get_buttons($subpanel_def, $response['query']);
-                    }else{
+                    } else {
                         $html_text .= $subpanelTiles->get_buttons($subpanel_def);
                     }
                 }
@@ -1484,11 +1484,11 @@ 
                 $html_text .= "</td>\n<td nowrap align=\"right\">".$start_link."&nbsp;&nbsp;".$previous_link."&nbsp;&nbsp;<span class='pageNumbers'>(".$start_record." - ".$end_record." ".$this->local_app_strings['LBL_LIST_OF']." ".$row_count.")</span>&nbsp;&nbsp;".$next_link."&nbsp;&nbsp;".$end_link."</td></tr></table>\n";
                 $html_text .= "</td>\n";
                 $html_text .= "</tr>\n";
-                $this->xTemplate->assign("PAGINATION",$html_text);
+                $this->xTemplate->assign("PAGINATION", $html_text);
             }
 
             //C.L. - Fix for 23461
-            if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
+            if (empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
                 $_SESSION['export_where'] = $this->query_where;
             }
             $this->xTemplate->parse($xtemplateSection.".list_nav_row");
@@ -1497,24 +1497,24 @@ 
 
     function processOrderBy($html_varName) {
 
-        if(!isset($this->base_URL)) {
+        if (!isset($this->base_URL)) {
             $this->base_URL = $_SERVER['PHP_SELF'];
 
-            if(isset($_SERVER['QUERY_STRING'])) {
-                $this->base_URL = preg_replace("/\&".$this->getSessionVariableName($html_varName,"ORDER_BY")."=[0-9a-zA-Z\_\.]*/","",$this->base_URL .'?'.$_SERVER['QUERY_STRING']);
-                $this->base_URL = preg_replace("/\&".$this->getSessionVariableName($html_varName,"offset")."=[0-9]*/","",$this->base_URL);
+            if (isset($_SERVER['QUERY_STRING'])) {
+                $this->base_URL = preg_replace("/\&".$this->getSessionVariableName($html_varName, "ORDER_BY")."=[0-9a-zA-Z\_\.]*/", "", $this->base_URL.'?'.$_SERVER['QUERY_STRING']);
+                $this->base_URL = preg_replace("/\&".$this->getSessionVariableName($html_varName, "offset")."=[0-9]*/", "", $this->base_URL);
             }
-            if($_SERVER['REQUEST_METHOD'] == 'POST') {
+            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                 $this->base_URL .= '?';
-                if(isset($_REQUEST['action'])) $this->base_URL .= '&action='.$_REQUEST['action'];
-                if(isset($_REQUEST['record'])) $this->base_URL .= '&record='.$_REQUEST['record'];
-                if(isset($_REQUEST['module'])) $this->base_URL .= '&module='.$_REQUEST['module'];
+                if (isset($_REQUEST['action'])) $this->base_URL .= '&action='.$_REQUEST['action'];
+                if (isset($_REQUEST['record'])) $this->base_URL .= '&record='.$_REQUEST['record'];
+                if (isset($_REQUEST['module'])) $this->base_URL .= '&module='.$_REQUEST['module'];
             }
-            $this->base_URL .= "&".$this->getSessionVariableName($html_varName,"offset")."=";
+            $this->base_URL .= "&".$this->getSessionVariableName($html_varName, "offset")."=";
         }
 
-        if($this->is_dynamic) {
-            $this->base_URL.='&to_pdf=true&action=SubPanelViewer&subpanel=' . $this->source_module;
+        if ($this->is_dynamic) {
+            $this->base_URL .= '&to_pdf=true&action=SubPanelViewer&subpanel='.$this->source_module;
         }
 
         //bug43465 start
@@ -1522,19 +1522,19 @@ 
         {
             foreach ($this->appendToBaseUrl as $key => $value)
             {
-                $fullRequestString = $key . '=' . $value;
+                $fullRequestString = $key.'='.$value;
 
                 if ($this->base_URL == "/index.php")
                 {
                     $this->base_URL .= "?";
                 } else
                 {
-                    if ($fullRequestString == substr($this->baseURL, '-' . strlen($fullRequestString)))
+                    if ($fullRequestString == substr($this->baseURL, '-'.strlen($fullRequestString)))
                     {
-                        $this->base_URL = preg_replace("/&" . $key . "\=.*/", "", $this->base_URL);
+                        $this->base_URL = preg_replace("/&".$key."\=.*/", "", $this->base_URL);
                     } else
                     {
-                        $this->base_URL = preg_replace("/&" . $key . "\=.*?&/", "&", $this->base_URL);
+                        $this->base_URL = preg_replace("/&".$key."\=.*?&/", "&", $this->base_URL);
                     }
                     $this->base_URL .= "&";
                 }
@@ -1546,9 +1546,9 @@ 
         }
         //bug43465 end
 
-        $sort_URL_base = $this->base_URL. "&".$this->getSessionVariableName($html_varName,"ORDER_BY")."=";
+        $sort_URL_base = $this->base_URL."&".$this->getSessionVariableName($html_varName, "ORDER_BY")."=";
 
-        if($sort_URL_base !== "")
+        if ($sort_URL_base !== "")
         {
             $this->xTemplate->assign("ORDER_BY", $sort_URL_base);
             return $sort_URL_base;
@@ -1599,19 +1599,19 @@ 
         $mergeList = array();
         $module = '';
         //todo what is this?  It is using an array as a boolean
-        while(list($aVal, $aItem) = each($data))
+        while (list($aVal, $aItem) = each($data))
         {
-            if(isset($this->data_array)) {
+            if (isset($this->data_array)) {
                 $fields = $this->data_array;
             } else {
                 $aItem->check_date_relationships_load();
                 $fields = $aItem->get_list_view_data();
             }
 
-            if(is_object($aItem)) { // cn: bug 5349
+            if (is_object($aItem)) { // cn: bug 5349
                 //add item id to merge list, if the button is clicked
                 $mergeList[] = $aItem->id;
-                if(empty($module)) {
+                if (empty($module)) {
                     $module = $aItem->module_dir;
                 }
             }
@@ -1620,37 +1620,37 @@ 
                 $fields['OFFSET'] = ($offset + $count + 1);
 
             $fields['STAMP'] = $timeStamp;
-            if($this->shouldProcess) {
+            if ($this->shouldProcess) {
 
             $prerow = '';
-            if(!isset($this->data_array)) {
-                $prerow .= "<input onclick='sListView.check_item(this, document.MassUpdate)' type='checkbox' class='checkbox' name='mass[]' value='". $fields['ID']. "'>";
+            if (!isset($this->data_array)) {
+                $prerow .= "<input onclick='sListView.check_item(this, document.MassUpdate)' type='checkbox' class='checkbox' name='mass[]' value='".$fields['ID']."'>";
             }
             $this->xTemplate->assign('PREROW', $prerow);
 
             $this->xTemplate->assign('CHECKALL', "<input type='checkbox' class='checkbox'  title='".$GLOBALS['app_strings']['LBL_SELECT_ALL_TITLE']."'  name='massall' id='massall' value='' onclick='sListView.check_all(document.MassUpdate, \"mass[]\", this.checked)'>");
             }
-            if(!isset($this->data_array)) {
+            if (!isset($this->data_array)) {
                 $tag = $aItem->listviewACLHelper();
-                $this->xTemplate->assign('TAG',$tag) ;
+                $this->xTemplate->assign('TAG', $tag);
             }
 
-            if($oddRow)
+            if ($oddRow)
             {
                 $ROW_COLOR = 'oddListRow';
-                $BG_COLOR =  $odd_bg;
+                $BG_COLOR = $odd_bg;
             }
             else
             {
                 $ROW_COLOR = 'evenListRow';
-                $BG_COLOR =  $even_bg;
+                $BG_COLOR = $even_bg;
             }
             $oddRow = !$oddRow;
 
             $this->xTemplate->assign('ROW_COLOR', $ROW_COLOR);
             $this->xTemplate->assign('BG_COLOR', $BG_COLOR);
 
-            if(isset($this->data_array))
+            if (isset($this->data_array))
             {
                 $this->xTemplate->assign('KEY', $aVal);
                 $this->xTemplate->assign('VALUE', $aItem);
@@ -1661,23 +1661,23 @@ 
             {
     //AED -- some modules do not have their additionalDetails.php established. Add a check to ensure require_once does not fail
     // Bug #2786
-                if($this->_additionalDetails && $aItem->ACLAccess('DetailView') && (file_exists('modules/' . $aItem->module_dir . '/metadata/additionalDetails.php') || file_exists('custom/modules/' . $aItem->module_dir . '/metadata/additionalDetails.php'))) {
+                if ($this->_additionalDetails && $aItem->ACLAccess('DetailView') && (file_exists('modules/'.$aItem->module_dir.'/metadata/additionalDetails.php') || file_exists('custom/modules/'.$aItem->module_dir.'/metadata/additionalDetails.php'))) {
 
-                    $additionalDetailsFile = 'modules/' . $aItem->module_dir . '/metadata/additionalDetails.php';
-                    if(file_exists('custom/modules/' . $aItem->module_dir . '/metadata/additionalDetails.php')){
-                        $additionalDetailsFile = 'custom/modules/' . $aItem->module_dir . '/metadata/additionalDetails.php';
+                    $additionalDetailsFile = 'modules/'.$aItem->module_dir.'/metadata/additionalDetails.php';
+                    if (file_exists('custom/modules/'.$aItem->module_dir.'/metadata/additionalDetails.php')) {
+                        $additionalDetailsFile = 'custom/modules/'.$aItem->module_dir.'/metadata/additionalDetails.php';
                     }
 
                     require_once($additionalDetailsFile);
-                    $ad_function = (empty($this->additionalDetailsFunction) ? 'additionalDetails' : $this->additionalDetailsFunction) . $aItem->object_name;
+                    $ad_function = (empty($this->additionalDetailsFunction) ? 'additionalDetails' : $this->additionalDetailsFunction).$aItem->object_name;
                     $results = $ad_function($fields);
                     $results['string'] = str_replace(array("&#039", "'"), '\&#039', $results['string']); // no xss!
 
-                    if(trim($results['string']) == '') $results['string'] = $app_strings['LBL_NONE'];
+                    if (trim($results['string']) == '') $results['string'] = $app_strings['LBL_NONE'];
                     $fields[$results['fieldToAddTo']] = $fields[$results['fieldToAddTo']].'</a>';
                 }
 
-                if($aItem->ACLAccess('Delete')) {
+                if ($aItem->ACLAccess('Delete')) {
                     $delete = '<a class="listViewTdToolsS1" onclick="return confirm(\''.$this->local_app_strings['NTC_DELETE_CONFIRMATION'].'\')" href="'.'index.php?action=Delete&module='.$aItem->module_dir.'&record='.$fields['ID'].'&return_module='.$aItem->module_dir.'&return_action=index&return_id=">'.$this->local_app_strings['LBL_DELETE_INLINE'].'</a>';
                     require_once('include/Smarty/plugins/function.sugar_action_menu.php');
                     $fields['DELETE_BUTTON'] = smarty_function_sugar_action_menu(array(
@@ -1691,26 +1691,26 @@ 
                 $aItem->setupCustomFields($aItem->module_dir);
                 $aItem->custom_fields->populateAllXTPL($this->xTemplate, 'detail', $html_varName, $fields);
             }
-            if(!isset($this->data_array) && $aItem->ACLAccess('DetailView')) {
+            if (!isset($this->data_array) && $aItem->ACLAccess('DetailView')) {
                 $count++;
             }
-            if(isset($this->data_array)) {
+            if (isset($this->data_array)) {
                 $count++;
             }
-            if(!isset($this->data_array)) {
+            if (!isset($this->data_array)) {
                 $aItem->list_view_parse_additional_sections($this->xTemplate, $xtemplateSection);
 
-                if($this->xTemplate->exists($xtemplateSection.'.row.pro')) {
+                if ($this->xTemplate->exists($xtemplateSection.'.row.pro')) {
                     $this->xTemplate->parse($xtemplateSection.'.row.pro');
                 }
             }
-            $this->xTemplate->parse($xtemplateSection . '.row');
+            $this->xTemplate->parse($xtemplateSection.'.row');
 
-            if(isset($fields['ID'])) {
+            if (isset($fields['ID'])) {
                 $associated_row_data[$fields['ID']] = $fields;
                 // Bug 38908: cleanup data for JS to avoid having &nbsp; shuffled around
-                foreach($fields as $key => $value) {
-                    if($value == '&nbsp;') {
+                foreach ($fields as $key => $value) {
+                    if ($value == '&nbsp;') {
                         $associated_row_data[$fields['ID']][$key] = '';
                     }
                 }
@@ -1719,21 +1719,21 @@ 
 
         $_SESSION['MAILMERGE_RECORDS'] = $mergeList;
         $_SESSION['MAILMERGE_MODULE_FROM_LISTVIEW'] = $module;
-        if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
+        if (empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
             $_SESSION['MAILMERGE_MODULE'] = $module;
         }
 
-        if($this->process_for_popups)
+        if ($this->process_for_popups)
         {
             $json = getJSONobj();
             $is_show_fullname = showFullName() ? 1 : 0;
-            $associated_javascript_data = '<script type="text/javascript">' . "\n"
+            $associated_javascript_data = '<script type="text/javascript">'."\n"
                 //. '<!-- // associated javascript data generated by ListView' . "\n"
                 . 'var associated_javascript_data = '
-                . $json->encode($associated_row_data) . ";\n"
+                . $json->encode($associated_row_data).";\n"
                 //. '-->' . "\n"
                 . 'var is_show_fullname = '
-                . $is_show_fullname . ";\n"
+                . $is_show_fullname.";\n"
                 . '</script>';
             $this->xTemplate->assign('ASSOCIATED_JAVASCRIPT_DATA', $associated_javascript_data);
         }
@@ -1745,7 +1745,7 @@ 
     function getLayoutManager()
     {
         require_once('include/generic/LayoutManager.php');
-        if($this->layout_manager == null)
+        if ($this->layout_manager == null)
         {
             $this->layout_manager = new LayoutManager();
         }
@@ -1758,36 +1758,36 @@ 
 
 
         $layout_manager = $this->getLayoutManager();
-        $layout_manager->setAttribute('order_by_link',$this->processOrderBy($html_var));
-        $layout_manager->setAttribute('context','HeaderCell');
-        $layout_manager->setAttribute('image_path',$this->local_image_path);
-        $layout_manager->setAttribute('html_varName',$html_var);
+        $layout_manager->setAttribute('order_by_link', $this->processOrderBy($html_var));
+        $layout_manager->setAttribute('context', 'HeaderCell');
+        $layout_manager->setAttribute('image_path', $this->local_image_path);
+        $layout_manager->setAttribute('html_varName', $html_var);
         $layout_manager->setAttribute('module_name', $source_module);
-        list($orderBy,$desc) = $this->getOrderByInfo($html_var);
+        list($orderBy, $desc) = $this->getOrderByInfo($html_var);
 
-        if($orderBy == 'amount*1')
+        if ($orderBy == 'amount*1')
         {
-            $orderBy=  'amount';
+            $orderBy = 'amount';
         }
 		$buttons = false;
         $col_count = 0;
-        foreach($subpanel_def->get_list_fields() as $column_name=>$widget_args)
+        foreach ($subpanel_def->get_list_fields() as $column_name=>$widget_args)
         {
             $usage = empty($widget_args['usage']) ? '' : $widget_args['usage'];
-            if($usage != 'query_only' || !empty($widget_args['force_query_only_display']))
+            if ($usage != 'query_only' || !empty($widget_args['force_query_only_display']))
             {
                 $imgArrow = '';
 
-                if($orderBy == $column_name || (isset($widget_args['sort_by']) && str_replace('.','_',$widget_args['sort_by']) == $orderBy))
+                if ($orderBy == $column_name || (isset($widget_args['sort_by']) && str_replace('.', '_', $widget_args['sort_by']) == $orderBy))
                 {
                     $imgArrow = "_down";
-                    if($this->sort_order == 'asc') {
+                    if ($this->sort_order == 'asc') {
                         $imgArrow = "_up";
                     }
                 }
 
                 if (!preg_match("/_button/i", $column_name)) {
-	                $widget_args['name']=$column_name;
+	                $widget_args['name'] = $column_name;
 	                $widget_args['sort'] = $imgArrow;
 	                $widget_args['start_link_wrapper'] = $this->start_link_wrapper;
 	                $widget_args['end_link_wrapper'] = $this->end_link_wrapper;
@@ -1797,8 +1797,8 @@ 
 	                $cell_width = empty($widget_args['width']) ? '' : $widget_args['width'];
 	                $this->xTemplate->assign('HEADER_CELL', $widget_contents);
 	                static $count;
-	            if(!isset($count))$count = 0; else $count++;
-                    if($col_count == 0 || $column_name == 'name') $footable = 'data-toggle="true"';
+	            if (!isset($count))$count = 0; else $count++;
+                    if ($col_count == 0 || $column_name == 'name') $footable = 'data-toggle="true"';
                     else {
                         $footable = 'data-hide="phone"';
                         if ($col_count > 2) $footable = 'data-hide="phone,phonelandscape"';
@@ -1815,7 +1815,7 @@ 
             ++$col_count;
         }
 
-        if($buttons) {
+        if ($buttons) {
                     $this->xTemplate->assign('FOOTABLE', '');
         			$this->xTemplate->assign('HEADER_CELL', "&nbsp;");
         			$this->xTemplate->assign('CELL_COUNT', $count);
@@ -1843,37 +1843,37 @@ 
 
     function processListViewTwo($seed, $xTemplateSection, $html_varName) {
         global $current_user;
-        if(!isset($this->xTemplate)) {
+        if (!isset($this->xTemplate)) {
             $this->createXTemplate();
         }
 
         $isSugarBean = is_subclass_of($seed, "SugarBean");
         $list = null;
 
-        if($isSugarBean) {
+        if ($isSugarBean) {
             $list = $this->processSugarBean($xTemplateSection, $html_varName, $seed);
         } else {
             $list = $seed;
         }
 
         if (is_object($seed) && isset($seed->object_name) && $seed->object_name == 'WorkFlow') {
-            $tab=array();
+            $tab = array();
             $access = get_workflow_admin_modules_for_user($current_user);
             for ($i = 0; $i < count($list); $i++) {
-                if(!empty($access[$list[$i]->base_module])){
-                    $tab[]=$list[$i];
+                if (!empty($access[$list[$i]->base_module])) {
+                    $tab[] = $list[$i];
                 }
             }
             $list = $tab;
         }
 
-        if($this->is_dynamic) {
-            $this->processHeaderDynamic($xTemplateSection,$html_varName);
-            $this->processListRows($list,$xTemplateSection, $html_varName);
+        if ($this->is_dynamic) {
+            $this->processHeaderDynamic($xTemplateSection, $html_varName);
+            $this->processListRows($list, $xTemplateSection, $html_varName);
         } else {
             $this->processSortArrows($html_varName);
 
-            if($isSugarBean) {
+            if ($isSugarBean) {
                 $seed->parse_additional_headers($this->xTemplate, $xTemplateSection);
             }
             $this->xTemplateAssign('CHECKALL', SugarThemeRegistry::current()->getImage('blank', '', 1, 1, ".gif", ''));
@@ -1882,19 +1882,19 @@ 
             $this->processOrderBy($html_varName);
 
 
-            $this->processListRows($list,$xTemplateSection, $html_varName);
+            $this->processListRows($list, $xTemplateSection, $html_varName);
         }
 
-        if($this->display_header_and_footer) {
+        if ($this->display_header_and_footer) {
             $this->getAdditionalHeader();
-            if(!empty($this->header_title)) {
+            if (!empty($this->header_title)) {
                 echo get_form_header($this->header_title, $this->header_text, false);
             }
         }
 
         $this->xTemplate->out($xTemplateSection);
 
-        if(isset($_SESSION['validation'])) {
+        if (isset($_SESSION['validation'])) {
             print base64_decode('PGEgaHJlZj0naHR0cDovL3d3dy5zdWdhcmNybS5jb20nPlBPV0VSRUQmbmJzcDtCWSZuYnNwO1NVR0FSQ1JNPC9hPg==');
         }
     }
@@ -1906,7 +1906,7 @@ 
     }
 
     function getArrowUpDownStart($upDown) {
-        $ext = ( SugarThemeRegistry::current()->pngSupport ? "png" : "gif" );
+        $ext = (SugarThemeRegistry::current()->pngSupport ? "png" : "gif");
 
         if (!isset($upDown) || empty($upDown)) {
             $upDown = "";
@@ -1917,7 +1917,7 @@ 
 	function getArrowEnd() {
 		$imgFileParts = pathinfo(SugarThemeRegistry::current()->getImageURL("arrow.gif"));
 
-        list($width,$height) = ListView::getArrowImageSize();
+        list($width, $height) = ListView::getArrowImageSize();
 
 		return '.'.$imgFileParts['extension']."' width='$width' height='$height' align='absmiddle' alt=".translate('LBL_SORT').">";
     }
@@ -1928,13 +1928,13 @@ 
         }
         $imgFileParts = pathinfo(SugarThemeRegistry::current()->getImageURL("arrow{$upDown}.gif"));
 
-        list($width,$height) = ListView::getArrowUpDownImageSize($upDown);
+        list($width, $height) = ListView::getArrowUpDownImageSize($upDown);
 
         //get the right alt tag for the sort
         $sortStr = translate('LBL_ALT_SORT');
-        if($upDown == '_down'){
+        if ($upDown == '_down') {
             $sortStr = translate('LBL_ALT_SORT_DESC');
-        }elseif($upDown == '_up'){
+        }elseif ($upDown == '_up') {
             $sortStr = translate('LBL_ALT_SORT_ASC');
         }
         return " width='$width' height='$height' align='absmiddle' alt='$sortStr'>";
@@ -1942,13 +1942,13 @@ 
 
 	function getArrowImageSize() {
 	    // jbasicChartDashletsExpColust get the non-sort image's size.. the up and down have be the same.
-		$image = SugarThemeRegistry::current()->getImageURL("arrow.gif",false);
+		$image = SugarThemeRegistry::current()->getImageURL("arrow.gif", false);
 
         $cache_key = 'arrow_size.'.$image;
 
         // Check the cache
         $result = sugar_cache_retrieve($cache_key);
-        if(!empty($result))
+        if (!empty($result))
         return $result;
 
         // No cache hit.  Calculate the value and return.
@@ -1959,13 +1959,13 @@ 
 
     function getArrowUpDownImageSize($upDown) {
         // just get the non-sort image's size.. the up and down have be the same.
-        $image = SugarThemeRegistry::current()->getImageURL("arrow{$upDown}.gif",false);
+        $image = SugarThemeRegistry::current()->getImageURL("arrow{$upDown}.gif", false);
 
         $cache_key = 'arrowupdown_size.'.$image;
 
         // Check the cache
         $result = sugar_cache_retrieve($cache_key);
-        if(!empty($result))
+        if (!empty($result))
         return $result;
 
         // No cache hit.  Calculate the value and return.
@@ -1979,7 +1979,7 @@ 
 		$orderBy = $this->getSessionVariable($html_varName, "OBL");
 		$desc = $this->getSessionVariable($html_varName, $orderBy.'S');
 		$orderBy = str_replace('.', '_', $orderBy);
-		return array($orderBy,$desc);
+		return array($orderBy, $desc);
 	}
 
     function processSortArrows($html_varName)
@@ -1987,20 +1987,20 @@ 
 
         $this->xTemplateAssign("arrow_start", $this->getArrowStart());
 
-        list($orderBy,$desc) = $this->getOrderByInfo($html_varName);
+        list($orderBy, $desc) = $this->getOrderByInfo($html_varName);
 
 		$imgArrow = "_up";
-		if($desc) {
+		if ($desc) {
 			$imgArrow = "_down";
 		}
 		/**
 		 * @deprecated only used by legacy opportunites listview, nothing current. Leaving for BC
 		 */
-		if($orderBy == 'amount')
+		if ($orderBy == 'amount')
 		{
 			$this->xTemplateAssign('amount_arrow', $imgArrow);
 		}
-		else if($orderBy == 'amount_usdollar')
+		else if ($orderBy == 'amount_usdollar')
 		{
 			$this->xTemplateAssign('amount_usdollar_arrow', $imgArrow);
 		}
@@ -2013,31 +2013,31 @@ 
     }
 
     // this is where translation happens for dynamic list views
-    function loadListFieldDefs(&$subpanel_fields,&$child_focus)
+    function loadListFieldDefs(&$subpanel_fields, &$child_focus)
     {
         $this->list_field_defs = $subpanel_fields;
 
-        for($i=0;$i < count($this->list_field_defs);$i++)
+        for ($i = 0; $i < count($this->list_field_defs); $i++)
         {
             $list_field = $this->list_field_defs[$i];
             $field_def = null;
             $key = '';
-            if(!empty($list_field['vname']))
+            if (!empty($list_field['vname']))
             {
                 $key = $list_field['vname'];
-            } else if(isset($list_field['name']) &&  isset($child_focus->field_defs[$list_field['name']]))
+            } else if (isset($list_field['name']) && isset($child_focus->field_defs[$list_field['name']]))
             {
                     $field_def = $child_focus->field_defs[$list_field['name']];
                     $key = $field_def['vname'];
             }
-            if(!empty($key))
+            if (!empty($key))
             {
-                $list_field['label'] = translate($key,$child_focus->module_dir);
-                $this->list_field_defs[$i]['label'] = preg_replace('/:$/','',$list_field['label']);
+                $list_field['label'] = translate($key, $child_focus->module_dir);
+                $this->list_field_defs[$i]['label'] = preg_replace('/:$/', '', $list_field['label']);
             }
             else
             {
-                $this->list_field_defs[$i]['label'] ='&nbsp;';
+                $this->list_field_defs[$i]['label'] = '&nbsp;';
             }
         }
     }
@@ -2052,7 +2052,7 @@ 
      * All Rights Reserved.
      * Contributor(s): ______________________________________.
      */
-     function setLocalSessionVariable($localVarName,$varName, $value) {
+     function setLocalSessionVariable($localVarName, $varName, $value) {
         $_SESSION[$localVarName."_".$varName] = $value;
      }
 
@@ -2062,11 +2062,11 @@ 
      * All Rights Reserved.
      * Contributor(s): ______________________________________.
      */
- function getLocalSessionVariable($localVarName,$varName) {
-    if(isset($_SESSION[$localVarName."_".$varName])) {
+ function getLocalSessionVariable($localVarName, $varName) {
+    if (isset($_SESSION[$localVarName."_".$varName])) {
         return $_SESSION[$localVarName."_".$varName];
     }
-    else{
+    else {
         return "";
     }
  }
@@ -2074,7 +2074,7 @@ 
  /* Set to true if you want Additional Details to appear in the listview
   */
  function setAdditionalDetails($value = true, $function = '') {
-    if(!empty($function)) $this->additionalDetailsFunction = $function;
+    if (!empty($function)) $this->additionalDetailsFunction = $function;
     $this->_additionalDetails = $value;
  }
 

Braces +174 added lines, -103 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -135,9 +137,13 @@ 
     }
 
     //when processing a multi-select popup.
-    if($this->process_for_popups && $this->multi_select_popup)  $this->shouldProcess =true;
+    if($this->process_for_popups && $this->multi_select_popup) {
+        $this->shouldProcess =true;
+    }
     //mass update turned off?
-    if(!$this->show_mass_update) $this->shouldProcess = false;
+    if(!$this->show_mass_update) {
+        $this->shouldProcess = false;
+    }
     if(is_subclass_of($seed, "SugarBean")) {
         if($seed->bean_implements('ACL')) {
             if(!ACLController::checkAccess($seed->module_dir,'list',true)) {
@@ -188,8 +194,9 @@ 
 {
         $this->source_module = $source_module;
         $this->subpanel_module = $subpanel_def->name;
-        if(!isset($this->xTemplate))
-            $this->createXTemplate();
+        if(!isset($this->xTemplate)) {
+                    $this->createXTemplate();
+        }
 
         $html_var = $this->subpanel_module . "_CELL";
 
@@ -280,8 +287,9 @@ 
     if ( empty($data) ) {
         $this->xTemplate->assign("ROW_COLOR", 'oddListRow');
         $thepanel=$subpanel_def;
-        if($subpanel_def->isCollection())
-            $thepanel=$subpanel_def->get_header_panel_def();
+        if($subpanel_def->isCollection()) {
+                    $thepanel=$subpanel_def->get_header_panel_def();
+        }
         $this->xTemplate->assign("COL_COUNT", count($thepanel->get_list_fields()));
         $this->xTemplate->parse($xtemplateSection.".nodata");
     }
@@ -339,8 +347,7 @@ 
         {
             $ROW_COLOR = 'oddListRow';
             $BG_COLOR =  $odd_bg;
-        }
-        else
+        } else
         {
             $ROW_COLOR = 'evenListRow';
             $BG_COLOR =  $even_bg;
@@ -353,8 +360,9 @@ 
         $layout_manager->setAttribute('context','List');
         $layout_manager->setAttribute('image_path',$this->local_image_path);
         $layout_manager->setAttribute('module_name', $subpanel_def->_instance_properties['module']);
-        if(!empty($this->child_focus))
-            $layout_manager->setAttribute('related_module_name',$this->child_focus->module_dir);
+        if(!empty($this->child_focus)) {
+                    $layout_manager->setAttribute('related_module_name',$this->child_focus->module_dir);
+        }
 
         //AG$subpanel_data = $this->list_field_defs;
         //$bla = array_pop($subpanel_data);
@@ -389,7 +397,9 @@ 
         $linked_field=$thepanel->get_data_source_name();
         $linked_field_set=$thepanel->get_data_source_name(true);
         static $count;
-        if(!isset($count))$count = 0;
+        if(!isset($count)) {
+            $count = 0;
+        }
 		/* BEGIN - SECURITY GROUPS */
 		/**
         $field_acl['DetailView'] = $aItem->ACLAccess('DetailView');
@@ -420,7 +430,7 @@ 
                 $this->xTemplate->assign('CELL', $widget_contents);
                 $this->xTemplate->parse($xtemplateSection.".row.cell");
 
-            }else if($usage != 'query_only')
+            } else if($usage != 'query_only')
             {
                 $list_field['name']=$field_name;
 
@@ -435,8 +445,11 @@ 
                     $list_field['owner_id'] = false;
                     $list_field['owner_module'] = false;
                 }
-                if(isset($list_field['alias'])) $list_field['name'] = $list_field['alias'];
-                else $list_field['name']=$field_name;
+                if(isset($list_field['alias'])) {
+                    $list_field['name'] = $list_field['alias'];
+                } else {
+                    $list_field['name']=$field_name;
+                }
                 $list_field['fields'] = $fields;
                 $list_field['module'] = $aItem->module_dir;
                 $list_field['start_link_wrapper'] = $this->start_link_wrapper;
@@ -485,7 +498,9 @@ 
                  $count++;
                 $this->xTemplate->assign('CELL_COUNT', $count);
                 $this->xTemplate->assign('CLASS', "");
-                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+                if ( empty($widget_contents) ) {
+                    $widget_contents = '&nbsp;';
+                }
                 $this->xTemplate->assign('CELL', $widget_contents);
                 $this->xTemplate->parse($xtemplateSection.".row.cell");
                 } else {
@@ -495,7 +510,9 @@ 
 		                $widget_contents = $layout_manager->widgetDisplay($list_field);
 		                $this->xTemplate->assign('CELL_COUNT', $count);
 		                $this->xTemplate->assign('CLASS', "");
-		                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+		                if ( empty($widget_contents) ) {
+		                    $widget_contents = '&nbsp;';
+		                }
 		                $this->xTemplate->assign('CELL', $widget_contents);
 		                $this->xTemplate->parse($xtemplateSection.".row.cell");
                 	} elseif (preg_match("/button/i", $list_field['name'])) {
@@ -503,8 +520,7 @@ 
                         {
                             $button_contents[] = $_content;
                             unset($_content);
-                        }
-                        else
+                        } else
                         {
                             $button_contents[] = '';
                         }
@@ -513,7 +529,9 @@ 
                			$this->xTemplate->assign('CLASS', "");
                			$widget_contents = $layout_manager->widgetDisplay($list_field);
 		                $this->xTemplate->assign('CELL_COUNT', $count);
-		                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+		                if ( empty($widget_contents) ) {
+		                    $widget_contents = '&nbsp;';
+		                }
 		                $this->xTemplate->assign('CELL', $widget_contents);
 		                $this->xTemplate->parse($xtemplateSection.".row.cell");
                 	}
@@ -541,8 +559,7 @@ 
                     'class' => 'clickMenu subpanel records fancymenu button',
                     'flat' => false //assign flat value as false to display dropdown menu at any other preferences.
                 ), $this->xTemplate);
-            }
-            else
+            } else
             {
                 $action_button = '';
             }
@@ -602,8 +619,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -645,11 +661,13 @@ 
 */
  function initNewXTemplate($XTemplatePath, $modString, $imagePath = null) {
     $this->setXTemplatePath($XTemplatePath);
-    if(isset($modString))
-        $this->setModStrings($modString);
-    if(isset($imagePath))
-        $this->setImagePath($imagePath);
-}
+    if(isset($modString)) {
+            $this->setModStrings($modString);
+    }
+    if(isset($imagePath)) {
+            $this->setImagePath($imagePath);
+    }
+    }
 
 
 function getOrderBy($varName, $defaultOrderBy='', $force_sortorder='') {
@@ -730,7 +748,7 @@ 
             }
             //Just clear from url...
             $this->appendToBaseUrl[$orderByColumn] = false;
-    }else {
+    } else {
         $this->query_orderby = "";
     }
     $this->sortby = $sortBy;
@@ -775,8 +793,10 @@ 
 */
  function setTheme($theme) {
     $this->local_theme = $theme;
-    if(isset($this->xTemplate))$this->xTemplate->assign("THEME", $this->local_theme);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("THEME", $this->local_theme);
+    }
+    }
 
 /**sets the AppStrings used only use if it is different from the global
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -786,8 +806,10 @@ 
  function setAppStrings($app_strings) {
     unset($this->local_app_strings);
     $this->local_app_strings = $app_strings;
-    if(isset($this->xTemplate))$this->xTemplate->assign("APP", $this->local_app_strings);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("APP", $this->local_app_strings);
+    }
+    }
 
 /**sets the ModStrings used
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -797,8 +819,10 @@ 
  function setModStrings($mod_strings) {
     unset($this->local_module_strings);
     $this->local_mod_strings = $mod_strings;
-    if(isset($this->xTemplate))$this->xTemplate->assign("MOD", $this->local_mod_strings);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("MOD", $this->local_mod_strings);
+    }
+    }
 
 /**sets the ImagePath used
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -810,8 +834,10 @@ 
     if(empty($this->local_image_path)) {
         $this->local_image_path = SugarThemeRegistry::get($this->local_theme)->getImagePath();
     }
-    if(isset($this->xTemplate))$this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
+    }
+    }
 
 /**sets the currentModule only use if this is different from the global
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -821,8 +847,10 @@ 
  function setCurrentModule($currentModule) {
     unset($this->local_current_module);
     $this->local_current_module = $currentModule;
-    if(isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
+    }
+    }
 
 /**INTERNAL FUNCTION creates an XTemplate DO NOT CALL THIS THIS IS AN INTERNAL FUNCTION
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -835,7 +863,9 @@ 
 
             $this->xTemplate = new XTemplate($this->xTemplatePath);
             $this->xTemplate->assign("APP", $this->local_app_strings);
-            if(isset($this->local_mod_strings))$this->xTemplate->assign("MOD", $this->local_mod_strings);
+            if(isset($this->local_mod_strings)) {
+                $this->xTemplate->assign("MOD", $this->local_mod_strings);
+            }
             $this->xTemplate->assign("THEME", $this->local_theme);
             $this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
             $this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
@@ -912,7 +942,9 @@ 
 }
 
 function setUserVariable($localVarName,$varName, $value) {
-        if($this->is_dynamic ||  $localVarName == 'CELL')return;
+        if($this->is_dynamic ||  $localVarName == 'CELL') {
+            return;
+        }
         global $current_user;
         $current_user->setPreference($this->local_current_module."_".$localVarName."_".$varName, $value);
 }
@@ -936,7 +968,9 @@ 
 
 function getUserVariable($localVarName, $varName) {
     global $current_user;
-    if($this->is_dynamic ||  $localVarName == 'CELL')return;
+    if($this->is_dynamic ||  $localVarName == 'CELL') {
+        return;
+    }
     if(isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
 
             $this->setUserVariable($localVarName,$varName,$_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
@@ -1015,11 +1049,21 @@ 
         //$filter = array('id', 'full_name');
         $filter=array();
         $ret_array = $seed->create_new_list_query($this->query_orderby, $this->query_where, $filter, $params, 0, '', true, $seed, true);
-        if(!is_array($params)) $params = array();
-        if(!isset($params['custom_select'])) $params['custom_select'] = '';
-        if(!isset($params['custom_from'])) $params['custom_from'] = '';
-        if(!isset($params['custom_where'])) $params['custom_where'] = '';
-        if(!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
+        if(!is_array($params)) {
+            $params = array();
+        }
+        if(!isset($params['custom_select'])) {
+            $params['custom_select'] = '';
+        }
+        if(!isset($params['custom_from'])) {
+            $params['custom_from'] = '';
+        }
+        if(!isset($params['custom_where'])) {
+            $params['custom_where'] = '';
+        }
+        if(!isset($params['custom_order_by'])) {
+            $params['custom_order_by'] = '';
+        }
         $main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
         SugarVCR::store($seed->module_dir,  $main_query);
         //ADDING VCR CONTROL
@@ -1080,8 +1124,7 @@ 
             {
                 $sort_order['session'] = $sort_order['session'] == 'asc' ? 'desc' : 'asc';
             }
-        }
-        else
+        } else
         {
             $sort_order['session'] = null;
         }
@@ -1113,7 +1156,7 @@ 
         if(!empty($this->response)){
             $response =& $this->response;
             echo 'cached';
-        }else{
+        } else{
             $response = SugarBean::get_union_related_list($sugarbean,$this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page,$this->query_limit,$subpanel_def);
             $this->response =& $response;
         }
@@ -1121,7 +1164,9 @@ 
         $row_count = $response['row_count'];
         $next_offset = $response['next_offset'];
         $previous_offset = $response['previous_offset'];
-        if(!empty($response['current_offset']))$current_offset = $response['current_offset'];
+        if(!empty($response['current_offset'])) {
+            $current_offset = $response['current_offset'];
+        }
         global $list_view_row_count;
         $list_view_row_count = $row_count;
         $this->processListNavigation('dyn_list_view', $html_var, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean,$subpanel_def);
@@ -1132,7 +1177,9 @@ 
     function getBaseURL($html_varName) {
         static $cache = array();
 
-        if(!empty($cache[$html_varName]))return $cache[$html_varName];
+        if(!empty($cache[$html_varName])) {
+            return $cache[$html_varName];
+        }
         $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount','current_query_by_page');
         if(!empty($this->base_URL)) {
             return $this->base_URL;
@@ -1152,10 +1199,11 @@ 
                 {
                     if(is_array($value)) {
                         foreach($value as $valuename=>$valuevalue) {
-                            if(substr_count($baseurl, '?') > 0)
-                                $baseurl	.= "&{$name}[]=".$valuevalue;
-                            else
-                                $baseurl	.= "?{$name}[]=".$valuevalue;
+                            if(substr_count($baseurl, '?') > 0) {
+                                                            $baseurl	.= "&{$name}[]=".$valuevalue;
+                            } else {
+                                                            $baseurl	.= "?{$name}[]=".$valuevalue;
+                            }
                         }
                     } else {
                         $value = urlencode($value);
@@ -1174,9 +1222,15 @@ 
                 if(substr_count($baseurl, '?') == 0) {
                     $baseurl .= '?';
                 }
-                if(isset($_REQUEST['action'])) $baseurl.= '&action='.$_REQUEST['action'];
-                if(isset($_REQUEST['record'])) $baseurl .= '&record='.$_REQUEST['record'];
-                if(isset($_REQUEST['module'])) $baseurl .= '&module='.$_REQUEST['module'];
+                if(isset($_REQUEST['action'])) {
+                    $baseurl.= '&action='.$_REQUEST['action'];
+                }
+                if(isset($_REQUEST['record'])) {
+                    $baseurl .= '&record='.$_REQUEST['record'];
+                }
+                if(isset($_REQUEST['module'])) {
+                    $baseurl .= '&module='.$_REQUEST['module'];
+                }
             }
 
             $baseurl .= "&".ListView::getSessionVariableName($html_varName,"offset")."=";
@@ -1203,11 +1257,13 @@ 
 
         $start_record = $current_offset + 1;
 
-        if(!is_numeric($col_count))
-            $col_count = 20;
+        if(!is_numeric($col_count)) {
+                    $col_count = 20;
+        }
 
-        if($row_count == 0)
-            $start_record = 0;
+        if($row_count == 0) {
+                    $start_record = 0;
+        }
 
         $end_record = $start_record + $this->records_per_page;
         // back up the the last page.
@@ -1215,10 +1271,11 @@ 
             $end_record = $row_count+1;
         }
         // Determine the start location of the last page
-        if($row_count == 0)
-            $number_pages = 0;
-        else
-            $number_pages = floor(($row_count - 1) / $this->records_per_page);
+        if($row_count == 0) {
+                    $number_pages = 0;
+        } else {
+                    $number_pages = floor(($row_count - 1) / $this->records_per_page);
+        }
 
         $last_offset = $number_pages * $this->records_per_page;
 
@@ -1278,7 +1335,7 @@ 
                     $onClick = '';
                     if(0 != preg_match('/javascript.*/', $start_URL)){
                         $onClick = "\"$start_URL;\"";
-                    }else{
+                    } else{
                         $onClick ="'location.href=\"$start_URL\";'";
                     }
                     $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("start","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
@@ -1286,7 +1343,7 @@ 
                     $onClick = '';
                     if(0 != preg_match('/javascript.*/', $previous_URL)){
                         $onClick = "\"$previous_URL;\"";
-                    }else{
+                    } else{
                         $onClick = "'location.href=\"$previous_URL\";'";
                     }
                     $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("previous","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
@@ -1310,7 +1367,7 @@ 
                     $onClick = '';
                     if(0 != preg_match('/javascript.*/', $next_URL)){
                         $onClick = "\"$next_URL;\"";
-                    }else{
+                    } else{
                         $onClick ="'location.href=\"$next_URL\";'";
                     }
                     $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("next","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
@@ -1318,7 +1375,7 @@ 
                     $onClick = '';
                     if(0 != preg_match('/javascript.*/', $end_URL)){
                         $onClick = "\"$end_URL;\"";
-                    }else{
+                    } else{
                         $onClick = "'location.href=\"$end_URL\";'";
                     }
                     $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("end","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
@@ -1467,18 +1524,17 @@ 
                     //attempt to get the query to recreate this subpanel
                     if(!empty($this->response)){
                         $response =& $this->response;
-                    }else{
+                    } else{
                         $response = SugarBean::get_union_related_list($sugarbean,$this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page,$this->query_limit,$subpanel_def);
                         $this->response = $response;
                     }
                     //if query is present, then pass it in as parameter
                     if (isset($response['query']) && !empty($response['query'])){
                         $html_text .= $subpanelTiles->get_buttons($subpanel_def, $response['query']);
-                    }else{
+                    } else{
                         $html_text .= $subpanelTiles->get_buttons($subpanel_def);
                     }
-                }
-                else {
+                } else {
                     $html_text .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr><td align=\"left\"  nowrap>$select_link&nbsp;$export_link&nbsp;$delete_link&nbsp;$selected_objects_span";
                 }
                 $html_text .= "</td>\n<td nowrap align=\"right\">".$start_link."&nbsp;&nbsp;".$previous_link."&nbsp;&nbsp;<span class='pageNumbers'>(".$start_record." - ".$end_record." ".$this->local_app_strings['LBL_LIST_OF']." ".$row_count.")</span>&nbsp;&nbsp;".$next_link."&nbsp;&nbsp;".$end_link."</td></tr></table>\n";
@@ -1506,9 +1562,15 @@ 
             }
             if($_SERVER['REQUEST_METHOD'] == 'POST') {
                 $this->base_URL .= '?';
-                if(isset($_REQUEST['action'])) $this->base_URL .= '&action='.$_REQUEST['action'];
-                if(isset($_REQUEST['record'])) $this->base_URL .= '&record='.$_REQUEST['record'];
-                if(isset($_REQUEST['module'])) $this->base_URL .= '&module='.$_REQUEST['module'];
+                if(isset($_REQUEST['action'])) {
+                    $this->base_URL .= '&action='.$_REQUEST['action'];
+                }
+                if(isset($_REQUEST['record'])) {
+                    $this->base_URL .= '&record='.$_REQUEST['record'];
+                }
+                if(isset($_REQUEST['module'])) {
+                    $this->base_URL .= '&module='.$_REQUEST['module'];
+                }
             }
             $this->base_URL .= "&".$this->getSessionVariableName($html_varName,"offset")."=";
         }
@@ -1639,8 +1701,7 @@ 
             {
                 $ROW_COLOR = 'oddListRow';
                 $BG_COLOR =  $odd_bg;
-            }
-            else
+            } else
             {
                 $ROW_COLOR = 'evenListRow';
                 $BG_COLOR =  $even_bg;
@@ -1656,8 +1717,7 @@ 
                 $this->xTemplate->assign('VALUE', $aItem);
                 $this->xTemplate->assign('INDEX', $count);
 
-            }
-            else
+            } else
             {
     //AED -- some modules do not have their additionalDetails.php established. Add a check to ensure require_once does not fail
     // Bug #2786
@@ -1673,7 +1733,9 @@ 
                     $results = $ad_function($fields);
                     $results['string'] = str_replace(array("&#039", "'"), '\&#039', $results['string']); // no xss!
 
-                    if(trim($results['string']) == '') $results['string'] = $app_strings['LBL_NONE'];
+                    if(trim($results['string']) == '') {
+                        $results['string'] = $app_strings['LBL_NONE'];
+                    }
                     $fields[$results['fieldToAddTo']] = $fields[$results['fieldToAddTo']].'</a>';
                 }
 
@@ -1797,12 +1859,21 @@ 
 	                $cell_width = empty($widget_args['width']) ? '' : $widget_args['width'];
 	                $this->xTemplate->assign('HEADER_CELL', $widget_contents);
 	                static $count;
-	            if(!isset($count))$count = 0; else $count++;
-                    if($col_count == 0 || $column_name == 'name') $footable = 'data-toggle="true"';
-                    else {
+	            if(!isset($count)) {
+	                $count = 0;
+	            } else {
+	                $count++;
+	            }
+                    if($col_count == 0 || $column_name == 'name') {
+                        $footable = 'data-toggle="true"';
+                    } else {
                         $footable = 'data-hide="phone"';
-                        if ($col_count > 2) $footable = 'data-hide="phone,phonelandscape"';
-                        if ($col_count > 4) $footable = 'data-hide="phone,phonelandscape,tablet"';
+                        if ($col_count > 2) {
+                            $footable = 'data-hide="phone,phonelandscape"';
+                        }
+                        if ($col_count > 4) {
+                            $footable = 'data-hide="phone,phonelandscape,tablet"';
+                        }
                     }
                     $this->xTemplate->assign('FOOTABLE', $footable);
 	                $this->xTemplate->assign('CELL_COUNT', $count);
@@ -1934,7 +2005,7 @@ 
         $sortStr = translate('LBL_ALT_SORT');
         if($upDown == '_down'){
             $sortStr = translate('LBL_ALT_SORT_DESC');
-        }elseif($upDown == '_up'){
+        } elseif($upDown == '_up'){
             $sortStr = translate('LBL_ALT_SORT_ASC');
         }
         return " width='$width' height='$height' align='absmiddle' alt='$sortStr'>";
@@ -1948,8 +2019,9 @@ 
 
         // Check the cache
         $result = sugar_cache_retrieve($cache_key);
-        if(!empty($result))
-        return $result;
+        if(!empty($result)) {
+                return $result;
+        }
 
         // No cache hit.  Calculate the value and return.
         $result = getimagesize($image);
@@ -1965,8 +2037,9 @@ 
 
         // Check the cache
         $result = sugar_cache_retrieve($cache_key);
-        if(!empty($result))
-        return $result;
+        if(!empty($result)) {
+                return $result;
+        }
 
         // No cache hit.  Calculate the value and return.
         $result = getimagesize($image);
@@ -1999,12 +2072,10 @@ 
 		if($orderBy == 'amount')
 		{
 			$this->xTemplateAssign('amount_arrow', $imgArrow);
-		}
-		else if($orderBy == 'amount_usdollar')
+		} else if($orderBy == 'amount_usdollar')
 		{
 			$this->xTemplateAssign('amount_usdollar_arrow', $imgArrow);
-		}
-		else
+		} else
 		{
 			$this->xTemplateAssign($orderBy.'_arrow', $imgArrow);
 		}
@@ -2034,8 +2105,7 @@ 
             {
                 $list_field['label'] = translate($key,$child_focus->module_dir);
                 $this->list_field_defs[$i]['label'] = preg_replace('/:$/','',$list_field['label']);
-            }
-            else
+            } else
             {
                 $this->list_field_defs[$i]['label'] ='&nbsp;';
             }
@@ -2065,8 +2135,7 @@ 
  function getLocalSessionVariable($localVarName,$varName) {
     if(isset($_SESSION[$localVarName."_".$varName])) {
         return $_SESSION[$localVarName."_".$varName];
-    }
-    else{
+    } else{
         return "";
     }
  }
@@ -2074,7 +2143,9 @@ 
  /* Set to true if you want Additional Details to appear in the listview
   */
  function setAdditionalDetails($value = true, $function = '') {
-    if(!empty($function)) $this->additionalDetailsFunction = $function;
+    if(!empty($function)) {
+        $this->additionalDetailsFunction = $function;
+    }
     $this->_additionalDetails = $value;
  }
 

include/SugarFields/Parsers/MetaParser.php

Spacing +102 added lines, -102 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.
@@ -60,9 +60,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function MetaParser(){
+    function MetaParser() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -81,7 +81,7 @@ 
  * Parses for contents enclosed within <form>...</form> tags
  */
 function getFormContents($contents, $all = true) {
-   if($all) {
+   if ($all) {
       preg_match_all("'(<form[^>]*?>)(.*?)(</form[^>]*?>)'si", $contents, $matches);
       return $matches;
    }
@@ -101,7 +101,7 @@ 
 function getFormElements($contents) {
    preg_match_all("'(<[ ]*?)(textarea|input|select)([^>]*?)(>)'si", $contents, $matches, PREG_PATTERN_ORDER);
    $elems = array();
-   foreach($matches[3] as $match) {
+   foreach ($matches[3] as $match) {
    	  $elems[] = $match;
    }
    return $elems;
@@ -133,13 +133,13 @@ 
 
    $exp = "'".$name."[\s]*?=[\s]*?[\'\"]([^\'^\"]*?)[\'\"]'si";
    preg_match_all($exp, $contents, $matches, PREG_SET_ORDER);
-   if(empty($filter)) {
+   if (empty($filter)) {
    	  return !empty($matches[0][1]) ? $matches[0][1] : '';
    }
 
    $filtered = array();
-   foreach($matches as $tag) {
-   	  if(preg_match($filter, $tag[1])) {
+   foreach ($matches as $tag) {
+   	  if (preg_match($filter, $tag[1])) {
    	  	 $filtered[] = $tag;
    	  }
    }
@@ -156,13 +156,13 @@ 
  */
 function getTables($tableClass = null, $contents) {
    preg_match_all("'(<table[^>]*?>)(.*?)(</table[^>]*?>)'si", $contents, $matches, PREG_SET_ORDER);
-   if($tableClass == null) {
+   if ($tableClass == null) {
    	  return $matches;
    }
 
    $tables = array();
-   foreach($matches as $key => $table) {
-   	  if(strpos($table[1], $tableClass) > 0) {
+   foreach ($matches as $key => $table) {
+   	  if (strpos($table[1], $tableClass) > 0) {
    	  	 $tables[] = $table;
    	  }
    }
@@ -185,27 +185,27 @@ 
    $x = strlen($contents);
    $mark = 0;
    $count = 0;
-   $stag1 = "<" . trim($type, " <>") . '>';
-   $stag2 = "<" . trim($type, " <>") . ' ';
+   $stag1 = "<".trim($type, " <>").'>';
+   $stag2 = "<".trim($type, " <>").' ';
    $etag = "</".$type.">";
    $sincrement = strlen($stag1);
    $eincrement = strlen($etag);
    $sarr = array();
    $values = array();
 
-   while($count < $x) {
+   while ($count < $x) {
    	     $stok = substr($contents, $count, $sincrement);
    	     $etok = substr($contents, $count, $eincrement);
-   	     if($stok == $stag1 || $stok == $stag2) {
+   	     if ($stok == $stag1 || $stok == $stag2) {
    	     	//Reset mark;
-   	        if(count($sarr) == 0) {
+   	        if (count($sarr) == 0) {
    	           $mark = $count;
    	        }
             $sarr[] = $count;
 
-   	     } else if($etok == $etag) {
+   	     } else if ($etok == $etag) {
    	        array_shift($sarr);
-   	        if(count($sarr) == 0) {
+   	        if (count($sarr) == 0) {
    	           $val = substr($contents, $mark, ($count - $mark) + $eincrement);
    	           $values[] = $val;
    	           $mark = $count;
@@ -246,7 +246,7 @@ 
 function stripFlavorTags($contents) {
    $flavor = isset($GLOBALS['sugar_flavor']) ? $GLOBALS['sugar_flavor'] : 'PRO';
    $isPro = ($flavor == 'ENT' || $flavor == 'PRO') ? true : false;
-   if($isPro) {
+   if ($isPro) {
    	 $contents = preg_replace('/<!-- BEGIN: open_source -->.*?<!-- END: open_source -->/', '', $contents);
    } else {
    	 $contents = preg_replace('/<!-- BEGIN: pro -->.*?<!-- END: pro -->/', '', $contents);
@@ -264,9 +264,9 @@ 
 function getMaxColumns($contents, $filter) {
    preg_match_all("'(<tr[^>]*?>)(.*?)(</tr[^>]*?>)'si", $contents, $matches, PREG_SET_ORDER);
    $max = 0;
-   foreach($matches as $tableRows) {
+   foreach ($matches as $tableRows) {
            $count = substr_count($tableRows[2], $filter);
-           if($count > $max) {
+           if ($count > $max) {
            	  $max = $count;
            }
    }
@@ -278,9 +278,9 @@ 
 
    $elements = array();
 
-   foreach($matches as $data) {
+   foreach ($matches as $data) {
    	   // We need 4 because the 1,2,3 indexes make up start,body,end
-	   if(count($data) == 4) {
+	   if (count($data) == 4) {
 	   	  $element = array();
 	   	  $element['start'] = $data[1];
 	   	  $element['body'] = $data[2];
@@ -321,12 +321,12 @@ 
 
 //Check if there are Javascript blocks of code to process
 preg_match_all("'(<script[^>]*?>)(.*?)(</script[^>]*?>)'si", $contents, $matches, PREG_PATTERN_ORDER);
-if(empty($matches)) {
+if (empty($matches)) {
    return $javascript;
 }
 
-foreach($matches[0] as $scriptBlock) {
-	    $javascript .= "\n" . $scriptBlock;
+foreach ($matches[0] as $scriptBlock) {
+	    $javascript .= "\n".$scriptBlock;
 } //foreach
 
 $javascript = substr($javascript, 1);
@@ -337,11 +337,11 @@ 
 
 //Find all blocks that may need to be replaced with Smarty syntax
 preg_match_all("'([\{])([a-zA-Z0-9_]*?)([\}])'si", $javascript, $matches, PREG_PATTERN_ORDER);
-if(!empty($matches)) {
+if (!empty($matches)) {
 	$replace = array();
 
-	foreach($matches[0] as $xTemplateCode) {
-		    if(!isset($replace[$xTemplateCode])) {
+	foreach ($matches[0] as $xTemplateCode) {
+		    if (!isset($replace[$xTemplateCode])) {
 		       $replace[$xTemplateCode] = str_replace("{", "{\$", $xTemplateCode);
 		    } //if
 	} //foreach
@@ -349,7 +349,7 @@ 
 	$javascript = str_replace(array_keys($replace), array_values($replace), $javascript);
 } //if
 
-if(!$addLiterals) {
+if (!$addLiterals) {
    return $javascript;
 }
 
@@ -363,12 +363,12 @@ 
 	$count = 0;
 	$inSmartyVariable = false;
 
-	while($count < $scriptLength) {
+	while ($count < $scriptLength) {
 
-	      if($inSmartyVariable) {
+	      if ($inSmartyVariable) {
 	      	 $start = $count;
 	      	 $numOfChars = 1;
-	      	 while(isset($javascript[$count]) && $javascript[$count] != '}') {
+	      	 while (isset($javascript[$count]) && $javascript[$count] != '}') {
 	      	 	   $count++;
 	      	 	   $numOfChars++;
 	      	 }
@@ -381,12 +381,12 @@ 
 			  $char = $javascript[$count];
 			  $nextChar = ($count + 1 >= $scriptLength) ? '' : $javascript[$count + 1];
 
-			  if($char == "{" && $nextChar == "$") {
+			  if ($char == "{" && $nextChar == "$") {
 			  	 $inSmartyVariable = true;
 			  	 $newJavascript .= $javascript[$count];
-			  } else if($char == "{") {
-			  	 $newJavascript .=  " {ldelim} ";
-			  } else if($char == "}") {
+			  } else if ($char == "{") {
+			  	 $newJavascript .= " {ldelim} ";
+			  } else if ($char == "}") {
 			  	 $newJavascript .= " {rdelim} ";
 			  } else {
 			     $newJavascript .= $javascript[$count];
@@ -412,32 +412,32 @@ 
  */
 function findAssignedVariableName($name, $filePath) {
 
-	if($this->mPHPFile == "INVALID") {
+	if ($this->mPHPFile == "INVALID") {
 	   return $name;
 	}
 
-	if(!isset($this->mPHPFile)) {
-	   if(preg_match('/(.*?)(DetailView).html$/', $filePath, $matches)) {
+	if (!isset($this->mPHPFile)) {
+	   if (preg_match('/(.*?)(DetailView).html$/', $filePath, $matches)) {
 	   	 $dir = $matches[1];
-	   } else if(preg_match('/(.*?)(EditView).html$/', $filePath, $matches)) {
+	   } else if (preg_match('/(.*?)(EditView).html$/', $filePath, $matches)) {
 	   	 $dir = $matches[1];
 	   }
 
-	   if(!isset($dir) || !is_dir($dir)) {
+	   if (!isset($dir) || !is_dir($dir)) {
 	      $this->mPHPFile = "INVALID";
 	      return $name;
 	   }
 
        $filesInDir = $this->dirList($dir);
        $phpFile = $matches[2].'.*?[\.]php';
-       foreach($filesInDir as $file) {
-       	  if(preg_match("/$phpFile/", $file)) {
-       	  	 $this->mPHPFile = $matches[1] . $file;
+       foreach ($filesInDir as $file) {
+       	  if (preg_match("/$phpFile/", $file)) {
+       	  	 $this->mPHPFile = $matches[1].$file;
        	  	 break;
        	  }
        }
 
-       if(!isset($this->mPHPFile) || !file_exists($this->mPHPFile)) {
+       if (!isset($this->mPHPFile) || !file_exists($this->mPHPFile)) {
        	  $this->mPHPFile = "INVALID";
        	  return $name;
        }
@@ -445,7 +445,7 @@ 
 
 	$phpContents = file_get_contents($this->mPHPFile);
 	$uname = strtoupper($name);
-	if(preg_match("/xtpl->assign[\(][\"\']".$uname."[\"\'][\s]*?,[\s]*?[\$]focus->(.*?)[\)]/si", $phpContents, $matches)) {
+	if (preg_match("/xtpl->assign[\(][\"\']".$uname."[\"\'][\s]*?,[\s]*?[\$]focus->(.*?)[\)]/si", $phpContents, $matches)) {
 	   return $matches[1];
 	}
 	return $name;
@@ -459,7 +459,7 @@ 
  * @param $directory The directory to scan
  * @return $results The files in the directory that were found
  */
-function dirList ($directory) {
+function dirList($directory) {
 
     // create an array to hold directory list
     $results = array();
@@ -491,19 +491,19 @@ 
  */
 function getCustomField($elementNames) {
 
-   if(!isset($elementNames) || (!is_string($elementNames) && !is_array($elementNames))) {
+   if (!isset($elementNames) || (!is_string($elementNames) && !is_array($elementNames))) {
    	  return null;
    }
 
-   if(is_string($elementNames)) {
-   	  if(preg_match('/(.+_c)(_basic)?(\[\])?$/', $elementNames, $matches)) {
+   if (is_string($elementNames)) {
+   	  if (preg_match('/(.+_c)(_basic)?(\[\])?$/', $elementNames, $matches)) {
    	  	 return count($matches) == 1 ? $matches[0] : $matches[1];
    	  }
    	  return null;
    }
 
-   foreach($elementNames as $name) {
-   	  if(preg_match('/(.+_c)(_basic)?(\[\])?$/', $name, $matches)) {
+   foreach ($elementNames as $name) {
+   	  if (preg_match('/(.+_c)(_basic)?(\[\])?$/', $name, $matches)) {
    	  	 return count($matches) == 1 ? $matches[0] : $matches[1];
    	  }
    }
@@ -512,7 +512,7 @@ 
 }
 
 function applyPreRules($moduleDir, $panels) {
-   if(file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
+   if (file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
 	  require_once("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php");
 	  $class = $moduleDir."ParseRule";
 	  $parseRule = new $class();
@@ -527,7 +527,7 @@ 
 
 function applyPostRules($moduleDir, $panels) {
    //Run module specific rules
-   if(file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
+   if (file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
 	  require_once("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php");
 	  $class = $moduleDir."ParseRule";
 	  $parseRule = new $class();
@@ -538,9 +538,9 @@ 
    require_once("include/SugarFields/Parsers/Rules/ParseRules.php");
    $rules = ParseRules::getRules();
 
-   foreach($rules as $rule) {
-   	  if(!file_exists($rule['file'])) {
-   	  	 $GLOBALS['log']->error("Cannot run rule for " . $rule['file']);
+   foreach ($rules as $rule) {
+   	  if (!file_exists($rule['file'])) {
+   	  	 $GLOBALS['log']->error("Cannot run rule for ".$rule['file']);
    	  	 continue;
    	  } //if
    	  require_once($rule['file']);
@@ -552,11 +552,11 @@ 
    return $panels;
 }
 
-function createFileContents($moduleDir, $panels, $templateMeta=array(), $htmlFilePath) {
+function createFileContents($moduleDir, $panels, $templateMeta = array(), $htmlFilePath) {
 
 $header = "<?php\n\n";
 
-if(empty($templateMeta)) {
+if (empty($templateMeta)) {
 $header .= "\$viewdefs['$moduleDir']['$this->mView'] = array(
     'templateMeta' => array('maxColumns' => '2',
                             'widths' => array(
@@ -566,7 +566,7 @@ 
     ),";
 } else {
 $header .= "\$viewdefs['$moduleDir']['$this->mView'] = array(
-    'templateMeta' =>" . var_export($templateMeta, true) . ",";
+    'templateMeta' =>".var_export($templateMeta, true).",";
 }
 
 //Replace all the @sq (single quote tags that may have been inserted)
@@ -591,8 +591,8 @@ 
 
    $metadata = '';
    $body = var_export($panels, true);
-   $metadata = $header . $body . $footer;
-   $metadata = preg_replace('/(\d+)[\s]=>[\s]?/',"",$metadata);
+   $metadata = $header.$body.$footer;
+   $metadata = preg_replace('/(\d+)[\s]=>[\s]?/', "", $metadata);
    return $metadata;
 
 }
@@ -611,10 +611,10 @@ 
    $masterpanels = $viewdefs[$moduleDir][$this->mView]['panels'];
    $hasMultiplePanels = $this->hasMultiplePanels($masterpanels);
 
-   if(!$hasMultiplePanels) {
+   if (!$hasMultiplePanels) {
    	    $keys = array_keys($viewdefs[$moduleDir][$this->mView]['panels']);
-        if(!empty($keys) && count($keys) == 1) {
-        	if(strtolower($keys[0]) == 'default') {
+        if (!empty($keys) && count($keys) == 1) {
+        	if (strtolower($keys[0]) == 'default') {
         	   $masterpanels = array('default'=>$viewdefs[$moduleDir][$this->mView]['panels'][$keys[0]]);
         	} else {
         	   $firstPanel = array_values($viewdefs[$moduleDir][$this->mView]['panels']);
@@ -624,18 +624,18 @@ 
         	$masterpanels = array('default'=>$viewdefs[$moduleDir][$this->mView]['panels']);
         }
    }
-   foreach($masterpanels as $name=>$masterpanel) {
-   	       if(isset($panels[$name])) {
+   foreach ($masterpanels as $name=>$masterpanel) {
+   	       if (isset($panels[$name])) {
 	   	       	  // Get all the names in the panel
 	   	       	  $existingElements = array();
 	   	       	  $existingLocation = array();
 
-	   	       	  foreach($panels[$name] as $rowKey=>$row) {
-	   	       	  	 foreach($row as $colKey=>$column) {
-	   	       	  	 	if(is_array($column) && !empty($column['name'])) {
+	   	       	  foreach ($panels[$name] as $rowKey=>$row) {
+	   	       	  	 foreach ($row as $colKey=>$column) {
+	   	       	  	 	if (is_array($column) && !empty($column['name'])) {
 	   	       	  	 	   $existingElements[$column['name']] = $column['name'];
 	   	       	  	 	   $existingLocation[$column['name']] = array("panel"=>$name, "row"=>$rowKey, "col"=>$colKey);
-	   	       	  	 	} else if(!is_array($column) && !empty($column)) {
+	   	       	  	 	} else if (!is_array($column) && !empty($column)) {
 	   	       	  	 	   $existingElements[$column] = $column;
 	   	       	  	 	   $existingLocation[$column] = array("panel"=>$name, "row"=>$rowKey, "col"=>$colKey);
 	   	       	  	 	}
@@ -643,23 +643,23 @@ 
 	   	       	  } //foreach
 
 	   	       	  // Now check against the $masterCopy
-	   	       	  foreach($masterpanel as $rowKey=>$row) {
+	   	       	  foreach ($masterpanel as $rowKey=>$row) {
 
 	   	       	  	 $addRow = array();
 
-	   	       	  	 foreach($row as $colKey=>$column) {
-	   	       	  	 	if(is_array($column) && isset($column['name'])) {
+	   	       	  	 foreach ($row as $colKey=>$column) {
+	   	       	  	 	if (is_array($column) && isset($column['name'])) {
 	   	       	  	 	   $id = $column['name'];
-	   	       	  	 	} else if(!is_array($column) && !empty($column)) {
+	   	       	  	 	} else if (!is_array($column) && !empty($column)) {
 	   	       	  	 	   $id = $column;
 	   	       	  	 	} else {
 	   	       	  	 	   continue;
 	   	       	  	 	}
-	   	       	  	 	if(empty($existingElements[$id])) {
+	   	       	  	 	if (empty($existingElements[$id])) {
 	   	       	  	 	   //Only add if
 	   	       	  	 	   // 1) if it is a required field (as defined in metadata)
 	   	       	  	 	   // 2) or if it has a customLabel and customCode (a very deep customization)
-	   	       	  	 	   if((is_array($column) && !empty($column['displayParams']['required'])) ||
+	   	       	  	 	   if ((is_array($column) && !empty($column['displayParams']['required'])) ||
 	   	       	  	 	      (is_array($column) && !empty($column['customCode']) && !empty($column['customLabel']))) {
 	   	       	  	 	   	  $addRow[] = $column;
 	   	       	  	 	   }
@@ -670,7 +670,7 @@ 
 	   	       	  	 } //foreach
 
 	   	       	  	 // Add it to the $panels
-	   	       	  	 if(!empty($addRow)) {
+	   	       	  	 if (!empty($addRow)) {
 	   	       	  	 	$panels[$name][] = $addRow;
 	   	       	  	 }
 	   	       	  } //foreach
@@ -682,8 +682,8 @@ 
 
    // We're not done yet... go through the $panels Array now and try to remove duplicate
    // or empty panels
-   foreach($panels as $name=>$panel) {
-   	   if(count($panel) == 0 || !isset($masterpanels[$name])) {
+   foreach ($panels as $name=>$panel) {
+   	   if (count($panel) == 0 || !isset($masterpanels[$name])) {
    	   	  unset($panels[$name]);
    	   }
    } //foreach
@@ -703,7 +703,7 @@ 
    require($masterCopy);
    $masterTemplateMeta = $viewdefs[$moduleDir][$this->mView]['templateMeta'];
 
-   if(isset($masterTemplateMeta['javascript'])) {
+   if (isset($masterTemplateMeta['javascript'])) {
    	  //Insert the getJSPath code back into src value
    	  $masterTemplateMeta['javascript'] = preg_replace('/src\s*=\s*[\'\"].*?(modules\/|include\/)([^\.]*?\.js)([^\'\"]*?)[\'\"]/i', 'src="@sq . getJSPath(@sq${1}${2}@sq) . @sq"', $masterTemplateMeta['javascript']);
    }
@@ -712,7 +712,7 @@ 
 }
 
 function hasRequiredSpanLabel($html) {
-   if(empty($html)) {
+   if (empty($html)) {
    	  return false;
    }
 
@@ -721,20 +721,20 @@ 
 
 function hasMultiplePanels($panels) {
 
-   if(!isset($panels) || empty($panels) || !is_array($panels)) {
+   if (!isset($panels) || empty($panels) || !is_array($panels)) {
    	  return false;
    }
 
-   if(is_array($panels) && (count($panels) == 0 || count($panels) == 1)) {
+   if (is_array($panels) && (count($panels) == 0 || count($panels) == 1)) {
    	  return false;
    }
 
-   foreach($panels as $panel) {
-   	  if(!empty($panel) && !is_array($panel)) {
+   foreach ($panels as $panel) {
+   	  if (!empty($panel) && !is_array($panel)) {
    	  	 return false;
    	  } else {
-   	  	 foreach($panel as $row) {
-   	  	    if(!empty($row) && !is_array($row)) {
+   	  	 foreach ($panel as $row) {
+   	  	    if (!empty($row) && !is_array($row)) {
    	  	       return false;
    	  	    } //if
    	  	 } //foreach
@@ -744,16 +744,16 @@ 
    return true;
 }
 
-function getRelateFieldName($mixed='') {
-   if(!is_array($mixed)) {
+function getRelateFieldName($mixed = '') {
+   if (!is_array($mixed)) {
    	  return '';
-   } else if(count($mixed) == 2){
+   } else if (count($mixed) == 2) {
       $id = '';
    	  $name = '';
-   	  foreach($mixed as $el) {
-   	  	 if(preg_match('/_id$/', $el)) {
+   	  foreach ($mixed as $el) {
+   	  	 if (preg_match('/_id$/', $el)) {
    	  	    $id = $el;
-   	  	 } else if(preg_match('/_name$/', $el)) {
+   	  	 } else if (preg_match('/_name$/', $el)) {
    	  	    $name = $el;
    	  	 }
    	  }
@@ -774,7 +774,7 @@ 
  *
  */
 function fixTablesWithMissingTr($tableContents) {
-   if(preg_match('/(<table[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
+   if (preg_match('/(<table[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
    	  return preg_replace('/(<table[^>]*?[\/]?>\s*?<td)/i', '<table><tr><td', $tableContents);
    }
    return $tableContents;
@@ -785,7 +785,7 @@ 
  * This is a very crude function to fix instances where files have an </tr> tag immediately followed by a <td> tag
  */
 function fixRowsWithMissingTr($tableContents) {
-   if(preg_match('/(<\/tr[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
+   if (preg_match('/(<\/tr[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
    	  return preg_replace('/(<\/tr[^>]*?[\/]?>\s*?<td)/i', '</tr><tr><td', $tableContents);
    }
    return $tableContents;
@@ -796,7 +796,7 @@ 
  * This is a very crude function to fix instances where files have two consecutive <tr> tags
  */
 function fixDuplicateTrTags($tableContents) {
-   if(preg_match('/(<tr[^>]*?[\/]?>\s*?<tr)/i', $tableContents, $matches)) {
+   if (preg_match('/(<tr[^>]*?[\/]?>\s*?<tr)/i', $tableContents, $matches)) {
    	  return preg_replace('/(<tr[^>]*?[\/]?>\s*?<tr)/i', '<tr', $tableContents);
    }
    return $tableContents;
@@ -807,14 +807,14 @@ 
  * Scans array of form elements to see if just one is a vardef element and, if so,
  * return that vardef name
  */
-function findSingleVardefElement($formElements=array(), $vardefs=array()) {
-   if(empty($formElements) || !is_array($formElements)) {
+function findSingleVardefElement($formElements = array(), $vardefs = array()) {
+   if (empty($formElements) || !is_array($formElements)) {
    	  return '';
    }
 
    $found = array();
-   foreach($formElements as $el) {
-   	   if(isset($vardefs[$el])) {
+   foreach ($formElements as $el) {
+   	   if (isset($vardefs[$el])) {
    	   	  $found[] = $el;
    	   }
    }

Braces +7 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -64,8 +66,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -471,8 +472,9 @@ 
     while ($file = readdir($handler)) {
         // if $file isn't this directory or its parent,
         // add it to the results array
-        if ($file != '.' && $file != '..')
-            $results[] = $file;
+        if ($file != '.' && $file != '..') {
+                    $results[] = $file;
+        }
     }
 
     // tidy up: close the handler

include/SugarFields/Parsers/EditViewMetaParser.php

Spacing +52 added lines, -52 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.
@@ -58,9 +58,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function EditViewMetaParser(){
+    function EditViewMetaParser() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -80,7 +80,7 @@ 
  * @param $masterCopy The file path of the mater copy of the metadata file to merge against
  * @return String format of metadata contents
  **/
-function parse($filePath, $vardefs = array(), $moduleDir = '', $merge=false, $masterCopy=null) {
+function parse($filePath, $vardefs = array(), $moduleDir = '', $merge = false, $masterCopy = null) {
 
    global $app_strings;
    $contents = file_get_contents($filePath);
@@ -94,9 +94,9 @@ 
    $tables = $this->getElementsByType("table", $contents);
    $formElements = $this->getFormElements($tables[0]);
    $hiddenInputs = array();
-   foreach($formElements as $elem) {
+   foreach ($formElements as $elem) {
    	      $type = $this->getTagAttribute("type", $elem);
-   	      if(preg_match('/hidden/si',$type)) {
+   	      if (preg_match('/hidden/si', $type)) {
    	         $name = $this->getTagAttribute("name", $elem);
    	         $value = $this->getTagAttribute("value", $elem);
    	         $hiddenInputs[$name] = $value;
@@ -110,22 +110,22 @@ 
    $addedElements = array();
    $maxTableCountNum = 0;
    $tableCount = 0;
-   foreach($tables as $table) {
+   foreach ($tables as $table) {
    	      $table = $this->fixTablesWithMissingTr($table);
    	      $toptr = $this->getElementsByType("tr", $table);
-          foreach($toptr as $tr) {
+          foreach ($toptr as $tr) {
           	      $tabledata = $this->getElementsByType("table", $tr);
           	      $data = array();
           	      $panelKey = $tableCount == 0 ? "default" : '';
-          	      foreach($tabledata as $t) {
+          	      foreach ($tabledata as $t) {
           	      	      $vals = array_values($this->getElementsByType("tr", $t));
-          	      	      if(preg_match_all('/<h4[^>]*?>.*?(\{MOD\.|\{APP\.)(LBL_[^\}]*?)[\}].*?<\/h4>/s', $vals[0], $matches, PREG_SET_ORDER)) {
+          	      	      if (preg_match_all('/<h4[^>]*?>.*?(\{MOD\.|\{APP\.)(LBL_[^\}]*?)[\}].*?<\/h4>/s', $vals[0], $matches, PREG_SET_ORDER)) {
           	      	      	array_shift($vals);
           	      	      	$panelKey = count($matches[0]) == 3 ? strtolower($matches[0][2]) : $panelKey;
           	      	      }
 
           	      	      //If $panelKey is empty use the maxTableCountNum value
-          	      	      if(empty($panelKey)) {
+          	      	      if (empty($panelKey)) {
           	      	      	$panels[$maxTableCountNum++] = $vals;
           	      	      } else {
           	      	        $panels[$panelKey] = $vals;
@@ -135,37 +135,37 @@ 
           } //foreach;
    } //foreach
 
-   foreach($panels as $id=>$tablerows) {
+   foreach ($panels as $id=>$tablerows) {
 
        $metarow = array();
 
-	   foreach($tablerows as $trow) {
+	   foreach ($tablerows as $trow) {
 
 	   	   $emptyCount = 0;
 	   	   $tablecolumns = $this->getElementsByType("td", $trow);
 	       $col = array();
 	       $slot = 0;
 
-		   foreach($tablecolumns as $tcols) {
+		   foreach ($tablecolumns as $tcols) {
 		   	  $hasRequiredLabel = false;
 
 		   	  //Get the sugar attribute value in the span elements of each table row
 		   	  $sugarAttrLabel = $this->getTagAttribute("sugar", $tcols, "'^slot[^b]+$'");
 
 		   	  //If there was no sugar attribute, try id (some versions of EditView.html used this instead)
-		   	  if(empty($sugarAttrLabel)) {
+		   	  if (empty($sugarAttrLabel)) {
 		   	     $sugarAttrLabel = $this->getTagAttribute("id", $tcols, "'^slot[^b]+$'");
 		   	  }
 
 		   	  //Check if this field is required
-		   	  if(!empty($sugarAttrLabel)) {
+		   	  if (!empty($sugarAttrLabel)) {
 		   	  	 $hasRequiredLabel = $this->hasRequiredSpanLabel($tcols);
 		   	  }
 
 		   	  $sugarAttrValue = $this->getTagAttribute("sugar", $tcols, "'slot[0-9]+b$'");
 
 		   	  //If there was no sugar attribute, try id (some versions of EditView.html used this instead)
-              if(empty($sugarAttrValue)) {
+              if (empty($sugarAttrValue)) {
               	 $sugarAttrValue = $this->getTagAttribute("id", $tcols, "'slot[0-9]+b$'");
               }
 
@@ -174,15 +174,15 @@ 
 	          $sugarAttrValue = count($sugarAttrValue) != 0 ? $sugarAttrValue : ($slot % 2 == 1) ? true : false;
 	          $slot++;
 
-              if($sugarAttrValue) {
+              if ($sugarAttrValue) {
 
 				   	  	 $spanValue = $this->getElementValue("span", $tcols);
 
-				   	  	 if(empty($spanValue)) {
+				   	  	 if (empty($spanValue)) {
 		                    $spanValue = $this->getElementValue("slot", $tcols);
 		                 }
 
-		                 if(empty($spanValue)) {
+		                 if (empty($spanValue)) {
 		                    $spanValue = $this->getElementValue("td", $tcols);
 		                 }
 
@@ -194,25 +194,25 @@ 
 		                 $fields = null;
 		                 $customCode = null;
 
-		                 if(!empty($customField)) {
+		                 if (!empty($customField)) {
 		                   // If it's a custom field we just set the name
 		                   $name = $customField;
 
-		                 } else if(empty($formElementNames) && preg_match_all('/[\{]([^\}]*?)[\}]/s', $spanValue, $matches, PREG_SET_ORDER)) {
+		                 } else if (empty($formElementNames) && preg_match_all('/[\{]([^\}]*?)[\}]/s', $spanValue, $matches, PREG_SET_ORDER)) {
 				   	  	   // We are here if the $spanValue did not contain a form element for editing.
 				   	  	   // We will assume that it is read only (since there were no edit form elements)
 
 
 					           // If there is more than one matching {} value then try to find the right one to key off
 					           // based on vardefs.php file.  Also, use the entire spanValue as customCode
-					           	if(count($matches) > 1) {
+					           	if (count($matches) > 1) {
 							       $name = $matches[0][1];
 							       $customCode = $spanValue;
-							       foreach($matches as $pair) {
-						   	  	 	   if(preg_match("/^(mod[\.]|app[\.]).*?/i", $pair[1])) {
+							       foreach ($matches as $pair) {
+						   	  	 	   if (preg_match("/^(mod[\.]|app[\.]).*?/i", $pair[1])) {
 						   	  	 	       $customCode = str_replace($pair[1], '$'.strtoupper($pair[1]), $customCode);
 						   	  	 	   } else {
-						   	  	 	       if(!empty($vardefs[$pair[1]])) {
+						   	  	 	       if (!empty($vardefs[$pair[1]])) {
 						   	  	 	       	  $name = $pair[1];
 						   	  	 	          $customCode = str_replace($pair[1], '$fields.'.strtolower($pair[1]).'.value', $customCode);
 						   	  	 	       } else {
@@ -223,24 +223,24 @@ 
 						           } //foreach
 						       } else {
 						       	   //If it is only a label, skip
-						       	   if(preg_match("/^(mod[\.]|app[\.]).*?/i", $matches[0][1])) {
+						       	   if (preg_match("/^(mod[\.]|app[\.]).*?/i", $matches[0][1])) {
 						       	   	  continue;
 						       	   }
 						   	  	   $name = strtolower($matches[0][1]);
 						   	   }
 
-				   	  	 } else if(is_array($formElementNames)) {
+				   	  	 } else if (is_array($formElementNames)) {
 
-				   	  	      if(count($formElementNames) == 1) {
+				   	  	      if (count($formElementNames) == 1) {
 
-				   	  	      	 if(!empty($vardefs[$formElementNames[0]])) {
+				   	  	      	 if (!empty($vardefs[$formElementNames[0]])) {
 				   	  	            $name = $formElementNames[0];
 				   	  	      	 } else {
 				   	  	      	 	// Try to use the EdtiView.php file to find author's intent
 				   	  	      	 	$name = $this->findAssignedVariableName($formElementNames[0], $filePath);
 
 				   	  	      	 	//If it's still empty, just use the entire block as customCode
-				   	  	      	 	if(empty($vardefs[$name])) {
+				   	  	      	 	if (empty($vardefs[$name])) {
 				   	  	      	 	   //Replace any { characters just in case
 				   	  	      	 	   $customCode = str_replace('{', '{$', $spanValue);
 				   	  	      	 	}
@@ -248,16 +248,16 @@ 
 				   	  	      } else {
 				   	  	      	 //If it is an Array of form elements, it is likely the _id and _name relate field combo
 		                         $relateName = $this->getRelateFieldName($formElementNames);
-		                         if(!empty($relateName)) {
+		                         if (!empty($relateName)) {
 		                            $name = $relateName;
 		                         } else {
 		                         	 //One last attempt to scan $formElementNames for one vardef field only
 		                         	 $name = $this->findSingleVardefElement($formElementNames, $vardefs);
-		                         	 if(empty($name)) {
+		                         	 if (empty($name)) {
 					   	  	      	 	 $fields = array();
 			                         	 $name = $formElementNames[0];
-						   	  	      	 foreach($formElementNames as $elementName) {
-						   	  	      	 	if(isset($vardefs[$elementName])) {
+						   	  	      	 foreach ($formElementNames as $elementName) {
+						   	  	      	 	if (isset($vardefs[$elementName])) {
 						   	  	      	 	   $fields[] = $elementName;
 						   	  	      	 	} else {
 						   	  	      	 	   $fields[] = $this->findAssignedVariableName($elementName, $filePath);
@@ -269,13 +269,13 @@ 
 				   	  	 }
 
 				   	  	 // Build the entry
-				   	  	 if(preg_match("/<textarea/si", $spanValue)) {
+				   	  	 if (preg_match("/<textarea/si", $spanValue)) {
 				   	  	 	//special case for textarea form elements (add the displayParams)
 				   	  	 	$displayParams = array();
 				   	  	    $displayParams['rows'] = $this->getTagAttribute("rows", $spanValue);
 				   	  	    $displayParams['cols'] = $this->getTagAttribute("cols", $spanValue);
 
-				   	  	    if(!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
+				   	  	    if (!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
 					   	  	    $field = array();
 					   	  	    $field['name'] = $name;
 								$field['displayParams'] = $displayParams;
@@ -284,13 +284,13 @@ 
 				   	  	    }
 				   	  	 } else {
 
-				   	  	 	if(isset($fields) || isset($customCode)) {
+				   	  	 	if (isset($fields) || isset($customCode)) {
 				   	  	 	   $field = array();
 				   	  	 	   $field['name'] = $name;
-				   	  	 	   if(isset($fields)) {
+				   	  	 	   if (isset($fields)) {
 				   	  	 	   	  $field['fields'] = $fields;
 				   	  	 	   }
-				   	  	 	   if(isset($customCode)) {
+				   	  	 	   if (isset($customCode)) {
 				   	  	 	   	  $field['customCode'] = $customCode;
 				   	  	 	   	  $field['description'] = 'This field was auto generated';
 				   	  	 	   }
@@ -301,12 +301,12 @@ 
 				   	  	 } //if-else if-else block
 
 				   	  	 $addedField = is_array($field) ? $field['name'] : $field;
-				   	  	 if(empty($addedField) || empty($addedElements[$addedField])) {
+				   	  	 if (empty($addedField) || empty($addedElements[$addedField])) {
 				   	  	 	//Add the meta-data definition for required fields
-				   	  	 	if($hasRequiredLabel) {
-				   	  	 	   if(is_array($field)) {
-				   	  	 	   	  if(isset($field['displayParams']) && is_array($field['displayParams'])) {
-				   	  	 	   	  	 $field['displayParams']['required']=true;
+				   	  	 	if ($hasRequiredLabel) {
+				   	  	 	   if (is_array($field)) {
+				   	  	 	   	  if (isset($field['displayParams']) && is_array($field['displayParams'])) {
+				   	  	 	   	  	 $field['displayParams']['required'] = true;
 				   	  	 	   	  } else {
 				   	  	 	   	     $field['displayParams'] = array('required'=>true);
 				   	  	 	   	  }
@@ -321,14 +321,14 @@ 
 		   } //foreach
 
 		   // One last final check.  If $emptyCount does not equal Array $col count, don't add
-		   if($emptyCount != count($col)) {
+		   if ($emptyCount != count($col)) {
 
-			   	  if($hasRequiredLabel) {
-			   	  	 if(is_array($col)) {
-			   	  	    if(isset($col['displayParams'])) {
-			   	  	       $col['displayParams']['required']=true;
+			   	  if ($hasRequiredLabel) {
+			   	  	 if (is_array($col)) {
+			   	  	    if (isset($col['displayParams'])) {
+			   	  	       $col['displayParams']['required'] = true;
 			   	  	    } else {
-			   	  	       $col['displayParams']=array('required'=>true);
+			   	  	       $col['displayParams'] = array('required'=>true);
 			   	  	    }
 			   	  	 } else {
 			   	  	    $col = array('name'=>strtolower($col), 'displayParams'=>array('required'=>true));
@@ -347,7 +347,7 @@ 
    $panels = $this->applyPreRules($moduleDir, $panels);
 
    $templateMeta = array();
-   if($merge && !empty($masterCopy) && file_exists($masterCopy)) {
+   if ($merge && !empty($masterCopy) && file_exists($masterCopy)) {
       $panels = $this->mergePanels($panels, $vardefs, $moduleDir, $masterCopy);
       $templateMeta = $this->mergeTemplateMeta($templateMeta, $moduleDir, $masterCopy);
    }

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();

include/SugarFields/Parsers/SearchFormMetaParser.php

Spacing +34 added lines, -34 removed lines

@@ -48,9 +48,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function SearchFormMetaParser(){
+    function SearchFormMetaParser() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -65,7 +65,7 @@ 
  * @param $mixed
  * @return $obj A MetaDataBean instance
  **/
-function parse($filePath, $vardefs = array(), $moduleDir = '', $merge=false, $masterCopy=null) {
+function parse($filePath, $vardefs = array(), $moduleDir = '', $merge = false, $masterCopy = null) {
 
    $contents = file_get_contents($filePath);
    $contents = $this->trimHTML($contents);
@@ -75,16 +75,16 @@ 
    //basic search table
    $basicSection = $this->processSection("basic", $tables[0], $filePath, $vardefs);
    $advancedSection = $this->processSection("advanced", $tables[1], $filePath, $vardefs);
-   if(file_exists($masterCopy)) {
+   if (file_exists($masterCopy)) {
 	   require($masterCopy);
 	   $layouts = $searchdefs[$moduleDir]['layout'];
 
-	   if(isset($layouts['basic_search'])) {
+	   if (isset($layouts['basic_search'])) {
 		  $basicSection = $this->mergeSection($basicSection, $layouts['basic_search']);
 	      $basicSection = $this->applyRules($moduleDir, $basicSection);
 	   }
 
-	   if(isset($layouts['advanced_search'])) {
+	   if (isset($layouts['advanced_search'])) {
 		  $advancedSection = $this->mergeSection($advancedSection, $layouts['advanced_search']);
 	      $advancedSection = $this->applyRules($moduleDir, $advancedSection);
 	   }
@@ -95,15 +95,15 @@ 
     'templateMeta' => array('maxColumns' => '3', 'widths' => array('label' => '10', 'field' => '30')),
     'layout' => array(
 \n\t'basic_search' =>";
-$header .= "\t" . var_export($basicSection, true);
+$header .= "\t".var_export($basicSection, true);
 $header .= "\n\t,'advanced_search' =>";
-$header .= "\t" . var_export($advancedSection, true);
+$header .= "\t".var_export($advancedSection, true);
 $header .= "
      ),\n
 );
 ?>";
 
-$header = preg_replace('/(\d+)[\s]=>[\s]?/',"",$header);
+$header = preg_replace('/(\d+)[\s]=>[\s]?/', "", $header);
 return $header;
 
 }
@@ -114,18 +114,18 @@ 
   $existingElements = array();
   $existingLocation = array();
 
-  foreach($section as $rowKey=>$row) {
-  	   if(is_array($row) && !empty($row['name'])) {
+  foreach ($section as $rowKey=>$row) {
+  	   if (is_array($row) && !empty($row['name'])) {
   	 	   $existingElements[$row['name']] = $row['name'];
   	 	   $existingLocation[$row['name']] = array("row"=>$rowKey);
-  	   } else if(!is_array($row) && !empty($row)) {
+  	   } else if (!is_array($row) && !empty($row)) {
 	 	   $existingElements[$row] = $row;
 	 	   $existingLocation[$row] = array("row"=>$rowKey);
   	   }
   } //foreach
 
   // Now check against the $masterCopy
-  foreach($masterSection as $row) {
+  foreach ($masterSection as $row) {
 
   	 $addEntry = '';
   	 $id = is_array($row) ? $row['name'] : $row;
@@ -136,7 +136,7 @@ 
   	 }
   	 */
 
-  	 if(isset($existingElements[$id])) {
+  	 if (isset($existingElements[$id])) {
   	 	//Use master copy instead
   	 	$section[$existingLocation[$id]['row']] = $row;
   	 }
@@ -152,11 +152,11 @@ 
   return $section;
 }
 
-function processSection($section, $table, $filePath, $vardefs=array()) {
+function processSection($section, $table, $filePath, $vardefs = array()) {
 
    $toptr = $this->getElementsByType("tr", $table);
 
-   if(!is_array($toptr) || empty($toptr)) {
+   if (!is_array($toptr) || empty($toptr)) {
    	  $GLOBALS['log']->error("Could not process top row (<tr>) for $section section");
    	  $GLOBALS['log']->error($table);
    	  return array();
@@ -164,31 +164,31 @@ 
 
    $tabledata = $this->getElementsByType("table", $toptr[0]);
 
-   if(empty($tabledata)) {
+   if (empty($tabledata)) {
    	  $GLOBALS['log']->error("Error: HTML format for SearchForm.html not as expected, results may not be accurate");
    	  $GLOBALS['log']->error($toptr[0]);
    	  $tabledata[0] = "<table>{$table}</table>";
    }
 
-   if(is_array($tabledata) && !empty($tabledata[0])) {
+   if (is_array($tabledata) && !empty($tabledata[0])) {
       $rows = $this->getElementsByType("tr", $tabledata[0]);
    } else {
    	  $rows = $toptr[0];
    }
 
-   if(!is_array($rows)) {
+   if (!is_array($rows)) {
    	  return array();
    }
 
    $metarow = array();
-   foreach($rows as $trow) {
+   foreach ($rows as $trow) {
    	   $tablecolumns = $this->getElementsByType("td", $trow);
 
        $emptyCount = 0;
        $metacolumn = array();
        $col = null;
 
-	   foreach($tablecolumns as $tcols) {
+	   foreach ($tablecolumns as $tcols) {
 
 	   	  	 $spanValue = strtolower($this->getElementValue("span", $tcols));
              $spanValue2 = strtolower($this->getElementValue("slot", $tcols));
@@ -204,27 +204,27 @@ 
              $fields = null;
              $customCode = null;
 
-             if(!empty($customField)) {
+             if (!empty($customField)) {
                // If it's a custom field we just set the name
                $name = $customField;
-	   	  	 } else if(is_array($formElementNames) && count($formElementNames) == 1
+	   	  	 } else if (is_array($formElementNames) && count($formElementNames) == 1
 	   	  	           && (isset($vardefs[$formElementNames[0]]) || $formElementNames[0] == 'current_user_only')) {
 	   	  	   $name = $formElementNames[0];
 	   	  	 }
 
 	   	  	 //Skip and continue if $name is empty
-	   	  	 if(empty($name)) {
+	   	  	 if (empty($name)) {
 	   	  	    continue;
 	   	  	 }
 
 	   	  	 // Build the entry
-	   	  	 if(preg_match("/<textarea/si", $spanValue)) {
+	   	  	 if (preg_match("/<textarea/si", $spanValue)) {
 	   	  	 	//special case for textarea form elements (add the displayParams)
 	   	  	 	$displayParams = array();
 	   	  	    $displayParams['rows'] = $this->getTagAttribute("rows", $spanValue);
 	   	  	    $displayParams['cols'] = $this->getTagAttribute("cols", $spanValue);
 
-	   	  	    if(!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
+	   	  	    if (!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
 		   	  	    $field = array();
 		   	  	    $field['name'] = $name;
 					$field['displayParams'] = $displayParams;
@@ -236,14 +236,14 @@ 
 
 	   	  	 } else {
 
-	   	  	 	if(isset($fields)) {
+	   	  	 	if (isset($fields)) {
 	   	  	 	   $field = array();
 	   	  	 	   $field['name'] = $name;
-	   	  	 	   if(isset($fields)) {
+	   	  	 	   if (isset($fields)) {
 	   	  	 	   	  $field['fields'] = $fields;
 	   	  	 	   }
 
-	   	  	 	   if(!empty($customCode)) {
+	   	  	 	   if (!empty($customCode)) {
 	   	  	 	   	  $field['customCode'] = $customCode;
 	   	  	 	   }
 
@@ -257,7 +257,7 @@ 
 	   } //foreach
 
 	   // One last final check.  If $emptyCount does not equal Array $col count, don't add
-	   if($emptyCount != count($col)) {
+	   if ($emptyCount != count($col)) {
    	      //$metarow[] = $col;
 	   } //if
 
@@ -266,17 +266,17 @@ 
    return $metarow;
 }
 
-function applyRules($moduleDir, $section=array()) {
+function applyRules($moduleDir, $section = array()) {
    require_once('include/SugarFields/Parsers/Rules/BaseRule.php');
    $baseRule = new BaseRule();
-   if(!is_array($section)) {
+   if (!is_array($section)) {
    	  $GLOBALS['log']->error("Error: SearchFormMetaParser->applyRules expects Array");
    	  return $section;
    }
 
-   foreach($section as $key=>$row) {
+   foreach ($section as $key=>$row) {
    	  //Override email1 fields
-   	  if($baseRule->matches($row, '/^email1$/si')) {
+   	  if ($baseRule->matches($row, '/^email1$/si')) {
    	  	 $section[$key] = array('name' => 'email', 'label' =>'LBL_ANY_EMAIL', 'type' => 'name');
    	  }
    }

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($seed, $module, $subPanel, $options);

include/SugarFields/Parsers/QuickCreateMetaParser.php

Spacing +40 added lines, -40 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.
@@ -58,9 +58,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function QuickCreateMetaParser(){
+    function QuickCreateMetaParser() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -80,29 +80,29 @@ 
  * @param $masterCopy The file path of the mater copy of the metadata file to merge against
  * @return String format of metadata contents
  **/
-function parse($filePath, $vardefs = array(), $moduleDir = '', $merge=false, $masterCopy=null) {
+function parse($filePath, $vardefs = array(), $moduleDir = '', $merge = false, $masterCopy = null) {
 
    global $app_strings;
    $contents = file_get_contents($filePath);
 
    // The contents are not well formed so we add this section to make it easier to parse
-   $contents = $this->trimHTML($contents) . '</td></tr></table>';
+   $contents = $this->trimHTML($contents).'</td></tr></table>';
    $moduleName = '';
 
    $forms = $this->getElementsByType("form", $contents);
-   $tables = $this->getElementsByType("table", $forms[0] . "</td></tr></table>");
+   $tables = $this->getElementsByType("table", $forms[0]."</td></tr></table>");
    $mainrow = $this->getElementsByType("tr", $tables[1]);
    $rows = substr($mainrow[0], strpos($mainrow[0], "</tr>"));
    $tablerows = $this->getElementsByType("tr", $rows);
 
-   foreach($tablerows as $trow) {
+   foreach ($tablerows as $trow) {
 
    	   $emptyCount = 0;
    	   $tablecolumns = $this->getElementsByType("td", $trow);
        $col = array();
        $slot = 0;
 
-	   foreach($tablecolumns as $tcols) {
+	   foreach ($tablecolumns as $tcols) {
 
 	   	  $sugarAttrLabel = $this->getTagAttribute("sugar", $tcols, "'^slot[^b]+$'");
 	   	  $sugarAttrValue = $this->getTagAttribute("sugar", $tcols, "'slot[0-9]+b$'");
@@ -113,13 +113,13 @@ 
 
           $slot++;
 
-          if($sugarAttrValue) {
+          if ($sugarAttrValue) {
 
 	   	  	 $spanValue = strtolower($this->getElementValue("span", $tcols));
-             if(empty($spanValue)) {
+             if (empty($spanValue)) {
                 $spanValue = strtolower($this->getElementValue("slot", $tcols));
              }
-             if(empty($spanValue)) {
+             if (empty($spanValue)) {
                 $spanValue = strtolower($this->getElementValue("td", $tcols));
              }
 
@@ -132,56 +132,56 @@ 
              $fields = null;
              $customCode = null;
 
-             if(!empty($customField)) {
+             if (!empty($customField)) {
                // If it's a custom field we just set the name
                $name = $customField;
 
-             } else if(empty($formElementNames) && preg_match_all('/[\{]([^\}]*?)[\}]/s', $spanValue, $matches, PREG_SET_ORDER)) {
+             } else if (empty($formElementNames) && preg_match_all('/[\{]([^\}]*?)[\}]/s', $spanValue, $matches, PREG_SET_ORDER)) {
 	   	  	   // We are here if the $spanValue did not contain a form element for editing.
 	   	  	   // We will assume that it is read only (since there were no edit form elements)
 
 
 	           // If there is more than one matching {} value then try to find the right one to key off
 	           // based on vardefs.php file.  Also, use the entire spanValue as customCode
-	           	if(count($matches) > 1) {
+	           	if (count($matches) > 1) {
 			       $name = $matches[0][1];
 			       $customCode = $spanValue;
-			       foreach($matches as $pair) {
-		   	  	 	   if(preg_match("/^(mod[\.]|app[\.]).*?/s", $pair[1])) {
+			       foreach ($matches as $pair) {
+		   	  	 	   if (preg_match("/^(mod[\.]|app[\.]).*?/s", $pair[1])) {
 		   	  	 	       $customCode = str_replace($pair[1], '$'.strtoupper($pair[1]), $customCode);
-		   	  	 	   } else if(!empty($vardefs[$pair[1]])) {
+		   	  	 	   } else if (!empty($vardefs[$pair[1]])) {
 		   	  	 	       $name = $pair[1];
 		   	  	 	       $customCode = str_replace($pair[1], '$fields.'.$pair[1].'.value', $customCode);
 		   	  	 	   }
 		           } //foreach
 		       } else {
 		       	   //If it is only a label, skip
-		       	   if(preg_match("/^(mod[\.]|app[\.]).*?/s", $matches[0][1])) {
+		       	   if (preg_match("/^(mod[\.]|app[\.]).*?/s", $matches[0][1])) {
 		       	   	  continue;
-		       	   } else if(preg_match("/^[\$].*?/s", $matches[0][1])) {
-		       	   	  $name = '{' . strtoupper($matches[0][1]) . '}';
+		       	   } else if (preg_match("/^[\$].*?/s", $matches[0][1])) {
+		       	   	  $name = '{'.strtoupper($matches[0][1]).'}';
 		       	   } else {
 		   	  	   	  $name = $matches[0][1];
 		       	   }
 		   	   }
 
 		   	   $readOnly = true;
-	   	  	 } else if(is_array($formElementNames)) {
+	   	  	 } else if (is_array($formElementNames)) {
 
-	   	  	      if(count($formElementNames) == 1) {
-	   	  	      	 if(!empty($vardefs[$formElementNames[0]])) {
+	   	  	      if (count($formElementNames) == 1) {
+	   	  	      	 if (!empty($vardefs[$formElementNames[0]])) {
 	   	  	            $name = $formElementNames[0];
 	   	  	      	 }
 	   	  	      } else {
 	   	  	      	 $fields = array();
-	   	  	      	 foreach($formElementNames as $elementName) {
+	   	  	      	 foreach ($formElementNames as $elementName) {
 	   	  	      	 	// What we are doing here is saying that we will add all your fields assuming
 	   	  	      	 	// there are none that are of type relate or link.  However, if we find such a type
 	   	  	      	 	// we'll take the first one found and assume that is the field you want (the SugarFields
 	   	  	      	 	// library will handle rendering the popup and select and clear buttons for you).
-	   	  	      	 	if(isset($vardefs[$elementName])) {
+	   	  	      	 	if (isset($vardefs[$elementName])) {
 	   	  	      	 	   $type = $vardefs[$elementName]['type'];
-	   	  	      	 	   if($type != 'relate' && $type != 'link') {
+	   	  	      	 	   if ($type != 'relate' && $type != 'link') {
 	   	  	      	 	      $fields[] = $elementName;
 	   	  	      	 	      $name = $elementName;
 	   	  	      	 	   } else {
@@ -195,13 +195,13 @@ 
 	   	  	 }
 
 	   	  	 // Build the entry
-	   	  	 if(preg_match("/<textarea/si", $spanValue)) {
+	   	  	 if (preg_match("/<textarea/si", $spanValue)) {
 	   	  	 	//special case for textarea form elements (add the displayParams)
 	   	  	 	$displayParams = array();
 	   	  	    $displayParams['rows'] = $this->getTagAttribute("rows", $spanValue);
 	   	  	    $displayParams['cols'] = $this->getTagAttribute("cols", $spanValue);
 
-	   	  	    if(!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
+	   	  	    if (!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
 		   	  	    $field = array();
 		   	  	    $field['name'] = $name;
 					$field['displayParams'] = $displayParams;
@@ -209,23 +209,23 @@ 
 	   	  	        $field = $name;
 	   	  	    }
 	   	  	    $col[] = $field;
-	   	  	 } else if($readOnly) {
+	   	  	 } else if ($readOnly) {
 	   	  	 	$field = array();
 	   	  	 	$field['name'] = $name;
 	   	  	 	$field['type'] = 'readonly';
-	   	  	 	if(isset($customCode)) {
+	   	  	 	if (isset($customCode)) {
 	   	  	 	   $field['customCode'] = $customCode;
 	   	  	 	} //if
 	   	  	 	$col[] = $field;
 	   	  	 } else {
 
-	   	  	 	if(isset($fields) || isset($customCode)) {
+	   	  	 	if (isset($fields) || isset($customCode)) {
 	   	  	 	   $field = array();
 	   	  	 	   $field['name'] = $name;
-	   	  	 	   if(isset($fields)) {
+	   	  	 	   if (isset($fields)) {
 	   	  	 	   	  $field['fields'] = $fields;
 	   	  	 	   }
-	   	  	 	   if(isset($customCode)) {
+	   	  	 	   if (isset($customCode)) {
 	   	  	 	   	  $field['customCode'] = $customCode;
 	   	  	 	   }
 
@@ -239,7 +239,7 @@ 
 	   } //foreach
 
 	   // One last final check.  If $emptyCount does not equal Array $col count, don't add
-	   if($emptyCount != count($col)) {
+	   if ($emptyCount != count($col)) {
    	      $metarow[] = $col;
 	   } //if
    } //foreach
@@ -249,26 +249,26 @@ 
 
    preg_match_all("/(<input[^>]*?)>/si", $tables[0], $matches);
    $buttons = array();
-   foreach($matches[0] as $button) {
+   foreach ($matches[0] as $button) {
    		$buttons[] = array('customCode'=>$button);
    }
    $templateMeta['form']['buttons'] = $buttons;
 
    $formElements = $this->getFormElements($contents);
    $hiddenInputs = array();
-   foreach($formElements as $elem) {
+   foreach ($formElements as $elem) {
    	      $type = $this->getTagAttribute("type", $elem);
-   	      if(preg_match('/hidden/si',$type, $matches)) {
+   	      if (preg_match('/hidden/si', $type, $matches)) {
    	         $name = $this->getTagAttribute("name", $elem);
    	         $value = $this->getTagAttribute("value", $elem);
    	         $index = stripos($value, '$REQUEST');
-   	         $value =  !empty($index) ? '$smarty.request.' . substr($value, 10) : $value;
-   	         $hiddenInputs[] = '<input id="' . $name . '" name="' . $name . '" value="' . $value . '">';
+   	         $value = !empty($index) ? '$smarty.request.'.substr($value, 10) : $value;
+   	         $hiddenInputs[] = '<input id="'.$name.'" name="'.$name.'" value="'.$value.'">';
    	      }
    } //foreach
 
    $templateMeta['form']['hidden'] = $hiddenInputs;
-   $templateMeta['widths'] = array(array('label' => '10', 'field' => '30'),  array('label' => '10', 'field' => '30'));
+   $templateMeta['widths'] = array(array('label' => '10', 'field' => '30'), array('label' => '10', 'field' => '30'));
    $templateMeta['maxColumns'] = 2;
 
    $panels = array();

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();

include/SugarFields/SugarFieldHandler.php

Indentation +43 added lines, -43 removed lines

@@ -64,24 +64,24 @@ 
 
     static function fixupFieldType($field) {
             switch($field) {
-               case 'double':
+                case 'double':
                case 'decimal':
                     $field = 'float';
                     break;
-               case 'uint':
+                case 'uint':
                case 'ulong':
                case 'long':
                case 'short':
                case 'tinyint':
                     $field = 'int';
                     break;
-               case 'date':
+                case 'date':
                     $field = 'datetime';
                     break;
-               case 'url':
-               		$field = 'link';
-               		break;
-               case 'varchar':
+                case 'url':
+                       $field = 'link';
+                        break;
+                case 'varchar':
                     $field = 'base';
                     break;
             }
@@ -101,34 +101,34 @@ 
         $field = ucfirst($field);
 
         if(!isset($sugarFieldObjects[$field])) {
-        	//check custom directory
-        	if(file_exists('custom/include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
-        		$file = 'custom/include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
+            //check custom directory
+            if(file_exists('custom/include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
+                $file = 'custom/include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
                 $type = $field;
-			//else check the fields directory
-			}else if(file_exists('include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
-           		$file = 'include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
+            //else check the fields directory
+            }else if(file_exists('include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
+                    $file = 'include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
                 $type = $field;
-        	}else{
+            }else{
                 // No direct class, check the directories to see if they are defined
-        		if( $returnNullIfBase &&
+                if( $returnNullIfBase &&
                     !is_dir('custom/include/SugarFields/Fields/'.$field) &&
                     !is_dir('include/SugarFields/Fields/'.$field) ) {
                     return null;
                 }
-        		$file = 'include/SugarFields/Fields/Base/SugarFieldBase.php';
+                $file = 'include/SugarFields/Fields/Base/SugarFieldBase.php';
                 $type = 'Base';
-        	}
-			require_once($file);
-
-			$class = 'SugarField' . $type;
-			//could be a custom class check it
-			$customClass = 'Custom' . $class;
-        	if(class_exists($customClass)){
-        		$sugarFieldObjects[$field] = new $customClass($field);
-        	}else{
-        		$sugarFieldObjects[$field] = new $class($field);
-        	}
+            }
+            require_once($file);
+
+            $class = 'SugarField' . $type;
+            //could be a custom class check it
+            $customClass = 'Custom' . $class;
+            if(class_exists($customClass)){
+                $sugarFieldObjects[$field] = new $customClass($field);
+            }else{
+                $sugarFieldObjects[$field] = new $class($field);
+            }
         }
         return $sugarFieldObjects[$field];
     }
@@ -149,22 +149,22 @@ 
         $string = '';
         $displayTypeFunc = 'get' . $displayType . 'Smarty'; // getDetailViewSmarty, getEditViewSmarty, etc...
 
-		// This will handle custom type fields.
-		// The incoming $vardef Array may have custom_type set.
-		// If so, set $vardef['type'] to the $vardef['custom_type'] value
-		if(isset($vardef['custom_type'])) {
-		   $vardef['type'] = $vardef['custom_type'];
-		}
-		if(empty($vardef['type'])) {
-			$vardef['type'] = 'varchar';
-		}
-
-		$field = self::getSugarField($vardef['type']);
-		if ( !empty($vardef['function']) ) {
-			$string = $field->displayFromFunc($displayType, $parentFieldArray, $vardef, $displayParams, $tabindex);
-		} else {
-			$string = $field->$displayTypeFunc($parentFieldArray, $vardef, $displayParams, $tabindex);
-		}
+        // This will handle custom type fields.
+        // The incoming $vardef Array may have custom_type set.
+        // If so, set $vardef['type'] to the $vardef['custom_type'] value
+        if(isset($vardef['custom_type'])) {
+            $vardef['type'] = $vardef['custom_type'];
+        }
+        if(empty($vardef['type'])) {
+            $vardef['type'] = 'varchar';
+        }
+
+        $field = self::getSugarField($vardef['type']);
+        if ( !empty($vardef['function']) ) {
+            $string = $field->displayFromFunc($displayType, $parentFieldArray, $vardef, $displayParams, $tabindex);
+        } else {
+            $string = $field->$displayTypeFunc($parentFieldArray, $vardef, $displayParams, $tabindex);
+        }
 
         return $string;
     }

Spacing +20 added lines, -20 removed lines

@@ -50,9 +50,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function SugarFieldHandler(){
+    function SugarFieldHandler() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -63,7 +63,7 @@ 
 
 
     static function fixupFieldType($field) {
-            switch($field) {
+            switch ($field) {
                case 'double':
                case 'decimal':
                     $field = 'float';
@@ -94,26 +94,26 @@ 
      *
      * @param field string field type
      */
-    static function getSugarField($field, $returnNullIfBase=false) {
+    static function getSugarField($field, $returnNullIfBase = false) {
         static $sugarFieldObjects = array();
 
         $field = self::fixupFieldType($field);
         $field = ucfirst($field);
 
-        if(!isset($sugarFieldObjects[$field])) {
+        if (!isset($sugarFieldObjects[$field])) {
         	//check custom directory
-        	if(file_exists('custom/include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
-        		$file = 'custom/include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
+        	if (file_exists('custom/include/SugarFields/Fields/'.$field.'/SugarField'.$field.'.php')) {
+        		$file = 'custom/include/SugarFields/Fields/'.$field.'/SugarField'.$field.'.php';
                 $type = $field;
 			//else check the fields directory
-			}else if(file_exists('include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
-           		$file = 'include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
+			} else if (file_exists('include/SugarFields/Fields/'.$field.'/SugarField'.$field.'.php')) {
+           		$file = 'include/SugarFields/Fields/'.$field.'/SugarField'.$field.'.php';
                 $type = $field;
-        	}else{
+        	} else {
                 // No direct class, check the directories to see if they are defined
-        		if( $returnNullIfBase &&
+        		if ($returnNullIfBase &&
                     !is_dir('custom/include/SugarFields/Fields/'.$field) &&
-                    !is_dir('include/SugarFields/Fields/'.$field) ) {
+                    !is_dir('include/SugarFields/Fields/'.$field)) {
                     return null;
                 }
         		$file = 'include/SugarFields/Fields/Base/SugarFieldBase.php';
@@ -121,12 +121,12 @@ 
         	}
 			require_once($file);
 
-			$class = 'SugarField' . $type;
+			$class = 'SugarField'.$type;
 			//could be a custom class check it
-			$customClass = 'Custom' . $class;
-        	if(class_exists($customClass)){
+			$customClass = 'Custom'.$class;
+        	if (class_exists($customClass)) {
         		$sugarFieldObjects[$field] = new $customClass($field);
-        	}else{
+        	} else {
         		$sugarFieldObjects[$field] = new $class($field);
         	}
         }
@@ -147,20 +147,20 @@ 
      */
     static function displaySmarty($parentFieldArray, $vardef, $displayType, $displayParams = array(), $tabindex = 1) {
         $string = '';
-        $displayTypeFunc = 'get' . $displayType . 'Smarty'; // getDetailViewSmarty, getEditViewSmarty, etc...
+        $displayTypeFunc = 'get'.$displayType.'Smarty'; // getDetailViewSmarty, getEditViewSmarty, etc...
 
 		// This will handle custom type fields.
 		// The incoming $vardef Array may have custom_type set.
 		// If so, set $vardef['type'] to the $vardef['custom_type'] value
-		if(isset($vardef['custom_type'])) {
+		if (isset($vardef['custom_type'])) {
 		   $vardef['type'] = $vardef['custom_type'];
 		}
-		if(empty($vardef['type'])) {
+		if (empty($vardef['type'])) {
 			$vardef['type'] = 'varchar';
 		}
 
 		$field = self::getSugarField($vardef['type']);
-		if ( !empty($vardef['function']) ) {
+		if (!empty($vardef['function'])) {
 			$string = $field->displayFromFunc($displayType, $parentFieldArray, $vardef, $displayParams, $tabindex);
 		} else {
 			$string = $field->$displayTypeFunc($parentFieldArray, $vardef, $displayParams, $tabindex);

Braces +4 added lines, -5 removed lines

@@ -54,8 +54,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -106,10 +105,10 @@ 
         		$file = 'custom/include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
                 $type = $field;
 			//else check the fields directory
-			}else if(file_exists('include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
+			} else if(file_exists('include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
            		$file = 'include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
                 $type = $field;
-        	}else{
+        	} else{
                 // No direct class, check the directories to see if they are defined
         		if( $returnNullIfBase &&
                     !is_dir('custom/include/SugarFields/Fields/'.$field) &&
@@ -126,7 +125,7 @@ 
 			$customClass = 'Custom' . $class;
         	if(class_exists($customClass)){
         		$sugarFieldObjects[$field] = new $customClass($field);
-        	}else{
+        	} else{
         		$sugarFieldObjects[$field] = new $class($field);
         	}
         }