adamjakab / SuiteCRM

include/MVC/Controller/ControllerFactory.php

Indentation +37 added lines, -37 removed lines

@@ -44,43 +44,43 @@
  */
 class ControllerFactory
 {
-	/**
-	 * Obtain an instance of the correct controller.
-	 *
-	 * @return an instance of SugarController
-	 */
-	static function getController($module){
-		$class = ucfirst($module).'Controller';
-		$customClass = 'Custom' . $class;
-		if(file_exists('custom/modules/'.$module.'/controller.php')){
-			$customClass = 'Custom' . $class;
-			require_once('custom/modules/'.$module.'/controller.php');
-			if(class_exists($customClass)){
-				$controller = new $customClass();
-			}else if(class_exists($class)){
-				$controller = new $class();
-			}
-		}elseif(file_exists('modules/'.$module.'/controller.php')){
-			require_once('modules/'.$module.'/controller.php');
-			if(class_exists($customClass)){
-				$controller = new $customClass();
-			}else if(class_exists($class)){
-				$controller = new $class();
-			}
-		}else{
-			if(file_exists('custom/include/MVC/Controller/SugarController.php')){
-				require_once('custom/include/MVC/Controller/SugarController.php');
-			}
-			if(class_exists('CustomSugarController')){
-				$controller = new CustomSugarController();
-			}else{
-			$controller = new SugarController();
-			}
-		}
-		//setup the controller
-		$controller->setup($module);
-		return $controller;
-	}
+    /**
+     * Obtain an instance of the correct controller.
+     *
+     * @return an instance of SugarController
+     */
+    static function getController($module){
+        $class = ucfirst($module).'Controller';
+        $customClass = 'Custom' . $class;
+        if(file_exists('custom/modules/'.$module.'/controller.php')){
+            $customClass = 'Custom' . $class;
+            require_once('custom/modules/'.$module.'/controller.php');
+            if(class_exists($customClass)){
+                $controller = new $customClass();
+            }else if(class_exists($class)){
+                $controller = new $class();
+            }
+        }elseif(file_exists('modules/'.$module.'/controller.php')){
+            require_once('modules/'.$module.'/controller.php');
+            if(class_exists($customClass)){
+                $controller = new $customClass();
+            }else if(class_exists($class)){
+                $controller = new $class();
+            }
+        }else{
+            if(file_exists('custom/include/MVC/Controller/SugarController.php')){
+                require_once('custom/include/MVC/Controller/SugarController.php');
+            }
+            if(class_exists('CustomSugarController')){
+                $controller = new CustomSugarController();
+            }else{
+            $controller = new SugarController();
+            }
+        }
+        //setup the controller
+        $controller->setup($module);
+        return $controller;
+    }
 
 }
 ?>
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -49,31 +49,31 @@
 	 *
 	 * @return an instance of SugarController
 	 */
-	static function getController($module){
+	static function getController($module) {
 		$class = ucfirst($module).'Controller';
-		$customClass = 'Custom' . $class;
-		if(file_exists('custom/modules/'.$module.'/controller.php')){
-			$customClass = 'Custom' . $class;
+		$customClass = 'Custom'.$class;
+		if (file_exists('custom/modules/'.$module.'/controller.php')) {
+			$customClass = 'Custom'.$class;
 			require_once('custom/modules/'.$module.'/controller.php');
-			if(class_exists($customClass)){
+			if (class_exists($customClass)) {
 				$controller = new $customClass();
-			}else if(class_exists($class)){
+			} else if (class_exists($class)) {
 				$controller = new $class();
 			}
-		}elseif(file_exists('modules/'.$module.'/controller.php')){
+		}elseif (file_exists('modules/'.$module.'/controller.php')) {
 			require_once('modules/'.$module.'/controller.php');
-			if(class_exists($customClass)){
+			if (class_exists($customClass)) {
 				$controller = new $customClass();
-			}else if(class_exists($class)){
+			} else if (class_exists($class)) {
 				$controller = new $class();
 			}
-		}else{
-			if(file_exists('custom/include/MVC/Controller/SugarController.php')){
+		} else {
+			if (file_exists('custom/include/MVC/Controller/SugarController.php')) {
 				require_once('custom/include/MVC/Controller/SugarController.php');
 			}
-			if(class_exists('CustomSugarController')){
+			if (class_exists('CustomSugarController')) {
 				$controller = new CustomSugarController();
-			}else{
+			} else {
 			$controller = new SugarController();
 			}
 		}

Braces +5 added lines, -5 removed lines

@@ -57,23 +57,23 @@
 			require_once('custom/modules/'.$module.'/controller.php');
 			if(class_exists($customClass)){
 				$controller = new $customClass();
-			}else if(class_exists($class)){
+			} else if(class_exists($class)){
 				$controller = new $class();
 			}
-		}elseif(file_exists('modules/'.$module.'/controller.php')){
+		} elseif(file_exists('modules/'.$module.'/controller.php')){
 			require_once('modules/'.$module.'/controller.php');
 			if(class_exists($customClass)){
 				$controller = new $customClass();
-			}else if(class_exists($class)){
+			} else if(class_exists($class)){
 				$controller = new $class();
 			}
-		}else{
+		} else{
 			if(file_exists('custom/include/MVC/Controller/SugarController.php')){
 				require_once('custom/include/MVC/Controller/SugarController.php');
 			}
 			if(class_exists('CustomSugarController')){
 				$controller = new CustomSugarController();
-			}else{
+			} else{
 			$controller = new SugarController();
 			}
 		}

include/MVC/Controller/SugarController.php

Indentation +678 added lines, -678 removed lines

@@ -44,247 +44,247 @@ 
  * @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.
-	 */
-	function SugarController(){
-	}
+    /**
+     * 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'
+                                        );
 
-	/**
-	 * 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;
-	}
+    /**
+     * Constructor. This ie meant tot load up the module, action, record as well
+     * as the mapping arrays.
+     */
+    function SugarController(){
+    }
 
-	/**
-	 * 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'];
-	}
+    /**
+     * 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;
+    }
 
-	/**
-	 * 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);
-	}
+    /**
+     * 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'];
+    }
 
-	/**
-	 * 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;
-				}
-			}
-		}
-	}
+    /**
+     * 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);
+    }
 
-	/**
-	 * 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');
-			}
+    /**
+     * 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');
+            }
 
             // 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
@@ -296,7 +296,7 @@ 
             }
             elseif(!empty($this->redirect_url))
             {
-            			$this->redirect();
+                        $this->redirect();
             }
         }
         catch (Exception $e)
@@ -306,12 +306,12 @@ 
 
 
 
-	}
+    }
 
     /**
-      * Handle exception
-      * @param Exception $e
-      */
+     * Handle exception
+     * @param Exception $e
+     */
     protected function handleException(Exception $e)
     {
         $GLOBALS['log']->fatal('Exception in Controller: ' . $e->getMessage());
@@ -328,52 +328,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()
+    {}
 
-		//check to ensure we have access to the module.
-		if($this->hasAccess){
-			$this->do_action = $this->action;
+    /**
+     * 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;
 
-			$file = self::getActionFilename($this->do_action);
+        //check to ensure we have access to the module.
+        if($this->hasAccess){
+            $this->do_action = $this->action;
 
-			$this->loadBean();
+            $file = self::getActionFilename($this->do_action);
 
-			$processed = false;
+            $this->loadBean();
+
+            $processed = false;
             if (!$this->_processed) {
                 foreach ($this->process_tasks as $process) {
                     $this->$process();
@@ -383,173 +383,173 @@ 
                 }
             }
 
-			$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);
-		}
-		$this->bean->unformat_all_fields();
-	}
+        }
 
-	/**
-	 * 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);
+        }
+        $this->bean->unformat_all_fields();
+    }
+
+    /**
+     * Perform the actual save
+     */
+    public function action_save(){
+        $this->bean->save(!empty($this->bean->notify_on_save));
+    }
 
 
     public function action_spot()
@@ -558,43 +558,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'] :
@@ -610,23 +610,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
@@ -652,35 +652,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';
+    }
 
 /*
 
@@ -689,63 +689,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
@@ -775,84 +775,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
@@ -870,67 +870,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 +146 added lines, -151 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,7 +162,7 @@ 
 	 * Constructor. This ie meant tot load up the module, action, record as well
 	 * as the mapping arrays.
 	 */
-	function SugarController(){
+	function SugarController() {
 	}
 
 	/**
@@ -170,14 +170,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
@@ -190,7 +190,7 @@ 
 	 *
 	 * @param object $module
 	 */
-	public function setModule($module){
+	public function setModule($module) {
 		$this->module = $module;
 	}
 
@@ -198,18 +198,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'];
 	}
 
@@ -217,7 +217,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);
@@ -228,14 +228,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;
 				}
 			}
@@ -245,38 +245,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;
 	}
@@ -290,11 +290,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();
             }
@@ -314,7 +314,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))
@@ -331,18 +331,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();
@@ -361,12 +361,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);
@@ -384,7 +384,7 @@ 
             }
 
 			$this->redirect();
-		}else{
+		} else {
 			$this->no_access();
 		}
 	}
@@ -398,9 +398,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;
@@ -410,9 +410,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;
@@ -424,9 +424,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;
@@ -438,9 +438,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;
@@ -451,14 +451,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';
 	}
 
@@ -471,7 +471,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);
 	}
 
