adamjakab / SuiteCRM

include/database/DBManagerFactory.php

Indentation +11 added lines, -11 removed lines

@@ -80,7 +80,7 @@ 
                     }
                     break;
                 case "mssql":
-                  	if ( function_exists('sqlsrv_connect')
+                      if ( function_exists('sqlsrv_connect')
                                 && (empty($config['db_mssql_force_driver']) || $config['db_mssql_force_driver'] == 'sqlsrv' )) {
                         $my_db_manager = 'SqlsrvManager';
                     } elseif (self::isFreeTDS()
@@ -122,20 +122,20 @@ 
     }
 
     /**
-	 * Returns a reference to the DB object for instance $instanceName, or the default
+     * Returns a reference to the DB object for instance $instanceName, or the default
      * instance if one is not specified
      *
      * @param  string $instanceName optional, name of the instance
      * @return object DBManager instance
      */
-	public static function getInstance($instanceName = '')
+    public static function getInstance($instanceName = '')
     {
         global $sugar_config;
         static $count = 0, $old_count = 0;
 
         //fall back to the default instance name
         if(empty($sugar_config['db'][$instanceName])){
-        	$instanceName = '';
+            $instanceName = '';
         }
         if(!isset(self::$instances[$instanceName])){
             $config = $sugar_config['dbconfig'];
@@ -248,7 +248,7 @@ 
     /**
      * Check if we have freeTDS driver installed
      * Invoked when connected to mssql. checks if we have freetds version of mssql library.
-	 * the response is put into a global variable.
+     * the response is put into a global variable.
      * @return bool
      */
     public static function isFreeTDS()
@@ -256,14 +256,14 @@ 
         static $is_freetds = null;
 
         if($is_freetds === null) {
-    		ob_start();
-    		phpinfo(INFO_MODULES);
-    		$info=ob_get_contents();
-    		ob_end_clean();
+            ob_start();
+            phpinfo(INFO_MODULES);
+            $info=ob_get_contents();
+            ob_end_clean();
 
-    		$is_freetds = (strpos($info,'FreeTDS') !== false);
+            $is_freetds = (strpos($info,'FreeTDS') !== false);
         }
 
         return $is_freetds;
-     }
+        }
 }
\ No newline at end of file

include/ListView/ListView.php

Indentation +194 added lines, -196 removed lines

@@ -236,8 +236,8 @@ 
  * @param unknown $html_varName
  * @desc INTERNAL FUNCTION handles the rows
  */
- function process_dynamic_listview_rows($data,$parent_data, $xtemplateSection, $html_varName, $subpanel_def)
- {
+    function process_dynamic_listview_rows($data,$parent_data, $xtemplateSection, $html_varName, $subpanel_def)
+    {
     global $subpanel_item_count;
     global $odd_bg;
     global $even_bg;
@@ -346,7 +346,7 @@ 
             $BG_COLOR =  $even_bg;
         }
         $oddRow = !$oddRow;
-		$button_contents = array();
+        $button_contents = array();
         $this->xTemplate->assign("ROW_COLOR", $ROW_COLOR);
         $this->xTemplate->assign("BG_COLOR", $BG_COLOR);
         $layout_manager = $this->getLayoutManager();
@@ -366,43 +366,43 @@ 
             $thepanel=$subpanel_def;
         }
 
-		/* BEGIN - SECURITY GROUPS */ 
+        /* BEGIN - SECURITY GROUPS */ 
 
-		//This check is costly doing it field by field in the below foreach
-		//instead pull up here and do once per record....
-		$aclaccess_is_owner = false;
-		$aclaccess_in_group = false;
+        //This check is costly doing it field by field in the below foreach
+        //instead pull up here and do once per record....
+        $aclaccess_is_owner = false;
+        $aclaccess_in_group = false;
 
-		global $current_user;
-		if(is_admin($current_user)) {
-			$aclaccess_is_owner = true;
-		} else {
-			$aclaccess_is_owner = $aItem->isOwner($current_user->id);
-		}
+        global $current_user;
+        if(is_admin($current_user)) {
+            $aclaccess_is_owner = true;
+        } else {
+            $aclaccess_is_owner = $aItem->isOwner($current_user->id);
+        }
 
-		require_once("modules/SecurityGroups/SecurityGroup.php");
-		$aclaccess_in_group = SecurityGroup::groupHasAccess($aItem->module_dir,$aItem->id);
+        require_once("modules/SecurityGroups/SecurityGroup.php");
+        $aclaccess_in_group = SecurityGroup::groupHasAccess($aItem->module_dir,$aItem->id);
         	
-    	/* END - SECURITY GROUPS */ 
+        /* END - SECURITY GROUPS */ 
     	
         //get data source name
         $linked_field=$thepanel->get_data_source_name();
         $linked_field_set=$thepanel->get_data_source_name(true);
         static $count;
         if(!isset($count))$count = 0;
-		/* BEGIN - SECURITY GROUPS */ 
-		/**
+        /* BEGIN - SECURITY GROUPS */ 
+        /**
         $field_acl['DetailView'] = $aItem->ACLAccess('DetailView');
         $field_acl['ListView'] = $aItem->ACLAccess('ListView');
         $field_acl['EditView'] = $aItem->ACLAccess('EditView');
         $field_acl['Delete'] = $aItem->ACLAccess('Delete');
-		*/
-		//pass is_owner, in_group...vars defined above
+         */
+        //pass is_owner, in_group...vars defined above
         $field_acl['DetailView'] = $aItem->ACLAccess('DetailView',$aclaccess_is_owner,$aclaccess_in_group);
         $field_acl['ListView'] = $aItem->ACLAccess('ListView',$aclaccess_is_owner,$aclaccess_in_group);
         $field_acl['EditView'] = $aItem->ACLAccess('EditView',$aclaccess_is_owner,$aclaccess_in_group);
         $field_acl['Delete'] = $aItem->ACLAccess('Delete',$aclaccess_is_owner,$aclaccess_in_group);
-		/* END - SECURITY GROUPS */ 
+        /* END - SECURITY GROUPS */ 
         foreach($thepanel->get_list_fields() as $field_name=>$list_field)
         {
             //add linked field attribute to the array.
@@ -469,7 +469,7 @@ 
                         // So we'll populate the field data with the pre-rendered display for the field
                         $list_field['fields'][$field_name] = $widget_contents;
                         if('full_name' == $field_name){//bug #32465
-                           $list_field['fields'][strtoupper($field_name)] = $widget_contents;
+                            $list_field['fields'][strtoupper($field_name)] = $widget_contents;
                         }
 
                         //vardef source is non db, assign the field name to varname for processing of column.
@@ -482,7 +482,7 @@ 
                         $widget_contents = $layout_manager->widgetDisplay($list_field);
                     }
 
-                 $count++;
+                    $count++;
                 $this->xTemplate->assign('CELL_COUNT', $count);
                 $this->xTemplate->assign('CLASS', "");
                 if ( empty($widget_contents) ) $widget_contents = ' ';
