adamjakab / SuiteCRM

modules/Home/UnifiedSearchAdvanced.php

Spacing +98 added lines, -98 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.
@@ -58,10 +58,10 @@ 
     /*search form class name*/
     var $searchFormClass = 'SearchForm';
 
-    function __construct(){
-        if(!empty($_REQUEST['query_string'])){
+    function __construct() {
+        if (!empty($_REQUEST['query_string'])) {
             $query_string = trim($_REQUEST['query_string']);
-            if(!empty($query_string)){
+            if (!empty($query_string)) {
                 $this->query_string = $query_string;
             }
         }
@@ -72,7 +72,7 @@ 
 	function getDropDownDiv($tpl = 'modules/Home/UnifiedSearchAdvanced.tpl') {
 		global $app_list_strings, $app_strings;
 
-		if(!file_exists($this->cache_search))
+		if (!file_exists($this->cache_search))
 		{
 			$this->buildCache();
 		}
@@ -83,10 +83,10 @@ 
 		$users_modules = $current_user->getPreference('globalSearch', 'search');
 
 		// preferences are empty, select all
-		if(empty($users_modules)) {
+		if (empty($users_modules)) {
 			$users_modules = array();
-			foreach($unified_search_modules_display as $module=>$data) {
-				if (!empty($data['visible']) ) {
+			foreach ($unified_search_modules_display as $module=>$data) {
+				if (!empty($data['visible'])) {
                     $users_modules[$module] = $beanList[$module];
                 }
 			}
@@ -97,15 +97,15 @@ 
 
 		$modules_to_search = array();
 
-		foreach($users_modules as $key=>$module)
+		foreach ($users_modules as $key=>$module)
 		{
-            if(ACLController::checkAccess($key, 'list', true))
+            if (ACLController::checkAccess($key, 'list', true))
             {
                 $modules_to_search[$key]['checked'] = true;
             }
 		}
 
-		if(!empty($this->query_string))
+		if (!empty($this->query_string))
 		{
 			$sugar_smarty->assign('query_string', securexss($this->query_string));
 		} else {
@@ -121,9 +121,9 @@ 
 		$json_disabled = array();
 
 		//Now add the rest of the modules that are searchable via Global Search settings
-		foreach($unified_search_modules_display as $module=>$data)
+		foreach ($unified_search_modules_display as $module=>$data)
 		{
-			if(!isset($modules_to_search[$module]) && $data['visible'] && ACLController::checkAccess($module, 'list', true))
+			if (!isset($modules_to_search[$module]) && $data['visible'] && ACLController::checkAccess($module, 'list', true))
 			{
 			   $modules_to_search[$module]['checked'] = false;
 			} else if (isset($modules_to_search[$module]) && !$data['visible']) {
@@ -132,10 +132,10 @@ 
 		}
 
 		//Create the two lists (doing it this way preserves the user's ordering choice for enabled modules)
-		foreach($modules_to_search as $module=>$data)
+		foreach ($modules_to_search as $module=>$data)
 		{
 			$label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
-			if(!empty($data['checked']))
+			if (!empty($data['checked']))
 			{
 				$json_enabled[] = array("module" => $module, 'label' => $label);
 			} else {
@@ -147,7 +147,7 @@ 
 		$sugar_smarty->assign('disabled_modules', json_encode($json_disabled));
 
 		$showDiv = $current_user->getPreference('showGSDiv', 'search');
-		if(!isset($showDiv))
+		if (!isset($showDiv))
 		{
 		   $showDiv = 'no';
 		}
@@ -181,11 +181,11 @@ 
 
 		$this->query_string = $GLOBALS['db']->quote(securexss(from_html(clean_string($this->query_string, 'UNIFIED_SEARCH'))));
 
-		if(!empty($_REQUEST['advanced']) && $_REQUEST['advanced'] != 'false') {
+		if (!empty($_REQUEST['advanced']) && $_REQUEST['advanced'] != 'false') {
 			$modules_to_search = array();
-			if(!empty($_REQUEST['search_modules']))
+			if (!empty($_REQUEST['search_modules']))
 			{
-			    foreach(explode (',', $_REQUEST['search_modules'] ) as $key)
+			    foreach (explode(',', $_REQUEST['search_modules']) as $key)
 	            {
                     if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible']))
                     {
@@ -200,16 +200,16 @@ 
 			$users_modules = $current_user->getPreference('globalSearch', 'search');
 			$modules_to_search = array();
 
-			if(!empty($users_modules)) {
+			if (!empty($users_modules)) {
 				// use user's previous selections
-			    foreach ( $users_modules as $key => $value ) {
+			    foreach ($users_modules as $key => $value) {
 			    	if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible'])) {
 		            	$modules_to_search[$key] = $beanList[$key];
 		        	}
 			    }
 			} else {
-				foreach($unified_search_modules_display as $module=>$data) {
-				    if (!empty($data['visible']) ) {
+				foreach ($unified_search_modules_display as $module=>$data) {
+				    if (!empty($data['visible'])) {
 				        $modules_to_search[$module] = $beanList[$module];
 				    }
 				}
@@ -219,7 +219,7 @@ 
 
 
 		$templateFile = 'modules/Home/UnifiedSearchAdvancedForm.tpl';
-		if(file_exists('custom/' . $templateFile))
+		if (file_exists('custom/'.$templateFile))
 		{
 		   $templateFile = 'custom/'.$templateFile;
 		}
@@ -230,9 +230,9 @@ 
 		$module_counts = array();
 		$has_results = false;
 
-		if(!empty($this->query_string)) {
-			foreach($modules_to_search as $moduleName => $beanName) {
-                require_once $beanFiles[$beanName] ;
+		if (!empty($this->query_string)) {
+			foreach ($modules_to_search as $moduleName => $beanName) {
+                require_once $beanFiles[$beanName];
                 $seed = new $beanName();
 
                 $lv = new ListViewSmarty();
@@ -243,25 +243,25 @@ 
                 require('modules/'.$seed->module_dir.'/metadata/listviewdefs.php');
 				$orig_listViewDefs = $listViewDefs;
 
-                if(file_exists('custom/modules/'.$seed->module_dir.'/metadata/listviewdefs.php'))
+                if (file_exists('custom/modules/'.$seed->module_dir.'/metadata/listviewdefs.php'))
                 {
                     require('custom/modules/'.$seed->module_dir.'/metadata/listviewdefs.php');
                 }
 
-                if ( !isset($listViewDefs) || !isset($listViewDefs[$seed->module_dir]) )
+                if (!isset($listViewDefs) || !isset($listViewDefs[$seed->module_dir]))
                 {
                     continue;
                 }
 
-			    $unifiedSearchFields = array () ;
+			    $unifiedSearchFields = array();
                 $innerJoins = array();
-                foreach ( $unified_search_modules[ $moduleName ]['fields'] as $field=>$def )
+                foreach ($unified_search_modules[$moduleName]['fields'] as $field=>$def)
                 {
                 	$listViewCheckField = strtoupper($field);
                 	//check to see if the field is in listview defs
-					if ( empty($listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
+					if (empty($listViewDefs[$seed->module_dir][$listViewCheckField]['default'])) {
 						//check to see if field is in original list view defs (in case we are using custom layout defs)
-						if (!empty($orig_listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
+						if (!empty($orig_listViewDefs[$seed->module_dir][$listViewCheckField]['default'])) {
 							//if we are here then the layout has been customized, but the field is still needed for query creation
 							$listViewDefs[$seed->module_dir][$listViewCheckField] = $orig_listViewDefs[$seed->module_dir][$listViewCheckField];
 						}
@@ -270,9 +270,9 @@ 
 
                     //bug: 34125 we might want to try to use the LEFT JOIN operator instead of the INNER JOIN in the case we are
                     //joining against a field that has not been populated.
-                    if(!empty($def['innerjoin']) )
+                    if (!empty($def['innerjoin']))
                     {
-                        if (empty($def['db_field']) )
+                        if (empty($def['db_field']))
                         {
                             continue;
                         }
@@ -280,37 +280,37 @@ 
                         $def['innerjoin'] = str_replace('INNER', 'LEFT', $def['innerjoin']);
                     }
 
-                    if(isset($seed->field_defs[$field]['type']))
+                    if (isset($seed->field_defs[$field]['type']))
                     {
                         $type = $seed->field_defs[$field]['type'];
-                        if($type == 'int' && !is_numeric($this->query_string))
+                        if ($type == 'int' && !is_numeric($this->query_string))
                         {
                             continue;
                         }
                     }
 
-                    $unifiedSearchFields[ $moduleName ] [ $field ] = $def ;
-                    $unifiedSearchFields[ $moduleName ] [ $field ][ 'value' ] = $this->query_string ;
+                    $unifiedSearchFields[$moduleName] [$field] = $def;
+                    $unifiedSearchFields[$moduleName] [$field]['value'] = $this->query_string;
                 }
 
                 /*
                  * Use searchForm2->generateSearchWhere() to create the search query, as it can generate SQL for the full set of comparisons required
                  * generateSearchWhere() expects to find the search conditions for a field in the 'value' parameter of the searchFields entry for that field
                  */
-                require_once $beanFiles[$beanName] ;
+                require_once $beanFiles[$beanName];
                 $seed = new $beanName();
                 
 				require_once $this->searchFormPath;
-                $searchForm = new $this->searchFormClass ( $seed, $moduleName ) ;
+                $searchForm = new $this->searchFormClass($seed, $moduleName);
 
-                $searchForm->setup (array ( $moduleName => array() ) , $unifiedSearchFields , '' , 'saved_views' /* hack to avoid setup doing further unwanted processing */ ) ;
-                $where_clauses = $searchForm->generateSearchWhere() ;
+                $searchForm->setup(array($moduleName => array()), $unifiedSearchFields, '', 'saved_views' /* hack to avoid setup doing further unwanted processing */);
+                $where_clauses = $searchForm->generateSearchWhere();
                 //add inner joins back into the where clause
                 $params = array('custom_select' => "");
-                foreach($innerJoins as $field=>$def) {
+                foreach ($innerJoins as $field=>$def) {
                     if (isset ($def['db_field'])) {
-                      foreach($def['db_field'] as $dbfield)
-                          $where_clauses[] = $dbfield . " LIKE '" . $this->query_string . "%'";
+                      foreach ($def['db_field'] as $dbfield)
+                          $where_clauses[] = $dbfield." LIKE '".$this->query_string."%'";
                           $params['custom_select'] .= ", $dbfield";
                           $params['distinct'] = true;
                           //$filterFields[$dbfield] = $dbfield;
@@ -319,7 +319,7 @@ 
 
                 if (count($where_clauses) > 0)
                 {
-                    $where = '(('. implode(' ) OR ( ', $where_clauses) . '))';
+                    $where = '(('.implode(' ) OR ( ', $where_clauses).'))';
                 }
                 else
                 {
@@ -328,16 +328,16 @@ 
                     $where = '';
                 }
                 $displayColumns = array();
-                foreach($listViewDefs[$seed->module_dir] as $colName => $param)
+                foreach ($listViewDefs[$seed->module_dir] as $colName => $param)
                 {
-                    if(!empty($param['default']) && $param['default'] == true)
+                    if (!empty($param['default']) && $param['default'] == true)
                     {
-                        $param['url_sort'] = true;//bug 27933
+                        $param['url_sort'] = true; //bug 27933
                         $displayColumns[$colName] = $param;
                     }
                 }
 
-                if(count($displayColumns) > 0)
+                if (count($displayColumns) > 0)
                 {
                 	$lv->displayColumns = $displayColumns;
                 } else {
@@ -354,12 +354,12 @@ 
 
                 $lv->setup($seed, 'include/ListView/ListViewNoMassUpdate.tpl', $where, $params, 0, 10);
 
-                $module_results[$moduleName] = '<br /><br />' . get_form_header($GLOBALS['app_list_strings']['moduleList'][$seed->module_dir] . ' (' . $lv->data['pageData']['offsets']['total'] . ')', '', false);
+                $module_results[$moduleName] = '<br /><br />'.get_form_header($GLOBALS['app_list_strings']['moduleList'][$seed->module_dir].' ('.$lv->data['pageData']['offsets']['total'].')', '', false);
                 $module_counts[$moduleName] = $lv->data['pageData']['offsets']['total'];
 
-                if($lv->data['pageData']['offsets']['total'] == 0) {
+                if ($lv->data['pageData']['offsets']['total'] == 0) {
                     //$module_results[$moduleName] .= "<li class='noBullet' id='whole_subpanel_{$moduleName}'><div id='div_{$moduleName}'><h2>" . $home_mod_strings['LBL_NO_RESULTS_IN_MODULE'] . '</h2></div></li>';
-                    $module_results[$moduleName] .= '<h2>' . $home_mod_strings['LBL_NO_RESULTS_IN_MODULE'] . '</h2>';
+                    $module_results[$moduleName] .= '<h2>'.$home_mod_strings['LBL_NO_RESULTS_IN_MODULE'].'</h2>';
                 } else {
                     $has_results = true;
                     //$module_results[$moduleName] .= "<li class='noBullet' id='whole_subpanel_{$moduleName}'><div id='div_{$moduleName}'>" . $lv->display(false, false) . '</div></li>';
@@ -369,11 +369,11 @@ 
 			}
 		}
 
-		if($has_results) {
-			foreach($module_counts as $name=>$value) {
+		if ($has_results) {
+			foreach ($module_counts as $name=>$value) {
 				echo $module_results[$name];
 			}
-		} else if(empty($_REQUEST['form_only'])) {
+		} else if (empty($_REQUEST['form_only'])) {
 			echo $home_mod_strings['LBL_NO_RESULTS'];
 			echo $home_mod_strings['LBL_NO_RESULTS_TIPS'];
 		}
@@ -387,68 +387,68 @@ 
 
 		$supported_modules = array();
 
-		foreach($beanList as $moduleName=>$beanName)
+		foreach ($beanList as $moduleName=>$beanName)
 		{
 			if (!isset($beanFiles[$beanName]))
 				continue;
 
 			$beanName = BeanFactory::getObjectName($moduleName);
-			$manager = new VardefManager ( );
-			$manager->loadVardef( $moduleName , $beanName ) ;
+			$manager = new VardefManager( );
+			$manager->loadVardef($moduleName, $beanName);
 
 			// obtain the field definitions used by generateSearchWhere (duplicate code in view.list.php)
-			if(file_exists('custom/modules/'.$moduleName.'/metadata/metafiles.php')){
+			if (file_exists('custom/modules/'.$moduleName.'/metadata/metafiles.php')) {
                 require('custom/modules/'.$moduleName.'/metadata/metafiles.php');
-            }elseif(file_exists('modules/'.$moduleName.'/metadata/metafiles.php')){
+            }elseif (file_exists('modules/'.$moduleName.'/metadata/metafiles.php')) {
                 require('modules/'.$moduleName.'/metadata/metafiles.php');
             }
 
 
-			if(!empty($metafiles[$moduleName]['searchfields']))
+			if (!empty($metafiles[$moduleName]['searchfields']))
 			{
-				require $metafiles[$moduleName]['searchfields'] ;
-			} else if(file_exists("modules/{$moduleName}/metadata/SearchFields.php")) {
-				require "modules/{$moduleName}/metadata/SearchFields.php" ;
+				require $metafiles[$moduleName]['searchfields'];
+			} else if (file_exists("modules/{$moduleName}/metadata/SearchFields.php")) {
+				require "modules/{$moduleName}/metadata/SearchFields.php";
 			}
 
 			//Load custom SearchFields.php if it exists
-			if(file_exists("custom/modules/{$moduleName}/metadata/SearchFields.php"))
+			if (file_exists("custom/modules/{$moduleName}/metadata/SearchFields.php"))
 			{
-				require "custom/modules/{$moduleName}/metadata/SearchFields.php" ;
+				require "custom/modules/{$moduleName}/metadata/SearchFields.php";
 			}				
 
             //If there are $searchFields are empty, just continue, there are no search fields defined for the module
-            if(empty($searchFields[$moduleName]))
+            if (empty($searchFields[$moduleName]))
             {
                 continue;
             }
 
-			$isCustomModule = preg_match('/^([a-z0-9]{1,5})_([a-z0-9_]+)$/i' , $moduleName);
+			$isCustomModule = preg_match('/^([a-z0-9]{1,5})_([a-z0-9_]+)$/i', $moduleName);
 
 			//If the bean supports unified search or if it's a custom module bean and unified search is not defined
-			if(!empty($dictionary[$beanName]['unified_search']) || $isCustomModule)
+			if (!empty($dictionary[$beanName]['unified_search']) || $isCustomModule)
 			{
 				$fields = array();
-				foreach ( $dictionary [ $beanName ][ 'fields' ] as $field => $def )
+				foreach ($dictionary [$beanName]['fields'] as $field => $def)
 				{
 					// We cannot enable or disable unified_search for email in the vardefs as we don't actually have a vardef entry for 'email'
 					// the searchFields entry for 'email' doesn't correspond to any vardef entry. Instead it contains SQL to directly perform the search.
 					// So as a proxy we allow any field in the vardefs that has a name starting with 'email...' to be tagged with the 'unified_search' parameter
 
-					if (strpos($field,'email') !== false)
+					if (strpos($field, 'email') !== false)
 					{
-						$field = 'email' ;
+						$field = 'email';
 					}
 
 					//bug: 38139 - allow phone to be searched through Global Search
-					if (strpos($field,'phone') !== false)
+					if (strpos($field, 'phone') !== false)
 					{
-						$field = 'phone' ;
+						$field = 'phone';
 					}
 
-					if ( !empty($def['unified_search']) && isset ( $searchFields [ $moduleName ] [ $field ]  ))
+					if (!empty($def['unified_search']) && isset ($searchFields [$moduleName] [$field]))
 					{
-						$fields [ $field ] = $searchFields [ $moduleName ] [ $field ] ;
+						$fields [$field] = $searchFields [$moduleName] [$field];
 					}
 				}
 
@@ -463,7 +463,7 @@ 
                     }
                 }
 
-				if(count($fields) > 0) {
+				if (count($fields) > 0) {
 					$supported_modules [$moduleName] ['fields'] = $fields;
 					if (isset($dictionary[$beanName]['unified_search_default_enabled']) && $dictionary[$beanName]['unified_search_default_enabled'] === TRUE)
 					{
@@ -494,10 +494,10 @@ 
         //Add the translated attribute for display label
         $json_enabled = array();
         $json_disabled = array();
-        foreach($unified_search_modules_display as $module=>$data)
+        foreach ($unified_search_modules_display as $module=>$data)
         {
             $label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
-            if($data['visible'] === true)
+            if ($data['visible'] === true)
             {
                 $json_enabled[] = array("module" => $module, 'label' => $label);
             }
@@ -508,7 +508,7 @@ 
         }
 
         //If the file doesn't exist
-        if(!file_exists($this->cache_search))
+        if (!file_exists($this->cache_search))
         {
             $this->buildCache();
         }
@@ -516,12 +516,12 @@ 
         include($this->cache_search);
 
         //Now add any new modules that may have since been added to unified_search_modules.php
-        foreach($unified_search_modules as $module=>$data)
+        foreach ($unified_search_modules as $module=>$data)
         {
-            if(!isset($unified_search_modules_display[$module]))
+            if (!isset($unified_search_modules_display[$module]))
             {
                 $label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
-                if($data['default'])
+                if ($data['default'])
                 {
                   $json_enabled[] = array("module" => $module, 'label' => $label);
                 } else {
@@ -542,20 +542,20 @@ 
 	 */
 	function saveGlobalSearchSettings()
 	{
-		if(isset($_REQUEST['enabled_modules']))
+		if (isset($_REQUEST['enabled_modules']))
 		{
             $unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
 
 			$new_unified_search_modules_display = array();
 
-            foreach(explode (',', $_REQUEST['enabled_modules'] ) as $module)
+            foreach (explode(',', $_REQUEST['enabled_modules']) as $module)
             {
                 $new_unified_search_modules_display[$module]['visible'] = true;
             }
 
-			foreach($unified_search_modules_display as $module=>$data)
+			foreach ($unified_search_modules_display as $module=>$data)
 			{
-				if(!isset($new_unified_search_modules_display[$module]))
+				if (!isset($new_unified_search_modules_display[$module]))
 				{
 				   $new_unified_search_modules_display[$module]['visible'] = false;
 				}
@@ -569,7 +569,7 @@ 
 	public static function unlinkUnifiedSearchModulesFile() {
 		//clear the unified_search_module.php file
 		$cache_search = sugar_cached('modules/unified_search_modules.php');
-    	if(file_exists($cache_search))
+    	if (file_exists($cache_search))
     	{
     		$GLOBALS['log']->info("unlink {$cache_search}");
     		unlink($cache_search);
@@ -589,14 +589,14 @@ 
     {
 		//Make directory if it doesn't exist
         $cachedir = sugar_cached('modules');
-		if(!file_exists($cachedir))
+		if (!file_exists($cachedir))
 		{
 		   mkdir_recursive($cachedir);
 		}
 
 		//Load unified_search_modules.php file
         $cachedFile = sugar_cached('modules/unified_search_modules.php');
-		if(!file_exists($cachedFile))
+		if (!file_exists($cachedFile))
 		{
 			$this->buildCache();
 		}
@@ -616,15 +616,15 @@ 
      */
     public function getUnifiedSearchModulesDisplay()
     {
-		if(!file_exists('custom/modules/unified_search_modules_display.php'))
+		if (!file_exists('custom/modules/unified_search_modules_display.php'))
 		{
             $unified_search_modules = $this->getUnifiedSearchModules();
 
             $unified_search_modules_display = array();
 
-            if(!empty($unified_search_modules))
+            if (!empty($unified_search_modules))
             {
-                foreach($unified_search_modules as $module=>$data)
+                foreach ($unified_search_modules as $module=>$data)
                 {
                     $unified_search_modules_display[$module]['visible'] = (isset($data['default']) && $data['default']) ? true : false;
                 }
@@ -647,12 +647,12 @@ 
 	 */
 	private function writeUnifiedSearchModulesDisplayFile($unified_search_modules_display)
 	{
-		if(is_null($unified_search_modules_display) || empty($unified_search_modules_display))
+		if (is_null($unified_search_modules_display) || empty($unified_search_modules_display))
 		{
 		   return false;
 		}
 
-	    if(!write_array_to_file("unified_search_modules_display", $unified_search_modules_display, 'custom/modules/unified_search_modules_display.php'))
+	    if (!write_array_to_file("unified_search_modules_display", $unified_search_modules_display, 'custom/modules/unified_search_modules_display.php'))
 	    {
 	    	//Log error message and throw Exception
 	    	global $app_strings;
@@ -667,7 +667,7 @@ 
 
 
 function unified_search_modules_cmp($a, $b) {
-	if(!isset($a['translated']) || !isset($b['translated']))
+	if (!isset($a['translated']) || !isset($b['translated']))
 	{
 	   return 0;
 	}

modules/Home/index.php

Spacing +43 added lines, -43 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.
@@ -45,7 +45,7 @@ 
 require_once('include/MySugar/MySugar.php');
 
 // build dashlet cache file if not found
-if(!is_file($cachefile = sugar_cached('dashlets/dashlets.php'))) {
+if (!is_file($cachefile = sugar_cached('dashlets/dashlets.php'))) {
     require_once('include/Dashlets/DashletCacheBuilder.php');
 
     $dc = new DashletCacheBuilder();
@@ -63,7 +63,7 @@ 
 
 $hasUserPreferences = (!isset($pages) || empty($pages) || !isset($dashlets) || empty($dashlets)) ? false : true;
 
-if(!$hasUserPreferences){
+if (!$hasUserPreferences) {
     $dashlets = array();
 
     //list of preferences to move over and to where
@@ -88,7 +88,7 @@ 
     $old_columns = $current_user->getPreference('columns', 'home');
     $old_dashlets = $current_user->getPreference('dashlets', 'home');
 
-    if (isset($old_columns) && !empty($old_columns) && isset($old_dashlets) && !empty($old_dashlets)){
+    if (isset($old_columns) && !empty($old_columns) && isset($old_dashlets) && !empty($old_dashlets)) {
         $columns = $old_columns;
         $dashlets = $old_dashlets;
 
@@ -98,23 +98,23 @@ 
         $current_user->setPreference('columns', $old_columns, 0, 'home');
         $current_user->setPreference('dashlets', $old_dashlets, 0, 'home');
     }
-    else{
+    else {
         // This is here to get Sugar dashlets added above the rest
-        $dashlets[create_guid()] = array ('className' => 'SugarFeedDashlet',
+        $dashlets[create_guid()] = array('className' => 'SugarFeedDashlet',
             'module' => 'SugarFeed',
             'forceColumn' => 1,
             'fileLocation' => $dashletsFiles['SugarFeedDashlet']['file'],
         );
 
-        foreach($defaultDashlets as $dashletName=>$module){
+        foreach ($defaultDashlets as $dashletName=>$module) {
             // clint - fixes bug #20398
             // only display dashlets that are from visibile modules and that the user has permission to list
             $myDashlet = new MySugar($module);
             $displayDashlet = $myDashlet->checkDashletDisplay();
-            if (isset($dashletsFiles[$dashletName]) && $displayDashlet){
+            if (isset($dashletsFiles[$dashletName]) && $displayDashlet) {
                 $options = array();
-                $prefsforthisdashlet = array_keys($prefstomove,$dashletName);
-                foreach ( $prefsforthisdashlet as $pref ) {
+                $prefsforthisdashlet = array_keys($prefstomove, $dashletName);
+                foreach ($prefsforthisdashlet as $pref) {
                     $options[$pref] = $current_user->getPreference($pref);
                 }
                 $dashlets[create_guid()] = array('className' => $dashletName,
@@ -134,8 +134,8 @@ 
         $columns[1]['width'] = '40%';
         $columns[1]['dashlets'] = array();
 
-        foreach($dashlets as $guid=>$dashlet) {
-            if( $dashlet['forceColumn'] == 0 ) array_push($columns[0]['dashlets'], $guid);
+        foreach ($dashlets as $guid=>$dashlet) {
+            if ($dashlet['forceColumn'] == 0) array_push($columns[0]['dashlets'], $guid);
             else array_push($columns[1]['dashlets'], $guid);
             $count++;
         }
@@ -150,29 +150,29 @@ 
 // handles upgrading from versions that had the 'Dashboard' module; move those items over to the Home page
 $pagesDashboard = $current_user->getPreference('pages', 'Dashboard');
 $dashletsDashboard = $current_user->getPreference('dashlets', 'Dashboard');
-if ( !empty($pagesDashboard) ) {
+if (!empty($pagesDashboard)) {
     // move dashlets from the dashboard to be at the end of the home screen dashlets
-    foreach ($pagesDashboard[0]['columns'] as $dashboardColumnKey => $dashboardColumn ) {
-        foreach ($dashboardColumn['dashlets'] as $dashletItem ) {
+    foreach ($pagesDashboard[0]['columns'] as $dashboardColumnKey => $dashboardColumn) {
+        foreach ($dashboardColumn['dashlets'] as $dashletItem) {
             $pages[0]['columns'][$dashboardColumnKey]['dashlets'][] = $dashletItem;
         }
     }
-    $pages = array_merge($pages,$pagesDashboard);
+    $pages = array_merge($pages, $pagesDashboard);
     $current_user->setPreference('pages', $pages, 0, 'Home');
 }
-if ( !empty($dashletsDashboard) ) {
-    $dashlets = array_merge($dashlets,$dashletsDashboard);
+if (!empty($dashletsDashboard)) {
+    $dashlets = array_merge($dashlets, $dashletsDashboard);
     $current_user->setPreference('dashlets', $dashlets, 0, 'Home');
 }
-if ( !empty($pagesDashboard) || !empty($dashletsDashboard) )
+if (!empty($pagesDashboard) || !empty($dashletsDashboard))
     $current_user->resetPreferences('Dashboard');
 
-if (empty($pages)){
+if (empty($pages)) {
     $pages = array();
     $pageIndex = 0;
     $pages[0]['columns'] = $columns;
     $pages[0]['numColumns'] = '3';
-    $pages[0]['pageTitleLabel'] = 'LBL_HOME_PAGE_1_NAME';	// "My Sugar"
+    $pages[0]['pageTitleLabel'] = 'LBL_HOME_PAGE_1_NAME'; // "My Sugar"
     $pageIndex++;
     $current_user->setPreference('pages', $pages, 0, 'Home');
     $activePage = 0;
@@ -191,34 +191,34 @@ 
 $dashletIds = array(); // collect ids to pass to javascript
 $display = array();
 
-foreach($pages[$activePage]['columns'] as $colNum => $column) {
-    if ($colNum == $numCols){
+foreach ($pages[$activePage]['columns'] as $colNum => $column) {
+    if ($colNum == $numCols) {
         break;
     }
     $display[$colNum]['width'] = $column['width'];
     $display[$colNum]['dashlets'] = array();
-    foreach($column['dashlets'] as $num => $id) {
+    foreach ($column['dashlets'] as $num => $id) {
         // clint - fixes bug #20398
         // only display dashlets that are from visibile modules and that the user has permission to list
-        if(!empty($id) && isset($dashlets[$id]) && is_file($dashlets[$id]['fileLocation'])) {
+        if (!empty($id) && isset($dashlets[$id]) && is_file($dashlets[$id]['fileLocation'])) {
             $module = 'Home';
-            if ( !empty($dashletsFiles[$dashlets[$id]['className']]['module']) )
+            if (!empty($dashletsFiles[$dashlets[$id]['className']]['module']))
                 $module = $dashletsFiles[$dashlets[$id]['className']]['module'];
             // Bug 24772 - Look into the user preference for the module the dashlet is a part of in case
             //             of the Report Chart dashlets.
-            elseif ( !empty($dashlets[$id]['module']) )
+            elseif (!empty($dashlets[$id]['module']))
                 $module = $dashlets[$id]['module'];
 
             $myDashlet = new MySugar($module);
 
-            if($myDashlet->checkDashletDisplay()) {
+            if ($myDashlet->checkDashletDisplay()) {
                 require_once($dashlets[$id]['fileLocation']);
 
 
                 $dashlet = new $dashlets[$id]['className']($id, (isset($dashlets[$id]['options']) ? $dashlets[$id]['options'] : array()));
                 // Need to add support to dynamically display/hide dashlets
                 // If it has a method 'shouldDisplay' we will call it to see if we should display it or not
-                if (method_exists($dashlet,'shouldDisplay')) {
+                if (method_exists($dashlet, 'shouldDisplay')) {
                     if (!$dashlet->shouldDisplay()) {
                         // This dashlet doesn't want us to show it, skip it.
                         continue;
@@ -229,7 +229,7 @@ 
 
                 $dashlets = $current_user->getPreference('dashlets', 'Home'); // Using hardcoded 'Home' because DynamicAction.php $_REQUEST['module'] value is always Home
                 $lvsParams = array();
-                if(!empty($dashlets[$id]['sort_options'])){
+                if (!empty($dashlets[$id]['sort_options'])) {
                     $lvsParams = $dashlets[$id]['sort_options'];
                 }
 
@@ -238,10 +238,10 @@ 
                     $display[$colNum]['dashlets'][$id]['display'] = $dashlet->display();
                     $display[$colNum]['dashlets'][$id]['displayHeader'] = $dashlet->getHeader();
                     $display[$colNum]['dashlets'][$id]['displayFooter'] = $dashlet->getFooter();
-                    if($dashlet->hasScript) {
+                    if ($dashlet->hasScript) {
                         $display[$colNum]['dashlets'][$id]['script'] = $dashlet->displayScript();
                     }
-                } catch (Exception $ex) {
+                }catch (Exception $ex) {
                     $display[$colNum]['dashlets'][$id]['display'] = $ex->getMessage();
                     $display[$colNum]['dashlets'][$id]['displayHeader'] = $dashlet->getHeader();
                     $display[$colNum]['dashlets'][$id]['displayFooter'] = $dashlet->getFooter();
@@ -253,18 +253,18 @@ 
 
 
 $i = 0;
-    while($i < count($pages)){
-        if($i == 0){
+    while ($i < count($pages)) {
+        if ($i == 0) {
             $pageTabs[$i]['pageTitle'] = $GLOBALS['app_strings']['LBL_SUITE_DASHBOARD'];
 //            $pageTabs[$i]['active'] = 'current';
-        }else{
+        } else {
             $pageTabs[$i]['pageTitle'] = $pages[$i]['pageTitle'];
             $divPages[] = $i;
         }
         $i++;
     }
 
-if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $sugar_smarty->assign('lock_homepage', true);
+if (!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $sugar_smarty->assign('lock_homepage', true);
 
 $sugar_smarty->assign('sugarVersion', $sugar_version);
 $sugar_smarty->assign('sugarFlavor', $sugar_flavor);
@@ -274,7 +274,7 @@ 
 
 $sugar_smarty->assign('maxCount', empty($sugar_config['max_dashlets_homepage']) ? 15 : $sugar_config['max_dashlets_homepage']);
 $sugar_smarty->assign('dashletCount', $count);
-$sugar_smarty->assign('dashletIds', '["' . implode('","', $dashletIds) . '"]');
+$sugar_smarty->assign('dashletIds', '["'.implode('","', $dashletIds).'"]');
 $sugar_smarty->assign('columns', $display);
 
 global $theme;
@@ -305,16 +305,16 @@ 
 $sugar_smarty->assign('chartResources', $resources);
 $sugar_smarty->assign('mySugarChartResources', $mySugarResources);
 
-if (file_exists("custom/themes/" . $theme ."/tpls/MySugar.tpl")) {
-    echo $sugar_smarty->fetch("custom/themes/" . $theme ."/tpls/MySugar.tpl");
+if (file_exists("custom/themes/".$theme."/tpls/MySugar.tpl")) {
+    echo $sugar_smarty->fetch("custom/themes/".$theme."/tpls/MySugar.tpl");
 }
-else if(file_exists('custom/include/MySugar/tpls/MySugar.tpl')) {
+else if (file_exists('custom/include/MySugar/tpls/MySugar.tpl')) {
     echo $sugar_smarty->fetch('custom/include/MySugar/tpls/MySugar.tpl');
 }
-elseif (file_exists("themes/" . $theme ."/tpls/MySugar.tpl")) {
-    echo $sugar_smarty->fetch("themes/" . $theme ."/tpls/MySugar.tpl");
+elseif (file_exists("themes/".$theme."/tpls/MySugar.tpl")) {
+    echo $sugar_smarty->fetch("themes/".$theme."/tpls/MySugar.tpl");
 }
-else if(file_exists('include/MySugar/tpls/MySugar.tpl')) {
+else if (file_exists('include/MySugar/tpls/MySugar.tpl')) {
     echo $sugar_smarty->fetch('include/MySugar/tpls/MySugar.tpl');
 }
 else {

modules/Project/delete_project_tasks.php

Spacing +2 added lines, -2 removed lines

@@ -24,12 +24,12 @@
  * Used to delete a project's related tasks after a project is deleted
  */
 class delete_project_tasks {
-    function delete_tasks(&$bean, $event, $arguments){
+    function delete_tasks(&$bean, $event, $arguments) {
         global $db;
         $Task = BeanFactory::getBean('ProjectTask');
         $tasks = $Task->get_full_list("order_number", "project_task.project_id = '".$bean->id."'");
 
-        foreach($tasks as $task){
+        foreach ($tasks as $task) {
             $query = "UPDATE project_task SET deleted ='1' WHERE id ='".$task->id."'";
             $update = $db->query($query);
         }

modules/Project/metadata/additionalDetails.php

Spacing +5 added lines, -5 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.
@@ -43,16 +43,16 @@ 
 
 function additionalDetailsProject($fields) {
 	static $mod_strings;
-	if(empty($mod_strings)) {
+	if (empty($mod_strings)) {
 		global $current_language;
 		$mod_strings = return_module_language($current_language, 'Project');
 	}
 		
 	$overlib_string = '';
 	
-	if(!empty($fields['DESCRIPTION'])) {
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+	if (!empty($fields['DESCRIPTION'])) {
+		$overlib_string .= '<b>'.$mod_strings['LBL_DESCRIPTION'].'</b> '.substr($fields['DESCRIPTION'], 0, 300);
+		if (strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
 	}	
 
 	return array('fieldToAddTo' => 'NAME', 

modules/Project/metadata/dashletviewdefs.php

Spacing +13 added lines, -13 removed lines

@@ -1,22 +1,22 @@ 
 <?php
-$dashletData['ProjectDashlet']['searchFields'] = array (
+$dashletData['ProjectDashlet']['searchFields'] = array(
   'date_entered' => 
-  array (
+  array(
     'default' => '',
   ),
   'date_modified' => 
-  array (
+  array(
     'default' => '',
   ),
   'assigned_user_id' => 
-  array (
+  array(
     'type' => 'assigned_user_name',
     'default' => 'Administrator',
   ),
 );
-$dashletData['ProjectDashlet']['columns'] = array (
+$dashletData['ProjectDashlet']['columns'] = array(
   'name' => 
-  array (
+  array(
     'width' => '30%',
     'label' => 'LBL_LIST_NAME',
     'link' => true,
@@ -24,7 +24,7 @@ 
     'name' => 'name',
   ),
   'status' => 
-  array (
+  array(
     'type' => 'enum',
     'default' => true,
     'label' => 'LBL_STATUS',
@@ -32,7 +32,7 @@ 
     'name' => 'status',
   ),
   'estimated_start_date' => 
-  array (
+  array(
     'type' => 'date',
     'label' => 'LBL_DATE_START',
     'width' => '10%',
@@ -40,14 +40,14 @@ 
     'name' => 'estimated_start_date',
   ),
   'assigned_user_name' => 
-  array (
+  array(
     'width' => '8%',
     'label' => 'LBL_LIST_ASSIGNED_USER',
     'name' => 'assigned_user_name',
     'default' => true,
   ),
   'estimated_end_date' => 
-  array (
+  array(
     'type' => 'date',
     'label' => 'LBL_DATE_END',
     'width' => '10%',
@@ -55,21 +55,21 @@ 
     'name' => 'estimated_end_date',
   ),
   'date_modified' => 
-  array (
+  array(
     'width' => '15%',
     'label' => 'LBL_DATE_MODIFIED',
     'name' => 'date_modified',
     'default' => false,
   ),
   'date_entered' => 
-  array (
+  array(
     'width' => '15%',
     'label' => 'LBL_DATE_ENTERED',
     'default' => false,
     'name' => 'date_entered',
   ),
   'created_by' => 
-  array (
+  array(
     'width' => '8%',
     'label' => 'LBL_CREATED',
     'name' => 'created_by',

modules/Project/metadata/editviewdefs.php

Spacing +24 added lines, -24 removed lines

@@ -41,96 +41,96 @@
 
 
 $viewdefs ['Project'] =
-array (
+array(
   'EditView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
       ),
       'form' => 
-      array (
+      array(
         'hidden' => '<input type="hidden" name="is_template" value="{$is_template}" />',
         'buttons' => 
-        array (
+        array(
           0 => 'SAVE',
           1 => 
-          array (
+          array(
             'customCode' => '{if !empty($smarty.request.return_action) && $smarty.request.return_action == "ProjectTemplatesDetailView" && (!empty($fields.id.value) || !empty($smarty.request.return_id)) }<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="this.form.action.value=\'ProjectTemplatesDetailView\'; this.form.module.value=\'{$smarty.request.return_module}\'; this.form.record.value=\'{$smarty.request.return_id}\';" type="submit" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" id="CANCEL{$place}"> {elseif !empty($smarty.request.return_action) && $smarty.request.return_action == "DetailView" && (!empty($fields.id.value) || !empty($smarty.request.return_id)) }<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="this.form.action.value=\'DetailView\'; this.form.module.value=\'{$smarty.request.return_module}\'; this.form.record.value=\'{$smarty.request.return_id}\';" type="submit" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" id="CANCEL{$place}"> {elseif $is_template}<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="this.form.action.value=\'ProjectTemplatesListView\'; this.form.module.value=\'{$smarty.request.return_module}\'; this.form.record.value=\'{$smarty.request.return_id}\';" type="submit" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" id="CANCEL{$place}"> {else}<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="this.form.action.value=\'index\'; this.form.module.value=\'{$smarty.request.return_module}\'; this.form.record.value=\'{$smarty.request.return_id}\';" type="submit" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" id="CANCEL{$place}"> {/if}',
           ),
         ),
       ),
       'useTabs' => false,
       'tabDefs' => 
-      array (
+      array(
         'LBL_PROJECT_INFORMATION' => 
-        array (
+        array(
           'newTab' => false,
           'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ASSIGNMENT' => 
-        array (
+        array(
           'newTab' => false,
           'panelDefault' => 'expanded',
         ),
       ),
     ),
     'panels' => 
-    array (
+    array(
       'lbl_project_information' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 'name',
           1 => 'status',
         ),
         1 => 
-        array (
+        array(
           0 => 'estimated_start_date',
           1 => 'priority',
         ),
         2 => 
-        array (
+        array(
           0 => 'estimated_end_date',
           1 => '',
         ),
         3 => 
-        array (
+        array(
           0 => 'description',
         ),
       ),
       'LBL_PANEL_ASSIGNMENT' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 'assigned_user_name',
           1 => 
-          array (
+          array(
             'name' => 'am_projecttemplates_project_1_name',
           ),
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'date_entered',
             'comment' => 'Date record created',
             'label' => 'LBL_DATE_ENTERED',
           ),
           1 => 
-          array (
+          array(
             'name' => 'date_modified',
             'comment' => 'Date record last modified',
             'label' => 'LBL_DATE_MODIFIED',

modules/Project/metadata/searchdefs.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 						'basic_search' => array(
 						 	'name',
 						 	array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
-                            array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
+                            array('name' => 'favorites_only', 'label' => 'LBL_FAVORITES_FILTER', 'type' => 'bool',),
 
 
                         ),

modules/Project/metadata/SearchFields.php

Spacing +17 added lines, -17 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.
@@ -40,31 +40,31 @@ 
 global $current_user;
 $module_name = "Project";
 $searchFields['Project'] = 
-    array (
-        'name' => array( 'query_type'=>'default'),
-        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+    array(
+        'name' => array('query_type'=>'default'),
+        'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
         'favorites_only' => array(
             'query_type'=>'format',
             'operator' => 'subquery',
             'subquery' => 'SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = "'.$module_name.'"
-			                        and favorites.assigned_user_id = "' .$current_user->id . '") OR NOT ({0}',
+			                        and favorites.assigned_user_id = "' .$current_user->id.'") OR NOT ({0}',
             'db_field'=>array('id')),
 		//Range Search Support 
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	    
-	   'range_estimated_start_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_estimated_start_date' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_estimated_start_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_estimated_end_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_estimated_end_date' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_estimated_end_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_estimated_start_date' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_estimated_start_date' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_estimated_start_date' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_estimated_end_date' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_estimated_end_date' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_estimated_end_date' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 		//Range Search Support 				
     );
 ?>

modules/Project/metadata/detailviewdefs.php

Spacing +39 added lines, -39 removed lines

@@ -41,49 +41,49 @@ 
 
 
 $viewdefs ['Project'] =
-array (
+array(
   'DetailView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
       ),
       'includes' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'file' => 'modules/Project/Project.js',
         ),
         1 => 
-        array (
+        array(
           'file' => 'modules/Project/js/custom_project.js',
         ),
       ),
       'form' => 
-      array (
+      array(
         'buttons' => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'customCode' => '<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="button" type="submit" name="Edit" id="edit_button" value="{$APP.LBL_EDIT_BUTTON_LABEL}"onclick="{if $IS_TEMPLATE}this.form.return_module.value=\'Project\'; this.form.return_action.value=\'ProjectTemplatesDetailView\'; this.form.return_id.value=\'{$id}\'; this.form.action.value=\'ProjectTemplatesEditView\';{else}this.form.return_module.value=\'Project\'; this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$id}\'; this.form.action.value=\'EditView\'; {/if}"/>',
             'sugar_html' => 
-            array (
+            array(
               'type' => 'submit',
               'value' => ' {$APP.LBL_EDIT_BUTTON_LABEL} ',
               'htmlOptions' => 
-              array (
+              array(
                 'id' => 'edit_button',
                 'class' => 'button',
                 'accessKey' => '{$APP.LBL_EDIT_BUTTON_KEY}',
@@ -93,15 +93,15 @@ 
             ),
           ),
           1 => 
-          array (
+          array(
             'customCode' => '<input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="button" type="button" name="Delete" id="delete_button" value="{$APP.LBL_DELETE_BUTTON_LABEL}" onclick="project_delete(this);"/>',
             'sugar_html' => 
-            array (
+            array(
               'type' => 'button',
               'id' => 'delete_button',
               'value' => '{$APP.LBL_DELETE_BUTTON_LABEL}',
               'htmlOptions' => 
-              array (
+              array(
                 'title' => '{$APP.LBL_DELETE_BUTTON_TITLE}',
                 'accessKey' => '{$APP.LBL_DELETE_BUTTON_KEY}',
                 'id' => 'delete_button',
@@ -111,14 +111,14 @@ 
             ),
           ),
           2 => 
-          array (
+          array(
             'customCode' => '<input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="button" type="submit" name="Duplicate" id="duplicate_button" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}"onclick="{if $IS_TEMPLATE}this.form.return_module.value=\'Project\'; this.form.return_action.value=\'ProjectTemplatesDetailView\'; this.form.isDuplicate.value=true; this.form.action.value=\'projecttemplateseditview\'; this.form.return_id.value=\'{$id}\';{else}this.form.return_module.value=\'Project\'; this.form.return_action.value=\'DetailView\'; this.form.isDuplicate.value=true; this.form.action.value=\'EditView\'; this.form.return_id.value=\'{$id}\';{/if}""/>',
             'sugar_html' => 
-            array (
+            array(
               'type' => 'submit',
               'value' => '{$APP.LBL_DUPLICATE_BUTTON_LABEL}',
               'htmlOptions' => 
-              array (
+              array(
                 'title' => '{$APP.LBL_DUPLICATE_BUTTON_TITLE}',
                 'accessKey' => '{$APP.LBL_DUPLICATE_BUTTON_KEY}',
                 'class' => 'button',
@@ -129,82 +129,82 @@ 
             ),
           ),
           3 => 
-          array (
+          array(
             'customCode' => '<input title="{$APP.LBL_VIEW_GANTT_TITLE}" class="button" type="button" name="view_gantt" id="view_gantt" value="{$APP.LBL_GANTT_BUTTON_LABEL}" onclick="javascript:window.location.href=\'index.php?module=Project&action=view_GanttChart&project_id={$id}\'"/>',
           ),
         ),
       ),
       'useTabs' => true,
       'tabDefs' => 
-      array (
+      array(
         'LBL_PROJECT_INFORMATION' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ASSIGNMENT' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
       ),
     ),
     'panels' => 
-    array (
+    array(
       'lbl_project_information' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 'name',
           1 => 'status',
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'estimated_start_date',
             'label' => 'LBL_DATE_START',
           ),
           1 => 'priority',
         ),
         2 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'estimated_end_date',
             'label' => 'LBL_DATE_END',
           ),
           1 => '',
         ),
         3 => 
-        array (
+        array(
           0 => 'description',
         ),
       ),
       'LBL_PANEL_ASSIGNMENT' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO',
           ),
           1 => 
-          array (
+          array(
             'name' => 'am_projecttemplates_project_1_name',
           ),
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'date_entered',
             'comment' => 'Date record created',
             'label' => 'LBL_DATE_ENTERED',
           ),
           1 => 
-          array (
+          array(
             'name' => 'date_modified',
             'comment' => 'Date record last modified',
             'label' => 'LBL_DATE_MODIFIED',