adamjakab / SuiteCRM

include/connectors/ConnectorFactory.php

Indentation +37 added lines, -37 removed lines

@@ -44,45 +44,45 @@
  */
 class ConnectorFactory{
 
-	static $source_map = array();
+    static $source_map = array();
 
-	public static function getInstance($source_name){
-		if(empty(self::$source_map[$source_name])) {
-			require_once('include/connectors/sources/SourceFactory.php');
-			require_once('include/connectors/component.php');
-			$source = SourceFactory::getSource($source_name);
-			$component = new component();
-			$component->setSource($source);
-			$component->init();
-			self::$source_map[$source_name] = $component;
-		}
-		return self::$source_map[$source_name];
-	}
+    public static function getInstance($source_name){
+        if(empty(self::$source_map[$source_name])) {
+            require_once('include/connectors/sources/SourceFactory.php');
+            require_once('include/connectors/component.php');
+            $source = SourceFactory::getSource($source_name);
+            $component = new component();
+            $component->setSource($source);
+            $component->init();
+            self::$source_map[$source_name] = $component;
+        }
+        return self::$source_map[$source_name];
+    }
 
-	/**
-	 * Split the class name by _ and go through the class name
-	 * which represents the inheritance structure to load up all required parents.
-	 * @param string $class the root class we want to load.
-	 */
-	public static function load($class, $type){
-		self::loadClass($class, $type);
-	}
+    /**
+     * Split the class name by _ and go through the class name
+     * which represents the inheritance structure to load up all required parents.
+     * @param string $class the root class we want to load.
+     */
+    public static function load($class, $type){
+        self::loadClass($class, $type);
+    }
 
-	/**
-	 * include a source class file.
-	 * @param string $class a class file to include.
-	 */
-	public static function loadClass($class, $type){
-		$dir = str_replace('_','/',$class);
-		$parts = explode("/", $dir);
-		$file = $parts[count($parts)-1] . '.php';
-		if(file_exists("custom/modules/Connectors/connectors/{$type}/{$dir}/$file")){
-			require_once("custom/modules/Connectors/connectors/{$type}/{$dir}/$file");
-		} else if(file_exists("modules/Connectors/connectors/{$type}/{$dir}/$file")) {
-			require_once("modules/Connectors/connectors/{$type}/{$dir}/$file");
-		} else if(file_exists("connectors/{$type}/{$dir}/$file")) {
-			require_once("connectors/{$type}/{$dir}/$file");
-		}
-	}
+    /**
+     * include a source class file.
+     * @param string $class a class file to include.
+     */
+    public static function loadClass($class, $type){
+        $dir = str_replace('_','/',$class);
+        $parts = explode("/", $dir);
+        $file = $parts[count($parts)-1] . '.php';
+        if(file_exists("custom/modules/Connectors/connectors/{$type}/{$dir}/$file")){
+            require_once("custom/modules/Connectors/connectors/{$type}/{$dir}/$file");
+        } else if(file_exists("modules/Connectors/connectors/{$type}/{$dir}/$file")) {
+            require_once("modules/Connectors/connectors/{$type}/{$dir}/$file");
+        } else if(file_exists("connectors/{$type}/{$dir}/$file")) {
+            require_once("connectors/{$type}/{$dir}/$file");
+        }
+    }
 }
 ?>
\ No newline at end of file

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.
@@ -42,12 +42,12 @@ 
  * Connector factory
  * @api
  */