@@ -481,7 +481,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;
 	}
 
@@ -489,9 +489,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);
 	}
 
@@ -506,38 +506,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);
 		}
@@ -547,7 +547,7 @@ 
 	/**
 	 * Perform the actual save
 	 */
-	public function action_save(){
+	public function action_save() {
 		$this->bean->save(!empty($this->bean->notify_on_save));
 	}
 
@@ -561,7 +561,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);
@@ -577,16 +577,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");
 		}
 	}
@@ -594,24 +594,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'];
 		}
 
@@ -620,15 +617,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");
@@ -636,40 +633,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 = 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);
@@ -677,7 +672,7 @@ 
 	/**
 	 * Perform the listview action
 	 */
-	protected function action_listview(){
+	protected function action_listview() {
 		$this->view_object_map['bean'] = $this->bean;
 		$this->view = 'list';
 	}
@@ -692,24 +687,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 {
@@ -722,22 +717,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())));
 
 		    }
@@ -761,7 +756,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";
@@ -779,7 +774,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;
@@ -796,40 +791,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;
 	}
 
@@ -841,12 +836,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 = '';
@@ -864,8 +859,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;
     }
@@ -877,26 +872,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;
 		}
@@ -907,17 +902,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();
 	}
 
@@ -925,8 +920,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 +52 added lines, -46 removed lines

@@ -171,11 +171,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'];
@@ -199,18 +201,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'];
+		}
 	}
 
 	/**
@@ -235,8 +243,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;
+					}
 				}
 			}
 		}
@@ -250,7 +259,7 @@ 
 		if(!$$var){
 			if($merge && !empty($this->$var)){
 				$$var = $this->$var;
-			}else{
+			} else{
 				$$var = array();
 			}
 			if(file_exists('include/MVC/Controller/'. $var . '.php')){
@@ -293,13 +302,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);
         }
@@ -321,8 +328,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);
         }
@@ -384,7 +390,7 @@ 
             }
 
 			$this->redirect();
-		}else{
+		} else{
 			$this->no_access();
 		}
 	}
@@ -491,8 +497,9 @@ 
 	 */
 	protected function redirect(){
 
-		if(!empty($this->redirect_url))
-			SugarApplication::redirect($this->redirect_url);
+		if(!empty($this->redirect_url)) {
+					SugarApplication::redirect($this->redirect_url);
+		}
 	}
 
 	////////////////////////////////////////////////////////
@@ -586,7 +593,7 @@ 
 				sugar_cleanup(true);
 			}
 			$this->bean->mark_deleted($_REQUEST['record']);
-		}else{
+		} else{
 			sugar_die("A record number must be specified to delete");
 		}
 	}
@@ -652,7 +659,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");
 		}
 	}
@@ -711,8 +718,7 @@ 
 
 		        if(method_exists($dashlet, $requestedMethod) || method_exists($dashlet, '__call')) {
 		            echo $dashlet->$requestedMethod();
-		        }
-		        else {
+		        } else {
 		            echo 'no method';
 		        }
 		    }
@@ -734,15 +740,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';
 		}
 	}
@@ -824,13 +828,14 @@ 
 						$this->_processed = true;
 						$this->no_access();
 					}
-				}else{
+				} else{
 					$this->_processed = true;
 					$this->no_access();
 				}
 			}
-		}else
-			$this->_processed = false;
+		} else {
+					$this->_processed = false;
+		}
 	}
 
 	/**
@@ -865,8 +870,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;
     }
 
@@ -879,8 +885,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
@@ -913,12 +918,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/Controller/entry_point_registry.php

Indentation +24 added lines, -24 removed lines

@@ -39,19 +39,19 @@ 
  ********************************************************************************/
 
 $entry_point_registry = array(
-	'emailImage' => array('file' => 'modules/EmailMan/EmailImage.php', 'auth' => false),
-	'download' => array('file' => 'download.php', 'auth' => true),
-	'export' => array('file' => 'export.php', 'auth' => true),
-	'export_dataset' => array('file' => 'export_dataset.php', 'auth' => true),
-	'Changenewpassword' => array('file' => 'modules/Users/Changenewpassword.php', 'auth' => false),
-	'GeneratePassword' => array('file' => 'modules/Users/GeneratePassword.php', 'auth' => false),
-	'vCard' => array('file' => 'vCard.php', 'auth' => true),
-	'pdf' => array('file' => 'pdf.php', 'auth' => true),
-	'minify' => array('file' => 'jssource/minify.php', 'auth' => true),
+    'emailImage' => array('file' => 'modules/EmailMan/EmailImage.php', 'auth' => false),
+    'download' => array('file' => 'download.php', 'auth' => true),
+    'export' => array('file' => 'export.php', 'auth' => true),
+    'export_dataset' => array('file' => 'export_dataset.php', 'auth' => true),
+    'Changenewpassword' => array('file' => 'modules/Users/Changenewpassword.php', 'auth' => false),
+    'GeneratePassword' => array('file' => 'modules/Users/GeneratePassword.php', 'auth' => false),
+    'vCard' => array('file' => 'vCard.php', 'auth' => true),
+    'pdf' => array('file' => 'pdf.php', 'auth' => true),
+    'minify' => array('file' => 'jssource/minify.php', 'auth' => true),
     'json_server' => array('file' => 'json_server.php', 'auth' => true),
     'get_url' => array('file' => 'get_url.php', 'auth' => true),
-	'HandleAjaxCall' => array('file' => 'HandleAjaxCall.php', 'auth' => true),
-	'TreeData' => array('file' => 'TreeData.php', 'auth' => true),
+    'HandleAjaxCall' => array('file' => 'HandleAjaxCall.php', 'auth' => true),
+    'TreeData' => array('file' => 'TreeData.php', 'auth' => true),
     'image' => array('file' => 'modules/Campaigns/image.php', 'auth' => false),
     'campaign_trackerv2' => array('file' => 'modules/Campaigns/Tracker.php', 'auth' => false),
     'WebToLeadCapture' => array('file' => 'modules/Campaigns/WebToLeadCapture.php', 'auth' => false),
@@ -59,7 +59,7 @@ 
     'acceptDecline' => array('file' => 'modules/Contacts/AcceptDecline.php', 'auth' => false),
     'leadCapture' => array('file' => 'modules/Leads/Capture.php', 'auth' => false),
     'process_queue' => array('file' => 'process_queue.php', 'auth' => true),
-	'zipatcher' => array('file' => 'zipatcher.php', 'auth' => true),
+    'zipatcher' => array('file' => 'zipatcher.php', 'auth' => true),
     'mm_get_doc' => array('file' => 'modules/MailMerge/get_doc.php', 'auth' => true),
     'getImage' => array('file' => 'include/SugarTheme/getImage.php', 'auth' => false),
     'GenerateQuickComposeFrame' => array('file' => 'modules/Emails/GenerateQuickComposeFrame.php', 'auth' => true),
@@ -68,18 +68,18 @@ 
     'UploadFileCheck' => array('file' => 'modules/Configurator/UploadFileCheck.php', 'auth' => true),
     'SAML'=>  array('file' => 'modules/Users/authentication/SAMLAuthenticate/index.php', 'auth' => false),
     'jslang'=> array('file' => 'include/language/getJSLanguage.php', 'auth' => true),
-	'deleteAttachment' => array('file' => 'modules/FP_events/responseEntryPoint.php', 'auth' => false),
-	'responseEntryPoint' => array('file' => 'modules/FP_events/responseEntryPoint.php', 'auth' => false),
-	'formLetter' => array('file' => 'modules/AOS_PDF_Templates/formLetterPdf.php' , 'auth' => true),
-	'generatePdf' => array('file' => 'modules/AOS_PDF_Templates/generatePdf.php' , 'auth' => true),
-	'Reschedule' => array('file' => 'modules/Calls_Reschedule/Reschedule_popup.php' , 'auth' => true),
-	'Reschedule2' => array('file' => 'modules/Calls/Reschedule.php' , 'auth' => true),
-	'social' => array('file' => 'include/social/get_data.php' , 'auth' => true),
-	'social_reader' => array('file' => 'include/social/get_feed_data.php' , 'auth' => true),
-	'add_dash_page' => array('file' => 'modules/Home/AddDashboardPages.php' , 'auth' => true),
-	'retrieve_dash_page' => array('file' => 'include/MySugar/retrieve_dash_page.php' , 'auth' => true),
-	'remove_dash_page' => array('file' => 'modules/Home/RemoveDashboardPages.php' , 'auth' => true),
-	'rename_dash_page' => array('file' => 'modules/Home/RenameDashboardPages.php' , 'auth' => true)
+    'deleteAttachment' => array('file' => 'modules/FP_events/responseEntryPoint.php', 'auth' => false),
+    'responseEntryPoint' => array('file' => 'modules/FP_events/responseEntryPoint.php', 'auth' => false),
+    'formLetter' => array('file' => 'modules/AOS_PDF_Templates/formLetterPdf.php' , 'auth' => true),
+    'generatePdf' => array('file' => 'modules/AOS_PDF_Templates/generatePdf.php' , 'auth' => true),
+    'Reschedule' => array('file' => 'modules/Calls_Reschedule/Reschedule_popup.php' , 'auth' => true),
+    'Reschedule2' => array('file' => 'modules/Calls/Reschedule.php' , 'auth' => true),
+    'social' => array('file' => 'include/social/get_data.php' , 'auth' => true),
+    'social_reader' => array('file' => 'include/social/get_feed_data.php' , 'auth' => true),
+    'add_dash_page' => array('file' => 'modules/Home/AddDashboardPages.php' , 'auth' => true),
+    'retrieve_dash_page' => array('file' => 'include/MySugar/retrieve_dash_page.php' , 'auth' => true),
+    'remove_dash_page' => array('file' => 'modules/Home/RemoveDashboardPages.php' , 'auth' => true),
+    'rename_dash_page' => array('file' => 'modules/Home/RenameDashboardPages.php' , 'auth' => true)
 );
 
 ?>