@@ -490,15 +490,15 @@ 
                 $this->xTemplate->parse($xtemplateSection.".row.cell");
                 } else {
                     // This handles the edit and remove buttons and icon widget
-                	if( isset($list_field['widget_class']) && $list_field['widget_class'] == "SubPanelIcon") {
-		                $count++;
-		                $widget_contents = $layout_manager->widgetDisplay($list_field);
-		                $this->xTemplate->assign('CELL_COUNT', $count);
-		                $this->xTemplate->assign('CLASS', "");
-		                if ( empty($widget_contents) ) $widget_contents = ' ';
-		                $this->xTemplate->assign('CELL', $widget_contents);
-		                $this->xTemplate->parse($xtemplateSection.".row.cell");
-                	} elseif (preg_match("/button/i", $list_field['name'])) {
+                    if( isset($list_field['widget_class']) && $list_field['widget_class'] == "SubPanelIcon") {
+                        $count++;
+                        $widget_contents = $layout_manager->widgetDisplay($list_field);
+                        $this->xTemplate->assign('CELL_COUNT', $count);
+                        $this->xTemplate->assign('CLASS', "");
+                        if ( empty($widget_contents) ) $widget_contents = ' ';
+                        $this->xTemplate->assign('CELL', $widget_contents);
+                        $this->xTemplate->parse($xtemplateSection.".row.cell");
+                    } elseif (preg_match("/button/i", $list_field['name'])) {
                         if ((($list_field['name'] === 'edit_button' && $field_acl['EditView']) || ($list_field['name'] === 'close_button' && $field_acl['EditView']) || ($list_field['name'] === 'remove_button' && $field_acl['Delete'])) && '' != ($_content = $layout_manager->widgetDisplay($list_field)) )
                         {
                             $button_contents[] = $_content;
@@ -508,15 +508,15 @@ 
                         {
                             $button_contents[] = '';
                         }
-                	} else {
-               			$count++;
-               			$this->xTemplate->assign('CLASS', "");
-               			$widget_contents = $layout_manager->widgetDisplay($list_field);
-		                $this->xTemplate->assign('CELL_COUNT', $count);
-		                if ( empty($widget_contents) ) $widget_contents = ' ';
-		                $this->xTemplate->assign('CELL', $widget_contents);
-		                $this->xTemplate->parse($xtemplateSection.".row.cell");
-                	}
+                    } else {
+                            $count++;
+                            $this->xTemplate->assign('CLASS', "");
+                            $widget_contents = $layout_manager->widgetDisplay($list_field);
+                        $this->xTemplate->assign('CELL_COUNT', $count);
+                        if ( empty($widget_contents) ) $widget_contents = ' ';
+                        $this->xTemplate->assign('CELL', $widget_contents);
+                        $this->xTemplate->parse($xtemplateSection.".row.cell");
+                    }
                 }
 
             }
