adamjakab / SuiteCRM

include/MVC/View/SugarView.php

Indentation +135 added lines, -135 removed lines

@@ -125,11 +125,11 @@ 
 
         //For the ajaxUI, we need to use output buffering to return the page in an ajax friendly format
         if ($this->_getOption('json_output')){
-			ob_start();
-			if(!empty($_REQUEST['ajax_load']) && !empty($_REQUEST['loadLanguageJS'])) {
-				echo $this->_getModLanguageJS();
-			}
-		}
+            ob_start();
+            if(!empty($_REQUEST['ajax_load']) && !empty($_REQUEST['loadLanguageJS'])) {
+                echo $this->_getModLanguageJS();
+            }
+        }
 
         if ($this->_getOption('show_header')) {
             $this->displayHeader();
@@ -175,11 +175,11 @@ 
             $module = $this->module;
             $ajax_ret = array(
                 'content' => mb_detect_encoding($content) == "UTF-8" ? $content : utf8_encode($content),
-                 'menu' => array(
-                     'module' => $module,
-                     'label' => translate($module),
-                     $this->getMenu($module),
-                 ),
+                    'menu' => array(
+                        'module' => $module,
+                        'label' => translate($module),
+                        $this->getMenu($module),
+                    ),
                 'title' => $this->getBrowserTitle(),
                 'action' => isset($_REQUEST['action']) ? $_REQUEST['action'] : "",
                 'record' => isset($_REQUEST['record']) ? $_REQUEST['record'] : "",
@@ -422,10 +422,10 @@ 
                         "URL"   => current($attributevalue),
                         "SUBMENU" => array(),
                         );
-                   if(substr($gcls[$key]["URL"], 0, 11) == "javascript:") {
-                       $gcls[$key]["ONCLICK"] = substr($gcls[$key]["URL"],11);
-                       $gcls[$key]["URL"] = "javascript:void(0)";
-                   }
+                    if(substr($gcls[$key]["URL"], 0, 11) == "javascript:") {
+                        $gcls[$key]["ONCLICK"] = substr($gcls[$key]["URL"],11);
+                        $gcls[$key]["URL"] = "javascript:void(0)";
+                    }
                 }
                 // and now the sublinks
                 if ( $linkattribute == 'submenu' && is_array($attributevalue) ) {
@@ -434,10 +434,10 @@ 
                             "LABEL" => key($submenulinkinfo),
                             "URL"   => current($submenulinkinfo),
                         );
-                       if(substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"], 0, 11) == "javascript:") {
-                           $gcls[$key]['SUBMENU'][$submenulinkkey]["ONCLICK"] = substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"],11);
-                           $gcls[$key]['SUBMENU'][$submenulinkkey]["URL"] = "javascript:void(0)";
-                       }
+                        if(substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"], 0, 11) == "javascript:") {
+                            $gcls[$key]['SUBMENU'][$submenulinkkey]["ONCLICK"] = substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"],11);
+                            $gcls[$key]['SUBMENU'][$submenulinkkey]["URL"] = "javascript:void(0)";
+                        }
                 }
             }
         }
@@ -665,14 +665,14 @@ 
             $ss->assign("shortcutExtraMenu",$shortcutExtraMenu);
         }
        
-       if(!empty($current_user)){
-       	$ss->assign("max_tabs", $current_user->getPreference("max_tabs"));
-       } 
+        if(!empty($current_user)){
+            $ss->assign("max_tabs", $current_user->getPreference("max_tabs"));
+        } 
       
        
         $imageURL = SugarThemeRegistry::current()->getImageURL("dashboard.png");
         $homeImage = "<img src='$imageURL'>";
-		$ss->assign("homeImage",$homeImage);
+        $ss->assign("homeImage",$homeImage);
         global $mod_strings;
         $mod_strings = $bakModStrings;
         $headerTpl = $themeObject->getTemplate('header.tpl');
@@ -777,12 +777,12 @@ 
         list ($num_grp_sep, $dec_sep) = get_number_seperators();
 
         $the_script = "<script type=\"text/javascript\">\n" . "\tvar time_reg_format = '" .
-             $timereg['format'] . "';\n" . "\tvar date_reg_format = '" .
-             $datereg['format'] . "';\n" . "\tvar date_reg_positions = { $date_pos };\n" .
-             "\tvar time_separator = '$time_separator';\n" .
-             "\tvar cal_date_format = '$cal_date_format';\n" .
-             "\tvar time_offset = $hour_offset;\n" . "\tvar num_grp_sep = '$num_grp_sep';\n" .
-             "\tvar dec_sep = '$dec_sep';\n" . "</script>";
+                $timereg['format'] . "';\n" . "\tvar date_reg_format = '" .
+                $datereg['format'] . "';\n" . "\tvar date_reg_positions = { $date_pos };\n" .
+                "\tvar time_separator = '$time_separator';\n" .
+                "\tvar cal_date_format = '$cal_date_format';\n" .
+                "\tvar time_offset = $hour_offset;\n" . "\tvar num_grp_sep = '$num_grp_sep';\n" .
+                "\tvar dec_sep = '$dec_sep';\n" . "</script>";
 
         return $the_script;
     }
@@ -847,7 +847,7 @@ 
             }
             echo getVersionedScript('cache/jsLanguage/'. $GLOBALS['current_language'] . '.js', $GLOBALS['sugar_config']['js_lang_version']);
 
-			echo $this->_getModLanguageJS();
+            echo $this->_getModLanguageJS();
 
             if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client'])
                 echo getVersionedScript('modules/Sync/headersync.js');
@@ -863,13 +863,13 @@ 
         }
     }
 