Spacing +11 added lines, -11 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.
@@ -70,16 +70,16 @@ 
     'jslang'=> array('file' => 'include/language/getJSLanguage.php', 'auth' => true),
 	'deleteAttachment' => array('file' => 'modules/FP_events/responseEntryPoint.php', 'auth' => false),
 	'responseEntryPoint' => array('file' => 'modules/FP_events/responseEntryPoint.php', 'auth' => false),
-	'formLetter' => array('file' => 'modules/AOS_PDF_Templates/formLetterPdf.php' , 'auth' => true),
-	'generatePdf' => array('file' => 'modules/AOS_PDF_Templates/generatePdf.php' , 'auth' => true),
-	'Reschedule' => array('file' => 'modules/Calls_Reschedule/Reschedule_popup.php' , 'auth' => true),
-	'Reschedule2' => array('file' => 'modules/Calls/Reschedule.php' , 'auth' => true),
-	'social' => array('file' => 'include/social/get_data.php' , 'auth' => true),
-	'social_reader' => array('file' => 'include/social/get_feed_data.php' , 'auth' => true),
-	'add_dash_page' => array('file' => 'modules/Home/AddDashboardPages.php' , 'auth' => true),
-	'retrieve_dash_page' => array('file' => 'include/MySugar/retrieve_dash_page.php' , 'auth' => true),
-	'remove_dash_page' => array('file' => 'modules/Home/RemoveDashboardPages.php' , 'auth' => true),
-	'rename_dash_page' => array('file' => 'modules/Home/RenameDashboardPages.php' , 'auth' => true)
+	'formLetter' => array('file' => 'modules/AOS_PDF_Templates/formLetterPdf.php', 'auth' => true),
+	'generatePdf' => array('file' => 'modules/AOS_PDF_Templates/generatePdf.php', 'auth' => true),
+	'Reschedule' => array('file' => 'modules/Calls_Reschedule/Reschedule_popup.php', 'auth' => true),
+	'Reschedule2' => array('file' => 'modules/Calls/Reschedule.php', 'auth' => true),
+	'social' => array('file' => 'include/social/get_data.php', 'auth' => true),
+	'social_reader' => array('file' => 'include/social/get_feed_data.php', 'auth' => true),
+	'add_dash_page' => array('file' => 'modules/Home/AddDashboardPages.php', 'auth' => true),
+	'retrieve_dash_page' => array('file' => 'include/MySugar/retrieve_dash_page.php', 'auth' => true),
+	'remove_dash_page' => array('file' => 'modules/Home/RemoveDashboardPages.php', 'auth' => true),
+	'rename_dash_page' => array('file' => 'modules/Home/RenameDashboardPages.php', 'auth' => true)
 );
 
 ?>

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

include/MVC/Controller/action_view_map.php

Indentation +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
  * To change the template for this generated file go to
  * Window - Preferences - PHPeclipse - PHP - Code Templates
  */
- //format '<action_name>' => '<view_name>'
+    //format '<action_name>' => '<view_name>'
 $action_view_map['multieditview']= 'multiedit';
 $action_view_map['detailview']= 'detail';
 $action_view_map['editview']= 'edit';

Spacing +13 added lines, -13 removed lines

@@ -44,21 +44,21 @@
  * Window - Preferences - PHPeclipse - PHP - Code Templates
  */
  //format '<action_name>' => '<view_name>'
-$action_view_map['multieditview']= 'multiedit';
-$action_view_map['detailview']= 'detail';
-$action_view_map['editview']= 'edit';
-$action_view_map['listview']= 'list';
-$action_view_map['popup']= 'popup';
-$action_view_map['vcard']= 'vcard';
-$action_view_map['importvcard']= 'importvcard';
-$action_view_map['importvcardsave']= 'importvcardsave';
-$action_view_map['modulelistmenu']= 'modulelistmenu';
-$action_view_map['favorites']= 'favorites';
-$action_view_map['ajaxui']= 'ajaxui';
-$action_view_map['noaccess']= 'noaccess';
+$action_view_map['multieditview'] = 'multiedit';
+$action_view_map['detailview'] = 'detail';
+$action_view_map['editview'] = 'edit';
+$action_view_map['listview'] = 'list';
+$action_view_map['popup'] = 'popup';
+$action_view_map['vcard'] = 'vcard';
+$action_view_map['importvcard'] = 'importvcard';
+$action_view_map['importvcardsave'] = 'importvcardsave';
+$action_view_map['modulelistmenu'] = 'modulelistmenu';
+$action_view_map['favorites'] = 'favorites';
+$action_view_map['ajaxui'] = 'ajaxui';
+$action_view_map['noaccess'] = 'noaccess';
 
 // SugarPDF
-$action_view_map['sugarpdf']= 'sugarpdf';
+$action_view_map['sugarpdf'] = 'sugarpdf';
 $action_view_map['dc'] = 'dc';
 $action_view_map['dcajax'] = 'dcajax';
 $action_view_map['quick'] = 'quick';

include/MVC/Controller/file_access_control_map.php

Indentation +24 added lines, -24 removed lines

@@ -46,29 +46,29 @@
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 $file_access_control_map = array(
-	'modules' => array(
-		'administration' => array(
-			'actions' => array(
-				'backups',
-				'updater',
-			),
-			'links'	=> array(
-				'update',
-				'backup_management',
-				'upgrade_wizard',
-				'moduleBuilder',
-			),
-		),
-		'upgradewizard' => array(
-				'actions' => array(
-					'index',
-				),
-		),
-		'modulebuilder' => array(
-				'actions' => array(
-					'index' => array('params' => array('type' => array('mb'))),
-				),
-		),
-	)
+    'modules' => array(
+        'administration' => array(
+            'actions' => array(
+                'backups',
+                'updater',
+            ),
+            'links'	=> array(
+                'update',
+                'backup_management',
+                'upgrade_wizard',
+                'moduleBuilder',
+            ),
+        ),
+        'upgradewizard' => array(
+                'actions' => array(
+                    'index',
+                ),
+        ),
+        'modulebuilder' => array(
+                'actions' => array(
+                    'index' => array('params' => array('type' => array('mb'))),
+                ),
+        ),
+    )
 );
 ?>
\ No newline at end of file

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

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

include/javascript/jsAlerts.php

Indentation +86 added lines, -86 removed lines