@@ -579,7 +579,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function ListView() {
+    function ListView() {
 
 
     if(!$this->initialized) {
@@ -598,11 +598,11 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setRecordsPerPage($count) {
+    function setRecordsPerPage($count) {
     $this->records_per_page = $count;
 }
 /**sets the header title */
- function setHeaderTitle($value) {
+    function setHeaderTitle($value) {
     $this->header_title = $value;
 }
 /**sets the header text this is text that's appended to the header table and is usually used for the creation of buttons
@@ -610,7 +610,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setHeaderText($value) {
+    function setHeaderText($value) {
     $this->header_text = $value;
 }
 /**sets the path for the XTemplate HTML file to be used this is only needed to be set if you are allowing ListView to create the XTemplate
@@ -618,7 +618,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setXTemplatePath($value) {
+    function setXTemplatePath($value) {
     $this->xTemplatePath= $value;
 }
 
@@ -627,7 +627,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function initNewXTemplate($XTemplatePath, $modString, $imagePath = null) {
+    function initNewXTemplate($XTemplatePath, $modString, $imagePath = null) {
     $this->setXTemplatePath($XTemplatePath);
     if(isset($modString))
         $this->setModStrings($modString);
@@ -728,7 +728,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setQuery($where, $limit, $orderBy, $varName, $allowOrderByOveride=true) {
+    function setQuery($where, $limit, $orderBy, $varName, $allowOrderByOveride=true) {
     $this->query_where = $where;
     if($this->getSessionVariable("query", "where") != $where) {
         $this->query_where_has_changed = true;
@@ -757,7 +757,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setTheme($theme) {
+    function setTheme($theme) {
     $this->local_theme = $theme;
     if(isset($this->xTemplate))$this->xTemplate->assign("THEME", $this->local_theme);
 }
@@ -767,7 +767,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setAppStrings($app_strings) {
+    function setAppStrings($app_strings) {
     unset($this->local_app_strings);
     $this->local_app_strings = $app_strings;
     if(isset($this->xTemplate))$this->xTemplate->assign("APP", $this->local_app_strings);
@@ -778,7 +778,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setModStrings($mod_strings) {
+    function setModStrings($mod_strings) {
     unset($this->local_module_strings);
     $this->local_mod_strings = $mod_strings;
     if(isset($this->xTemplate))$this->xTemplate->assign("MOD", $this->local_mod_strings);
@@ -789,7 +789,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setImagePath($image_path) {
+    function setImagePath($image_path) {
     $this->local_image_path = $image_path;
     if(empty($this->local_image_path)) {
         $this->local_image_path = SugarThemeRegistry::get($this->local_theme)->getImagePath();
@@ -802,7 +802,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setCurrentModule($currentModule) {
+    function setCurrentModule($currentModule) {
     unset($this->local_current_module);
     $this->local_current_module = $currentModule;
     if(isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
@@ -813,7 +813,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function createXTemplate() {
+    function createXTemplate() {
     if(!isset($this->xTemplate)) {
         if(isset($this->xTemplatePath)) {
 
@@ -834,7 +834,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setXTemplate($newXTemplate) {
+    function setXTemplate($newXTemplate) {
     $this->xTemplate = $newXTemplate;
 }
 
@@ -843,7 +843,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function getXTemplate() {
+    function getXTemplate() {
     return $this->xTemplate;
 }
 
@@ -852,7 +852,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function xTemplateAssign($name, $value) {
+    function xTemplateAssign($name, $value) {
 
         if(!isset($this->xTemplate)) {
             $this->createXTemplate();
@@ -866,15 +866,15 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function getOffset($localVarName) {
- 	if($this->query_where_has_changed || isset($GLOBALS['record_has_changed'])) {
- 		$this->setSessionVariable($localVarName,"offset", 0);
- 	}
-	$offset = $this->getSessionVariable($localVarName,"offset");
-	if(isset($offset)) {
-		return $offset;
-	}
-	return 0;
+    function getOffset($localVarName) {
+        if($this->query_where_has_changed || isset($GLOBALS['record_has_changed'])) {
+            $this->setSessionVariable($localVarName,"offset", 0);
+        }
+    $offset = $this->getSessionVariable($localVarName,"offset");
+    if(isset($offset)) {
+        return $offset;
+    }
+    return 0;
 }
 
 /**INTERNAL FUNCTION sets the offset in the session
@@ -882,7 +882,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setOffset($localVarName, $value) {
+    function setOffset($localVarName, $value) {
         $this->setSessionVariable($localVarName, "offset", $value);
 }
 
@@ -891,7 +891,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function setSessionVariable($localVarName,$varName, $value) {
+    function setSessionVariable($localVarName,$varName, $value) {
     $_SESSION[$this->local_current_module."_".$localVarName."_".$varName] = $value;
 }
 
@@ -906,7 +906,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
 */
- function getSessionVariable($localVarName,$varName) {
+    function getSessionVariable($localVarName,$varName) {
     //Set any variables pass in through request first
     if(isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
         $this->setSessionVariable($localVarName,$varName,$_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
@@ -941,10 +941,10 @@ 
     function calculateSortOrder($sortOrderList)
     {
         $priority_map = array(
-          'request',
-          'session',
-          'subpaneldefs',
-          'default',
+            'request',
+            'session',
+            'subpaneldefs',
+            'default',
         );
 
         foreach($priority_map as $p) {
@@ -960,33 +960,31 @@ 
 
 
     /**
-
-    * @return void
-    * @param unknown $localVarName
-    * @param unknown $varName
-    * @desc INTERNAL FUNCTION returns the session/query variable name
-    * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
-    * All Rights Reserved.
-    * Contributor(s): ______________________________________..
-    */
+     * @return void
+     * @param unknown $localVarName
+     * @param unknown $varName
+     * @desc INTERNAL FUNCTION returns the session/query variable name
+     * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+     * All Rights Reserved.
+     * Contributor(s): ______________________________________..
+     */
     function getSessionVariableName($localVarName,$varName) {
         return $this->local_current_module."_".$localVarName."_".$varName;
     }
 
     /**
-
-    * @return void
-    * @param unknown $seed
-    * @param unknown $xTemplateSection
-    * @param unknown $html_varName
-    * @desc INTERNAL FUNCTION Handles List Views using seeds that extend SugarBean
+     * @return void
+     * @param unknown $seed
+     * @param unknown $xTemplateSection
+     * @param unknown $html_varName
+     * @desc INTERNAL FUNCTION Handles List Views using seeds that extend SugarBean
         $XTemplateSection is the section in the XTemplate file that should be parsed usually main
         $html_VarName is the variable name used in the XTemplateFile e.g. TASK
         $seed is a seed that extends SugarBean
-        * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-        * All Rights Reserved..
-        * Contributor(s): ______________________________________..
-    */
+     * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+     * All Rights Reserved..
+     * Contributor(s): ______________________________________..
+     */
     function processSugarBean($xtemplateSection, $html_varName, $seed) {
         global $list_view_row_count;
 
@@ -1035,15 +1033,15 @@ 
 
     function processUnionBeans($sugarbean, $subpanel_def, $html_var = 'CELL') {
 
-		$last_detailview_record = $this->getSessionVariable("detailview", "record");
-		if(!empty($last_detailview_record) && $last_detailview_record != $sugarbean->id){
-			$GLOBALS['record_has_changed'] = true;
-		}
-		$this->setSessionVariable("detailview", "record", $sugarbean->id);
+        $last_detailview_record = $this->getSessionVariable("detailview", "record");
+        if(!empty($last_detailview_record) && $last_detailview_record != $sugarbean->id){
+            $GLOBALS['record_has_changed'] = true;
+        }
+        $this->setSessionVariable("detailview", "record", $sugarbean->id);
 
-		$current_offset = $this->getOffset($html_var);
-		$module = isset($_REQUEST['module']) ? $_REQUEST['module'] : '';
-		$response = array();
+        $current_offset = $this->getOffset($html_var);
+        $module = isset($_REQUEST['module']) ? $_REQUEST['module'] : '';
+        $response = array();
 
         // choose sort order
         $sort_order = array();
@@ -1088,11 +1086,11 @@ 
         $_SESSION['last_sub' .$this->subpanel_module. '_order'] = $this->sort_order;
         $_SESSION['last_sub' .$this->subpanel_module. '_url'] = $this->getBaseURL($html_var);
 
-		// Bug 8139 - Correct Subpanel sorting on 'name', when subpanel sorting default is 'last_name, first_name'
-		if (($this->sortby == 'name' || $this->sortby == 'last_name') &&
-			str_replace(' ', '', trim($subpanel_def->_instance_properties['sort_by'])) == 'last_name,first_name') {
-			$this->sortby = 'last_name '.$this->sort_order.', first_name ';
-		}
+        // Bug 8139 - Correct Subpanel sorting on 'name', when subpanel sorting default is 'last_name, first_name'
+        if (($this->sortby == 'name' || $this->sortby == 'last_name') &&
+            str_replace(' ', '', trim($subpanel_def->_instance_properties['sort_by'])) == 'last_name,first_name') {
+            $this->sortby = 'last_name '.$this->sort_order.', first_name ';
+        }
 
         if(!empty($this->response)){
             $response =& $this->response;
@@ -1168,15 +1166,15 @@ 
             return $baseurl;
     }
     /**
-    * @return void
-    * @param unknown $data
-    * @param unknown $xTemplateSection
-    * @param unknown $html_varName
-    * @desc INTERNAL FUNCTION process the List Navigation
-    * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
-    * All Rights Reserved.
-    * Contributor(s): ______________________________________..
-    */
+     * @return void
+     * @param unknown $data
+     * @param unknown $xTemplateSection
+     * @param unknown $html_varName
+     * @desc INTERNAL FUNCTION process the List Navigation
+     * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+     * All Rights Reserved.
+     * Contributor(s): ______________________________________..
+     */
     function processListNavigation($xtemplateSection, $html_varName, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean=null, $subpanel_def=null, $col_count = 20) {
 
         global $export_module;
@@ -1316,8 +1314,8 @@ 
             $end_record = $end_record-1;
 
 $script_href = "<a style=\'width: 150px\' name=\"thispage\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'if (document.MassUpdate.select_entire_list.value==1){document.MassUpdate.select_entire_list.value=0;sListView.check_all(document.MassUpdate, \"mass[]\", true, $this->records_per_page)}else {sListView.check_all(document.MassUpdate, \"mass[]\", true)};\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_CURRENT']}&nbsp;&#x28;{$this->records_per_page}&#x29;&#x200E;</a>"
- . "<a style=\'width: 150px\' name=\"selectall\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.check_entire_list(document.MassUpdate, \"mass[]\",true,{$row_count});\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}&nbsp;&#x28;{$row_count}&#x29;&#x200E;</a>"
- . "<a style=\'width: 150px\' name=\"deselect\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.clear_all(document.MassUpdate, \"mass[]\", false);\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_NONE']}</a>";
+    . "<a style=\'width: 150px\' name=\"selectall\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.check_entire_list(document.MassUpdate, \"mass[]\",true,{$row_count});\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}&nbsp;&#x28;{$row_count}&#x29;&#x200E;</a>"
+    . "<a style=\'width: 150px\' name=\"deselect\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.clear_all(document.MassUpdate, \"mass[]\", false);\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_NONE']}</a>";
 
 $close_inline_img = SugarThemeRegistry::current()->getImage('close_inline', 'border=0', null, null, ".gif", $app_strings['LBL_CLOSEINLINE']);
 
@@ -1548,15 +1546,15 @@ 
 
 
     /**
-    * @return void
-    * @param unknown $data
-    * @param unknown $xTemplateSection
-    * @param unknown $html_varName
-    * @desc INTERNAL FUNCTION handles the rows
-    * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
-    * All Rights Reserved.
-    * Contributor(s): ______________________________________..
-    */
+     * @return void
+     * @param unknown $data
+     * @param unknown $xTemplateSection
+     * @param unknown $html_varName
+     * @desc INTERNAL FUNCTION handles the rows
+     * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+     * All Rights Reserved.
+     * Contributor(s): ______________________________________..
+     */
     function processListRows($data, $xtemplateSection, $html_varName)
     {
         global $odd_bg;
@@ -1753,7 +1751,7 @@ 
         {
             $orderBy=  'amount';
         }
-		$buttons = false;
+        $buttons = false;
         $col_count = 0;
         foreach($subpanel_def->get_list_fields() as $column_name=>$widget_args)
         {
@@ -1771,17 +1769,17 @@ 
                 }
 
                 if (!preg_match("/_button/i", $column_name)) {
-	                $widget_args['name']=$column_name;
-	                $widget_args['sort'] = $imgArrow;
-	                $widget_args['start_link_wrapper'] = $this->start_link_wrapper;
-	                $widget_args['end_link_wrapper'] = $this->end_link_wrapper;
-	                $widget_args['subpanel_module'] = $this->subpanel_module;
-
-	                $widget_contents = $layout_manager->widgetDisplay($widget_args);
-	                $cell_width = empty($widget_args['width']) ? '' : $widget_args['width'];
-	                $this->xTemplate->assign('HEADER_CELL', $widget_contents);
-	                static $count;
-	            if(!isset($count))$count = 0; else $count++;
+                    $widget_args['name']=$column_name;
+                    $widget_args['sort'] = $imgArrow;
+                    $widget_args['start_link_wrapper'] = $this->start_link_wrapper;
+                    $widget_args['end_link_wrapper'] = $this->end_link_wrapper;
+                    $widget_args['subpanel_module'] = $this->subpanel_module;
+
+                    $widget_contents = $layout_manager->widgetDisplay($widget_args);
+                    $cell_width = empty($widget_args['width']) ? '' : $widget_args['width'];
+                    $this->xTemplate->assign('HEADER_CELL', $widget_contents);
+                    static $count;
+                if(!isset($count))$count = 0; else $count++;
                     if($col_count == 0 || $column_name == 'name') $footable = 'data-toggle="true"';
                     else {
                         $footable = 'data-hide="phone"';
@@ -1789,11 +1787,11 @@ 
                         if ($col_count > 4) $footable = 'data-hide="phone,phonelandscape,tablet"';
                     }
                     $this->xTemplate->assign('FOOTABLE', $footable);
-	                $this->xTemplate->assign('CELL_COUNT', $count);
-	                $this->xTemplate->assign('CELL_WIDTH', $cell_width);
-	                $this->xTemplate->parse('dyn_list_view.header_cell');
+                    $this->xTemplate->assign('CELL_COUNT', $count);
+                    $this->xTemplate->assign('CELL_WIDTH', $cell_width);
+                    $this->xTemplate->parse('dyn_list_view.header_cell');
                 } else {
-                	$buttons = true;
+                    $buttons = true;
                 }
             }
             ++$col_count;
@@ -1801,29 +1799,29 @@ 
 
         if($buttons) {
                     $this->xTemplate->assign('FOOTABLE', '');
-        			$this->xTemplate->assign('HEADER_CELL', "&nbsp;");
-        			$this->xTemplate->assign('CELL_COUNT', $count);
-	                $this->xTemplate->assign('CELL_WIDTH', $cell_width);
-	                $this->xTemplate->parse('dyn_list_view.header_cell');
+                    $this->xTemplate->assign('HEADER_CELL', "&nbsp;");
+                    $this->xTemplate->assign('CELL_COUNT', $count);
+                    $this->xTemplate->assign('CELL_WIDTH', $cell_width);
+                    $this->xTemplate->parse('dyn_list_view.header_cell');
         }
 
     }
 
 
     /**
-    * @return void
-    * @param unknown $seed
-    * @param unknown $xTemplateSection
-    * @param unknown $html_varName
-    * @desc PUBLIC FUNCTION Handles List Views using seeds that extend SugarBean
+     * @return void
+     * @param unknown $seed
+     * @param unknown $xTemplateSection
+     * @param unknown $html_varName
+     * @desc PUBLIC FUNCTION Handles List Views using seeds that extend SugarBean
         $XTemplateSection is the section in the XTemplate file that should be parsed usually main
         $html_VarName is the variable name used in the XTemplateFile e.g. TASK
         $seed is a seed there are two types of seeds one is a subclass of SugarBean, the other is a list usually created from a sugar bean using get_list
         if no XTemplate is set it will create  a new XTemplate
-        * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-        * All Rights Reserved..
-        * Contributor(s): ______________________________________..
-    */
+     * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+     * All Rights Reserved..
+     * Contributor(s): ______________________________________..
+     */
 
     function processListViewTwo($seed, $xTemplateSection, $html_varName) {
         global $current_user;
@@ -1898,12 +1896,12 @@ 
         return "&nbsp;<img border='0' src='".SugarThemeRegistry::current()->getImageURL("arrow{$upDown}.{$ext}")."' ";
     }
 
-	function getArrowEnd() {
-		$imgFileParts = pathinfo(SugarThemeRegistry::current()->getImageURL("arrow.gif"));
+    function getArrowEnd() {
+        $imgFileParts = pathinfo(SugarThemeRegistry::current()->getImageURL("arrow.gif"));
 
         list($width,$height) = ListView::getArrowImageSize();
 
-		return '.'.$imgFileParts['extension']."' width='$width' height='$height' align='absmiddle' alt=".translate('LBL_SORT').">";
+        return '.'.$imgFileParts['extension']."' width='$width' height='$height' align='absmiddle' alt=".translate('LBL_SORT').">";
     }
 
     function getArrowUpDownEnd($upDown) {
@@ -1924,9 +1922,9 @@ 
         return " width='$width' height='$height' align='absmiddle' alt='$sortStr'>";
     }
 
-	function getArrowImageSize() {
-	    // jbasicChartDashletsExpColust get the non-sort image's size.. the up and down have be the same.
-		$image = SugarThemeRegistry::current()->getImageURL("arrow.gif",false);
+    function getArrowImageSize() {
+        // jbasicChartDashletsExpColust get the non-sort image's size.. the up and down have be the same.
+        $image = SugarThemeRegistry::current()->getImageURL("arrow.gif",false);
 
         $cache_key = 'arrow_size.'.$image;
 
@@ -1958,13 +1956,13 @@ 
         return $result;
     }
 
-	function getOrderByInfo($html_varName)
-	{
-		$orderBy = $this->getSessionVariable($html_varName, "OBL");
-		$desc = $this->getSessionVariable($html_varName, $orderBy.'S');
-		$orderBy = str_replace('.', '_', $orderBy);
-		return array($orderBy,$desc);
-	}
+    function getOrderByInfo($html_varName)
+    {
+        $orderBy = $this->getSessionVariable($html_varName, "OBL");
+        $desc = $this->getSessionVariable($html_varName, $orderBy.'S');
+        $orderBy = str_replace('.', '_', $orderBy);
+        return array($orderBy,$desc);
+    }
 
     function processSortArrows($html_varName)
     {
@@ -1973,25 +1971,25 @@ 
 
         list($orderBy,$desc) = $this->getOrderByInfo($html_varName);
 
-		$imgArrow = "_up";
-		if($desc) {
-			$imgArrow = "_down";
-		}
-		/**
-		 * @deprecated only used by legacy opportunites listview, nothing current. Leaving for BC
-		 */
-		if($orderBy == 'amount')
-		{
-			$this->xTemplateAssign('amount_arrow', $imgArrow);
-		}
-		else if($orderBy == 'amount_usdollar')
-		{
-			$this->xTemplateAssign('amount_usdollar_arrow', $imgArrow);
-		}
-		else
-		{
-			$this->xTemplateAssign($orderBy.'_arrow', $imgArrow);
-		}
+        $imgArrow = "_up";
+        if($desc) {
+            $imgArrow = "_down";
+        }
+        /**
+         * @deprecated only used by legacy opportunites listview, nothing current. Leaving for BC
+         */
+        if($orderBy == 'amount')
+        {
+            $this->xTemplateAssign('amount_arrow', $imgArrow);
+        }
+        else if($orderBy == 'amount_usdollar')
+        {
+            $this->xTemplateAssign('amount_usdollar_arrow', $imgArrow);
+        }
+        else
+        {
+            $this->xTemplateAssign($orderBy.'_arrow', $imgArrow);
+        }
 
         $this->xTemplateAssign('arrow_end', $this->getArrowEnd());
     }
@@ -2030,37 +2028,37 @@ 
         return sugar_microtime();
     }
 
-     /**INTERNAL FUNCTION sets a session variable keeping it local to the listview
+        /**INTERNAL FUNCTION sets a session variable keeping it local to the listview
      not the current_module
      * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
      * All Rights Reserved.
      * Contributor(s): ______________________________________.
      */
-     function setLocalSessionVariable($localVarName,$varName, $value) {
+        function setLocalSessionVariable($localVarName,$varName, $value) {
         $_SESSION[$localVarName."_".$varName] = $value;
-     }
+        }
 
-     /**INTERNAL FUNCTION returns a session variable that is local to the listview,
+        /**INTERNAL FUNCTION returns a session variable that is local to the listview,
      not the current_module
      * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
      * All Rights Reserved.
      * Contributor(s): ______________________________________.
      */
- function getLocalSessionVariable($localVarName,$varName) {
+    function getLocalSessionVariable($localVarName,$varName) {
     if(isset($_SESSION[$localVarName."_".$varName])) {
         return $_SESSION[$localVarName."_".$varName];
     }
     else{
         return "";
     }
- }
+    }
 
- /* Set to true if you want Additional Details to appear in the listview
+    /* Set to true if you want Additional Details to appear in the listview
   */
- function setAdditionalDetails($value = true, $function = '') {
+    function setAdditionalDetails($value = true, $function = '') {
     if(!empty($function)) $this->additionalDetailsFunction = $function;
     $this->_additionalDetails = $value;
- }
+    }
 
 }
 ?>

include/ListView/ListViewData.php

Indentation +250 added lines, -250 removed lines

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

include/utils/sugar_file_utils.php

Indentation +153 added lines, -153 removed lines

@@ -54,44 +54,44 @@ 
  * @return boolean - Returns true on success false on failure
  */
 function sugar_mkdir($pathname, $mode=null, $recursive=false, $context='') {
-	$mode = get_mode('dir_mode', $mode);
-
-	if ( sugar_is_dir($pathname,$mode) )
-	    return true;
-
-	$result = false;
-	if(empty($mode))
-		$mode = 0777;
-	if(empty($context)) {
-		$result = @mkdir($pathname, $mode, $recursive);
-	} else {
-		$result = @mkdir($pathname, $mode, $recursive, $context);
-	}
-
-	if($result){
-		if(!sugar_chmod($pathname, $mode)){
-			return false;
-		}
-		if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
-			if(!sugar_chown($pathname)){
-				return false;
-			}
-		}
-		if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
-   			if(!sugar_chgrp($pathname)) {
-   				return false;
-   			}
-		}
-	}
-	else {
-		$errorMessage = "Cannot create directory $pathname cannot be touched";
-		if(is_null($GLOBALS['log'])) {
-			throw new Exception("Error occurred but the system doesn't have logger. Error message: \"$errorMessage\"");
-		}
-		$GLOBALS['log']->error($errorMessage);
-	}
-
-	return $result;
+    $mode = get_mode('dir_mode', $mode);
+
+    if ( sugar_is_dir($pathname,$mode) )
+        return true;
+
+    $result = false;
+    if(empty($mode))
+        $mode = 0777;
+    if(empty($context)) {
+        $result = @mkdir($pathname, $mode, $recursive);
+    } else {
+        $result = @mkdir($pathname, $mode, $recursive, $context);
+    }
+
+    if($result){
+        if(!sugar_chmod($pathname, $mode)){
+            return false;
+        }
+        if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
+            if(!sugar_chown($pathname)){
+                return false;
+            }
+        }
+        if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+                if(!sugar_chgrp($pathname)) {
+                    return false;
+                }
+        }
+    }
+    else {
+        $errorMessage = "Cannot create directory $pathname cannot be touched";
+        if(is_null($GLOBALS['log'])) {
+            throw new Exception("Error occurred but the system doesn't have logger. Error message: \"$errorMessage\"");
+        }
+        $GLOBALS['log']->error($errorMessage);
+    }
+
+    return $result;
 }
 
 /**
@@ -109,17 +109,17 @@ 
  * @return boolean - Returns a file pointer on success, false otherwise
  */
 function sugar_fopen($filename, $mode, $use_include_path=false, $context=null){
-	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
-		sugar_touch($filename);
-	}
+    //check to see if the file exists, if not then use touch to create it.
+    if(!file_exists($filename)){
+        sugar_touch($filename);
+    }
 
-	if(empty($context)) {
+    if(empty($context)) {
 
-		return fopen($filename, $mode, $use_include_path);
-	} else {
-		return fopen($filename, $mode, $use_include_path, $context);
-	}
+        return fopen($filename, $mode, $use_include_path);
+    } else {
+        return fopen($filename, $mode, $use_include_path, $context);
+    }
 }
 
 /**
@@ -137,23 +137,23 @@ 
  * @return int - Returns the number of bytes written to the file, false otherwise.
  */
 function sugar_file_put_contents($filename, $data, $flags=null, $context=null){
-	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
-		sugar_touch($filename);
-	}
-
-	if ( !is_writable($filename) ) {
-	    $GLOBALS['log']->error("File $filename cannot be written to");
-	    return false;
-	}
-
-	if(empty($flags)) {
-		return file_put_contents($filename, $data);
-	} elseif(empty($context)) {
-		return file_put_contents($filename, $data, $flags);
-	} else{
-		return file_put_contents($filename, $data, $flags, $context);
-	}
+    //check to see if the file exists, if not then use touch to create it.
+    if(!file_exists($filename)){
+        sugar_touch($filename);
+    }
+
+    if ( !is_writable($filename) ) {
+        $GLOBALS['log']->error("File $filename cannot be written to");
+        return false;
+    }
+
+    if(empty($flags)) {
+        return file_put_contents($filename, $data);
+    } elseif(empty($context)) {
+        return file_put_contents($filename, $data, $flags);
+    } else{
+        return file_put_contents($filename, $data, $flags, $context);
+    }
 }
 
 
@@ -198,7 +198,7 @@ 
 
     if(file_exists($filename))
     {
-       return sugar_chmod($filename, 0755);
+        return sugar_chmod($filename, 0755);
     }
 
     return false;
@@ -215,21 +215,21 @@ 
  * @return string|boolean - Returns a file data on success, false otherwise
  */
 function sugar_file_get_contents($filename, $use_include_path=false, $context=null){
-	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
-		sugar_touch($filename);
-	}
-
-	if ( !is_readable($filename) ) {
-	    $GLOBALS['log']->error("File $filename cannot be read");
-	    return false;
-	}
-
-	if(empty($context)) {
-		return file_get_contents($filename, $use_include_path);
-	} else {
-		return file_get_contents($filename, $use_include_path, $context);
-	}
+    //check to see if the file exists, if not then use touch to create it.
+    if(!file_exists($filename)){
+        sugar_touch($filename);
+    }
+
+    if ( !is_readable($filename) ) {
+        $GLOBALS['log']->error("File $filename cannot be read");
+        return false;
+    }
+
+    if(empty($context)) {
+        return file_get_contents($filename, $use_include_path);
+    } else {
+        return file_get_contents($filename, $use_include_path, $context);
+    }
 }
 
 /**
@@ -248,31 +248,31 @@ 
  */
 function sugar_touch($filename, $time=null, $atime=null) {
 
-   $result = false;
-
-   if(!empty($atime) && !empty($time)) {
-   	  $result = @touch($filename, $time, $atime);
-   } else if(!empty($time)) {
-   	  $result = @touch($filename, $time);
-   } else {
-   	  $result = @touch($filename);
-   }
-
-   if(!$result) {
-       $GLOBALS['log']->error("File $filename cannot be touched");
-       return $result;
-   }
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['file_mode'])){
-		sugar_chmod($filename, $GLOBALS['sugar_config']['default_permissions']['file_mode']);
-	}
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
-		sugar_chown($filename);
-	}
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
-		sugar_chgrp($filename);
-	}
-
-   return true;
+    $result = false;
+
+    if(!empty($atime) && !empty($time)) {
+            $result = @touch($filename, $time, $atime);
+    } else if(!empty($time)) {
+            $result = @touch($filename, $time);
+    } else {
+            $result = @touch($filename);
+    }
+
+    if(!$result) {
+        $GLOBALS['log']->error("File $filename cannot be touched");
+        return $result;
+    }
+    if(!empty($GLOBALS['sugar_config']['default_permissions']['file_mode'])){
+        sugar_chmod($filename, $GLOBALS['sugar_config']['default_permissions']['file_mode']);
+    }
+    if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
+        sugar_chown($filename);
+    }
+    if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+        sugar_chgrp($filename);
+    }
+
+    return true;
 }
 
 /**
@@ -287,17 +287,17 @@ 
 function sugar_chmod($filename, $mode=null) {
     if ( !is_int($mode) )
         $mode = (int) $mode;
-	if(!is_windows()){
-		if(!isset($mode)){
-			$mode = get_mode('file_mode', $mode);
-		}
+    if(!is_windows()){
+        if(!isset($mode)){
+            $mode = get_mode('file_mode', $mode);
+        }
         if(isset($mode) && $mode > 0){
-		   return @chmod($filename, $mode);
-		}else{
-	    	return false;
-		}
-	}
-	return true;
+            return @chmod($filename, $mode);
+        }else{
+            return false;
+        }
+    }
+    return true;
 }
 
 /**
@@ -310,19 +310,19 @@ 
  * @return boolean - Returns TRUE on success or FALSE on failure.
  */
 function sugar_chown($filename, $user='') {
-	if(!is_windows()){
-		if(strlen($user)){
-			return chown($filename, $user);
-		}else{
-			if(strlen($GLOBALS['sugar_config']['default_permissions']['user'])){
-				$user = $GLOBALS['sugar_config']['default_permissions']['user'];
-				return chown($filename, $user);
-			}else{
-				return false;
-			}
-		}
-	}
-	return true;
+    if(!is_windows()){
+        if(strlen($user)){
+            return chown($filename, $user);
+        }else{
+            if(strlen($GLOBALS['sugar_config']['default_permissions']['user'])){
+                $user = $GLOBALS['sugar_config']['default_permissions']['user'];
+                return chown($filename, $user);
+            }else{
+                return false;
+            }
+        }
+    }
+    return true;
 }
 
 /**
@@ -335,19 +335,19 @@ 
  * @return boolean - Returns TRUE on success or FALSE on failure.
  */
 function sugar_chgrp($filename, $group='') {
-	if(!is_windows()){
-		if(!empty($group)){
-			return chgrp($filename, $group);
-		}else{
-			if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
-				$group = $GLOBALS['sugar_config']['default_permissions']['group'];
-				return chgrp($filename, $group);
-			}else{
-				return false;
-			}
-		}
-	}
-	return true;
+    if(!is_windows()){
+        if(!empty($group)){
+            return chgrp($filename, $group);
+        }else{
+            if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+                $group = $GLOBALS['sugar_config']['default_permissions']['group'];
+                return chgrp($filename, $group);
+            }else{
+                return false;
+            }
+        }
+    }
+    return true;
 }
 
 /**
@@ -361,26 +361,26 @@ 
  * @return int - the mode either found in the config file or passed in via the input parameter
  */
 function get_mode($key = 'dir_mode', $mode=null) {
-	if ( !is_int($mode) )
+    if ( !is_int($mode) )
         $mode = (int) $mode;
     if(!class_exists('SugarConfig', true)) {
-		require 'include/SugarObjects/SugarConfig.php';
-	}
-	if(!is_windows()){
-		$conf_inst=SugarConfig::getInstance();
-		$mode = $conf_inst->get('default_permissions.'.$key, $mode);
-	}
-	return $mode;
+        require 'include/SugarObjects/SugarConfig.php';
+    }
+    if(!is_windows()){
+        $conf_inst=SugarConfig::getInstance();
+        $mode = $conf_inst->get('default_permissions.'.$key, $mode);
+    }
+    return $mode;
 }
 
 function sugar_is_dir($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_dir($path, $mode);
-		return is_dir($path);
+        if(defined('TEMPLATE_URL'))return is_dir($path, $mode);
+        return is_dir($path);
 }
 
 function sugar_is_file($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_file($path, $mode);
-		return is_file($path);
+        if(defined('TEMPLATE_URL'))return is_file($path, $mode);
+        return is_file($path);
 }
 
 /**

include/modules.php

Indentation +2 added lines, -2 removed lines

@@ -237,7 +237,7 @@ 
     );
 $adminOnlyList = array(
                     //module => list of actions  (all says all actions are admin only)
-                   //'Administration'=>array('all'=>1, 'SupportPortal'=>'allow'),
+                    //'Administration'=>array('all'=>1, 'SupportPortal'=>'allow'),
                     'Dropdown'=>array('all'=>1),
                     'Dynamic'=>array('all'=>1),
                     'DynamicFields'=>array('all'=>1),
@@ -294,7 +294,7 @@ 
     'DocumentRevisions' => 'Documents',
     'EmailTemplates' => 'Emails',
     'EmailMarketing' => 'Campaigns',
- );
+    );
 $beanList['EAPM'] = 'EAPM';
 $beanFiles['EAPM'] = 'modules/EAPM/EAPM.php';
 $modules_exempt_from_availability_check['EAPM'] = 'EAPM';

include/TemplateHandler/TemplateHandler.php

Indentation +87 added lines, -87 removed lines

@@ -50,7 +50,7 @@ 
     var $templateDir = 'modules/';
     var $ss;
     function TemplateHandler() {
-      $this->cacheDir = sugar_cached('');
+        $this->cacheDir = sugar_cached('');
     }
 
     function loadSmarty(){
@@ -66,10 +66,10 @@ 
      *
      */
     static function clearAll() {
-    	global $beanList;
-		foreach($beanList as $module_dir =>$object_name){
+        global $beanList;
+        foreach($beanList as $module_dir =>$object_name){
                 TemplateHandler::clearCache($module_dir);
-		}
+        }
     }
 
 