-	protected function _getModLanguageJS(){
-		if (!is_file(sugar_cached('jsLanguage/') . $this->module . '/' . $GLOBALS['current_language'] . '.js')) {
-			require_once ('include/language/jsLanguage.php');
-			jsLanguage::createModuleStringsCache($this->module, $GLOBALS['current_language']);
-		}
-		return getVersionedScript("cache/jsLanguage/{$this->module}/". $GLOBALS['current_language'] . '.js', $GLOBALS['sugar_config']['js_lang_version']);
-	}
+    protected function _getModLanguageJS(){
+        if (!is_file(sugar_cached('jsLanguage/') . $this->module . '/' . $GLOBALS['current_language'] . '.js')) {
+            require_once ('include/language/jsLanguage.php');
+            jsLanguage::createModuleStringsCache($this->module, $GLOBALS['current_language']);
+        }
+        return getVersionedScript("cache/jsLanguage/{$this->module}/". $GLOBALS['current_language'] . '.js', $GLOBALS['sugar_config']['js_lang_version']);
+    }
 
     /**
      * Called from process(). This method will display the footer on the page.
@@ -882,7 +882,7 @@ 
         global $sugar_config;
         global $app_strings;
         global $mod_strings;
-		$themeObject = SugarThemeRegistry::current();
+        $themeObject = SugarThemeRegistry::current();
         //decide whether or not to show themepicker, default is to show
         $showThemePicker = true;
         if (isset($sugar_config['showThemePicker'])) {
@@ -893,30 +893,30 @@ 
         $ss->assign("AUTHENTICATED",isset($_SESSION["authenticated_user_id"]));
         $ss->assign('MOD',return_module_language($GLOBALS['current_language'], 'Users'));
 
-		$bottomLinkList = array();
-		 if (isset($this->action) && $this->action != "EditView") {
-			 $bottomLinkList['print'] = array($app_strings['LNK_PRINT'] => getPrintLink());
-		}
-		$bottomLinkList['backtotop'] = array($app_strings['LNK_BACKTOTOP'] => 'javascript:SUGAR.util.top();');
-
-		$bottomLinksStr = "";
-		foreach($bottomLinkList as $key => $value) {
-			foreach($value as $text => $link) {
-				   $href = $link;
-				   if(substr($link, 0, 11) == "javascript:") {
-                       $onclick = " onclick=\"".substr($link,11)."\"";
-                       $href = "javascript:void(0)";
-                   } else {
-                   		$onclick = "";
-                   	}
+        $bottomLinkList = array();
+            if (isset($this->action) && $this->action != "EditView") {
+                $bottomLinkList['print'] = array($app_strings['LNK_PRINT'] => getPrintLink());
+        }
+        $bottomLinkList['backtotop'] = array($app_strings['LNK_BACKTOTOP'] => 'javascript:SUGAR.util.top();');
+
+        $bottomLinksStr = "";
+        foreach($bottomLinkList as $key => $value) {
+            foreach($value as $text => $link) {
+                    $href = $link;
+                    if(substr($link, 0, 11) == "javascript:") {
+                        $onclick = " onclick=\"".substr($link,11)."\"";
+                        $href = "javascript:void(0)";
+                    } else {
+                            $onclick = "";
+                        }
                 $imageURL = SugarThemeRegistry::current()->getImageURL($key.'.gif');
-				$bottomLinksStr .= "<a href=\"{$href}\"";
-				$bottomLinksStr .= (isset($onclick)) ? $onclick : "";
-				$bottomLinksStr .= "><img src='{$imageURL}' alt=''>"; //keeping alt blank on purpose for 508 (text will be read instead)
-				$bottomLinksStr .= " ".$text."</a>";
-			}
-		}
-		$ss->assign("BOTTOMLINKS",$bottomLinksStr);
+                $bottomLinksStr .= "<a href=\"{$href}\"";
+                $bottomLinksStr .= (isset($onclick)) ? $onclick : "";
+                $bottomLinksStr .= "><img src='{$imageURL}' alt=''>"; //keeping alt blank on purpose for 508 (text will be read instead)
+                $bottomLinksStr .= " ".$text."</a>";
+            }
+        }
+        $ss->assign("BOTTOMLINKS",$bottomLinksStr);
         if (SugarConfig::getInstance()->get('calculate_response_time', false))
             $ss->assign('STATISTICS',$this->_getStatistics());
 
@@ -946,7 +946,7 @@ 
         $attribLinkImg = "<img style='margin-top: 2px' border='0' width='120' height='34' src='include/images/poweredby_sugarcrm_65.png' alt='Powered By SugarCRM'>\n";
 
 
-		// handle resizing of the company logo correctly on the fly
+        // handle resizing of the company logo correctly on the fly
         $companyLogoURL = $themeObject->getImageURL('company_logo.png');
         $companyLogoURL_arr = explode('?', $companyLogoURL);
         $companyLogoURL = $companyLogoURL_arr[0];
@@ -1069,7 +1069,7 @@ 
 
 
         $trackerManager = TrackerManager::getInstance();
-	    $trackerManager->save();
+        $trackerManager->save();
 
     }
 
@@ -1109,7 +1109,7 @@ 
         $deltaTime = $endTime - $GLOBALS['startTime'];
         $response_time_string = $GLOBALS['app_strings']['LBL_SERVER_RESPONSE_TIME'] . ' ' . number_format(round($deltaTime, 2), 2) . ' ' . $GLOBALS['app_strings']['LBL_SERVER_RESPONSE_TIME_SECONDS'];
         $return = $response_time_string;
-       // $return .= '<br />';
+        // $return .= '<br />';
         if (!empty($GLOBALS['sugar_config']['show_page_resources'])) {
             // Print out the resources used in constructing the page.
             $included_files = get_included_files();
@@ -1170,8 +1170,8 @@ 
             {
                 $data = array
                 (
-                   !empty($this->module) ? $this->module : $GLOBALS['app_strings']['LBL_LINK_NONE'],
-                   !empty($this->action) ? $this->action : $GLOBALS['app_strings']['LBL_LINK_NONE'],
+                    !empty($this->module) ? $this->module : $GLOBALS['app_strings']['LBL_LINK_NONE'],
+                    !empty($this->action) ? $this->action : $GLOBALS['app_strings']['LBL_LINK_NONE'],
                 );
 
                 $output = string_format($GLOBALS['app_strings']['LBL_SERVER_MEMORY_LOG_MESSAGE'], $data) . $newline;
@@ -1240,15 +1240,15 @@ 
     }
 
     /**
-    * Returns the module name which should be highlighted in the module menu
+     * Returns the module name which should be highlighted in the module menu
      */
     protected function _getModuleTab()
     {
         global $app_list_strings, $moduleTabMap, $current_user;
 
-		$userTabs = query_module_access_list($current_user);
-		//If the home tab is in the user array use it as the default tab, otherwise use the first element in the tab array
-		$defaultTab = (in_array("Home",$userTabs)) ? "Home" : key($userTabs);
+        $userTabs = query_module_access_list($current_user);
+        //If the home tab is in the user array use it as the default tab, otherwise use the first element in the tab array
+        $defaultTab = (in_array("Home",$userTabs)) ? "Home" : key($userTabs);
 		
         // Need to figure out what tab this module belongs to, most modules have their own tabs, but there are exceptions.
         if ( !empty($_REQUEST['module_tab']) )
@@ -1264,17 +1264,17 @@ 
         elseif ( !isset($app_list_strings['moduleList'][$this->module]) )
             return $defaultTab;
         elseif ( isset($_REQUEST['action']) && $_REQUEST['action'] == "ajaxui" )
-        	return $defaultTab;
+            return $defaultTab;
         else
             return $this->module;
     }
 