@@ -42,28 +42,28 @@ 
 require_once("include/utils/db_utils.php");
 
 class jsAlerts{
-	var $script;
+    var $script;
 
-	function jsAlerts(){
-		global $app_strings;
-		$this->script .= <<<EOQ
+    function jsAlerts(){
+        global $app_strings;
+        $this->script .= <<<EOQ
 		if (!alertsTimeoutId) {
 		    checkAlerts();
 		}
 
 EOQ;
-		$this->addActivities();
-		Reminder::addNotifications($this);
-		if(!empty($GLOBALS['sugar_config']['enable_timeout_alerts'])){
-			$this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_1'], (session_cache_expire() - 2) * 60 );
-			$this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_2'], (session_cache_expire()) * 60 , 'index.php');
-		}
-	}
-	function addAlert($type, $name, $subtitle, $description, $countdown, $redirect='')
+        $this->addActivities();
+        Reminder::addNotifications($this);
+        if(!empty($GLOBALS['sugar_config']['enable_timeout_alerts'])){
+            $this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_1'], (session_cache_expire() - 2) * 60 );
+            $this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_2'], (session_cache_expire()) * 60 , 'index.php');
+        }
+    }
+    function addAlert($type, $name, $subtitle, $description, $countdown, $redirect='')
     {
-		$script = 'addAlert(' . json_encode($type) .',' . json_encode($name). ',' . json_encode($subtitle). ','. json_encode(str_replace(array("\r", "\n"), array('','<br>'),$description)) . ',' . $countdown . ','.json_encode($redirect).');' . "\n";
+        $script = 'addAlert(' . json_encode($type) .',' . json_encode($name). ',' . json_encode($subtitle). ','. json_encode(str_replace(array("\r", "\n"), array('','<br>'),$description)) . ',' . $countdown . ','.json_encode($redirect).');' . "\n";
         $this->script .= $script;
-	}
+    }
 
     function getScript()
     {
@@ -87,29 +87,29 @@ 
     }
 
     function addActivities(){
-		global $app_list_strings, $timedate, $current_user, $app_strings;
-		global $sugar_config;
+        global $app_list_strings, $timedate, $current_user, $app_strings;
+        global $sugar_config;
 
-		if (empty($current_user->id)) {
+        if (empty($current_user->id)) {
             return;
-		}
+        }
 
         //Create separate variable to hold timedate value
         $alertDateTimeNow = $timedate->nowDb();
 
-		// cn: get a boundary limiter
-		$dateTimeMax = $timedate->getNow()->modify("+{$app_list_strings['reminder_max_time']} seconds")->asDb();
-		$dateTimeNow = $timedate->nowDb();
+        // cn: get a boundary limiter
+        $dateTimeMax = $timedate->getNow()->modify("+{$app_list_strings['reminder_max_time']} seconds")->asDb();
+        $dateTimeNow = $timedate->nowDb();
 
-		global $db;
-		$dateTimeNow = $db->convert($db->quoted($dateTimeNow), 'datetime');
-		$dateTimeMax = $db->convert($db->quoted($dateTimeMax), 'datetime');
-		$desc = $db->convert("description", "text2char");
-		if($desc != "description") {
-		    $desc .= " description";
-		}
+        global $db;
+        $dateTimeNow = $db->convert($db->quoted($dateTimeNow), 'datetime');
+        $dateTimeMax = $db->convert($db->quoted($dateTimeMax), 'datetime');
+        $desc = $db->convert("description", "text2char");
+        if($desc != "description") {
+            $desc .= " description";
+        }
 
-		// Prep Meetings Query
+        // Prep Meetings Query
         $selectMeetings = "SELECT meetings.id, name,reminder_time, $desc,location, status, parent_type, parent_id, date_start, assigned_user_id
 			FROM meetings LEFT JOIN meetings_users ON meetings.id = meetings_users.meeting_id
 			WHERE meetings_users.user_id ='".$current_user->id."'
@@ -119,61 +119,61 @@ 
 				AND meetings.status = 'Planned'
 			    AND date_start >= $dateTimeNow
 			    AND date_start <= $dateTimeMax";
-		$result = $db->query($selectMeetings);
-
-		///////////////////////////////////////////////////////////////////////
-		////	MEETING INTEGRATION
-		$meetingIntegration = null;
-		if(isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
-			if(!class_exists($sugar_config['meeting_integration'])) {
-				require_once("modules/{$sugar_config['meeting_integration']}/{$sugar_config['meeting_integration']}.php");
-			}
-			$meetingIntegration = new $sugar_config['meeting_integration']();
-		}
-		////	END MEETING INTEGRATION
-		///////////////////////////////////////////////////////////////////////
-
-		while($row = $db->fetchByAssoc($result)) {
-			// need to concatenate since GMT times can bridge two local days
-			$timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
-			$timeRemind = $row['reminder_time'];
-			$timeStart -= $timeRemind;
-
-			$url = 'index.php?action=DetailView&module=Meetings&record=' . $row['id'];
-			$instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
-
-			///////////////////////////////////////////////////////////////////
-			////	MEETING INTEGRATION
-			if(!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($row['id'])) {
-				$url = $meetingIntegration->miUrlGetJsAlert($row);
-				$instructions = $meetingIntegration->miGetJsAlertInstructions();
-			}
-			////	END MEETING INTEGRATION
-			///////////////////////////////////////////////////////////////////
-
-			$meetingName = from_html($row['name']);
-			$desc1 = from_html($row['description']);
-			$location = from_html($row['location']);
+        $result = $db->query($selectMeetings);
+
+        ///////////////////////////////////////////////////////////////////////
+        ////	MEETING INTEGRATION
+        $meetingIntegration = null;
+        if(isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
+            if(!class_exists($sugar_config['meeting_integration'])) {
+                require_once("modules/{$sugar_config['meeting_integration']}/{$sugar_config['meeting_integration']}.php");
+            }
+            $meetingIntegration = new $sugar_config['meeting_integration']();
+        }
+        ////	END MEETING INTEGRATION
+        ///////////////////////////////////////////////////////////////////////
+
+        while($row = $db->fetchByAssoc($result)) {
+            // need to concatenate since GMT times can bridge two local days
+            $timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
+            $timeRemind = $row['reminder_time'];
+            $timeStart -= $timeRemind;
+
+            $url = 'index.php?action=DetailView&module=Meetings&record=' . $row['id'];
+            $instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
+
+            ///////////////////////////////////////////////////////////////////
+            ////	MEETING INTEGRATION
+            if(!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($row['id'])) {
+                $url = $meetingIntegration->miUrlGetJsAlert($row);
+                $instructions = $meetingIntegration->miGetJsAlertInstructions();
+            }
+            ////	END MEETING INTEGRATION
+            ///////////////////////////////////////////////////////////////////
+
+            $meetingName = from_html($row['name']);
+            $desc1 = from_html($row['description']);
+            $location = from_html($row['location']);
 
             $relatedToMeeting = $this->getRelatedName($row['parent_type'], $row['parent_id']);
 
-			$description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
+            $description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
             $description = $description  ."\n" .$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . $row['status'] ."\n". $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO']. $relatedToMeeting;
 
 
-			// standard functionality
-			$this->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING'], $meetingName,
-				$app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$timedate->to_display_date_time($db->fromConvert($row['date_start'], 'datetime')),
-				$app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'].$location.
-				$description.
-				$instructions,
-				$timeStart - strtotime($alertDateTimeNow),
-				$url
-			);
-		}
+            // standard functionality
+            $this->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING'], $meetingName,
+                $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$timedate->to_display_date_time($db->fromConvert($row['date_start'], 'datetime')),
+                $app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'].$location.
+                $description.
+                $instructions,
+                $timeStart - strtotime($alertDateTimeNow),
+                $url
+            );
+        }
 
-		// Prep Calls Query
-		$selectCalls = "
+        // Prep Calls Query
+        $selectCalls = "
 				SELECT calls.id, name, reminder_time, $desc, date_start, status, parent_type, parent_id
 				FROM calls LEFT JOIN calls_users ON calls.id = calls_users.call_id
 				WHERE calls_users.user_id ='".$current_user->id."'
@@ -184,14 +184,14 @@ 
 				    AND date_start >= $dateTimeNow
 				    AND date_start <= $dateTimeMax";
 
-		$result = $db->query($selectCalls);
+        $result = $db->query($selectCalls);
 
-		while($row = $db->fetchByAssoc($result)){
-			// need to concatenate since GMT times can bridge two local days
-			$timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
-			$timeRemind = $row['reminder_time'];
-			$timeStart -= $timeRemind;
-			$row['description'] = (isset($row['description'])) ? $row['description'] : '';
+        while($row = $db->fetchByAssoc($result)){
+            // need to concatenate since GMT times can bridge two local days
+            $timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
+            $timeRemind = $row['reminder_time'];
+            $timeStart -= $timeRemind;
+            $row['description'] = (isset($row['description'])) ? $row['description'] : '';
 
             $relatedToCall = $this->getRelatedName($row['parent_type'], $row['parent_id']);
 
@@ -199,8 +199,8 @@ 
 
 
             $this->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_CALL'], $row['name'], $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$timedate->to_display_date_time($db->fromConvert($row['date_start'], 'datetime')) , $app_strings['MSG_JS_ALERT_MTG_REMINDER_DESC'].$callDescription , $timeStart - strtotime($alertDateTimeNow), 'index.php?action=DetailView&module=Calls&record=' . $row['id']);
-		}
-	}
+        }
+    }
 
 
 }

Spacing +20 added lines, -20 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.
@@ -41,10 +41,10 @@ 
 
 require_once("include/utils/db_utils.php");
 