@@ -132,7 +132,7 @@ 
                     foreach($panel as $row) {
                             foreach($row as $entry) {
                                     if(empty($entry)) {
-                                       continue;
+                                        continue;
                                     }
 
                                     if(is_array($entry) &&
@@ -140,35 +140,35 @@ 
                                        isset($entry['displayParams']) &&
                                        isset($entry['displayParams']['required']) &&
                                        $entry['displayParams']['required']) {
-                                       $panelFields[$entry['name']] = $entry;
+                                        $panelFields[$entry['name']] = $entry;
                                     }
 
                                     if(is_array($entry)) {
-                                      $defs2[$entry['name']] = $entry;
+                                        $defs2[$entry['name']] = $entry;
                                     } else {
-                                      $defs2[$entry] = array('name' => $entry);
+                                        $defs2[$entry] = array('name' => $entry);
                                     }
                             } //foreach
                     } //foreach
             } //foreach
 
             foreach($panelFields as $field=>$value) {
-                      $nameList = array();
-                      if(!is_array($value['displayParams']['required'])) {
-                         $nameList[] = $field;
-                      } else {
-                         foreach($value['displayParams']['required'] as $groupedField) {
-                                 $nameList[] = $groupedField;
-                         }
-                      }
-
-                      foreach($nameList as $x) {
-                         if(isset($defs[$x]) &&
+                        $nameList = array();
+                        if(!is_array($value['displayParams']['required'])) {
+                            $nameList[] = $field;
+                        } else {
+                            foreach($value['displayParams']['required'] as $groupedField) {
+                                    $nameList[] = $groupedField;
+                            }
+                        }
+
+                        foreach($nameList as $x) {
+                            if(isset($defs[$x]) &&
                             isset($defs[$x]['type']) &&
                             !isset($defs[$x]['required'])) {
                             $defs[$x]['required'] = true;
-                         }
-                      }
+                            }
+                        }
             } //foreach
 
             //Create a base class with field_name_map property