-   /**
-    * Return the "breadcrumbs" to display at the top of the page
-    *
-    * @param  bool $show_help optional, true if we show the help links
-    * @return HTML string containing breadcrumb title
-    */
+    /**
+     * Return the "breadcrumbs" to display at the top of the page
+     *
+     * @param  bool $show_help optional, true if we show the help links
+     * @return HTML string containing breadcrumb title
+     */
     public function getModuleTitle(
         $show_help = true
         )
@@ -1288,13 +1288,13 @@ 
         $params = $this->_getModuleTitleParams();
         $index = 0;
 
-		if(SugarThemeRegistry::current()->directionality == "rtl") {
-			$params = array_reverse($params);
-		}
-		if(count($params) > 1) {
-			array_shift($params);
-		}
-		$count = count($params);
+        if(SugarThemeRegistry::current()->directionality == "rtl") {
+            $params = array_reverse($params);
+        }
+        if(count($params) > 1) {
+            array_shift($params);
+        }
+        $count = count($params);
         $paramString = '';
         foreach($params as $parm){
             $index++;
@@ -1305,13 +1305,13 @@ 
         }
 
         if(!empty($paramString)){
-               $theTitle .= "<h2> $paramString </h2>";
+                $theTitle .= "<h2> $paramString </h2>";
 
             if($this->type == "detail"){
                 $theTitle .= "<div class='favorite' record_id='" . $this->bean->id . "' module='" . $this->bean->module_dir . "'><div class='favorite_icon_outline'>" . SugarThemeRegistry::current()->getImage('favorite-star-outline','title="' . translate('LBL_DASHLET_EDIT', 'Home') . '" border="0"  align="absmiddle"', null,null,'.gif',translate('LBL_DASHLET_EDIT', 'Home')) . "</div>
                                                     <div class='favorite_icon_fill'>" . SugarThemeRegistry::current()->getImage('favorite-star','title="' . translate('LBL_DASHLET_EDIT', 'Home') . '" border="0"  align="absmiddle"', null,null,'.gif',translate('LBL_DASHLET_EDIT', 'Home')) . "</div></div>";
             }
-           }
+            }
 
         // bug 56131 - restore conditional so that link doesn't appear where it shouldn't
         if($show_help || $this->type == 'list') {
@@ -1384,7 +1384,7 @@ 
     protected function _getModuleTitleParams($browserTitle = false)
     {
         $params = array($this->_getModuleTitleListParam($browserTitle));
-		//$params = array();
+        //$params = array();
         if (isset($this->action)){
             switch ($this->action) {
             case 'EditView':
@@ -1414,48 +1414,48 @@ 
      */
     protected function _getModuleTitleListParam( $browserTitle = false )
     {
-    	global $current_user;
-    	global $app_strings;
-
-    	if(!empty($GLOBALS['app_list_strings']['moduleList'][$this->module]))
-    		$firstParam = $GLOBALS['app_list_strings']['moduleList'][$this->module];
-    	else
-    		$firstParam = $this->module;
-
-    	$iconPath = $this->getModuleTitleIconPath($this->module);
-    	if($this->action == "ListView" || $this->action == "index") {
-    	    if (!empty($iconPath) && !$browserTitle) {
-    	    	if (SugarThemeRegistry::current()->directionality == "ltr") {
-    	    		return $app_strings['LBL_SEARCH']."&nbsp;"
-    	    			 . "$firstParam";
-
-    	    	} else {
-					return "$firstParam"
-					     . "&nbsp;".$app_strings['LBL_SEARCH'];
-    	    	}
-			} else {
-				return $firstParam;
-			}
-    	}
-    	else {
-		    if (!empty($iconPath) && !$browserTitle) {
-				//return "<a href='index.php?module={$this->module}&action=index'>$this->module</a>";
-			} else {
-				return $firstParam;
-			}
-    	}
+        global $current_user;
+        global $app_strings;
+
+        if(!empty($GLOBALS['app_list_strings']['moduleList'][$this->module]))
+            $firstParam = $GLOBALS['app_list_strings']['moduleList'][$this->module];
+        else
+            $firstParam = $this->module;
+
+        $iconPath = $this->getModuleTitleIconPath($this->module);
+        if($this->action == "ListView" || $this->action == "index") {
+            if (!empty($iconPath) && !$browserTitle) {
+                if (SugarThemeRegistry::current()->directionality == "ltr") {
+                    return $app_strings['LBL_SEARCH']."&nbsp;"
+                            . "$firstParam";
+
+                } else {
+                    return "$firstParam"
+                            . "&nbsp;".$app_strings['LBL_SEARCH'];
+                }
+            } else {
+                return $firstParam;
+            }
+        }
+        else {
+            if (!empty($iconPath) && !$browserTitle) {
+                //return "<a href='index.php?module={$this->module}&action=index'>$this->module</a>";
+            } else {
+                return $firstParam;
+            }
+        }
     }
 
     protected function getModuleTitleIconPath($module)
     {
-    	$iconPath = "";
-    	if(is_file(SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png',false))) {
-    		$iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png');
-    	}
-    	else if (is_file(SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png',false))) {
-    		$iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png');
-    	}
-    	return $iconPath;
+        $iconPath = "";
+        if(is_file(SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png',false))) {
+            $iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png');
+        }
+        else if (is_file(SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png',false))) {
+            $iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png');
+        }
+        return $iconPath;
     }
 
     /**
@@ -1485,11 +1485,11 @@ 
      */
     public function getBreadCrumbSymbol()
     {
-    	if(SugarThemeRegistry::current()->directionality == "ltr") {
-        	return "<span class='pointer'>&raquo;</span>";
+        if(SugarThemeRegistry::current()->directionality == "ltr") {
+            return "<span class='pointer'>&raquo;</span>";
         }
         else {
-        	return "<span class='pointer'>&laquo;</span>";
+            return "<span class='pointer'>&laquo;</span>";
         }
     }
 
@@ -1658,20 +1658,20 @@ 
     }
 
     /**
-	 * Determines whether the state of the post global array indicates there was an error uploading a
+     * Determines whether the state of the post global array indicates there was an error uploading a
      * file that exceeds the post_max_size setting.  Such an error can be detected if:
      *  1. The Server['REQUEST_METHOD'] will still point to POST
      *  2. POST and FILES global arrays will be returned empty despite the request method
      * This also results in a redirect to the home page (due to lack of module and action in POST)
      *
-	 * @return boolean indicating true or false
-	 */
+     * @return boolean indicating true or false
+     */
     public function checkPostMaxSizeError(){
-         //if the referrer is post, and the post array is empty, then an error has occurred, most likely
-         //while uploading a file that exceeds the post_max_size.
-         if(empty($_FILES) && empty($_POST) && isset($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'post'){
-             $GLOBALS['log']->fatal($GLOBALS['app_strings']['UPLOAD_ERROR_HOME_TEXT']);
-             return true;
+            //if the referrer is post, and the post array is empty, then an error has occurred, most likely
+            //while uploading a file that exceeds the post_max_size.
+            if(empty($_FILES) && empty($_POST) && isset($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'post'){
+                $GLOBALS['log']->fatal($GLOBALS['app_strings']['UPLOAD_ERROR_HOME_TEXT']);
+                return true;
         }
         return false;
     }

Switch Indentation +12 added lines, -12 removed lines

@@ -1387,18 +1387,18 @@
 		//$params = array();
         if (isset($this->action)){
             switch ($this->action) {
-            case 'EditView':
-                if(!empty($this->bean->id) && (empty($_REQUEST['isDuplicate']) || $_REQUEST['isDuplicate'] === 'false')) {
-                    $params[] = "<a href='index.php?module={$this->module}&action=DetailView&record={$this->bean->id}'>".$this->bean->get_summary_text()."</a>";
-                    $params[] = $GLOBALS['app_strings']['LBL_EDIT_BUTTON_LABEL'];
-                }
-                else
-                    $params[] = $GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL'];
-                break;
-            case 'DetailView':
-                $beanName = $this->bean->get_summary_text();
-                $params[] = $beanName;
-                break;
+                case 'EditView':
+                    if(!empty($this->bean->id) && (empty($_REQUEST['isDuplicate']) || $_REQUEST['isDuplicate'] === 'false')) {
+                        $params[] = "<a href='index.php?module={$this->module}&action=DetailView&record={$this->bean->id}'>".$this->bean->get_summary_text()."</a>";
+                        $params[] = $GLOBALS['app_strings']['LBL_EDIT_BUTTON_LABEL'];
+                    }
+                    else
+                        $params[] = $GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL'];
+                    break;
+                case 'DetailView':
+                    $beanName = $this->bean->get_summary_text();
+                    $params[] = $beanName;
+                    break;
             }
         }
 

Spacing +228 added lines, -229 removed lines

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

Braces +131 added lines, -105 removed lines

@@ -161,13 +161,17 @@ 
             echo $jsAlerts->getScript();
         }
 
-        if ($this->_getOption('show_subpanels') && !empty($_REQUEST['record'])) $this->_displaySubPanels();
+        if ($this->_getOption('show_subpanels') && !empty($_REQUEST['record'])) {
+            $this->_displaySubPanels();
+        }
 
         if ($this->action === 'Login') {
             //this is needed for a faster loading login page ie won't render unless the tables are closed
             ob_flush();
         }
-        if ($this->_getOption('show_footer')) $this->displayFooter();
+        if ($this->_getOption('show_footer')) {
+            $this->displayFooter();
+        }
         $GLOBALS['logic_hook']->call_custom_logic('', 'after_ui_footer');
         if ($this->_getOption('json_output'))
         {
@@ -186,11 +190,13 @@ 
                 'favicon' => $this->getFavicon(),
             );
 
-            if(SugarThemeRegistry::current()->name == 'Classic' || SugarThemeRegistry::current()->classic)
-                $ajax_ret['moduleList'] = $this->displayHeader(true);
+            if(SugarThemeRegistry::current()->name == 'Classic' || SugarThemeRegistry::current()->classic) {
+                            $ajax_ret['moduleList'] = $this->displayHeader(true);
+            }
 
-            if(empty($this->responseTime))
-                $this->_calculateFooterMetrics();
+            if(empty($this->responseTime)) {
+                            $this->_calculateFooterMetrics();
+            }
             $ajax_ret['responseTime'] = $this->responseTime;
             $json = getJSONobj();
             echo $json->encode($ajax_ret);
@@ -214,8 +220,7 @@ 
 
         if ( !$this->suppressDisplayErrors ) {
             echo $errors;
-        }
-        else {
+        } else {
             return $errors;
         }
     }
@@ -329,24 +334,26 @@ 
         ob_end_clean();
 
         // get favicon
-        if(isset($GLOBALS['sugar_config']['default_module_favicon']))
-            $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
-        else
-            $module_favicon = false;
+        if(isset($GLOBALS['sugar_config']['default_module_favicon'])) {
+                    $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
+        } else {
+                    $module_favicon = false;
+        }
 
         $favicon = $this->getFavicon();
         $ss->assign('FAVICON_URL', $favicon['url']);
 
         // build the shortcut menu
         $shortcut_menu = array();
-        foreach ( $this->getMenu() as $key => $menu_item )
-            $shortcut_menu[$key] = array(
+        foreach ( $this->getMenu() as $key => $menu_item ) {
+                    $shortcut_menu[$key] = array(
                 "URL"         => $menu_item[0],
                 "LABEL"       => $menu_item[1],
                 "MODULE_NAME" => $menu_item[2],
                 "IMAGE"       => $themeObject
                     ->getImage($menu_item[2],"border='0' align='absmiddle'",null,null,'.gif',$menu_item[1]),
                 );
+        }
         $ss->assign("SHORTCUT_MENU",$shortcut_menu);
 
         // handle rtl text direction
@@ -370,8 +377,7 @@ 
             $ss->assign("COMPANY_LOGO_MD5", $company_logo_attributes[0]);
             $ss->assign("COMPANY_LOGO_WIDTH", $company_logo_attributes[1]);
             $ss->assign("COMPANY_LOGO_HEIGHT", $company_logo_attributes[2]);
-        }
-        else {
+        } else {
             // Always need to md5 the file
             $ss->assign("COMPANY_LOGO_MD5", md5_file($companyLogoURL));
 
@@ -379,14 +385,14 @@ 
             if ( $width > 212 || $height > 40 ) {
                 $resizePctWidth  = ($width - 212)/212;
                 $resizePctHeight = ($height - 40)/40;
-                if ( $resizePctWidth > $resizePctHeight )
-                    $resizeAmount = $width / 212;
-                else
-                    $resizeAmount = $height / 40;
+                if ( $resizePctWidth > $resizePctHeight ) {
+                                    $resizeAmount = $width / 212;
+                } else {
+                                    $resizeAmount = $height / 40;
+                }
                 $ss->assign("COMPANY_LOGO_WIDTH", round($width * (1/$resizeAmount)));
                 $ss->assign("COMPANY_LOGO_HEIGHT", round($height * (1/$resizeAmount)));
-            }
-            else {
+            } else {
                 $ss->assign("COMPANY_LOGO_WIDTH", $width);
                 $ss->assign("COMPANY_LOGO_HEIGHT", $height);
             }
@@ -429,11 +435,12 @@ 
                 }
                 // and now the sublinks
                 if ( $linkattribute == 'submenu' && is_array($attributevalue) ) {
-                    foreach ($attributevalue as $submenulinkkey => $submenulinkinfo)
-                        $gcls[$key]['SUBMENU'][$submenulinkkey] = array(
+                    foreach ($attributevalue as $submenulinkkey => $submenulinkinfo) {
+                                            $gcls[$key]['SUBMENU'][$submenulinkkey] = array(
                             "LABEL" => key($submenulinkinfo),
                             "URL"   => current($submenulinkinfo),
                         );
+                    }
                        if(substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"], 0, 11) == "javascript:") {
                            $gcls[$key]['SUBMENU'][$submenulinkkey]["ONCLICK"] = substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"],11);
                            $gcls[$key]['SUBMENU'][$submenulinkkey]["URL"] = "javascript:void(0)";
@@ -445,8 +452,9 @@ 
 
         $ss->assign("SEARCH", isset($_REQUEST['query_string']) ? $_REQUEST['query_string'] : '');
 
-        if ($this->action == "EditView" || $this->action == "Login")
-            $ss->assign("ONLOAD", 'onload="set_focus()"');
+        if ($this->action == "EditView" || $this->action == "Login") {
+                    $ss->assign("ONLOAD", 'onload="set_focus()"');
+        }
 
         $ss->assign("AUTHENTICATED",isset($_SESSION["authenticated_user_id"]));
 
@@ -506,8 +514,7 @@ 
                 foreach($frames as $key => $values){
                         $fullModuleList[$key] = $values;
                 }
-            }
-            elseif (isset($fullModuleList['iFrames'])) {
+            } elseif (isset($fullModuleList['iFrames'])) {
                 unset($fullModuleList['iFrames']);
             }
 
@@ -523,8 +530,7 @@ 
                     // We have a default value. Use it
                     if(isset($GLOBALS['sugar_config']['default_max_tabs'])){
                         $max_tabs = $GLOBALS['sugar_config']['default_max_tabs'];
-                    }
-                    else{
+                    } else{
                         $max_tabs = 8;
                     }
                 }
@@ -633,7 +639,9 @@ 
                         );
                 }
             }
-            if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $ss->assign('lock_homepage', true);
+            if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) {
+                $ss->assign('lock_homepage', true);
+            }
             $ss->assign("groupTabs",$groupTabs);
             $ss->assign("shortcutTopMenu",$shortcutTopMenu);
             $ss->assign('USE_GROUP_TABS',$usingGroupTabs);
@@ -676,8 +684,9 @@ 
         global $mod_strings;
         $mod_strings = $bakModStrings;
         $headerTpl = $themeObject->getTemplate('header.tpl');
-        if (inDeveloperMode() )
-            $ss->clear_compiled_tpl($headerTpl);
+        if (inDeveloperMode() ) {
+                    $ss->clear_compiled_tpl($headerTpl);
+        }
 
         if ($retModTabs)
         {
@@ -716,8 +725,9 @@ 
         global $gridline, $request_string, $modListHeader, $dashletData, $authController, $locale, $currentModule, $import_bean_map, $image_path, $license;
         global $user_unique_key, $server_unique_key, $barChartColors, $modules_exempt_from_availability_check, $dictionary, $current_language, $beanList, $beanFiles, $sugar_build, $sugar_codename;
         global $timedate, $login_error; // cn: bug 13855 - timedate not available to classic views.
-        if (!empty($this->module))
-            $currentModule = $this->module;
+        if (!empty($this->module)) {
+                    $currentModule = $this->module;
+        }
         require_once ($file);
     }
 
@@ -747,8 +757,9 @@ 
             if ( typeof(SUGAR.themes) == 'undefined' ) SUGAR.themes = {};
         </script>
 EOQ;
-        if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client'])
-            echo getVersionedScript('modules/Sync/headersync.js');
+        if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client']) {
+                    echo getVersionedScript('modules/Sync/headersync.js');
+        }
     }
 
     /**
@@ -849,8 +860,9 @@ 
 
 			echo $this->_getModLanguageJS();
 
-            if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client'])
-                echo getVersionedScript('modules/Sync/headersync.js');
+            if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client']) {
+                            echo getVersionedScript('modules/Sync/headersync.js');
+            }
 
 
             //echo out the $js_vars variables as javascript variables
@@ -917,8 +929,9 @@ 
 			}
 		}
 		$ss->assign("BOTTOMLINKS",$bottomLinksStr);
-        if (SugarConfig::getInstance()->get('calculate_response_time', false))
-            $ss->assign('STATISTICS',$this->_getStatistics());
+        if (SugarConfig::getInstance()->get('calculate_response_time', false)) {
+                    $ss->assign('STATISTICS',$this->_getStatistics());
+        }
 
         // Under the License referenced above, you are required to leave in all copyright statements in both
         // the code and end-user application.
@@ -956,8 +969,7 @@ 
             $ss->assign("COMPANY_LOGO_MD5", $company_logo_attributes[0]);
             $ss->assign("COMPANY_LOGO_WIDTH", $company_logo_attributes[1]);
             $ss->assign("COMPANY_LOGO_HEIGHT", $company_logo_attributes[2]);
-        }
-        else {
+        } else {
             // Always need to md5 the file
             $ss->assign("COMPANY_LOGO_MD5", md5_file($companyLogoURL));
 
@@ -965,14 +977,14 @@ 
             if ( $width > 212 || $height > 40 ) {
                 $resizePctWidth  = ($width - 212)/212;
                 $resizePctHeight = ($height - 40)/40;
-                if ( $resizePctWidth > $resizePctHeight )
-                    $resizeAmount = $width / 212;
-                else
-                    $resizeAmount = $height / 40;
+                if ( $resizePctWidth > $resizePctHeight ) {
+                                    $resizeAmount = $width / 212;
+                } else {
+                                    $resizeAmount = $height / 40;
+                }
                 $ss->assign("COMPANY_LOGO_WIDTH", round($width * (1/$resizeAmount)));
                 $ss->assign("COMPANY_LOGO_HEIGHT", round($height * (1/$resizeAmount)));
-            }
-            else {
+            } else {
                 $ss->assign("COMPANY_LOGO_WIDTH", $width);
                 $ss->assign("COMPANY_LOGO_HEIGHT", $height);
             }
@@ -1030,8 +1042,9 @@ 
 
     protected function _buildModuleList()
     {
-        if (!empty($GLOBALS['current_user']) && empty($GLOBALS['modListHeader']))
-            $GLOBALS['modListHeader'] = query_module_access_list($GLOBALS['current_user']);
+        if (!empty($GLOBALS['current_user']) && empty($GLOBALS['modListHeader'])) {
+                    $GLOBALS['modListHeader'] = query_module_access_list($GLOBALS['current_user']);
+        }
     }
 
     /**
@@ -1051,7 +1064,9 @@ 
             return $this->options['show_all'];
         } elseif (!empty($this->options) && isset($this->options[$option])) {
             return $this->options[$option];
-        } else return $default;
+        } else {
+            return $default;
+        }
     }
 
     /**
@@ -1088,10 +1103,11 @@ 
 
     public function renderJavascript()
     {
-        if ($this->action !== 'Login')
-            $this->_displayJavascript();
-        else
-            $this->_displayLoginJS();
+        if ($this->action !== 'Login') {
+                    $this->_displayJavascript();
+        } else {
+                    $this->_displayLoginJS();
+        }
     }
 
     private function _calculateFooterMetrics()
@@ -1198,8 +1214,9 @@ 
     {
         global $current_language, $current_user, $mod_strings, $app_strings, $module_menu;
 
-        if ( empty($module) )
-            $module = $this->module;
+        if ( empty($module) ) {
+                    $module = $this->module;
+        }
 
         //Need to make sure the mod_strings match the requested module or Menus may fail
         $curr_mod_strings = $mod_strings;
@@ -1220,13 +1237,14 @@ 
                 $GLOBALS['mod_strings']['LNK_NEW_RECORD'],"{$GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL']}$module" ,$module );
             $module_menu[] = array("index.php?module=$module&action=index", $GLOBALS['mod_strings']['LNK_LIST'],
                 $module, $module);
-            if ( ($this->bean instanceOf SugarBean) && !empty($this->bean->importable) )
-                if ( !empty($mod_strings['LNK_IMPORT_'.strtoupper($module)]) )
+            if ( ($this->bean instanceOf SugarBean) && !empty($this->bean->importable) ) {
+                            if ( !empty($mod_strings['LNK_IMPORT_'.strtoupper($module)]) )
                     $module_menu[] = array("index.php?module=Import&action=Step1&import_module=$module&return_module=$module&return_action=index",
                         $mod_strings['LNK_IMPORT_'.strtoupper($module)], "Import", $module);
-                else
-                    $module_menu[] = array("index.php?module=Import&action=Step1&import_module=$module&return_module=$module&return_action=index",
+            } else {
+                                    $module_menu[] = array("index.php?module=Import&action=Step1&import_module=$module&return_module=$module&return_action=index",
                         $app_strings['LBL_IMPORT'], "Import", $module);
+                }
         }
         if (file_exists('custom/application/Ext/Menus/menu.ext.php')) {
             require('custom/application/Ext/Menus/menu.ext.php');
@@ -1251,22 +1269,25 @@ 
 		$defaultTab = (in_array("Home",$userTabs)) ? "Home" : key($userTabs);
 		
         // Need to figure out what tab this module belongs to, most modules have their own tabs, but there are exceptions.
-        if ( !empty($_REQUEST['module_tab']) )
-            return $_REQUEST['module_tab'];
-        elseif ( isset($moduleTabMap[$this->module]) )
-            return $moduleTabMap[$this->module];
+        if ( !empty($_REQUEST['module_tab']) ) {
+                    return $_REQUEST['module_tab'];
+        } elseif ( isset($moduleTabMap[$this->module]) ) {
+                    return $moduleTabMap[$this->module];
+        }
         // Special cases
-        elseif ( $this->module == 'MergeRecords' )
-            return !empty($_REQUEST['merge_module']) ? $_REQUEST['merge_module'] : $_REQUEST['return_module'];
-        elseif ( $this->module == 'Users' && $this->action == 'SetTimezone' )
-            return $defaultTab;
+        elseif ( $this->module == 'MergeRecords' ) {
+                    return !empty($_REQUEST['merge_module']) ? $_REQUEST['merge_module'] : $_REQUEST['return_module'];
+        } elseif ( $this->module == 'Users' && $this->action == 'SetTimezone' ) {
+                    return $defaultTab;
+        }
         // Default anonymous pages to be under Home
-        elseif ( !isset($app_list_strings['moduleList'][$this->module]) )
-            return $defaultTab;
-        elseif ( isset($_REQUEST['action']) && $_REQUEST['action'] == "ajaxui" )
-        	return $defaultTab;
-        else
-            return $this->module;
+        elseif ( !isset($app_list_strings['moduleList'][$this->module]) ) {
+                    return $defaultTab;
+        } elseif ( isset($_REQUEST['action']) && $_REQUEST['action'] == "ajaxui" ) {
+                	return $defaultTab;
+        } else {
+                    return $this->module;
+        }
     }
 
    /**
@@ -1317,7 +1338,10 @@ 
         if($show_help || $this->type == 'list') {
             $theTitle .= "<span class='utils'>";
             $createImageURL = SugarThemeRegistry::current()->getImageURL('create-record.gif');
-            if($this->type == 'list') $theTitle .= '<a href="#" class="btn btn-success showsearch"><span class=" glyphicon glyphicon-search" aria-hidden="true"></span></a>';$url = ajaxLink("index.php?module=$module&action=EditView&return_module=$module&return_action=DetailView");
+            if($this->type == 'list') {
+                $theTitle .= '<a href="#" class="btn btn-success showsearch"><span class=" glyphicon glyphicon-search" aria-hidden="true"></span></a>';
+            }
+            $url = ajaxLink("index.php?module=$module&action=EditView&return_module=$module&return_action=DetailView");
             if($show_help) {
                 $theTitle .= <<<EOHTML
 &nbsp;
@@ -1349,14 +1373,14 @@ 
         if(file_exists('custom/' .$coreMetaPath )){
             $metadataFile = 'custom/' . $coreMetaPath;
             $foundViewDefs = true;
-        }else{
+        } else{
             if(file_exists('custom/modules/'.$this->module.'/metadata/metafiles.php')){
                 require_once('custom/modules/'.$this->module.'/metadata/metafiles.php');
                 if(!empty($metafiles[$this->module][$viewDef])){
                     $metadataFile = $metafiles[$this->module][$viewDef];
                     $foundViewDefs = true;
                 }
-            }elseif(file_exists('modules/'.$this->module.'/metadata/metafiles.php')){
+            } elseif(file_exists('modules/'.$this->module.'/metadata/metafiles.php')){
                 require_once('modules/'.$this->module.'/metadata/metafiles.php');
                 if(!empty($metafiles[$this->module][$viewDef])){
                     $metadataFile = $metafiles[$this->module][$viewDef];
@@ -1391,9 +1415,9 @@ 
                 if(!empty($this->bean->id) && (empty($_REQUEST['isDuplicate']) || $_REQUEST['isDuplicate'] === 'false')) {
                     $params[] = "<a href='index.php?module={$this->module}&action=DetailView&record={$this->bean->id}'>".$this->bean->get_summary_text()."</a>";
                     $params[] = $GLOBALS['app_strings']['LBL_EDIT_BUTTON_LABEL'];
+                } else {
+                                    $params[] = $GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL'];
                 }
-                else
-                    $params[] = $GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL'];
                 break;
             case 'DetailView':
                 $beanName = $this->bean->get_summary_text();
@@ -1417,10 +1441,11 @@ 
     	global $current_user;
     	global $app_strings;
 
-    	if(!empty($GLOBALS['app_list_strings']['moduleList'][$this->module]))
-    		$firstParam = $GLOBALS['app_list_strings']['moduleList'][$this->module];
-    	else
-    		$firstParam = $this->module;
+    	if(!empty($GLOBALS['app_list_strings']['moduleList'][$this->module])) {
+    	    		$firstParam = $GLOBALS['app_list_strings']['moduleList'][$this->module];
+    	} else {
+    	    		$firstParam = $this->module;
+    	}
 
     	$iconPath = $this->getModuleTitleIconPath($this->module);
     	if($this->action == "ListView" || $this->action == "index") {
@@ -1436,8 +1461,7 @@ 
 			} else {
 				return $firstParam;
 			}
-    	}
-    	else {
+    	} else {
 		    if (!empty($iconPath) && !$browserTitle) {
 				//return "<a href='index.php?module={$this->module}&action=index'>$this->module</a>";
 			} else {
@@ -1451,8 +1475,7 @@ 
     	$iconPath = "";
     	if(is_file(SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png',false))) {
     		$iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png');
-    	}
-    	else if (is_file(SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png',false))) {
+    	} else if (is_file(SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png',false))) {
     		$iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png');
     	}
     	return $iconPath;
@@ -1469,11 +1492,13 @@ 
         global $app_strings;
 
         $browserTitle = $app_strings['LBL_BROWSER_TITLE'];
-        if ( $this->module == 'Users' && ($this->action == 'SetTimezone' || $this->action == 'Login') )
-            return $browserTitle;
+        if ( $this->module == 'Users' && ($this->action == 'SetTimezone' || $this->action == 'Login') ) {
+                    return $browserTitle;
+        }
         $params = $this->_getModuleTitleParams(true);
-        foreach ($params as $value )
-            $browserTitle = strip_tags($value) . ' &raquo; ' . $browserTitle;
+        foreach ($params as $value ) {
+                    $browserTitle = strip_tags($value) . ' &raquo; ' . $browserTitle;
+        }
 
         return $browserTitle;
     }
@@ -1487,8 +1512,7 @@ 
     {
     	if(SugarThemeRegistry::current()->directionality == "ltr") {
         	return "<span class='pointer'>&raquo;</span>";
-        }
-        else {
+        } else {
         	return "<span class='pointer'>&laquo;</span>";
         }
     }
@@ -1510,8 +1534,7 @@ 
         }
         if ( empty($sugar_config['disableAjaxUI']) ) {
             $config_js[] = "SUGAR.config.disableAjaxUI = false;";
-        }
-        else{
+        } else{
             $config_js[] = "SUGAR.config.disableAjaxUI = true;";
         }
         if ( !empty($sugar_config['addAjaxBannedModules']) ){
@@ -1581,18 +1604,21 @@ 
     protected function getFavicon()
     {
         // get favicon
-        if(isset($GLOBALS['sugar_config']['default_module_favicon']))
-            $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
-        else
-            $module_favicon = false;
+        if(isset($GLOBALS['sugar_config']['default_module_favicon'])) {
+                    $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
+        } else {
+                    $module_favicon = false;
+        }
 
         $themeObject = SugarThemeRegistry::current();
 
         $favicon = '';
-        if ( $module_favicon )
-            $favicon = $themeObject->getImageURL($this->module.'.gif',false);
-        if ( !sugar_is_file($favicon) || !$module_favicon )
-            $favicon = $themeObject->getImageURL('sugar_icon.ico',false);
+        if ( $module_favicon ) {
+                    $favicon = $themeObject->getImageURL($this->module.'.gif',false);
+        }
+        if ( !sugar_is_file($favicon) || !$module_favicon ) {
+                    $favicon = $themeObject->getImageURL('sugar_icon.ico',false);
+        }
 
         $extension = pathinfo($favicon, PATHINFO_EXTENSION);
         switch ($extension)

Doc Comments +6 added lines, -2 removed lines

@@ -1039,6 +1039,7 @@ 
      *
      * @param string option - the option that we want to know the valye of
      * @param bool default - what the default value should be if we do not find the option
+     * @param string $option
      *
      * @return bool - the value of the option
      */
@@ -1273,7 +1274,7 @@ 
     * Return the "breadcrumbs" to display at the top of the page
     *
     * @param  bool $show_help optional, true if we show the help links
-    * @return HTML string containing breadcrumb title
+    * @return string string containing breadcrumb title
     */
     public function getModuleTitle(
         $show_help = true
@@ -1446,6 +1447,9 @@ 
     	}
     }
 
+    /**
+     * @param string $module
+     */
     protected function getModuleTitleIconPath($module)
     {
     	$iconPath = "";
@@ -1496,7 +1500,7 @@ 
     /**
      * Fetch config values to be put into an array for JavaScript
      *
-     * @return array
+     * @return string[]
      */
     protected function getSugarConfigJS(){
         global $sugar_config;

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();
+		}
 	}
 
 	/**

Doc Comments +4 added lines, -1 removed lines

@@ -244,6 +244,7 @@ 
 
 	/**
 	 * Generic load method to load mapping arrays.
+	 * @param string $var
 	 */
 	private function loadMapping($var, $merge = false){
 		$$var = sugar_cache_retrieve("CONTROLLER_". $var . "_".$this->module);
@@ -469,7 +470,8 @@ 
 	/**
 	 * 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
+	 * @param string $function
+	 * @return boolean if the method exists on the object, false otherwise
 	 */
 	protected function hasFunction($function){
 		return method_exists($this, $function);
@@ -777,6 +779,7 @@ 
 
 	/**
 	 * getActionFilename
+	 * @param string $action
 	 */
 	public static function getActionFilename($action) {
 	   if(isset(self::$action_case_file[$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.

Doc Comments +4 added lines

@@ -59,6 +59,10 @@
 			$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');
 		}
 	}
+
+	/**
+	 * @param string $subtitle
+	 */
 	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";

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

Doc Comments +6 added lines

@@ -364,6 +364,10 @@ 
     }
 
     //Added as the rgraph charts do not use SugarCharts and this is where this method was previously
+
+    /**
+     * @param string $query
+     */
     function getChartData($query)
     {
         global $app_list_strings, $db;
@@ -390,6 +394,8 @@ 
     string $keycolname1      We will sort by this key secondly, and  it can be null, then it will only sort by the first column.
     bool $translate1            Whether to trabslate the second column
     bool $ifsort2                 Whether to sort by the second column or just translate the second column.
+    * @param string $keycolname1
+    * @param string $keycolname2
      * @return        The sorted and translated data.
      */
     function sortData($data_set, $keycolname1=null, $translate1=false, $keycolname2=null, $translate2=false, $ifsort2=false) {