-class jsAlerts{
+class jsAlerts {
 	var $script;
 
-	function jsAlerts(){
+	function jsAlerts() {
 		global $app_strings;
 		$this->script .= <<<EOQ
 		if (!alertsTimeoutId) {
@@ -54,20 +54,20 @@ 
 EOQ;
 		$this->addActivities();
 		Reminder::addNotifications($this);
-		if(!empty($GLOBALS['sugar_config']['enable_timeout_alerts'])){
-			$this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_1'], (session_cache_expire() - 2) * 60 );
-			$this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_2'], (session_cache_expire()) * 60 , 'index.php');
+		if (!empty($GLOBALS['sugar_config']['enable_timeout_alerts'])) {
+			$this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'], '', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_1'], (session_cache_expire() - 2) * 60);
+			$this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'], '', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_2'], (session_cache_expire()) * 60, 'index.php');
 		}
 	}
-	function addAlert($type, $name, $subtitle, $description, $countdown, $redirect='')
+	function addAlert($type, $name, $subtitle, $description, $countdown, $redirect = '')
     {
-		$script = 'addAlert(' . json_encode($type) .',' . json_encode($name). ',' . json_encode($subtitle). ','. json_encode(str_replace(array("\r", "\n"), array('','<br>'),$description)) . ',' . $countdown . ','.json_encode($redirect).');' . "\n";
+		$script = 'addAlert('.json_encode($type).','.json_encode($name).','.json_encode($subtitle).','.json_encode(str_replace(array("\r", "\n"), array('', '<br>'), $description)).','.$countdown.','.json_encode($redirect).');'."\n";
         $this->script .= $script;
 	}
 
     function getScript()
     {
-        return "<script>secondsSinceLoad = 0; alertList = [];" . $this->script . "</script>";
+        return "<script>secondsSinceLoad = 0; alertList = [];".$this->script."</script>";
     }
 
     /*
@@ -86,7 +86,7 @@ 
         return '';
     }
 
-    function addActivities(){
+    function addActivities() {
 		global $app_list_strings, $timedate, $current_user, $app_strings;
 		global $sugar_config;
 
@@ -105,7 +105,7 @@ 
 		$dateTimeNow = $db->convert($db->quoted($dateTimeNow), 'datetime');
 		$dateTimeMax = $db->convert($db->quoted($dateTimeMax), 'datetime');
 		$desc = $db->convert("description", "text2char");
-		if($desc != "description") {
+		if ($desc != "description") {
 		    $desc .= " description";
 		}
 
@@ -124,8 +124,8 @@ 
 		///////////////////////////////////////////////////////////////////////
 		////	MEETING INTEGRATION
 		$meetingIntegration = null;
-		if(isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
-			if(!class_exists($sugar_config['meeting_integration'])) {
+		if (isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
+			if (!class_exists($sugar_config['meeting_integration'])) {
 				require_once("modules/{$sugar_config['meeting_integration']}/{$sugar_config['meeting_integration']}.php");
 			}
 			$meetingIntegration = new $sugar_config['meeting_integration']();
@@ -133,18 +133,18 @@ 
 		////	END MEETING INTEGRATION
 		///////////////////////////////////////////////////////////////////////
 
-		while($row = $db->fetchByAssoc($result)) {
+		while ($row = $db->fetchByAssoc($result)) {
 			// need to concatenate since GMT times can bridge two local days
 			$timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
 			$timeRemind = $row['reminder_time'];
 			$timeStart -= $timeRemind;
 
-			$url = 'index.php?action=DetailView&module=Meetings&record=' . $row['id'];
+			$url = 'index.php?action=DetailView&module=Meetings&record='.$row['id'];
 			$instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
 
 			///////////////////////////////////////////////////////////////////
 			////	MEETING INTEGRATION
-			if(!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($row['id'])) {
+			if (!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($row['id'])) {
 				$url = $meetingIntegration->miUrlGetJsAlert($row);
 				$instructions = $meetingIntegration->miGetJsAlertInstructions();
 			}
@@ -158,7 +158,7 @@ 
             $relatedToMeeting = $this->getRelatedName($row['parent_type'], $row['parent_id']);
 
 			$description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
-            $description = $description  ."\n" .$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . $row['status'] ."\n". $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO']. $relatedToMeeting;
+            $description = $description."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'].$row['status']."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO'].$relatedToMeeting;
 
 
 			// standard functionality
@@ -186,7 +186,7 @@ 
 
 		$result = $db->query($selectCalls);
 
-		while($row = $db->fetchByAssoc($result)){
+		while ($row = $db->fetchByAssoc($result)) {
 			// need to concatenate since GMT times can bridge two local days
 			$timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
 			$timeRemind = $row['reminder_time'];
@@ -195,10 +195,10 @@ 
 
             $relatedToCall = $this->getRelatedName($row['parent_type'], $row['parent_id']);
 
-            $callDescription = $row['description'] ."\n" .$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . $row['status'] ."\n". $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO']. $relatedToCall;
+            $callDescription = $row['description']."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'].$row['status']."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO'].$relatedToCall;
 
 
-            $this->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_CALL'], $row['name'], $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$timedate->to_display_date_time($db->fromConvert($row['date_start'], 'datetime')) , $app_strings['MSG_JS_ALERT_MTG_REMINDER_DESC'].$callDescription , $timeStart - strtotime($alertDateTimeNow), 'index.php?action=DetailView&module=Calls&record=' . $row['id']);
+            $this->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_CALL'], $row['name'], $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$timedate->to_display_date_time($db->fromConvert($row['date_start'], 'datetime')), $app_strings['MSG_JS_ALERT_MTG_REMINDER_DESC'].$callDescription, $timeStart - strtotime($alertDateTimeNow), 'index.php?action=DetailView&module=Calls&record='.$row['id']);
 		}
 	}
 

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

include/javascript/getYUIComboFile.php

Indentation +23 added lines, -23 removed lines

@@ -42,13 +42,13 @@ 
 
 $yui_path = array(
     "2.9.0" => "include/javascript/yui",
-	"2_9_0" => "include/javascript/yui",
-	"3.3.0" => "include/javascript/yui3",
-	"3_3_0" => "include/javascript/yui3"
+    "2_9_0" => "include/javascript/yui",
+    "3.3.0" => "include/javascript/yui3",
+    "3_3_0" => "include/javascript/yui3"
 );
 $types = array(
     "js" => "application/javascript",
-	"css" => "text/css",
+    "css" => "text/css",
 );
 $out = "";
 
@@ -57,36 +57,36 @@ 
 
 foreach ($_REQUEST as $param => $val)
 {
-	//No backtracking in the path
-	if (strpos($param, "..") !== false)
+    //No backtracking in the path
+    if (strpos($param, "..") !== false)
         continue;
 
-	$version = explode("/", $param);
-	$version = $version[0];
+    $version = explode("/", $param);
+    $version = $version[0];
     if (empty($yui_path[$version])) continue;
 
     $path = $yui_path[$version] . substr($param, strlen($version));
 
-	$extension = substr($path, strrpos($path, "_") + 1);
+    $extension = substr($path, strrpos($path, "_") + 1);
 
-	//Only allowed file extensions
-	if (empty($types[$extension]))
-	   continue;
+    //Only allowed file extensions
+    if (empty($types[$extension]))
+        continue;
 
-	if (empty($contentType))
+    if (empty($contentType))
     {
         $contentType = $types[$extension];
     }
-	//Put together the final filepath
-	$path = substr($path, 0, strrpos($path, "_")) . "." . $extension;
-	$contents = '';
-	if (is_file($path)) {
-	   $out .= "/*" . $path . "*/\n";
-	   $contents =  file_get_contents($path);
-	   $out .= $contents . "\n";
-	}
-	$path = empty($contents) ? $path : $contents;
-	$allpath .= md5($path);
+    //Put together the final filepath
+    $path = substr($path, 0, strrpos($path, "_")) . "." . $extension;
+    $contents = '';
+    if (is_file($path)) {
+        $out .= "/*" . $path . "*/\n";
+        $contents =  file_get_contents($path);
+        $out .= $contents . "\n";
+    }
+    $path = empty($contents) ? $path : $contents;
+    $allpath .= md5($path);
 }
 
 $etag = '"'.md5($allpath).'"';

Spacing +7 added lines, -7 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.
@@ -65,7 +65,7 @@ 
 	$version = $version[0];
     if (empty($yui_path[$version])) continue;
 
-    $path = $yui_path[$version] . substr($param, strlen($version));
+    $path = $yui_path[$version].substr($param, strlen($version));
 
 	$extension = substr($path, strrpos($path, "_") + 1);
 
@@ -78,12 +78,12 @@ 
         $contentType = $types[$extension];
     }
 	//Put together the final filepath
-	$path = substr($path, 0, strrpos($path, "_")) . "." . $extension;
+	$path = substr($path, 0, strrpos($path, "_")).".".$extension;
 	$contents = '';
 	if (is_file($path)) {
-	   $out .= "/*" . $path . "*/\n";
-	   $contents =  file_get_contents($path);
-	   $out .= $contents . "\n";
+	   $out .= "/*".$path."*/\n";
+	   $contents = file_get_contents($path);
+	   $out .= $contents."\n";
 	}
 	$path = empty($contents) ? $path : $contents;
 	$allpath .= md5($path);
@@ -95,6 +95,6 @@ 
 header("Cache-Control: private");
 header("Pragma: dummy=bogus");
 header("Etag: $etag");
-header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 2592000));
+header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + 2592000));
 header("Content-Type: $contentType");
 echo ($out);
\ No newline at end of file