@@ -195,23 +195,23 @@ 
             //5) not already been added to Array
             foreach($sugarbean->field_name_map as $name=>$def) {
 
-               if($def['type']=='relate' &&
+                if($def['type']=='relate' &&
                   isset($defs2[$name]) &&
                   (!isset($defs2[$name]['validateDependency']) || $defs2[$name]['validateDependency'] === true) &&
                   isset($def['id_name']) &&
                   !in_array($name, $validatedFields)) {
 
-                  if(isset($mod_strings[$def['vname']])
+                    if(isset($mod_strings[$def['vname']])
                         || isset($app_strings[$def['vname']])
                         || translate($def['vname'],$sugarbean->module_dir) != $def['vname']) {
-                     $vname = $def['vname'];
-                  }
-                  else{
-                     $vname = "undefined";
-                  }
-                  $javascript->addToValidateBinaryDependency($name, 'alpha', $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty($vname), (!empty($def['required']) ? 'true' : 'false'), '', $def['id_name']);
-                  $validatedFields[] = $name;
-               }
+                        $vname = $def['vname'];
+                    }
+                    else{
+                        $vname = "undefined";
+                    }
+                    $javascript->addToValidateBinaryDependency($name, 'alpha', $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty($vname), (!empty($def['required']) ? 'true' : 'false'), '', $def['id_name']);
+                    $validatedFields[] = $name;
+                }
             } //foreach
 
             $contents .= "{literal}\n";
