adamjakab / SuiteCRM

include/ListView/ListViewData.php

Spacing +104 added lines, -104 removed lines

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

include/utils/sugar_file_utils.php

Spacing +66 added lines, -66 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -53,39 +53,39 @@ 
  * @param $context
  * @return boolean - Returns true on success false on failure
  */
-function sugar_mkdir($pathname, $mode=null, $recursive=false, $context='') {
+function sugar_mkdir($pathname, $mode = null, $recursive = false, $context = '') {
 	$mode = get_mode('dir_mode', $mode);
 
-	if ( sugar_is_dir($pathname,$mode) )
+	if (sugar_is_dir($pathname, $mode))
 	    return true;
 
 	$result = false;
-	if(empty($mode))
+	if (empty($mode))
 		$mode = 0777;
-	if(empty($context)) {
+	if (empty($context)) {
 		$result = @mkdir($pathname, $mode, $recursive);
 	} else {
 		$result = @mkdir($pathname, $mode, $recursive, $context);
 	}
 
-	if($result){
-		if(!sugar_chmod($pathname, $mode)){
+	if ($result) {
+		if (!sugar_chmod($pathname, $mode)) {
 			return false;
 		}
-		if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
-			if(!sugar_chown($pathname)){
+		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)) {
+		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'])) {
+		if (is_null($GLOBALS['log'])) {
 			throw new Exception("Error occurred but the system doesn't have logger. Error message: \"$errorMessage\"");
 		}
 		$GLOBALS['log']->error($errorMessage);
@@ -108,13 +108,13 @@ 
  * @param $context
  * @return boolean - Returns a file pointer on success, false otherwise
  */
-function sugar_fopen($filename, $mode, $use_include_path=false, $context=null){
+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)){
+	if (!file_exists($filename)) {
 		sugar_touch($filename);
 	}
 
-	if(empty($context)) {
+	if (empty($context)) {
 
 		return fopen($filename, $mode, $use_include_path);
 	} else {
@@ -136,22 +136,22 @@ 
  * @param $context
  * @return int - Returns the number of bytes written to the file, false otherwise.
  */
-function sugar_file_put_contents($filename, $data, $flags=null, $context=null){
+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)){
+	if (!file_exists($filename)) {
 		sugar_touch($filename);
 	}
 
-	if ( !is_writable($filename) ) {
+	if (!is_writable($filename)) {
 	    $GLOBALS['log']->error("File $filename cannot be written to");
 	    return false;
 	}
 
-	if(empty($flags)) {
+	if (empty($flags)) {
 		return file_put_contents($filename, $data);
-	} elseif(empty($context)) {
+	} elseif (empty($context)) {
 		return file_put_contents($filename, $data, $flags);
-	} else{
+	} else {
 		return file_put_contents($filename, $data, $flags, $context);
 	}
 }
@@ -169,13 +169,13 @@ 
  * @param context $context Context to pass into fopen operation
  * @return boolean - Returns true if $filename was created, false otherwise.
  */
-function sugar_file_put_contents_atomic($filename, $data, $mode='wb', $use_include_path=false, $context=null){
+function sugar_file_put_contents_atomic($filename, $data, $mode = 'wb', $use_include_path = false, $context = null) {
 
     $dir = dirname($filename);
     $temp = tempnam($dir, 'temp');
 
     if (!($f = @fopen($temp, $mode))) {
-        $temp =  $dir . DIRECTORY_SEPARATOR . uniqid('temp');
+        $temp = $dir.DIRECTORY_SEPARATOR.uniqid('temp');
         if (!($f = @fopen($temp, $mode))) {
             trigger_error("sugar_file_put_contents_atomic() : error writing temporary file '$temp'", E_USER_WARNING);
             return false;
@@ -196,7 +196,7 @@ 
         }
     }
 
-    if(file_exists($filename))
+    if (file_exists($filename))
     {
        return sugar_chmod($filename, 0755);
     }
@@ -214,18 +214,18 @@ 
  * @param $context
  * @return string|boolean - Returns a file data on success, false otherwise
  */
-function sugar_file_get_contents($filename, $use_include_path=false, $context=null){
+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)){
+	if (!file_exists($filename)) {
 		sugar_touch($filename);
 	}
 
-	if ( !is_readable($filename) ) {
+	if (!is_readable($filename)) {
 	    $GLOBALS['log']->error("File $filename cannot be read");
 	    return false;
 	}
 
-	if(empty($context)) {
+	if (empty($context)) {
 		return file_get_contents($filename, $use_include_path);
 	} else {
 		return file_get_contents($filename, $use_include_path, $context);
@@ -246,29 +246,29 @@ 
  * @return boolean - Returns TRUE on success or FALSE on failure.
  *
  */
-function sugar_touch($filename, $time=null, $atime=null) {
+function sugar_touch($filename, $time = null, $atime = null) {
 
    $result = false;
 
-   if(!empty($atime) && !empty($time)) {
+   if (!empty($atime) && !empty($time)) {
    	  $result = @touch($filename, $time, $atime);
-   } else if(!empty($time)) {
+   } else if (!empty($time)) {
    	  $result = @touch($filename, $time);
    } else {
    	  $result = @touch($filename);
    }
 
-   if(!$result) {
+   if (!$result) {
        $GLOBALS['log']->error("File $filename cannot be touched");
        return $result;
    }
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['file_mode'])){
+	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'])){
+	if (!empty($GLOBALS['sugar_config']['default_permissions']['user'])) {
 		sugar_chown($filename);
 	}
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+	if (!empty($GLOBALS['sugar_config']['default_permissions']['group'])) {
 		sugar_chgrp($filename);
 	}
 
@@ -284,16 +284,16 @@ 
  * @param  int $mode The integer value of the permissions mode to set the created directory to
  * @return boolean   Returns TRUE on success or FALSE on failure.
  */
-function sugar_chmod($filename, $mode=null) {
-    if ( !is_int($mode) )
-        $mode = (int) $mode;
-	if(!is_windows()){
-		if(!isset($mode)){
+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(isset($mode) && $mode > 0){
+        if (isset($mode) && $mode > 0) {
 		   return @chmod($filename, $mode);
-		}else{
+		} else {
 	    	return false;
 		}
 	}
@@ -309,15 +309,15 @@ 
  * @param user - A user name or number
  * @return boolean - Returns TRUE on success or FALSE on failure.
  */
-function sugar_chown($filename, $user='') {
-	if(!is_windows()){
-		if(strlen($user)){
+function sugar_chown($filename, $user = '') {
+	if (!is_windows()) {
+		if (strlen($user)) {
 			return chown($filename, $user);
-		}else{
-			if(strlen($GLOBALS['sugar_config']['default_permissions']['user'])){
+		} else {
+			if (strlen($GLOBALS['sugar_config']['default_permissions']['user'])) {
 				$user = $GLOBALS['sugar_config']['default_permissions']['user'];
 				return chown($filename, $user);
-			}else{
+			} else {
 				return false;
 			}
 		}
@@ -334,15 +334,15 @@ 
  * @param group - A group name or number
  * @return boolean - Returns TRUE on success or FALSE on failure.
  */
-function sugar_chgrp($filename, $group='') {
-	if(!is_windows()){
-		if(!empty($group)){
+function sugar_chgrp($filename, $group = '') {
+	if (!is_windows()) {
+		if (!empty($group)) {
 			return chgrp($filename, $group);
-		}else{
-			if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+		} else {
+			if (!empty($GLOBALS['sugar_config']['default_permissions']['group'])) {
 				$group = $GLOBALS['sugar_config']['default_permissions']['group'];
 				return chgrp($filename, $group);
-			}else{
+			} else {
 				return false;
 			}
 		}
@@ -360,26 +360,26 @@ 
  * defined in the config file.
  * @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) )
-        $mode = (int) $mode;
-    if(!class_exists('SugarConfig', true)) {
+function get_mode($key = 'dir_mode', $mode = null) {
+	if (!is_int($mode))
+        $mode = (int)$mode;
+    if (!class_exists('SugarConfig', true)) {
 		require 'include/SugarObjects/SugarConfig.php';
 	}
-	if(!is_windows()){
-		$conf_inst=SugarConfig::getInstance();
+	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);
+function sugar_is_dir($path, $mode = 'r') {
+		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);
+function sugar_is_file($path, $mode = 'r') {
+		if (defined('TEMPLATE_URL'))return is_file($path, $mode);
 		return is_file($path);
 }
 
@@ -391,10 +391,10 @@ 
 function sugar_cached($file)
 {
     static $cdir = null;
-    if(empty($cdir) && !empty($GLOBALS['sugar_config']['cache_dir'])) {
+    if (empty($cdir) && !empty($GLOBALS['sugar_config']['cache_dir'])) {
         $cdir = rtrim($GLOBALS['sugar_config']['cache_dir'], '/\\');
     }
-    if(empty($cdir)) {
+    if (empty($cdir)) {
         $cdir = "cache";
     }
     return "$cdir/$file";

include/modules.php

Spacing +42 added lines, -42 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -79,18 +79,18 @@ 
 $beanList['Cases']          = 'aCase';
 $beanList['Bugs']           = 'Bug';
 $beanList['ProspectLists']      = 'ProspectList';
-$beanList['Prospects']  = 'Prospect';
+$beanList['Prospects'] = 'Prospect';
 $beanList['Project']            = 'Project';
-$beanList['ProjectTask']            = 'ProjectTask';
+$beanList['ProjectTask'] = 'ProjectTask';
 $beanList['Campaigns']          = 'Campaign';
-$beanList['EmailMarketing']  = 'EmailMarketing';
+$beanList['EmailMarketing'] = 'EmailMarketing';
 $beanList['CampaignLog']        = 'CampaignLog';
 $beanList['CampaignTrackers']   = 'CampaignTracker';
-$beanList['Releases']       = 'Release';
+$beanList['Releases'] = 'Release';
 $beanList['Groups'] = 'Group';
 $beanList['EmailMan'] = 'EmailMan';
-$beanList['Schedulers']  = 'Scheduler';
-$beanList['SchedulersJobs']  = 'SchedulersJob';
+$beanList['Schedulers'] = 'Scheduler';
+$beanList['SchedulersJobs'] = 'SchedulersJob';
 $beanList['Contacts']       = 'Contact';
 $beanList['Accounts']       = 'Account';
 $beanList['DynamicFields']  = 'DynamicField';
@@ -106,19 +106,19 @@ 
 $beanList['Currencies']     = 'Currency';
 $beanList['Trackers']       = 'Tracker';
 $beanList['Connectors']     = 'Connectors';
-$beanList['Import_1']         = 'ImportMap';
+$beanList['Import_1'] = 'ImportMap';
 $beanList['Import_2']       = 'UsersLastImport';
 $beanList['Versions']       = 'Version';
 $beanList['Administration'] = 'Administration';
 $beanList['vCals']          = 'vCal';
 $beanList['CustomFields']   = 'CustomFields';
-$beanList['Alerts']  = 'Alert';
+$beanList['Alerts'] = 'Alert';
 
 
 
 
-$beanList['Documents']  = 'Document';
-$beanList['DocumentRevisions']  = 'DocumentRevision';
+$beanList['Documents'] = 'Document';
+$beanList['DocumentRevisions'] = 'DocumentRevision';
 $beanList['Roles']  = 'Role';
 
 $beanList['Audit']  = 'Audit';
@@ -152,24 +152,24 @@ 
 $beanFiles['aCase']         = 'modules/Cases/Case.php';
 $beanFiles['Bug']           = 'modules/Bugs/Bug.php';
 $beanFiles['Group'] = 'modules/Groups/Group.php';
-$beanFiles['CampaignLog']  = 'modules/CampaignLog/CampaignLog.php';
+$beanFiles['CampaignLog'] = 'modules/CampaignLog/CampaignLog.php';
 $beanFiles['Project']           = 'modules/Project/Project.php';
-$beanFiles['ProjectTask']           = 'modules/ProjectTask/ProjectTask.php';
+$beanFiles['ProjectTask'] = 'modules/ProjectTask/ProjectTask.php';
 $beanFiles['Campaign']          = 'modules/Campaigns/Campaign.php';
 $beanFiles['ProspectList']      = 'modules/ProspectLists/ProspectList.php';
-$beanFiles['Prospect']  = 'modules/Prospects/Prospect.php';
+$beanFiles['Prospect'] = 'modules/Prospects/Prospect.php';
 
-$beanFiles['EmailMarketing']          = 'modules/EmailMarketing/EmailMarketing.php';
-$beanFiles['CampaignTracker']  = 'modules/CampaignTrackers/CampaignTracker.php';
+$beanFiles['EmailMarketing'] = 'modules/EmailMarketing/EmailMarketing.php';
+$beanFiles['CampaignTracker'] = 'modules/CampaignTrackers/CampaignTracker.php';
 $beanFiles['Release']           = 'modules/Releases/Release.php';
 $beanFiles['EmailMan']          = 'modules/EmailMan/EmailMan.php';
 
-$beanFiles['Scheduler']  = 'modules/Schedulers/Scheduler.php';
-$beanFiles['SchedulersJob']  = 'modules/SchedulersJobs/SchedulersJob.php';
+$beanFiles['Scheduler'] = 'modules/Schedulers/Scheduler.php';
+$beanFiles['SchedulersJob'] = 'modules/SchedulersJobs/SchedulersJob.php';
 $beanFiles['Contact']       = 'modules/Contacts/Contact.php';
 $beanFiles['Account']       = 'modules/Accounts/Account.php';
 $beanFiles['Opportunity']   = 'modules/Opportunities/Opportunity.php';
-$beanFiles['EmailTemplate']         = 'modules/EmailTemplates/EmailTemplate.php';
+$beanFiles['EmailTemplate'] = 'modules/EmailTemplates/EmailTemplate.php';
 $beanFiles['Note']          = 'modules/Notes/Note.php';
 $beanFiles['Call']          = 'modules/Calls/Call.php';
 $beanFiles['Email']         = 'modules/Emails/Email.php';
@@ -177,21 +177,21 @@ 
 $beanFiles['Task']          = 'modules/Tasks/Task.php';
 $beanFiles['User']          = 'modules/Users/User.php';
 $beanFiles['Employee']      = 'modules/Employees/Employee.php';
-$beanFiles['Currency']          = 'modules/Currencies/Currency.php';
-$beanFiles['Tracker']          = 'modules/Trackers/Tracker.php';
+$beanFiles['Currency'] = 'modules/Currencies/Currency.php';
+$beanFiles['Tracker'] = 'modules/Trackers/Tracker.php';
 $beanFiles['ImportMap']     = 'modules/Import/maps/ImportMap.php';
-$beanFiles['UsersLastImport']= 'modules/Import/UsersLastImport.php';
-$beanFiles['Administration']= 'modules/Administration/Administration.php';
-$beanFiles['UpgradeHistory']= 'modules/Administration/UpgradeHistory.php';
+$beanFiles['UsersLastImport'] = 'modules/Import/UsersLastImport.php';
+$beanFiles['Administration'] = 'modules/Administration/Administration.php';
+$beanFiles['UpgradeHistory'] = 'modules/Administration/UpgradeHistory.php';
 $beanFiles['vCal']          = 'modules/vCals/vCal.php';
-$beanFiles['Alert']          = 'modules/Alerts/Alert.php';
-$beanFiles['Version']           = 'modules/Versions/Version.php';
+$beanFiles['Alert'] = 'modules/Alerts/Alert.php';
+$beanFiles['Version'] = 'modules/Versions/Version.php';
 
 
 
-$beanFiles['Role']          = 'modules/Roles/Role.php';
+$beanFiles['Role'] = 'modules/Roles/Role.php';
 
-$beanFiles['Document']  = 'modules/Documents/Document.php';
+$beanFiles['Document'] = 'modules/Documents/Document.php';
 $beanFiles['DocumentRevision']  = 'modules/DocumentRevisions/DocumentRevision.php';
 $beanFiles['FieldsMetaData']    = 'modules/DynamicFields/FieldsMetaData.php';
 //$beanFiles['Audit']           = 'modules/Audit/Audit.php';
@@ -204,7 +204,7 @@ 
 
 
 $beanFiles['SavedSearch']  = 'modules/SavedSearch/SavedSearch.php';
-$beanFiles['UserPreference']  = 'modules/UserPreferences/UserPreference.php';
+$beanFiles['UserPreference'] = 'modules/UserPreferences/UserPreference.php';
 $beanFiles['MergeRecord']  = 'modules/MergeRecords/MergeRecord.php';
 $beanFiles['EmailAddress'] = 'modules/EmailAddresses/EmailAddress.php';
 $beanFiles['EmailText'] = 'modules/EmailText/EmailText.php';
@@ -216,19 +216,19 @@ 
 //$beanList['Library']= 'Library';
 //$beanFiles['Library'] = 'modules/Library/Library.php';
 
-$beanFiles['Configurator']          = 'modules/Configurator/Configurator.php';
+$beanFiles['Configurator'] = 'modules/Configurator/Configurator.php';
 
 // added these lists for security settings for tabs
 $modInvisList = array('Administration', 'Currencies', 'CustomFields', 'Connectors',
     'Dropdown', 'Dynamic', 'DynamicFields', 'DynamicLayout', 'EditCustomFields',
-    'Help', 'Import',  'MySettings', 'EditCustomFields','FieldsMetaData',
+    'Help', 'Import', 'MySettings', 'EditCustomFields', 'FieldsMetaData',
     'UpgradeWizard', 'Trackers', 'Connectors', 'Employees', 'Calendar',
-    'Releases','Sync',
-    'Users',  'Versions', 'LabelEditor','Roles','EmailMarketing'
-    ,'OptimisticLock', 'TeamMemberships', 'TeamSets', 'TeamSetModule', 'Audit', 'MailMerge', 'MergeRecords', 'EmailAddresses','EmailText',
-    'Schedulers','Schedulers_jobs', /*'Queues',*/ 'EmailTemplates',
+    'Releases', 'Sync',
+    'Users', 'Versions', 'LabelEditor', 'Roles', 'EmailMarketing'
+    ,'OptimisticLock', 'TeamMemberships', 'TeamSets', 'TeamSetModule', 'Audit', 'MailMerge', 'MergeRecords', 'EmailAddresses', 'EmailText',
+    'Schedulers', 'Schedulers_jobs', /*'Queues',*/ 'EmailTemplates',
     'CampaignTrackers', 'CampaignLog', 'EmailMan', 'Prospects', 'ProspectLists',
-    'Groups','InboundEmail',
+    'Groups', 'InboundEmail',
     'ACLActions', 'ACLRoles',
     'DocumentRevisions',
     'ProjectTask',
@@ -265,15 +265,15 @@ 
 $modInvisList[] = 'Connectors';
 
 $report_include_modules = array();
-$report_include_modules['Currencies']='Currency';
+$report_include_modules['Currencies'] = 'Currency';
 //add prospects
-$report_include_modules['Prospects']='Prospect';
+$report_include_modules['Prospects'] = 'Prospect';
 $report_include_modules['DocumentRevisions'] = 'DocumentRevision';
 $report_include_modules['ProductCategories'] = 'ProductCategory';
 $report_include_modules['ProductTypes'] = 'ProductType';
 //add Tracker modules
 
-$report_include_modules['Trackers']         = 'Tracker';
+$report_include_modules['Trackers'] = 'Tracker';
 
 
 
@@ -323,9 +323,9 @@ 
 //the bean class name == dictionary entry/object name convention
 //No future module should need an entry here.
 $objectList = array();
-$objectList['Cases'] =  'Case';
-$objectList['Groups'] =  'User';
-$objectList['Users'] =  'User';
+$objectList['Cases'] = 'Case';
+$objectList['Groups'] = 'User';
+$objectList['Users'] = 'User';
 
 
 // knowledge base

include/TemplateHandler/TemplateHandler.php

Spacing +99 added lines, -99 removed lines

@@ -53,8 +53,8 @@ 
       $this->cacheDir = sugar_cached('');
     }
 
-    function loadSmarty(){
-        if(empty($this->ss)){
+    function loadSmarty() {
+        if (empty($this->ss)) {
             $this->ss = new Sugar_Smarty();
         }
     }
@@ -67,7 +67,7 @@ 
      */
     static function clearAll() {
     	global $beanList;
-		foreach($beanList as $module_dir =>$object_name){
+		foreach ($beanList as $module_dir =>$object_name) {
                 TemplateHandler::clearCache($module_dir);
 		}
     }
@@ -80,14 +80,14 @@ 
      * @param String $module The module directory to clear
      * @param String $view Optional view value (DetailView, EditView, etc.)
      */
-    static function clearCache($module, $view=''){
-        $cacheDir = create_cache_directory('modules/'. $module . '/');
+    static function clearCache($module, $view = '') {
+        $cacheDir = create_cache_directory('modules/'.$module.'/');
         $d = dir($cacheDir);
-        while($e = $d->read()){
-            if(!empty($view) && $e != $view )continue;
-            $end =strlen($e) - 4;
-            if(is_file($cacheDir . $e) && $end > 1 && substr($e, $end) == '.tpl'){
-                unlink($cacheDir . $e);
+        while ($e = $d->read()) {
+            if (!empty($view) && $e != $view)continue;
+            $end = strlen($e) - 4;
+            if (is_file($cacheDir.$e) && $end > 1 && substr($e, $end) == '.tpl') {
+                unlink($cacheDir.$e);
             }
         }
     }
@@ -105,21 +105,21 @@ 
     function buildTemplate($module, $view, $tpl, $ajaxSave, $metaDataDefs) {
         $this->loadSmarty();
 
-        $cacheDir = create_cache_directory($this->templateDir. $module . '/');
-        $file = $cacheDir . $view . '.tpl';
-        $string = '{* Create Date: ' . date('Y-m-d H:i:s') . "*}\n";
+        $cacheDir = create_cache_directory($this->templateDir.$module.'/');
+        $file = $cacheDir.$view.'.tpl';
+        $string = '{* Create Date: '.date('Y-m-d H:i:s')."*}\n";
         $this->ss->left_delimiter = '{{';
         $this->ss->right_delimiter = '}}';
         $this->ss->assign('module', $module);
         $this->ss->assign('built_in_buttons', array('CANCEL', 'DELETE', 'DUPLICATE', 'EDIT', 'FIND_DUPLICATES', 'SAVE', 'CONNECTOR'));
         $contents = $this->ss->fetch($tpl);
         //Insert validation and quicksearch stuff here
-        if($view == 'EditView' || strpos($view,'QuickCreate') || $ajaxSave || $view == "ConvertLead") {
+        if ($view == 'EditView' || strpos($view, 'QuickCreate') || $ajaxSave || $view == "ConvertLead") {
 
             global $dictionary, $beanList, $app_strings, $mod_strings;
             $mod = $beanList[$module];
 
-            if($mod == 'aCase') {
+            if ($mod == 'aCase') {
                 $mod = 'Case';
             }
 
@@ -128,14 +128,14 @@ 
             //Retrieve all panel field definitions with displayParams Array field set
             $panelFields = array();
 
-            foreach($metaDataDefs['panels'] as $panel) {
-                    foreach($panel as $row) {
-                            foreach($row as $entry) {
-                                    if(empty($entry)) {
+            foreach ($metaDataDefs['panels'] as $panel) {
+                    foreach ($panel as $row) {
+                            foreach ($row as $entry) {
+                                    if (empty($entry)) {
                                        continue;
                                     }
 
-                                    if(is_array($entry) &&
+                                    if (is_array($entry) &&
                                        isset($entry['name']) &&
                                        isset($entry['displayParams']) &&
                                        isset($entry['displayParams']['required']) &&
@@ -143,7 +143,7 @@ 
                                        $panelFields[$entry['name']] = $entry;
                                     }
 
-                                    if(is_array($entry)) {
+                                    if (is_array($entry)) {
                                       $defs2[$entry['name']] = $entry;
                                     } else {
                                       $defs2[$entry] = array('name' => $entry);
@@ -152,18 +152,18 @@ 
                     } //foreach
             } //foreach
 
-            foreach($panelFields as $field=>$value) {
+            foreach ($panelFields as $field=>$value) {
                       $nameList = array();
-                      if(!is_array($value['displayParams']['required'])) {
+                      if (!is_array($value['displayParams']['required'])) {
                          $nameList[] = $field;
                       } else {
-                         foreach($value['displayParams']['required'] as $groupedField) {
+                         foreach ($value['displayParams']['required'] as $groupedField) {
                                  $nameList[] = $groupedField;
                          }
                       }
 
-                      foreach($nameList as $x) {
-                         if(isset($defs[$x]) &&
+                      foreach ($nameList as $x) {
+                         if (isset($defs[$x]) &&
                             isset($defs[$x]['type']) &&
                             !isset($defs[$x]['required'])) {
                             $defs[$x]['required'] = true;
@@ -182,7 +182,7 @@ 
 
             $javascript->setSugarBean($sugarbean);
             if ($view != "ConvertLead")
-                $javascript->addAllFields('', null,true);
+                $javascript->addAllFields('', null, true);
 
             $validatedFields = array();
             $javascript->addToValidateBinaryDependency('assigned_user_name', 'alpha', $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty('LBL_ASSIGNED_TO'), 'false', '', 'assigned_user_id');
@@ -193,20 +193,20 @@ 
             //3) not have validateDepedency set to false in metadata
             //4) have id_name in vardef entry
             //5) not already been added to Array
-            foreach($sugarbean->field_name_map as $name=>$def) {
+            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']) {
+                        || translate($def['vname'], $sugarbean->module_dir) != $def['vname']) {
                      $vname = $def['vname'];
                   }
-                  else{
+                  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']);
@@ -218,11 +218,11 @@ 
             $contents .= $javascript->getScript();
             $contents .= $this->createQuickSearchCode($defs, $defs2, $view, $module);
             $contents .= "{/literal}\n";
-        }else if(preg_match('/^SearchForm_.+/', $view)){
+        } else if (preg_match('/^SearchForm_.+/', $view)) {
             global $dictionary, $beanList, $app_strings, $mod_strings;
             $mod = $beanList[$module];
 
-            if($mod == 'aCase') {
+            if ($mod == 'aCase') {
                 $mod = 'Case';
             }
 
@@ -235,7 +235,7 @@ 
         //Remove all the copyright comments
         $contents = preg_replace('/\{\*[^\}]*?\*\}/', '', $contents);
 
-        if($fh = @sugar_fopen($file, 'w')) {
+        if ($fh = @sugar_fopen($file, 'w')) {
             fputs($fh, $contents);
             fclose($fh);
         }
@@ -251,12 +251,12 @@ 
      * @param module string module name
      * @param view string view need (eg DetailView, EditView, etc)
      */
-    function checkTemplate($module, $view, $checkFormName = false, $formName='') {
-        if(inDeveloperMode() || !empty($_SESSION['developerMode'])){
+    function checkTemplate($module, $view, $checkFormName = false, $formName = '') {
+        if (inDeveloperMode() || !empty($_SESSION['developerMode'])) {
             return false;
         }
         $view = $checkFormName ? $formName : $view;
-        return file_exists($this->cacheDir . $this->templateDir . $module . '/' .$view . '.tpl');
+        return file_exists($this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl');
     }
 
     /**
@@ -270,16 +270,16 @@ 
      */
     function displayTemplate($module, $view, $tpl, $ajaxSave = false, $metaDataDefs = null) {
         $this->loadSmarty();
-        if(!$this->checkTemplate($module, $view)) {
+        if (!$this->checkTemplate($module, $view)) {
             $this->buildTemplate($module, $view, $tpl, $ajaxSave, $metaDataDefs);
         }
-        $file = $this->cacheDir . $this->templateDir . $module . '/' . $view . '.tpl';
-        if(file_exists($file)) {
+        $file = $this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl';
+        if (file_exists($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";
+           $GLOBALS['log']->fatal($app_strings['ERR_NO_SUCH_FILE'].": $file");
+           return $app_strings['ERR_NO_SUCH_FILE'].": $file";
         }
     }
 
@@ -290,16 +290,16 @@ 
      * @param view string view need (eg DetailView, EditView, etc)
      */
     function deleteTemplate($module, $view) {
-        if(is_file($this->cacheDir . $this->templateDir . $module . '/' .$view . '.tpl')) {
+        if (is_file($this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl')) {
             // Bug #54634 : RTC 18144 : Cannot add more than 1 user to role but popup is multi-selectable
-            if ( !isset($this->ss) )
+            if (!isset($this->ss))
             {
                 $this->loadSmarty();
             }
-            $cache_file_name = $this->ss->_get_compile_path($this->cacheDir . $this->templateDir . $module . '/' .$view . '.tpl');
+            $cache_file_name = $this->ss->_get_compile_path($this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl');
             SugarCache::cleanFile($cache_file_name);
 
-            return unlink($this->cacheDir . $this->templateDir . $module . '/' .$view . '.tpl');
+            return unlink($this->cacheDir.$this->templateDir.$module.'/'.$view.'.tpl');
         }
         return false;
     }
@@ -316,47 +316,47 @@ 
      * @param strign $module
      * @return string
      */
-    public function createQuickSearchCode($defs, $defs2, $view = '', $module='')
+    public function createQuickSearchCode($defs, $defs2, $view = '', $module = '')
     {
         $sqs_objects = array();
         require_once('include/QuickSearchDefaults.php');
-        if(isset($this) && $this instanceof TemplateHandler) //If someone calls createQuickSearchCode as a static method (@see ImportViewStep3) $this becomes anoter object, not TemplateHandler
+        if (isset($this) && $this instanceof TemplateHandler) //If someone calls createQuickSearchCode as a static method (@see ImportViewStep3) $this becomes anoter object, not TemplateHandler
         {
             $qsd = QuickSearchDefaults::getQuickSearchDefaults($this->getQSDLookup());
-        }else
+        } else
         {
             $qsd = QuickSearchDefaults::getQuickSearchDefaults(array());
         }
         $qsd->setFormName($view);
-        if(preg_match('/^SearchForm_.+/', $view)){
-        	if(strpos($view, 'popup_query_form')){
+        if (preg_match('/^SearchForm_.+/', $view)) {
+        	if (strpos($view, 'popup_query_form')) {
         		$qsd->setFormName('popup_query_form');
             	$parsedView = 'advanced';
-        	}else{
+        	} 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) {
+            foreach ($defs as $f) {
                 $field = $f;
-                $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']) ) {
-                    if(preg_match('/^(Campaigns|Teams|Users|Contacts|Accounts)$/si', $field['module'], $matches)) {
+                if ($field['type'] == 'relate' && isset($field['module']) && preg_match('/_name$|_c$/si', $name) || !empty($field['quicksearch'])) {
+                    if (preg_match('/^(Campaigns|Teams|Users|Contacts|Accounts)$/si', $field['module'], $matches)) {
 
-                        if($matches[0] == 'Campaigns') {
+                        if ($matches[0] == 'Campaigns') {
                             $sqs_objects[$name.'_'.$parsedView] = $qsd->loadQSObject('Campaigns', 'Campaign', $field['name'], $field['id_name'], $field['id_name']);
-                        } else if($matches[0] == 'Users'){
+                        } else if ($matches[0] == 'Users') {
 
-                            if(!empty($f['name']) && !empty($f['id_name'])) {
-                                $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser($f['name'],$f['id_name']);
+                            if (!empty($f['name']) && !empty($f['id_name'])) {
+                                $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser($f['name'], $f['id_name']);
                             }
                             else {
                                 $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser();
                             }
-                        } else if($matches[0] == 'Campaigns') {
+                        } else if ($matches[0] == 'Campaigns') {
                             $sqs_objects[$name.'_'.$parsedView] = $qsd->loadQSObject('Campaigns', 'Campaign', $field['name'], $field['id_name'], $field['id_name']);
-                        } else if($matches[0] == 'Accounts') {
+                        } else if ($matches[0] == 'Accounts') {
                             $nameKey = $name;
                             $idKey = isset($field['id_name']) ? $field['id_name'] : 'account_id';
 
@@ -369,12 +369,12 @@ 
                             $shippingKey = isset($f['displayParams']['shippingKey']) ? $f['displayParams']['shippingKey'] : null;
                             $additionalFields = isset($f['displayParams']['additionalFields']) ? $f['displayParams']['additionalFields'] : null;
                             $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSAccount($nameKey, $idKey, $billingKey, $shippingKey, $additionalFields);
-                        } else if($matches[0] == 'Contacts'){
+                        } else if ($matches[0] == 'Contacts') {
                             $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'])) {
+                         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 {
@@ -382,63 +382,63 @@ 
                              $sqs_objects[$name.'_'.$parsedView]['field_list'] = $field['populate_list'];
                          }
                     }
-                } else if($field['type'] == 'parent') {
+                } else if ($field['type'] == 'parent') {
                     $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSParent();
                 } //if-else
             } //foreach
 
-            foreach ( $sqs_objects as $name => $field )
-               foreach ( $field['populate_list'] as $key => $fieldname )
-                    $sqs_objects[$name]['populate_list'][$key] = $sqs_objects[$name]['populate_list'][$key] . '_'.$parsedView;
-        }else{
+            foreach ($sqs_objects as $name => $field)
+               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
-            foreach($defs2 as $f) {
-                if(!isset($defs[$f['name']])) continue;
+            foreach ($defs2 as $f) {
+                if (!isset($defs[$f['name']])) continue;
 
                 $field = $defs[$f['name']];
                 if ($view == "ConvertLead")
                 {
-                    $field['name'] = $module . $field['name'];
+                    $field['name'] = $module.$field['name'];
                     if (isset($field['module']) && isset($field['id_name']) && substr($field['id_name'], -4) == "_ida") {
                         $lc_module = strtolower($field['module']);
                         $ida_suffix = "_".$lc_module.$lc_module."_ida";
                         if (preg_match('/'.$ida_suffix.'$/', $field['id_name']) > 0) {
-                            $field['id_name'] = $module . $field['id_name'];
+                            $field['id_name'] = $module.$field['id_name'];
                         }
                         else
-                            $field['id_name'] = $field['name'] . "_" . $field['id_name'];
+                            $field['id_name'] = $field['name']."_".$field['id_name'];
                     }
                     else {
                         if (!empty($field['id_name']))
                             $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']))) {
-                    if (!preg_match('/_c$/si',$name)
-                        && (!isset($field['id_name']) || !preg_match('/_c$/si',$field['id_name']))
+                if ($field['type'] == 'relate' && isset($field['module']) && (preg_match('/_name$|_c$/si', $name) || !empty($field['quicksearch']))) {
+                    if (!preg_match('/_c$/si', $name)
+                        && (!isset($field['id_name']) || !preg_match('/_c$/si', $field['id_name']))
                         && preg_match('/^(Campaigns|Teams|Users|Contacts|Accounts)$/si', $field['module'], $matches)
                     ) {
 
-                        if($matches[0] == 'Campaigns') {
+                        if ($matches[0] == 'Campaigns') {
                             $sqs_objects[$name] = $qsd->loadQSObject('Campaigns', 'Campaign', $field['name'], $field['id_name'], $field['id_name']);
-                        } else if($matches[0] == 'Users'){
-                            if($field['name'] == 'reports_to_name'){
-                                $sqs_objects[$name] = $qsd->getQSUser('reports_to_name','reports_to_id');
+                        } 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
-                            }elseif($field['name'] == 'assigned_user_name'){
-                                 $sqs_objects[$name] = $qsd->getQSUser('assigned_user_name','assigned_user_id');
+                            }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']);
 
 							}
-                        } else if($matches[0] == 'Campaigns') {
+                        } 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') {
+                        } else if ($matches[0] == 'Accounts') {
                             $nameKey = $name;
                             $idKey = isset($field['id_name']) ? $field['id_name'] : 'account_id';
 
@@ -451,15 +451,15 @@ 
                             $shippingKey = SugarArray::staticGet($f, 'displayParams.shippingKey');
                             $additionalFields = SugarArray::staticGet($f, 'displayParams.additionalFields');
                             $sqs_objects[$name] = $qsd->getQSAccount($nameKey, $idKey, $billingKey, $shippingKey, $additionalFields);
-                        } else if($matches[0] == 'Contacts'){
+                        } else if ($matches[0] == 'Contacts') {
                             $sqs_objects[$name] = $qsd->getQSContact($field['name'], $field['id_name']);
-                            if(preg_match('/_c$/si',$name) || !empty($field['quicksearch'])){
+                            if (preg_match('/_c$/si', $name) || !empty($field['quicksearch'])) {
                                 $sqs_objects[$name]['field_list'] = array('salutation', 'first_name', 'last_name', 'id');
                             }
                         }
                     } else {
                         $sqs_objects[$name] = $qsd->getQSParent($field['module']);
-                        if(!isset($field['field_list']) && !isset($field['populate_list'])) {
+                        if (!isset($field['field_list']) && !isset($field['populate_list'])) {
                             $sqs_objects[$name]['populate_list'] = array($field['name'], $field['id_name']);
                             // now handle quicksearches where the column to match is not 'name' but rather specified in 'rname'
                             if (!isset($field['rname']))
@@ -468,14 +468,14 @@ 
                             {
                                 $sqs_objects[$name]['field_list'] = array($field['rname'], 'id');
                                 $sqs_objects[$name]['order'] = $field['rname'];
-                                $sqs_objects[$name]['conditions'] = array(array('name'=>$field['rname'],'op'=>'like_custom','end'=>'%','value'=>''));
+                                $sqs_objects[$name]['conditions'] = array(array('name'=>$field['rname'], 'op'=>'like_custom', 'end'=>'%', 'value'=>''));
                             }
                         } else {
                             $sqs_objects[$name]['populate_list'] = $field['field_list'];
                             $sqs_objects[$name]['field_list'] = $field['populate_list'];
                         }
                     }
-                } else if($field['type'] == 'parent') {
+                } else if ($field['type'] == 'parent') {
                     $sqs_objects[$name] = $qsd->getQSParent();
                 } //if-else
 
@@ -485,13 +485,13 @@ 
 
                 //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++) {
+                    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];
+               			$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++) {
+                		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;
@@ -509,14 +509,14 @@ 
         }
 
        //Implement QuickSearch for the field
-       if(!empty($sqs_objects) && count($sqs_objects) > 0) {
+       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;}';
+           $quicksearch_js .= 'if(typeof sqs_objects == \'undefined\'){var sqs_objects = new Array;}';
            $json = getJSONobj();
-           foreach($sqs_objects as $sqsfield=>$sqsfieldArray){
+           foreach ($sqs_objects as $sqsfield=>$sqsfieldArray) {
                $quicksearch_js .= "sqs_objects['$sqsfield']={$json->encode($sqsfieldArray)};";
            }
-           return $quicksearch_js . '</script>';
+           return $quicksearch_js.'</script>';
        }
        return '';
     }

include/connectors/ConnectorFactory.php

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -42,12 +42,12 @@ 
  * Connector factory
  * @api
  */
-class ConnectorFactory{
+class ConnectorFactory {
 
 	static $source_map = array();
 
-	public static function getInstance($source_name){
-		if(empty(self::$source_map[$source_name])) {
+	public static function getInstance($source_name) {
+		if (empty(self::$source_map[$source_name])) {
 			require_once('include/connectors/sources/SourceFactory.php');
 			require_once('include/connectors/component.php');
 			$source = SourceFactory::getSource($source_name);
@@ -64,7 +64,7 @@ 
 	 * which represents the inheritance structure to load up all required parents.
 	 * @param string $class the root class we want to load.
 	 */
-	public static function load($class, $type){
+	public static function load($class, $type) {
 		self::loadClass($class, $type);
 	}
 
@@ -72,15 +72,15 @@ 
 	 * include a source class file.
 	 * @param string $class a class file to include.
 	 */
-	public static function loadClass($class, $type){
-		$dir = str_replace('_','/',$class);
+	public static function loadClass($class, $type) {
+		$dir = str_replace('_', '/', $class);
 		$parts = explode("/", $dir);
-		$file = $parts[count($parts)-1] . '.php';
-		if(file_exists("custom/modules/Connectors/connectors/{$type}/{$dir}/$file")){
+		$file = $parts[count($parts) - 1].'.php';
+		if (file_exists("custom/modules/Connectors/connectors/{$type}/{$dir}/$file")) {
 			require_once("custom/modules/Connectors/connectors/{$type}/{$dir}/$file");
-		} else if(file_exists("modules/Connectors/connectors/{$type}/{$dir}/$file")) {
+		} else if (file_exists("modules/Connectors/connectors/{$type}/{$dir}/$file")) {
 			require_once("modules/Connectors/connectors/{$type}/{$dir}/$file");
-		} else if(file_exists("connectors/{$type}/{$dir}/$file")) {
+		} else if (file_exists("connectors/{$type}/{$dir}/$file")) {
 			require_once("connectors/{$type}/{$dir}/$file");
 		}
 	}

include/MVC/View/SugarView.php

Spacing +228 added lines, -229 removed lines

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

include/MVC/Controller/ControllerFactory.php

Spacing +13 added lines, -13 removed lines

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

include/MVC/Controller/SugarController.php

Spacing +146 added lines, -151 removed lines

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

include/MVC/Controller/entry_point_registry.php

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -70,16 +70,16 @@ 
     'jslang'=> array('file' => 'include/language/getJSLanguage.php', 'auth' => true),
 	'deleteAttachment' => array('file' => 'modules/FP_events/responseEntryPoint.php', 'auth' => false),
 	'responseEntryPoint' => array('file' => 'modules/FP_events/responseEntryPoint.php', 'auth' => false),
-	'formLetter' => array('file' => 'modules/AOS_PDF_Templates/formLetterPdf.php' , 'auth' => true),
-	'generatePdf' => array('file' => 'modules/AOS_PDF_Templates/generatePdf.php' , 'auth' => true),
-	'Reschedule' => array('file' => 'modules/Calls_Reschedule/Reschedule_popup.php' , 'auth' => true),
-	'Reschedule2' => array('file' => 'modules/Calls/Reschedule.php' , 'auth' => true),
-	'social' => array('file' => 'include/social/get_data.php' , 'auth' => true),
-	'social_reader' => array('file' => 'include/social/get_feed_data.php' , 'auth' => true),
-	'add_dash_page' => array('file' => 'modules/Home/AddDashboardPages.php' , 'auth' => true),
-	'retrieve_dash_page' => array('file' => 'include/MySugar/retrieve_dash_page.php' , 'auth' => true),
-	'remove_dash_page' => array('file' => 'modules/Home/RemoveDashboardPages.php' , 'auth' => true),
-	'rename_dash_page' => array('file' => 'modules/Home/RenameDashboardPages.php' , 'auth' => true)
+	'formLetter' => array('file' => 'modules/AOS_PDF_Templates/formLetterPdf.php', 'auth' => true),
+	'generatePdf' => array('file' => 'modules/AOS_PDF_Templates/generatePdf.php', 'auth' => true),
+	'Reschedule' => array('file' => 'modules/Calls_Reschedule/Reschedule_popup.php', 'auth' => true),
+	'Reschedule2' => array('file' => 'modules/Calls/Reschedule.php', 'auth' => true),
+	'social' => array('file' => 'include/social/get_data.php', 'auth' => true),
+	'social_reader' => array('file' => 'include/social/get_feed_data.php', 'auth' => true),
+	'add_dash_page' => array('file' => 'modules/Home/AddDashboardPages.php', 'auth' => true),
+	'retrieve_dash_page' => array('file' => 'include/MySugar/retrieve_dash_page.php', 'auth' => true),
+	'remove_dash_page' => array('file' => 'modules/Home/RemoveDashboardPages.php', 'auth' => true),
+	'rename_dash_page' => array('file' => 'modules/Home/RenameDashboardPages.php', 'auth' => true)
 );
 
 ?>