Braces +15 added lines, -7 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.
@@ -38,7 +40,9 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-if (empty($_REQUEST)) die();
+if (empty($_REQUEST)) {
+    die();
+}
 
 $yui_path = array(
     "2.9.0" => "include/javascript/yui",
@@ -58,20 +62,24 @@ 
 foreach ($_REQUEST as $param => $val)
 {
 	//No backtracking in the path
-	if (strpos($param, "..") !== false)
-        continue;
+	if (strpos($param, "..") !== false) {
+	        continue;
+	}
 
 	$version = explode("/", $param);
 	$version = $version[0];
-    if (empty($yui_path[$version])) continue;
+    if (empty($yui_path[$version])) {
+        continue;
+    }
 
     $path = $yui_path[$version] . substr($param, strlen($version));
 
 	$extension = substr($path, strrpos($path, "_") + 1);
 
 	//Only allowed file extensions
-	if (empty($types[$extension]))
-	   continue;
+	if (empty($types[$extension])) {
+		   continue;
+	}
 
 	if (empty($contentType))
     {

include/Dashlets/DashletGenericChart.php

Indentation +10 added lines, -10 removed lines

@@ -139,7 +139,7 @@ 
      */
     public function setRefreshIcon()
     {
-    	$additionalTitle = '';
+        $additionalTitle = '';
         if($this->isRefreshable)
 
             $additionalTitle .= '<a href="#" onclick="SUGAR.mySugar.retrieveDashlet(\''
@@ -165,9 +165,9 @@ 
     public function displayScript()
     {
 
-		require_once('include/SugarCharts/SugarChartFactory.php');
-		$sugarChart = SugarChartFactory::getInstance();
-		return $sugarChart->getDashletScript($this->id);
+        require_once('include/SugarCharts/SugarChartFactory.php');
+        $sugarChart = SugarChartFactory::getInstance();
+        return $sugarChart->getDashletScript($this->id);
 
     }
 
@@ -272,11 +272,11 @@ 
         $this->getConfigureSmartyInstance()->assign('showClearButton', $this->isConfigPanelClearShown);
         
         if($this->isAutoRefreshable()) {
-       		$this->getConfigureSmartyInstance()->assign('isRefreshable', true);
-			$this->getConfigureSmartyInstance()->assign('autoRefresh', $GLOBALS['app_strings']['LBL_DASHLET_CONFIGURE_AUTOREFRESH']);
-			$this->getConfigureSmartyInstance()->assign('autoRefreshOptions', $this->getAutoRefreshOptions());
-			$this->getConfigureSmartyInstance()->assign('autoRefreshSelect', $this->autoRefresh);
-		}
+                $this->getConfigureSmartyInstance()->assign('isRefreshable', true);
+            $this->getConfigureSmartyInstance()->assign('autoRefresh', $GLOBALS['app_strings']['LBL_DASHLET_CONFIGURE_AUTOREFRESH']);
+            $this->getConfigureSmartyInstance()->assign('autoRefreshOptions', $this->getAutoRefreshOptions());
+            $this->getConfigureSmartyInstance()->assign('autoRefreshSelect', $this->autoRefresh);
+        }
 
         return parent::displayOptions() . $this->getConfigureSmartyInstance()->fetch($this->_configureTpl);
     }
@@ -339,7 +339,7 @@ 
             $dashletOffset = 0;
             $module = $_REQUEST['module'];
             if(isset($_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'])) {
-            	$dashletOffset = $_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'];
+                $dashletOffset = $_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'];
             }
         }
 

Spacing +67 added lines, -67 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.
@@ -59,7 +59,7 @@ 
     /**
      * @see Dashlet::$isRefreshable
      */
-    public $isRefreshable  = true;
+    public $isRefreshable = true;
 
     /**
      * location of smarty template file for configuring
@@ -105,15 +105,15 @@ 
     {
         parent::Dashlet($id);
 
-        if ( isset($options) ) {
-            foreach ( $options as $key => $value ) {
+        if (isset($options)) {
+            foreach ($options as $key => $value) {
                 $this->$key = $value;
             }
         }
 
         // load searchfields
         $classname = get_class($this);
-        if ( is_file("modules/Charts/Dashlets/$classname/$classname.data.php") ) {
+        if (is_file("modules/Charts/Dashlets/$classname/$classname.data.php")) {
             require("modules/Charts/Dashlets/$classname/$classname.data.php");
             $this->_searchFields = $dashletData[$classname]['searchFields'];
         }
@@ -121,16 +121,16 @@ 
         // load language files
         $this->loadLanguage($classname, 'modules/Charts/Dashlets/');
 
-        if ( empty($options['title']) )
+        if (empty($options['title']))
             $this->title = $this->dashletStrings['LBL_TITLE'];
-        if ( isset($options['autoRefresh']) )
+        if (isset($options['autoRefresh']))
             $this->autoRefresh = $options['autoRefresh'];
 
         $this->layoutManager = new LayoutManager();
         $this->layoutManager->setAttribute('context', 'Report');
         // fake a reporter object here just to pass along the db type used in many widgets.
         // this should be taken out when sugarwidgets change
-        $temp = (object) array('db' => &$GLOBALS['db'], 'report_def_str' => '');
+        $temp = (object)array('db' => &$GLOBALS['db'], 'report_def_str' => '');
         $this->layoutManager->setAttributePtr('reporter', $temp);
     }
 
@@ -140,14 +140,14 @@ 
     public function setRefreshIcon()
     {
     	$additionalTitle = '';
-        if($this->isRefreshable)
+        if ($this->isRefreshable)
 
             $additionalTitle .= '<a href="#" onclick="SUGAR.mySugar.retrieveDashlet(\''
                 . $this->id
                 . '\',\'predefined_chart\'); return false;"><!--not_in_theme!-->'
                 . SugarThemeRegistry::current()->getImage(
                     'dashlet-header-refresh',
-                    'border="0" align="absmiddle" title="'. translate('LBL_DASHLET_REFRESH', 'Home') . '"',
+                    'border="0" align="absmiddle" title="'.translate('LBL_DASHLET_REFRESH', 'Home').'"',
                     null,
                     null,
                     '.gif',
@@ -177,7 +177,7 @@ 
      */
     protected function getConfigureSmartyInstance()
     {
-        if ( !($this->_configureSS instanceof Sugar_Smarty) ) {
+        if (!($this->_configureSS instanceof Sugar_Smarty)) {
 
             $this->_configureSS = new Sugar_Smarty();
         }
@@ -200,18 +200,18 @@ 
 
         $options = array();
 
-        foreach($req as $name => $value)
-            if(!is_array($value)) $req[$name] = trim($value);
+        foreach ($req as $name => $value)
+            if (!is_array($value)) $req[$name] = trim($value);
 
-        foreach($this->_searchFields as $name => $params) {
+        foreach ($this->_searchFields as $name => $params) {
             $widgetDef = $params;
-            if ( isset($this->getSeedBean()->field_defs[$name]) )
+            if (isset($this->getSeedBean()->field_defs[$name]))
                 $widgetDef = $this->getSeedBean()->field_defs[$name];
-            if ( $widgetDef['type'] == 'date')           // special case date types
+            if ($widgetDef['type'] == 'date')           // special case date types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req['type_'.$widgetDef['name']], $timedate->get_date_format(), $timedate->dbDayFormat);
-            elseif ( $widgetDef['type'] == 'time')       // special case time types
+            elseif ($widgetDef['type'] == 'time')       // special case time types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req['type_'.$widgetDef['name']], $timedate->get_time_format(), $timedate->dbTimeFormat);
-            elseif ( $widgetDef['type'] == 'datepicker') // special case datepicker types
+            elseif ($widgetDef['type'] == 'datepicker') // special case datepicker types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req[$widgetDef['name']], $timedate->get_date_format(), $timedate->dbDayFormat);
             elseif (!empty($req[$widgetDef['name']]))
                 $options[$widgetDef['name']] = $req[$widgetDef['name']];
@@ -234,36 +234,36 @@ 
     {
         $currentSearchFields = array();
 
-        if ( is_array($this->_searchFields) ) {
-            foreach($this->_searchFields as $name=>$params) {
-                if(!empty($name)) {
+        if (is_array($this->_searchFields)) {
+            foreach ($this->_searchFields as $name=>$params) {
+                if (!empty($name)) {
                     $name = strtolower($name);
                     $currentSearchFields[$name] = array();
 
                     $widgetDef = $params;
-                    if ( isset($this->getSeedBean()->field_defs[$name]) )
+                    if (isset($this->getSeedBean()->field_defs[$name]))
                         $widgetDef = $this->getSeedBean()->field_defs[$name];
 
-                    if($widgetDef['type'] == 'enum' || $widgetDef['type'] == 'singleenum') $widgetDef['remove_blank'] = true; // remove the blank option for the dropdown
+                    if ($widgetDef['type'] == 'enum' || $widgetDef['type'] == 'singleenum') $widgetDef['remove_blank'] = true; // remove the blank option for the dropdown
 
-                    if ( empty($widgetDef['input_name0']) )
+                    if (empty($widgetDef['input_name0']))
                         $widgetDef['input_name0'] = empty($this->$name) ? '' : $this->$name;
                     $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], $this->getSeedBean()->module_dir);
-                    if ( $currentSearchFields[$name]['label'] == $widgetDef['vname'] )
+                    if ($currentSearchFields[$name]['label'] == $widgetDef['vname'])
                         $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], 'Charts');
                     $currentSearchFields[$name]['input'] = $this->layoutManager->widgetDisplayInput($widgetDef, true, (empty($this->$name) ? '' : $this->$name));
                 }
                 else { // ability to create spacers in input fields
-                    $currentSearchFields['blank' + $count]['label'] = '';
-                    $currentSearchFields['blank' + $count]['input'] = '';
+                    $currentSearchFields['blank' +$count]['label'] = '';
+                    $currentSearchFields['blank' +$count]['input'] = '';
                     $count++;
                 }
             }
         }
         $this->currentSearchFields = $currentSearchFields;
-        $this->getConfigureSmartyInstance()->assign('title',translate('LBL_TITLE','Charts'));
-        $this->getConfigureSmartyInstance()->assign('save',$GLOBALS['app_strings']['LBL_SAVE_BUTTON_LABEL']);
-        $this->getConfigureSmartyInstance()->assign('clear',$GLOBALS['app_strings']['LBL_CLEAR_BUTTON_LABEL']);
+        $this->getConfigureSmartyInstance()->assign('title', translate('LBL_TITLE', 'Charts'));
+        $this->getConfigureSmartyInstance()->assign('save', $GLOBALS['app_strings']['LBL_SAVE_BUTTON_LABEL']);
+        $this->getConfigureSmartyInstance()->assign('clear', $GLOBALS['app_strings']['LBL_CLEAR_BUTTON_LABEL']);
         $this->getConfigureSmartyInstance()->assign('id', $this->id);
         $this->getConfigureSmartyInstance()->assign('searchFields', $this->currentSearchFields);
         $this->getConfigureSmartyInstance()->assign('dashletTitle', $this->title);
@@ -271,14 +271,14 @@ 
         $this->getConfigureSmartyInstance()->assign('module', $_REQUEST['module']);
         $this->getConfigureSmartyInstance()->assign('showClearButton', $this->isConfigPanelClearShown);
         
-        if($this->isAutoRefreshable()) {
+        if ($this->isAutoRefreshable()) {
        		$this->getConfigureSmartyInstance()->assign('isRefreshable', true);
 			$this->getConfigureSmartyInstance()->assign('autoRefresh', $GLOBALS['app_strings']['LBL_DASHLET_CONFIGURE_AUTOREFRESH']);
 			$this->getConfigureSmartyInstance()->assign('autoRefreshOptions', $this->getAutoRefreshOptions());
 			$this->getConfigureSmartyInstance()->assign('autoRefreshSelect', $this->autoRefresh);
 		}
 
-        return parent::displayOptions() . $this->getConfigureSmartyInstance()->fetch($this->_configureTpl);
+        return parent::displayOptions().$this->getConfigureSmartyInstance()->fetch($this->_configureTpl);
     }
 
     /**
@@ -289,7 +289,7 @@ 
      */
     protected function getSeedBean()
     {
-        if ( !($this->_seedBean instanceof SugarBean) )
+        if (!($this->_seedBean instanceof SugarBean))
             $this->_seedBean = SugarModule::get($this->_seedName)->loadBean();
 
         return $this->_seedBean;
@@ -322,7 +322,7 @@ 
      */
     public function display()
     {
-        return parent::display() . $this->processAutoRefresh();
+        return parent::display().$this->processAutoRefresh();
     }
 
     /**
@@ -335,28 +335,28 @@ 
     {
         global $sugar_config;
 
-        if ( empty($dashletOffset) ) {
+        if (empty($dashletOffset)) {
             $dashletOffset = 0;
             $module = $_REQUEST['module'];
-            if(isset($_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'])) {
+            if (isset($_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'])) {
             	$dashletOffset = $_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'];
             }
         }
 
-        if ( !$this->isRefreshable ) {
+        if (!$this->isRefreshable) {
             return '';
         }
-        if ( !empty($sugar_config['dashlet_auto_refresh_min']) && $sugar_config['dashlet_auto_refresh_min'] == -1 ) {
+        if (!empty($sugar_config['dashlet_auto_refresh_min']) && $sugar_config['dashlet_auto_refresh_min'] == -1) {
             return '';
         }
         $autoRefreshSS = new Sugar_Smarty();
         $autoRefreshSS->assign('dashletOffset', $dashletOffset);
         $autoRefreshSS->assign('dashletId', $this->id);
-        $autoRefreshSS->assign('strippedDashletId', str_replace("-","",$this->id)); //javascript doesn't like "-" in function names
+        $autoRefreshSS->assign('strippedDashletId', str_replace("-", "", $this->id)); //javascript doesn't like "-" in function names
         $autoRefreshSS->assign('dashletRefreshInterval', $this->getAutoRefresh());
         $autoRefreshSS->assign('url', "predefined_chart");
         $tpl = 'include/Dashlets/DashletGenericAutoRefresh.tpl';
-        if ( $_REQUEST['action'] == "DynamicAction" ) {
+        if ($_REQUEST['action'] == "DynamicAction") {
             $tpl = 'include/Dashlets/DashletGenericAutoRefreshDynamic.tpl';
         }
 
@@ -372,7 +372,7 @@ 
 
         $row = $db->fetchByAssoc($result);
 
-        while ($row != null){
+        while ($row != null) {
             $dataSet[] = $row;
             $row = $db->fetchByAssoc($result);
         }
@@ -392,19 +392,19 @@ 
     bool $ifsort2                 Whether to sort by the second column or just translate the second column.
      * @return        The sorted and translated data.
      */
-    function sortData($data_set, $keycolname1=null, $translate1=false, $keycolname2=null, $translate2=false, $ifsort2=false) {
+    function sortData($data_set, $keycolname1 = null, $translate1 = false, $keycolname2 = null, $translate2 = false, $ifsort2 = false) {
         //You can set whether the columns need to be translated or sorted. It the column needn't to be translated, the sorting must be done in SQL, this function will not do the sorting.
         global $app_list_strings;
         $sortby1[] = array();
         foreach ($data_set as $row) {
-            $sortby1[]  = $row[$keycolname1];
+            $sortby1[] = $row[$keycolname1];
         }
         $sortby1 = array_unique($sortby1);
         //The data is from the database, the sorting should be done in the sql. So I will not do the sort here.
-        if($translate1) {
+        if ($translate1) {
             $temp_sortby1 = array();
-            foreach(array_keys($app_list_strings[$keycolname1.'_dom']) as $sortby1_value) {
-                if(in_array($sortby1_value, $sortby1)) {
+            foreach (array_keys($app_list_strings[$keycolname1.'_dom']) as $sortby1_value) {
+                if (in_array($sortby1_value, $sortby1)) {
                     $temp_sortby1[] = $sortby1_value;
                 }
             }
@@ -412,21 +412,21 @@ 
         }
 
         //if(isset($sortby1[0]) && $sortby1[0]=='') unset($sortby1[0]);//the beginning of lead_source_dom is blank.
-        if(isset($sortby1[0]) && $sortby1[0]==array()) unset($sortby1[0]);//the beginning of month after search is blank.
+        if (isset($sortby1[0]) && $sortby1[0] == array()) unset($sortby1[0]); //the beginning of month after search is blank.
 
-        if($ifsort2==false) $sortby2=array(0);
+        if ($ifsort2 == false) $sortby2 = array(0);
 
-        if($keycolname2!=null) {
+        if ($keycolname2 != null) {
             $sortby2 = array();
             foreach ($data_set as $row) {
-                $sortby2[]  = $row[$keycolname2];
+                $sortby2[] = $row[$keycolname2];
             }
             //The data is from the database, the sorting should be done in the sql. So I will not do the sort here.
             $sortby2 = array_unique($sortby2);
-            if($translate2) {
+            if ($translate2) {
                 $temp_sortby2 = array();
-                foreach(array_keys($app_list_strings[$keycolname2.'_dom']) as $sortby2_value) {
-                    if(in_array($sortby2_value, $sortby2)) {
+                foreach (array_keys($app_list_strings[$keycolname2.'_dom']) as $sortby2_value) {
+                    if (in_array($sortby2_value, $sortby2)) {
                         $temp_sortby2[] = $sortby2_value;
                     }
                 }
@@ -434,42 +434,42 @@ 
             }
         }
 
-        $data=array();
+        $data = array();
 
-        foreach($sortby1 as $sort1) {
-            foreach($sortby2 as $sort2) {
-                if($ifsort2) $a=0;
-                foreach($data_set as $key => $value){
-                    if($value[$keycolname1] == $sort1 && (!$ifsort2 || $value[$keycolname2]== $sort2)) {
-                        if($translate1) {
+        foreach ($sortby1 as $sort1) {
+            foreach ($sortby2 as $sort2) {
+                if ($ifsort2) $a = 0;
+                foreach ($data_set as $key => $value) {
+                    if ($value[$keycolname1] == $sort1 && (!$ifsort2 || $value[$keycolname2] == $sort2)) {
+                        if ($translate1) {
                             $value[$keycolname1.'_dom_option'] = $value[$keycolname1];
                             $value[$keycolname1] = $app_list_strings[$keycolname1.'_dom'][$value[$keycolname1]];
                         }
-                        if($translate2) {
+                        if ($translate2) {
                             $value[$keycolname2.'_dom_option'] = $value[$keycolname2];
                             $value[$keycolname2] = $app_list_strings[$keycolname2.'_dom'][$value[$keycolname2]];
                         }
                         array_push($data, $value);
                         unset($data_set[$key]);
-                        $a=1;
+                        $a = 1;
                     }
                 }
-                if($ifsort2 && $a==0) {//Add 0 for sorting by the second column, if the first row doesn't have a certain col, it will fill the column with 0.
-                    $val=array();
+                if ($ifsort2 && $a == 0) {//Add 0 for sorting by the second column, if the first row doesn't have a certain col, it will fill the column with 0.
+                    $val = array();
                     $val['total'] = 0;
                     $val['count'] = 0;
-                    if($translate1) {
+                    if ($translate1) {
                         $val[$keycolname1] = $app_list_strings[$keycolname1.'_dom'][$sort1];
                         $val[$keycolname1.'_dom_option'] = $sort1;
                     }
                     else {
                         $val[$keycolname1] = $sort1;
                     }
-                    if($translate2) {
+                    if ($translate2) {
                         $val[$keycolname2] = $app_list_strings[$keycolname2.'_dom'][$sort2];
                         $val[$keycolname2.'_dom_option'] = $sort2;
                     }
-                    elseif($keycolname2!=null) {
+                    elseif ($keycolname2 != null) {
                         $val[$keycolname2] = $sort2;
                     }
                     array_push($data, $val);

Braces +59 added lines, -36 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.
@@ -121,10 +123,12 @@ 
         // load language files
         $this->loadLanguage($classname, 'modules/Charts/Dashlets/');
 
-        if ( empty($options['title']) )
-            $this->title = $this->dashletStrings['LBL_TITLE'];
-        if ( isset($options['autoRefresh']) )
-            $this->autoRefresh = $options['autoRefresh'];
+        if ( empty($options['title']) ) {
+                    $this->title = $this->dashletStrings['LBL_TITLE'];
+        }
+        if ( isset($options['autoRefresh']) ) {
+                    $this->autoRefresh = $options['autoRefresh'];
+        }
 
         $this->layoutManager = new LayoutManager();
         $this->layoutManager->setAttribute('context', 'Report');
@@ -140,8 +144,8 @@ 
     public function setRefreshIcon()
     {
     	$additionalTitle = '';
-        if($this->isRefreshable)
-
+        if($this->isRefreshable) {
+        
             $additionalTitle .= '<a href="#" onclick="SUGAR.mySugar.retrieveDashlet(\''
                 . $this->id
                 . '\',\'predefined_chart\'); return false;"><!--not_in_theme!-->'
@@ -154,6 +158,7 @@ 
                     translate('LBL_DASHLET_REFRESH', 'Home')
                 )
                 . '</a>';
+        }
         return $additionalTitle;
     }
 
@@ -200,25 +205,32 @@ 
 
         $options = array();
 
-        foreach($req as $name => $value)
-            if(!is_array($value)) $req[$name] = trim($value);
+        foreach($req as $name => $value) {
+                    if(!is_array($value)) $req[$name] = trim($value);
+        }
 
         foreach($this->_searchFields as $name => $params) {
             $widgetDef = $params;
-            if ( isset($this->getSeedBean()->field_defs[$name]) )
-                $widgetDef = $this->getSeedBean()->field_defs[$name];
-            if ( $widgetDef['type'] == 'date')           // special case date types
+            if ( isset($this->getSeedBean()->field_defs[$name]) ) {
+                            $widgetDef = $this->getSeedBean()->field_defs[$name];
+            }
+            if ( $widgetDef['type'] == 'date') {
+                // special case date types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req['type_'.$widgetDef['name']], $timedate->get_date_format(), $timedate->dbDayFormat);
-            elseif ( $widgetDef['type'] == 'time')       // special case time types
+            } elseif ( $widgetDef['type'] == 'time') {
+                // special case time types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req['type_'.$widgetDef['name']], $timedate->get_time_format(), $timedate->dbTimeFormat);
-            elseif ( $widgetDef['type'] == 'datepicker') // special case datepicker types
+            } elseif ( $widgetDef['type'] == 'datepicker') {
+                // special case datepicker types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req[$widgetDef['name']], $timedate->get_date_format(), $timedate->dbDayFormat);
-            elseif (!empty($req[$widgetDef['name']]))
-                $options[$widgetDef['name']] = $req[$widgetDef['name']];
+            } elseif (!empty($req[$widgetDef['name']])) {
+                            $options[$widgetDef['name']] = $req[$widgetDef['name']];
+            }
         }
 
-        if (!empty($req['dashletTitle']))
-            $options['title'] = $req['dashletTitle'];
+        if (!empty($req['dashletTitle'])) {
+                    $options['title'] = $req['dashletTitle'];
+        }
 
         $options['autoRefresh'] = empty($req['autoRefresh']) ? '0' : $req['autoRefresh'];
 
@@ -241,19 +253,24 @@ 
                     $currentSearchFields[$name] = array();
 
                     $widgetDef = $params;
-                    if ( isset($this->getSeedBean()->field_defs[$name]) )
-                        $widgetDef = $this->getSeedBean()->field_defs[$name];
+                    if ( isset($this->getSeedBean()->field_defs[$name]) ) {
+                                            $widgetDef = $this->getSeedBean()->field_defs[$name];
+                    }
 
-                    if($widgetDef['type'] == 'enum' || $widgetDef['type'] == 'singleenum') $widgetDef['remove_blank'] = true; // remove the blank option for the dropdown
+                    if($widgetDef['type'] == 'enum' || $widgetDef['type'] == 'singleenum') {
+                        $widgetDef['remove_blank'] = true;
+                    }
+                    // remove the blank option for the dropdown
 
-                    if ( empty($widgetDef['input_name0']) )
-                        $widgetDef['input_name0'] = empty($this->$name) ? '' : $this->$name;
+                    if ( empty($widgetDef['input_name0']) ) {
+                                            $widgetDef['input_name0'] = empty($this->$name) ? '' : $this->$name;
+                    }
                     $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], $this->getSeedBean()->module_dir);
-                    if ( $currentSearchFields[$name]['label'] == $widgetDef['vname'] )
-                        $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], 'Charts');
+                    if ( $currentSearchFields[$name]['label'] == $widgetDef['vname'] ) {
+                                            $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], 'Charts');
+                    }
                     $currentSearchFields[$name]['input'] = $this->layoutManager->widgetDisplayInput($widgetDef, true, (empty($this->$name) ? '' : $this->$name));
-                }
-                else { // ability to create spacers in input fields
+                } else { // ability to create spacers in input fields
                     $currentSearchFields['blank' + $count]['label'] = '';
                     $currentSearchFields['blank' + $count]['input'] = '';
                     $count++;
@@ -289,8 +306,9 @@ 
      */
     protected function getSeedBean()
     {
-        if ( !($this->_seedBean instanceof SugarBean) )
-            $this->_seedBean = SugarModule::get($this->_seedName)->loadBean();
+        if ( !($this->_seedBean instanceof SugarBean) ) {
+                    $this->_seedBean = SugarModule::get($this->_seedName)->loadBean();
+        }
 
         return $this->_seedBean;
     }
@@ -412,9 +430,14 @@ 
         }
 
         //if(isset($sortby1[0]) && $sortby1[0]=='') unset($sortby1[0]);//the beginning of lead_source_dom is blank.
-        if(isset($sortby1[0]) && $sortby1[0]==array()) unset($sortby1[0]);//the beginning of month after search is blank.
+        if(isset($sortby1[0]) && $sortby1[0]==array()) {
+            unset($sortby1[0]);
+        }
+        //the beginning of month after search is blank.
 
-        if($ifsort2==false) $sortby2=array(0);
+        if($ifsort2==false) {
+            $sortby2=array(0);
+        }
 
         if($keycolname2!=null) {
             $sortby2 = array();
@@ -438,7 +461,9 @@ 
 
         foreach($sortby1 as $sort1) {
             foreach($sortby2 as $sort2) {
-                if($ifsort2) $a=0;
+                if($ifsort2) {
+                    $a=0;
+                }
                 foreach($data_set as $key => $value){
                     if($value[$keycolname1] == $sort1 && (!$ifsort2 || $value[$keycolname2]== $sort2)) {
                         if($translate1) {
@@ -461,15 +486,13 @@ 
                     if($translate1) {
                         $val[$keycolname1] = $app_list_strings[$keycolname1.'_dom'][$sort1];
                         $val[$keycolname1.'_dom_option'] = $sort1;
-                    }
-                    else {
+                    } else {
                         $val[$keycolname1] = $sort1;
                     }
                     if($translate2) {
                         $val[$keycolname2] = $app_list_strings[$keycolname2.'_dom'][$sort2];
                         $val[$keycolname2.'_dom_option'] = $sort2;
-                    }
-                    elseif($keycolname2!=null) {
+                    } elseif($keycolname2!=null) {
                         $val[$keycolname2] = $sort2;
                     }
                     array_push($data, $val);

include/Dashlets/DashletCacheBuilder.php

Spacing +7 added lines, -7 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.
@@ -64,28 +64,28 @@ 
         $cacheDir = create_cache_directory('dashlets/');
         $allDashlets = array_merge($dashletFiles, $dashletFilesCustom);
         $dashletFiles = array();
-        foreach($allDashlets as $num => $file) {
-            if(substr_count($file, '.meta') == 0) { // ignore meta data files
+        foreach ($allDashlets as $num => $file) {
+            if (substr_count($file, '.meta') == 0) { // ignore meta data files
                 $class = substr($file, strrpos($file, '/') + 1, -4);
                 $dashletFiles[$class] = array();
                 $dashletFiles[$class]['file'] = $file;
                 $dashletFiles[$class]['class'] = $class;
-                if(is_file(preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file))) { // is there an associated meta data file?
+                if (is_file(preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file))) { // is there an associated meta data file?
                     $dashletFiles[$class]['meta'] = preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file);
                     require($dashletFiles[$class]['meta']);
-                    if ( isset($dashletMeta[$class]['module']) )
+                    if (isset($dashletMeta[$class]['module']))
                         $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
                 }
                 
                 $filesInDirectory = array();
                 getFiles($filesInDirectory, substr($file, 0, strrpos($file, '/')), '/^.*\/Dashlets\/[^\.]*\.icon\.(jpg|jpeg|gif|png)$/i');
-                if(!empty($filesInDirectory)) {
+                if (!empty($filesInDirectory)) {
                     $dashletFiles[$class]['icon'] = $filesInDirectory[0]; // take the first icon we see
                 }
             }
         }
         
-        write_array_to_file('dashletsFiles', $dashletFiles, $cacheDir . 'dashlets.php');
+        write_array_to_file('dashletsFiles', $dashletFiles, $cacheDir.'dashlets.php');
     }
 }
 ?>
\ No newline at end of file

Braces +6 added lines, -3 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.
@@ -73,8 +75,9 @@ 
                 if(is_file(preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file))) { // is there an associated meta data file?
                     $dashletFiles[$class]['meta'] = preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file);
                     require($dashletFiles[$class]['meta']);
-                    if ( isset($dashletMeta[$class]['module']) )
-                        $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
+                    if ( isset($dashletMeta[$class]['module']) ) {
+                                            $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
+                    }
                 }
                 
                 $filesInDirectory = array();