-class ConnectorFactory{
+class ConnectorFactory {
 
 	static $source_map = array();
 
-	public static function getInstance($source_name){
-		if(empty(self::$source_map[$source_name])) {
+	public static function getInstance($source_name) {
+		if (empty(self::$source_map[$source_name])) {
 			require_once('include/connectors/sources/SourceFactory.php');
 			require_once('include/connectors/component.php');
 			$source = SourceFactory::getSource($source_name);
@@ -64,7 +64,7 @@ 
 	 * which represents the inheritance structure to load up all required parents.
 	 * @param string $class the root class we want to load.
 	 */
-	public static function load($class, $type){
+	public static function load($class, $type) {
 		self::loadClass($class, $type);
 	}
 
@@ -72,15 +72,15 @@ 
 	 * include a source class file.
 	 * @param string $class a class file to include.
 	 */
-	public static function loadClass($class, $type){
-		$dir = str_replace('_','/',$class);
+	public static function loadClass($class, $type) {
+		$dir = str_replace('_', '/', $class);
 		$parts = explode("/", $dir);
-		$file = $parts[count($parts)-1] . '.php';
-		if(file_exists("custom/modules/Connectors/connectors/{$type}/{$dir}/$file")){
+		$file = $parts[count($parts) - 1].'.php';
+		if (file_exists("custom/modules/Connectors/connectors/{$type}/{$dir}/$file")) {
 			require_once("custom/modules/Connectors/connectors/{$type}/{$dir}/$file");
-		} else if(file_exists("modules/Connectors/connectors/{$type}/{$dir}/$file")) {
+		} else if (file_exists("modules/Connectors/connectors/{$type}/{$dir}/$file")) {
 			require_once("modules/Connectors/connectors/{$type}/{$dir}/$file");
-		} else if(file_exists("connectors/{$type}/{$dir}/$file")) {
+		} else if (file_exists("connectors/{$type}/{$dir}/$file")) {
 			require_once("connectors/{$type}/{$dir}/$file");
 		}
 	}

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/View/SugarView.php

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

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

Spacing +230 added lines, -231 removed lines

@@ -98,9 +98,9 @@ 
      */
     public function SugarView($bean = null,
         $view_object_map = array()
-        ){
+        ) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -141,9 +141,9 @@ 
         $this->_trackView();
 
         //For the ajaxUI, we need to use output buffering to return the page in an ajax friendly format
-        if ($this->_getOption('json_output')){
+        if ($this->_getOption('json_output')) {
 			ob_start();
-			if(!empty($_REQUEST['ajax_load']) && !empty($_REQUEST['loadLanguageJS'])) {
+			if (!empty($_REQUEST['ajax_load']) && !empty($_REQUEST['loadLanguageJS'])) {
 				echo $this->_getModLanguageJS();
 			}
 		}
@@ -158,7 +158,7 @@ 
         $this->preDisplay();
         $this->displayErrors();
         $this->display();
-        if ( !empty($this->module) ) {
+        if (!empty($this->module)) {
             $GLOBALS['logic_hook']->call_custom_logic($this->module, 'after_ui_frame');
         } else {
             $GLOBALS['logic_hook']->call_custom_logic('', 'after_ui_frame');
@@ -203,10 +203,10 @@ 
                 'favicon' => $this->getFavicon(),
             );
 
-            if(SugarThemeRegistry::current()->name == 'Classic' || SugarThemeRegistry::current()->classic)
+            if (SugarThemeRegistry::current()->name == 'Classic' || SugarThemeRegistry::current()->classic)
                 $ajax_ret['moduleList'] = $this->displayHeader(true);
 
-            if(empty($this->responseTime))
+            if (empty($this->responseTime))
                 $this->_calculateFooterMetrics();
             $ajax_ret['responseTime'] = $this->responseTime;
             $json = getJSONobj();
@@ -225,11 +225,11 @@ 
     {
         $errors = '';
 
-        foreach($this->errors as $error) {
-            $errors .= '<span class="error">' . $error . '</span><br>';
+        foreach ($this->errors as $error) {
+            $errors .= '<span class="error">'.$error.'</span><br>';
         }
 
-        if ( !$this->suppressDisplayErrors ) {
+        if (!$this->suppressDisplayErrors) {
             echo $errors;
         }
         else {
@@ -266,14 +266,14 @@ 
     {
         $action = strtolower($this->action);
         //Skip save, tracked in SugarBean instead
-        if($action == 'save') {
+        if ($action == 'save') {
         return;
         }
 
 
         $trackerManager = TrackerManager::getInstance();
         $timeStamp = TimeDate::getInstance()->nowDb();
-        if($monitor = $trackerManager->getMonitor('tracker')){
+        if ($monitor = $trackerManager->getMonitor('tracker')) {
             $monitor->setValue('action', $action);
             $monitor->setValue('user_id', $GLOBALS['current_user']->id);
             $monitor->setValue('module_name', $this->module);
@@ -288,7 +288,7 @@ 
 
             //If visible is true, but there is no bean, do not track (invalid/unauthorized reference)
             //Also, do not track save actions where there is no bean id
-            if($monitor->visible && empty($this->bean->id)) {
+            if ($monitor->visible && empty($this->bean->id)) {
             $trackerManager->unsetMonitor($monitor);
             return;
             }
@@ -300,7 +300,7 @@ 
     /**
      * Displays the header on section of the page; basically everything before the content
      */
-    public function displayHeader($retModTabs=false)
+    public function displayHeader($retModTabs = false)
     {
         global $theme;
         global $max_tabs;
@@ -320,7 +320,7 @@ 
         $ss->assign("APP", $app_strings);
         $ss->assign("THEME", $theme);
         $ss->assign("THEME_CONFIG", $themeObject->getConfig());
-        $ss->assign("THEME_IE6COMPAT", $themeObject->ie6compat ? 'true':'false');
+        $ss->assign("THEME_IE6COMPAT", $themeObject->ie6compat ? 'true' : 'false');
         $ss->assign("MODULE_NAME", $this->module);
         $ss->assign("langHeader", get_language_header());
 
@@ -336,17 +336,17 @@ 
         if ($this->_getOption('view_print')) {
             $css .= '<link rel="stylesheet" type="text/css" href="'.$themeObject->getCSSURL('print.css').'" media="all" />';
         }
-        $ss->assign("SUGAR_CSS",$css);
+        $ss->assign("SUGAR_CSS", $css);
 
         // get javascript
         ob_start();
         $this->renderJavascript();
 
-        $ss->assign("SUGAR_JS",ob_get_contents().$themeObject->getJS());
+        $ss->assign("SUGAR_JS", ob_get_contents().$themeObject->getJS());
         ob_end_clean();
 
         // get favicon
-        if(isset($GLOBALS['sugar_config']['default_module_favicon']))
+        if (isset($GLOBALS['sugar_config']['default_module_favicon']))
             $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
         else
             $module_favicon = false;
@@ -356,24 +356,24 @@ 
 
         // build the shortcut menu
         $shortcut_menu = array();
-        foreach ( $this->getMenu() as $key => $menu_item )
+        foreach ($this->getMenu() as $key => $menu_item)
             $shortcut_menu[$key] = array(
                 "URL"         => $menu_item[0],
                 "LABEL"       => $menu_item[1],
                 "MODULE_NAME" => $menu_item[2],
                 "IMAGE"       => $themeObject
-                    ->getImage($menu_item[2],"border='0' align='absmiddle'",null,null,'.gif',$menu_item[1]),
+                    ->getImage($menu_item[2], "border='0' align='absmiddle'", null, null, '.gif', $menu_item[1]),
                 );
-        $ss->assign("SHORTCUT_MENU",$shortcut_menu);
+        $ss->assign("SHORTCUT_MENU", $shortcut_menu);
 
         // handle rtl text direction
-        if(isset($_REQUEST['RTL']) && $_REQUEST['RTL'] == 'RTL'){
+        if (isset($_REQUEST['RTL']) && $_REQUEST['RTL'] == 'RTL') {
             $_SESSION['RTL'] = true;
         }
-        if(isset($_REQUEST['LTR']) && $_REQUEST['LTR'] == 'LTR'){
+        if (isset($_REQUEST['LTR']) && $_REQUEST['LTR'] == 'LTR') {
             unset($_SESSION['RTL']);
         }
-        if(isset($_SESSION['RTL']) && $_SESSION['RTL']){
+        if (isset($_SESSION['RTL']) && $_SESSION['RTL']) {
             $ss->assign("DIR", 'dir="RTL"');
         }
 
@@ -383,7 +383,7 @@ 
         $companyLogoURL = $companyLogoURL_arr[0];
 
         $company_logo_attributes = sugar_cache_retrieve('company_logo_attributes');
-        if(!empty($company_logo_attributes)) {
+        if (!empty($company_logo_attributes)) {
             $ss->assign("COMPANY_LOGO_MD5", $company_logo_attributes[0]);
             $ss->assign("COMPANY_LOGO_WIDTH", $company_logo_attributes[1]);
             $ss->assign("COMPANY_LOGO_HEIGHT", $company_logo_attributes[2]);
@@ -392,16 +392,16 @@ 
             // Always need to md5 the file
             $ss->assign("COMPANY_LOGO_MD5", md5_file($companyLogoURL));
 
-            list($width,$height) = getimagesize($companyLogoURL);
-            if ( $width > 212 || $height > 40 ) {
-                $resizePctWidth  = ($width - 212)/212;
-                $resizePctHeight = ($height - 40)/40;
-                if ( $resizePctWidth > $resizePctHeight )
+            list($width, $height) = getimagesize($companyLogoURL);
+            if ($width > 212 || $height > 40) {
+                $resizePctWidth  = ($width - 212) / 212;
+                $resizePctHeight = ($height - 40) / 40;
+                if ($resizePctWidth > $resizePctHeight)
                     $resizeAmount = $width / 212;
                 else
                     $resizeAmount = $height / 40;
-                $ss->assign("COMPANY_LOGO_WIDTH", round($width * (1/$resizeAmount)));
-                $ss->assign("COMPANY_LOGO_HEIGHT", round($height * (1/$resizeAmount)));
+                $ss->assign("COMPANY_LOGO_WIDTH", round($width * (1 / $resizeAmount)));
+                $ss->assign("COMPANY_LOGO_HEIGHT", round($height * (1 / $resizeAmount)));
             }
             else {
                 $ss->assign("COMPANY_LOGO_WIDTH", $width);
@@ -417,110 +417,110 @@ 
                                 )
             );
         }
-        $ss->assign("COMPANY_LOGO_URL",getJSPath($companyLogoURL)."&logo_md5=".$ss->get_template_vars("COMPANY_LOGO_MD5"));
+        $ss->assign("COMPANY_LOGO_URL", getJSPath($companyLogoURL)."&logo_md5=".$ss->get_template_vars("COMPANY_LOGO_MD5"));
 
         // get the global links
         $gcls = array();
         $global_control_links = array();
         require("include/globalControlLinks.php");
 
-        foreach($global_control_links as $key => $value) {
-            if ($key == 'users')  {   //represents logout link.
+        foreach ($global_control_links as $key => $value) {
+            if ($key == 'users') {   //represents logout link.
                 $ss->assign("LOGOUT_LINK", $value['linkinfo'][key($value['linkinfo'])]);
-                $ss->assign("LOGOUT_LABEL", key($value['linkinfo']));//key value for first element.
+                $ss->assign("LOGOUT_LABEL", key($value['linkinfo'])); //key value for first element.
                 continue;
             }
 
             foreach ($value as $linkattribute => $attributevalue) {
                 // get the main link info
-                if ( $linkattribute == 'linkinfo' ) {
+                if ($linkattribute == 'linkinfo') {
                     $gcls[$key] = array(
                         "LABEL" => key($attributevalue),
                         "URL"   => current($attributevalue),
                         "SUBMENU" => array(),
                         );
-                   if(substr($gcls[$key]["URL"], 0, 11) == "javascript:") {
-                       $gcls[$key]["ONCLICK"] = substr($gcls[$key]["URL"],11);
+                   if (substr($gcls[$key]["URL"], 0, 11) == "javascript:") {
+                       $gcls[$key]["ONCLICK"] = substr($gcls[$key]["URL"], 11);
                        $gcls[$key]["URL"] = "javascript:void(0)";
                    }
                 }
                 // and now the sublinks
-                if ( $linkattribute == 'submenu' && is_array($attributevalue) ) {
+                if ($linkattribute == 'submenu' && is_array($attributevalue)) {
                     foreach ($attributevalue as $submenulinkkey => $submenulinkinfo)
                         $gcls[$key]['SUBMENU'][$submenulinkkey] = array(
                             "LABEL" => key($submenulinkinfo),
                             "URL"   => current($submenulinkinfo),
                         );
-                       if(substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"], 0, 11) == "javascript:") {
-                           $gcls[$key]['SUBMENU'][$submenulinkkey]["ONCLICK"] = substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"],11);
+                       if (substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"], 0, 11) == "javascript:") {
+                           $gcls[$key]['SUBMENU'][$submenulinkkey]["ONCLICK"] = substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"], 11);
                            $gcls[$key]['SUBMENU'][$submenulinkkey]["URL"] = "javascript:void(0)";
                        }
                 }
             }
         }
-        $ss->assign("GCLS",$gcls);
+        $ss->assign("GCLS", $gcls);
 
         $ss->assign("SEARCH", isset($_REQUEST['query_string']) ? $_REQUEST['query_string'] : '');
 
         if ($this->action == "EditView" || $this->action == "Login")
             $ss->assign("ONLOAD", 'onload="set_focus()"');
 
-        $ss->assign("AUTHENTICATED",isset($_SESSION["authenticated_user_id"]));
+        $ss->assign("AUTHENTICATED", isset($_SESSION["authenticated_user_id"]));
 
         // get other things needed for page style popup
         if (isset($_SESSION["authenticated_user_id"])) {
             // get the current user name and id
             $ss->assign("CURRENT_USER", $current_user->full_name == '' || !showFullName()
-                ? $current_user->user_name : $current_user->full_name );
+                ? $current_user->user_name : $current_user->full_name);
             $ss->assign("CURRENT_USER_ID", $current_user->id);
 
             // get the last viewed records
             require_once("modules/Favorites/Favorites.php");
             $favorites = new Favorites();
             $favorite_records = $favorites->getCurrentUserSidebarFavorites();
-            $ss->assign("favoriteRecords",$favorite_records);
+            $ss->assign("favoriteRecords", $favorite_records);
 
             $tracker = new Tracker();
             $history = $tracker->get_recently_viewed($current_user->id);
-            $ss->assign("recentRecords",$this->processRecentRecords($history));
+            $ss->assign("recentRecords", $this->processRecentRecords($history));
         }
 
         $bakModStrings = $mod_strings;
-        if (isset($_SESSION["authenticated_user_id"]) ) {
+        if (isset($_SESSION["authenticated_user_id"])) {
             // get the module list
             $moduleTopMenu = array();
 
             $max_tabs = $current_user->getPreference('max_tabs');
             // Attempt to correct if max tabs count is extremely high.
-            if ( !isset($max_tabs) || $max_tabs <= 0 || $max_tabs > 10 ) {
+            if (!isset($max_tabs) || $max_tabs <= 0 || $max_tabs > 10) {
                 $max_tabs = $GLOBALS['sugar_config']['default_max_tabs'];
                 $current_user->setPreference('max_tabs', $max_tabs, 0, 'global');
             }
 
             $moduleTab = $this->_getModuleTab();
-            $ss->assign('MODULE_TAB',$moduleTab);
+            $ss->assign('MODULE_TAB', $moduleTab);
 
 
             // See if they are using grouped tabs or not (removed in 6.0, returned in 6.1)
             $user_navigation_paradigm = $current_user->getPreference('navigation_paradigm');
-            if ( !isset($user_navigation_paradigm) ) {
+            if (!isset($user_navigation_paradigm)) {
                 $user_navigation_paradigm = $GLOBALS['sugar_config']['default_navigation_paradigm'];
             }
 
 
             // Get the full module list for later use
-            foreach ( query_module_access_list($current_user) as $module ) {
+            foreach (query_module_access_list($current_user) as $module) {
                 // Bug 25948 - Check for the module being in the moduleList
-                if ( isset($app_list_strings['moduleList'][$module]) ) {
+                if (isset($app_list_strings['moduleList'][$module])) {
                     $fullModuleList[$module] = $app_list_strings['moduleList'][$module];
                 }
             }
 
 
-            if(!should_hide_iframes()) {
+            if (!should_hide_iframes()) {
                 $iFrame = new iFrame();
                 $frames = $iFrame->lookup_frames('tab');
-                foreach($frames as $key => $values){
+                foreach ($frames as $key => $values) {
                         $fullModuleList[$key] = $values;
                 }
             }
@@ -528,7 +528,7 @@ 
                 unset($fullModuleList['iFrames']);
             }
 
-            if ( $user_navigation_paradigm == 'gm' && isset($themeObject->group_tabs) && $themeObject->group_tabs) {
+            if ($user_navigation_paradigm == 'gm' && isset($themeObject->group_tabs) && $themeObject->group_tabs) {
                 // We are using grouped tabs
                 require_once('include/GroupedTabs/GroupedTabStructure.php');
                 $groupedTabsClass = new GroupedTabStructure();
@@ -537,12 +537,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;
                     }
                 }
@@ -555,22 +555,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;
                 $groupTabs[$app_strings['LBL_TABGROUP_ALL']]['modules'] = $fullModuleList;
@@ -581,31 +581,31 @@ 
             $topTabList = array();
 
             // Now time to go through each of the tab sets and fix them up.
-            foreach ( $groupTabs as $tabIdx => $tabData ) {
+            foreach ($groupTabs as $tabIdx => $tabData) {
                 $topTabs = $tabData['modules'];
-                if ( ! is_array($topTabs) ) {
+                if (!is_array($topTabs)) {
                     $topTabs = array();
                 }
                 $extraTabs = array();
 
                 // Split it in to the tabs that go across the top, and the ones that are on the extra menu.
-                if ( count($topTabs) > $max_tabs ) {
-                    $extraTabs = array_splice($topTabs,$max_tabs);
+                if (count($topTabs) > $max_tabs) {
+                    $extraTabs = array_splice($topTabs, $max_tabs);
                 }
                 // Make sure the current module is accessable through one of the top tabs
-                if ( !isset($topTabs[$moduleTab]) ) {
+                if (!isset($topTabs[$moduleTab])) {
                     // Nope, we need to add it.
                     // First, take it out of the extra menu, if it's there
-                    if ( isset($extraTabs[$moduleTab]) ) {
+                    if (isset($extraTabs[$moduleTab])) {
                         unset($extraTabs[$moduleTab]);
                     }
-                    if ( count($topTabs) >= $max_tabs - 1 ) {
+                    if (count($topTabs) >= $max_tabs - 1) {
                         // We already have the maximum number of tabs, so we need to shuffle the last one
                         // from the top to the first one of the extras
-                        $lastElem = array_splice($topTabs,$max_tabs-1);
+                        $lastElem = array_splice($topTabs, $max_tabs - 1);
                         $extraTabs = $lastElem + $extraTabs;
                     }
-                    if ( !empty($moduleTab) ) {
+                    if (!empty($moduleTab)) {
                         $topTabs[$moduleTab] = $app_list_strings['moduleList'][$moduleTab];
                     }
                 }
@@ -624,7 +624,7 @@ 
                 */
 
                 // Get a unique list of the top tabs so we can build the popup menus for them
-                foreach ( $topTabs as $moduleKey => $module ) {
+                foreach ($topTabs as $moduleKey => $module) {
                     $topTabList[$moduleKey] = $module;
                 }
 
@@ -633,67 +633,67 @@ 
             }
         }
 
-        if ( isset($topTabList) && is_array($topTabList) ) {
+        if (isset($topTabList) && is_array($topTabList)) {
             // Adding shortcuts array to menu array for displaying shortcuts associated with each module
             $shortcutTopMenu = array();
-            foreach($topTabList as $module_key => $label) {
+            foreach ($topTabList as $module_key => $label) {
                 global $mod_strings;
                 $mod_strings = return_module_language($current_language, $module_key);
-                foreach ( $this->getMenu($module_key) as $key => $menu_item ) {
+                foreach ($this->getMenu($module_key) as $key => $menu_item) {
                     $shortcutTopMenu[$module_key][$key] = array(
                         "URL"         => $menu_item[0],
                         "LABEL"       => $menu_item[1],
                         "MODULE_NAME" => $menu_item[2],
                         "IMAGE"       => $themeObject
-                        ->getImage($menu_item[2],"border='0' align='absmiddle'",null,null,'.gif',$menu_item[1]),
+                        ->getImage($menu_item[2], "border='0' align='absmiddle'", null, null, '.gif', $menu_item[1]),
                         "ID"          => $menu_item[2]."_link",
                         );
                 }
             }
-            if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $ss->assign('lock_homepage', true);
-            $ss->assign("groupTabs",$groupTabs);
-            $ss->assign("shortcutTopMenu",$shortcutTopMenu);
-            $ss->assign('USE_GROUP_TABS',$usingGroupTabs);
+            if (!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $ss->assign('lock_homepage', true);
+            $ss->assign("groupTabs", $groupTabs);
+            $ss->assign("shortcutTopMenu", $shortcutTopMenu);
+            $ss->assign('USE_GROUP_TABS', $usingGroupTabs);
 
             // This is here for backwards compatibility, someday, somewhere, it will be able to be removed
-            $ss->assign("moduleTopMenu",$groupTabs[$app_strings['LBL_TABGROUP_ALL']]['modules']);
-            $ss->assign("moduleExtraMenu",$groupTabs[$app_strings['LBL_TABGROUP_ALL']]['extra']);
+            $ss->assign("moduleTopMenu", $groupTabs[$app_strings['LBL_TABGROUP_ALL']]['modules']);
+            $ss->assign("moduleExtraMenu", $groupTabs[$app_strings['LBL_TABGROUP_ALL']]['extra']);
 
 
         }
 
-        if ( isset($extraTabs) && is_array($extraTabs) ) {
+        if (isset($extraTabs) && is_array($extraTabs)) {
             // Adding shortcuts array to extra menu array for displaying shortcuts associated with each module
             $shortcutExtraMenu = array();
-            foreach($extraTabs as $module_key => $label) {
+            foreach ($extraTabs as $module_key => $label) {
                 global $mod_strings;
                 $mod_strings = return_module_language($current_language, $module_key);
-                foreach ( $this->getMenu($module_key) as $key => $menu_item ) {
+                foreach ($this->getMenu($module_key) as $key => $menu_item) {
                     $shortcutExtraMenu[$module_key][$key] = array(
                         "URL"         => $menu_item[0],
                         "LABEL"       => $menu_item[1],
                         "MODULE_NAME" => $menu_item[2],
                         "IMAGE"       => $themeObject
-                        ->getImage($menu_item[2],"border='0' align='absmiddle'",null,null,'.gif',$menu_item[1]),
+                        ->getImage($menu_item[2], "border='0' align='absmiddle'", null, null, '.gif', $menu_item[1]),
                         "ID"          => $menu_item[2]."_link",
                         );
                 }
             }
-            $ss->assign("shortcutExtraMenu",$shortcutExtraMenu);
+            $ss->assign("shortcutExtraMenu", $shortcutExtraMenu);
         }
 
-       if(!empty($current_user)){
+       if (!empty($current_user)) {
        	$ss->assign("max_tabs", $current_user->getPreference("max_tabs"));
        }
 
 
         $imageURL = SugarThemeRegistry::current()->getImageURL("dashboard.png");
         $homeImage = "<img src='$imageURL'>";
-		$ss->assign("homeImage",$homeImage);
+		$ss->assign("homeImage", $homeImage);
         global $mod_strings;
         $mod_strings = $bakModStrings;
         $headerTpl = $themeObject->getTemplate('header.tpl');
-        if (inDeveloperMode() )
+        if (inDeveloperMode())
             $ss->clear_compiled_tpl($headerTpl);
 
         if ($retModTabs)
@@ -705,9 +705,9 @@ 
             $this->includeClassicFile('modules/Administration/DisplayWarnings.php');
 
             $errorMessages = SugarApplication::getErrorMessages();
-            if ( !empty($errorMessages)) {
-                foreach ( $errorMessages as $error_message ) {
-                    echo('<p class="error">' . $error_message.'</p>');
+            if (!empty($errorMessages)) {
+                foreach ($errorMessages as $error_message) {
+                    echo('<p class="error">'.$error_message.'</p>');
                 }
             }
         }
@@ -744,15 +744,15 @@ 
 
         $template = new Sugar_Smarty();
 
-        if(isset($this->bean->module_dir)){
+        if (isset($this->bean->module_dir)) {
             $template->assign('MODULE_SUGAR_GRP1', $this->bean->module_dir);
         }
-        if(isset($_REQUEST['action'])){
+        if (isset($_REQUEST['action'])) {
             $template->assign('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"))) {
             $_REQUEST['root_directory'] = ".";
             require_once("jssource/minify_utils.php");
@@ -763,7 +763,7 @@ 
         $template->assign('SUGAR_GRP1', getVersionedPath('cache/include/javascript/sugar_grp1.js'));
         $template->assign('CALENDAR', getVersionedPath('include/javascript/calendar.js'));
 
-        if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client']) {
+        if (isset($sugar_config['disc_client']) && $sugar_config['disc_client']) {
             $template->assign('HEADERSYNC', getVersionedPath('modules/Sync/headersync.js'));
         }
         echo $template->fetch('include/MVC/View/tpls/displayLoginJS.tpl');
@@ -794,13 +794,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;
     }
@@ -828,13 +828,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");
@@ -847,33 +847,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";
             }
@@ -881,12 +881,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']);
 	}
 
     /**
@@ -908,8 +908,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") {
@@ -918,11 +918,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 = "";
@@ -934,9 +934,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.
@@ -970,7 +970,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]);
@@ -979,16 +979,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);
@@ -1004,28 +1004,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
 
@@ -1038,7 +1038,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);
@@ -1096,7 +1096,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;
@@ -1125,7 +1125,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'])) {
@@ -1136,16 +1136,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();
@@ -1162,37 +1162,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);
@@ -1216,30 +1215,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
@@ -1266,22 +1265,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;
@@ -1301,42 +1300,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">
@@ -1362,31 +1361,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;
     }
@@ -1403,10 +1402,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'];
                 }
@@ -1430,18 +1429,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;"
@@ -1467,10 +1466,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;
@@ -1487,11 +1486,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;
     }
@@ -1503,7 +1502,7 @@ 
      */
     public function getBreadCrumbSymbol()
     {
-    	if(SugarThemeRegistry::current()->directionality == "ltr") {
+    	if (SugarThemeRegistry::current()->directionality == "ltr") {
         	return "<span class='pointer'>&raquo;</span>";
         }
         else {
@@ -1516,29 +1515,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)
             {
@@ -1599,7 +1598,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;
@@ -1607,10 +1606,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)
@@ -1667,10 +1666,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;
     }
@@ -1684,10 +1683,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 +129 added lines, -105 removed lines

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

include/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/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/getYUIComboFile.php

Indentation +23 added lines, -23 removed lines

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

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -65,7 +65,7 @@ 
 	$version = $version[0];
     if (empty($yui_path[$version])) continue;
 
-    $path = $yui_path[$version] . substr($param, strlen($version));
+    $path = $yui_path[$version].substr($param, strlen($version));
 
 	$extension = substr($path, strrpos($path, "_") + 1);
 
@@ -78,12 +78,12 @@ 
         $contentType = $types[$extension];
     }
 	//Put together the final filepath
-	$path = substr($path, 0, strrpos($path, "_")) . "." . $extension;
+	$path = substr($path, 0, strrpos($path, "_")).".".$extension;
 	$contents = '';
 	if (is_file($path)) {
-	   $out .= "/*" . $path . "*/\n";
-	   $contents =  file_get_contents($path);
-	   $out .= $contents . "\n";
+	   $out .= "/*".$path."*/\n";
+	   $contents = file_get_contents($path);
+	   $out .= $contents."\n";
 	}
 	$path = empty($contents) ? $path : $contents;
 	$allpath .= md5($path);
@@ -95,6 +95,6 @@ 
 header("Cache-Control: private");
 header("Pragma: dummy=bogus");
 header("Etag: $etag");
-header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 2592000));
+header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + 2592000));
 header("Content-Type: $contentType");
 echo ($out);
\ No newline at end of file

Braces +15 added lines, -7 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -38,7 +40,9 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-if (empty($_REQUEST)) die();
+if (empty($_REQUEST)) {
+    die();
+}
 
 $yui_path = array(
     "2.9.0" => "include/javascript/yui",
@@ -58,20 +62,24 @@ 
 foreach ($_REQUEST as $param => $val)
 {
 	//No backtracking in the path
-	if (strpos($param, "..") !== false)
-        continue;
+	if (strpos($param, "..") !== false) {
+	        continue;
+	}
 
 	$version = explode("/", $param);
 	$version = $version[0];
-    if (empty($yui_path[$version])) continue;
+    if (empty($yui_path[$version])) {
+        continue;
+    }
 
     $path = $yui_path[$version] . substr($param, strlen($version));
 
 	$extension = substr($path, strrpos($path, "_") + 1);
 
 	//Only allowed file extensions
-	if (empty($types[$extension]))
-	   continue;
+	if (empty($types[$extension])) {
+		   continue;
+	}
 
 	if (empty($contentType))
     {

include/Dashlets/DashletGenericChart.php

Indentation +10 added lines, -10 removed lines

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

Spacing +67 added lines, -67 removed lines

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

Braces +59 added lines, -36 removed lines

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

include/Dashlets/DashletCacheBuilder.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -64,28 +64,28 @@ 
         $cacheDir = create_cache_directory('dashlets/');
         $allDashlets = array_merge($dashletFiles, $dashletFilesCustom);
         $dashletFiles = array();
-        foreach($allDashlets as $num => $file) {
-            if(substr_count($file, '.meta') == 0) { // ignore meta data files
+        foreach ($allDashlets as $num => $file) {
+            if (substr_count($file, '.meta') == 0) { // ignore meta data files
                 $class = substr($file, strrpos($file, '/') + 1, -4);
                 $dashletFiles[$class] = array();
                 $dashletFiles[$class]['file'] = $file;
                 $dashletFiles[$class]['class'] = $class;
-                if(is_file(preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file))) { // is there an associated meta data file?
+                if (is_file(preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file))) { // is there an associated meta data file?
                     $dashletFiles[$class]['meta'] = preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file);
                     require($dashletFiles[$class]['meta']);
-                    if ( isset($dashletMeta[$class]['module']) )
+                    if (isset($dashletMeta[$class]['module']))
                         $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
                 }
                 
                 $filesInDirectory = array();
                 getFiles($filesInDirectory, substr($file, 0, strrpos($file, '/')), '/^.*\/Dashlets\/[^\.]*\.icon\.(jpg|jpeg|gif|png)$/i');
-                if(!empty($filesInDirectory)) {
+                if (!empty($filesInDirectory)) {
                     $dashletFiles[$class]['icon'] = $filesInDirectory[0]; // take the first icon we see
                 }
             }
         }
         
-        write_array_to_file('dashletsFiles', $dashletFiles, $cacheDir . 'dashlets.php');
+        write_array_to_file('dashletsFiles', $dashletFiles, $cacheDir.'dashlets.php');
     }
 }
 ?>
\ No newline at end of file

Braces +6 added lines, -3 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -73,8 +75,9 @@ 
                 if(is_file(preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file))) { // is there an associated meta data file?
                     $dashletFiles[$class]['meta'] = preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file);
                     require($dashletFiles[$class]['meta']);
-                    if ( isset($dashletMeta[$class]['module']) )
-                        $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
+                    if ( isset($dashletMeta[$class]['module']) ) {
+                                            $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
+                    }
                 }
                 
                 $filesInDirectory = array();

include/Dashlets/DashletRssFeedTitle.php

Indentation +65 added lines, -65 removed lines

@@ -43,79 +43,79 @@
  * Created: Sep 12, 2011
  */
 class DashletRssFeedTitle {
-	public $defaultEncoding = "UTF-8";
-	public $readBytes = 8192;
-	public $url;
-	public $cut = 70;
-	public $contents = "";
-	public $title = "";
-	public $endWith = "...";
-	public $xmlEncoding = false;
-	public $fileOpen = false;
+    public $defaultEncoding = "UTF-8";
+    public $readBytes = 8192;
+    public $url;
+    public $cut = 70;
+    public $contents = "";
+    public $title = "";
+    public $endWith = "...";
+    public $xmlEncoding = false;
+    public $fileOpen = false;
 
-	public function __construct($url) {
-		$this->url = $url;
-	}
+    public function __construct($url) {
+        $this->url = $url;
+    }
 
-	public function generateTitle() {
-		if ($this->readFeed()) {
-			$this->getTitle();
-			if (!empty($this->title)) {
-				$this->convertEncoding();
-				$this->cutLength();
-			}
-		}
-		return $this->title;
-	}
+    public function generateTitle() {
+        if ($this->readFeed()) {
+            $this->getTitle();
+            if (!empty($this->title)) {
+                $this->convertEncoding();
+                $this->cutLength();
+            }
+        }
+        return $this->title;
+    }
 
-	/**
-	 * @todo use curl with waiting timeout instead of fopen
-	 */
-	public function readFeed() {
-		if ($this->url) {
+    /**
+     * @todo use curl with waiting timeout instead of fopen
+     */
+    public function readFeed() {
+        if ($this->url) {
                     if (!in_array(strtolower(parse_url($this->url, PHP_URL_SCHEME)), array("http", "https"), true)) {
                         return false;
                     }
-			$fileOpen = @fopen($this->url, 'r');
-			if ($fileOpen) {
-				$this->fileOpen = true;
-				$this->contents = fread($fileOpen, $this->readBytes);
-				fclose($fileOpen);
-				return true;
-			}
-		}
-		return false;
-	}
+            $fileOpen = @fopen($this->url, 'r');
+            if ($fileOpen) {
+                $this->fileOpen = true;
+                $this->contents = fread($fileOpen, $this->readBytes);
+                fclose($fileOpen);
+                return true;
+            }
+        }
+        return false;
+    }
 
-	/**
-	 *
-	 */
-	public function getTitle() {
-		$matches = array ();
-		preg_match("/<title>.*?<\/title>/i", $this->contents, $matches);
-		if (isset($matches[0])) {
-			$this->title = str_replace(array('<![CDATA[', '<title>', '</title>', ']]>'), '', $matches[0]);
-		}
-	}
+    /**
+     *
+     */
+    public function getTitle() {
+        $matches = array ();
+        preg_match("/<title>.*?<\/title>/i", $this->contents, $matches);
+        if (isset($matches[0])) {
+            $this->title = str_replace(array('<![CDATA[', '<title>', '</title>', ']]>'), '', $matches[0]);
+        }
+    }
 
-	public function cutLength() {
-		if (mb_strlen(trim($this->title), $this->defaultEncoding) > $this->cut) {
-			$this->title = mb_substr($this->title, 0, $this->cut, $this->defaultEncoding) . $this->endWith;
-		}
-	}
+    public function cutLength() {
+        if (mb_strlen(trim($this->title), $this->defaultEncoding) > $this->cut) {
+            $this->title = mb_substr($this->title, 0, $this->cut, $this->defaultEncoding) . $this->endWith;
+        }
+    }
 
-	private function _identifyXmlEncoding() {
-		$matches = array ();
-		preg_match('/encoding\=*\".*?\"/', $this->contents, $matches);
-		if (isset($matches[0])) {
-			$this->xmlEncoding = trim(str_replace('encoding="', '"', $matches[0]), '"');
-		}
-	}
+    private function _identifyXmlEncoding() {
+        $matches = array ();
+        preg_match('/encoding\=*\".*?\"/', $this->contents, $matches);
+        if (isset($matches[0])) {
+            $this->xmlEncoding = trim(str_replace('encoding="', '"', $matches[0]), '"');
+        }
+    }
 
-	public function convertEncoding() {
-		$this->_identifyXmlEncoding();
-		if ($this->xmlEncoding && $this->xmlEncoding != $this->defaultEncoding) {
-			$this->title = iconv($this->xmlEncoding, $this->defaultEncoding, $this->title);
-		}
-	}
+    public function convertEncoding() {
+        $this->_identifyXmlEncoding();
+        if ($this->xmlEncoding && $this->xmlEncoding != $this->defaultEncoding) {
+            $this->title = iconv($this->xmlEncoding, $this->defaultEncoding, $this->title);
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
 	 *
 	 */
 	public function getTitle() {
-		$matches = array ();
+		$matches = array();
 		preg_match("/<title>.*?<\/title>/i", $this->contents, $matches);
 		if (isset($matches[0])) {
 			$this->title = str_replace(array('<![CDATA[', '<title>', '</title>', ']]>'), '', $matches[0]);
@@ -100,12 +100,12 @@ 
 
 	public function cutLength() {
 		if (mb_strlen(trim($this->title), $this->defaultEncoding) > $this->cut) {
-			$this->title = mb_substr($this->title, 0, $this->cut, $this->defaultEncoding) . $this->endWith;
+			$this->title = mb_substr($this->title, 0, $this->cut, $this->defaultEncoding).$this->endWith;
 		}
 	}
 
 	private function _identifyXmlEncoding() {
-		$matches = array ();
+		$matches = array();
 		preg_match('/encoding\=*\".*?\"/', $this->contents, $matches);
 		if (isset($matches[0])) {
 			$this->xmlEncoding = trim(str_replace('encoding="', '"', $matches[0]), '"');