@@ -275,11 +275,11 @@ 
         }
         $file = $this->cacheDir . $this->templateDir . $module . '/' . $view . '.tpl';
         if(file_exists($file)) {
-           return $this->ss->fetch($file);
+            return $this->ss->fetch($file);
         } else {
-           global $app_strings;
-           $GLOBALS['log']->fatal($app_strings['ERR_NO_SUCH_FILE'] .": $file");
-           return $app_strings['ERR_NO_SUCH_FILE'] .": $file";
+            global $app_strings;
+            $GLOBALS['log']->fatal($app_strings['ERR_NO_SUCH_FILE'] .": $file");
+            return $app_strings['ERR_NO_SUCH_FILE'] .": $file";
         }
     }
 
@@ -329,13 +329,13 @@ 
         }
         $qsd->setFormName($view);
         if(preg_match('/^SearchForm_.+/', $view)){
-        	if(strpos($view, 'popup_query_form')){
-        		$qsd->setFormName('popup_query_form');
-            	$parsedView = 'advanced';
-        	}else{
-        		$qsd->setFormName('search_form');
-            	$parsedView = preg_replace("/^SearchForm_/", "", $view);
-        	}
+            if(strpos($view, 'popup_query_form')){
+                $qsd->setFormName('popup_query_form');
+                $parsedView = 'advanced';
+            }else{
+                $qsd->setFormName('search_form');
+                $parsedView = preg_replace("/^SearchForm_/", "", $view);
+            }
             //Loop through the Meta-Data fields to see which ones need quick search support
             foreach($defs as $f) {
                 $field = $f;
@@ -373,14 +373,14 @@ 
                             $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSContact($field['name'], $field['id_name']);
                         }
                     } else {
-                         $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSParent($field['module']);
-                         if(!isset($field['field_list']) && !isset($field['populate_list'])) {
-                             $sqs_objects[$name.'_'.$parsedView]['populate_list'] = array($field['name'], $field['id_name']);
-                             $sqs_objects[$name.'_'.$parsedView]['field_list'] = array('name', 'id');
-                         } else {
-                             $sqs_objects[$name.'_'.$parsedView]['populate_list'] = $field['field_list'];
-                             $sqs_objects[$name.'_'.$parsedView]['field_list'] = $field['populate_list'];
-                         }
+                            $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSParent($field['module']);
+                            if(!isset($field['field_list']) && !isset($field['populate_list'])) {
+                                $sqs_objects[$name.'_'.$parsedView]['populate_list'] = array($field['name'], $field['id_name']);
+                                $sqs_objects[$name.'_'.$parsedView]['field_list'] = array('name', 'id');
+                            } else {
+                                $sqs_objects[$name.'_'.$parsedView]['populate_list'] = $field['field_list'];
+                                $sqs_objects[$name.'_'.$parsedView]['field_list'] = $field['populate_list'];
+                            }
                     }
                 } else if($field['type'] == 'parent') {
                     $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSParent();
@@ -388,7 +388,7 @@ 
             } //foreach
 
             foreach ( $sqs_objects as $name => $field )
-               foreach ( $field['populate_list'] as $key => $fieldname )
+                foreach ( $field['populate_list'] as $key => $fieldname )
                     $sqs_objects[$name]['populate_list'][$key] = $sqs_objects[$name]['populate_list'][$key] . '_'.$parsedView;
         }else{
             //Loop through the Meta-Data fields to see which ones need quick search support
@@ -413,7 +413,7 @@ 
                             $field['id_name'] = $module.$field['id_name'];
                     }
                 }
-				$name = $qsd->form_name . '_' . $field['name'];
+                $name = $qsd->form_name . '_' . $field['name'];
 
 
                 if($field['type'] == 'relate' && isset($field['module']) && (preg_match('/_name$|_c$/si',$name) || !empty($field['quicksearch']))) {
@@ -427,15 +427,15 @@ 
                         } else if($matches[0] == 'Users'){
                             if($field['name'] == 'reports_to_name'){
                                 $sqs_objects[$name] = $qsd->getQSUser('reports_to_name','reports_to_id');
-                             // Bug #52994 : QuickSearch for a 1-M User relationship changes assigned to user
+                                // Bug #52994 : QuickSearch for a 1-M User relationship changes assigned to user
                             }elseif($field['name'] == 'assigned_user_name'){
-                                 $sqs_objects[$name] = $qsd->getQSUser('assigned_user_name','assigned_user_id');
-                             }
-                             else
-                             {
-                                 $sqs_objects[$name] = $qsd->getQSUser($field['name'], $field['id_name']);
+                                    $sqs_objects[$name] = $qsd->getQSUser('assigned_user_name','assigned_user_id');
+                                }
+                                else
+                                {
+                                    $sqs_objects[$name] = $qsd->getQSUser($field['name'], $field['id_name']);
 
-							}
+                            }
                         } else if($matches[0] == 'Campaigns') {
                             $sqs_objects[$name] = $qsd->loadQSObject('Campaigns', 'Campaign', $field['name'], $field['id_name'], $field['id_name']);
                         } else if($matches[0] == 'Accounts') {
@@ -486,39 +486,39 @@ 
                 //merge populate_list && field_list with vardef
                 if (!empty($field['field_list']) && !empty($field['populate_list'])) {
                     for ($j=0; $j<count($field['field_list']); $j++) {
-                		//search for the same couple (field_list_item,populate_field_item)
-               			$field_list_item = $field['field_list'][$j];
-               			$field_list_item_alternate = $qsd->form_name . '_' . $field['field_list'][$j];
-               			$populate_list_item = $field['populate_list'][$j];
-                		$found = false;
-                		for ($k=0; $k<count($sqs_objects[$name]['field_list']); $k++) {
-                			if (($field_list_item == $sqs_objects[$name]['populate_list'][$k] || $field_list_item_alternate == $sqs_objects[$name]['populate_list'][$k]) && //il faut inverser field_list et populate_list (cf lignes 465,466 ci-dessus)
-                				$populate_list_item == $sqs_objects[$name]['field_list'][$k]) {
-                				$found = true;
-                				break;
-                			}
-                		}
-                		if (!$found) {
-                			$sqs_objects[$name]['field_list'][] = $field['populate_list'][$j]; // as in lines 462 and 463
-                			$sqs_objects[$name]['populate_list'][] = $field['field_list'][$j];
-                		}
-                	}
+                        //search for the same couple (field_list_item,populate_field_item)
+                            $field_list_item = $field['field_list'][$j];
+                            $field_list_item_alternate = $qsd->form_name . '_' . $field['field_list'][$j];
+                            $populate_list_item = $field['populate_list'][$j];
+                        $found = false;
+                        for ($k=0; $k<count($sqs_objects[$name]['field_list']); $k++) {
+                            if (($field_list_item == $sqs_objects[$name]['populate_list'][$k] || $field_list_item_alternate == $sqs_objects[$name]['populate_list'][$k]) && //il faut inverser field_list et populate_list (cf lignes 465,466 ci-dessus)
+                                $populate_list_item == $sqs_objects[$name]['field_list'][$k]) {
+                                $found = true;
+                                break;
+                            }
+                        }
+                        if (!$found) {
+                            $sqs_objects[$name]['field_list'][] = $field['populate_list'][$j]; // as in lines 462 and 463
+                            $sqs_objects[$name]['populate_list'][] = $field['field_list'][$j];
+                        }
+                    }
                 }
 
             } //foreach
         }
 
-       //Implement QuickSearch for the field
-       if(!empty($sqs_objects) && count($sqs_objects) > 0) {
-           $quicksearch_js = '<script language="javascript">';
-           $quicksearch_js.= 'if(typeof sqs_objects == \'undefined\'){var sqs_objects = new Array;}';
-           $json = getJSONobj();
-           foreach($sqs_objects as $sqsfield=>$sqsfieldArray){
-               $quicksearch_js .= "sqs_objects['$sqsfield']={$json->encode($sqsfieldArray)};";
-           }
-           return $quicksearch_js . '</script>';
-       }
-       return '';
+        //Implement QuickSearch for the field
+        if(!empty($sqs_objects) && count($sqs_objects) > 0) {
+            $quicksearch_js = '<script language="javascript">';
+            $quicksearch_js.= 'if(typeof sqs_objects == \'undefined\'){var sqs_objects = new Array;}';
+            $json = getJSONobj();
+            foreach($sqs_objects as $sqsfield=>$sqsfieldArray){
+                $quicksearch_js .= "sqs_objects['$sqsfield']={$json->encode($sqsfieldArray)};";
+            }
+            return $quicksearch_js . '</script>';
+        }
+        return '';
     }
 
     

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

include/MVC/View/SugarView.php

Indentation +135 added lines, -135 removed lines

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

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