adamjakab / SuiteCRM

include/SubPanel/SubPanelSearchDisplay.php

Spacing +6 added lines, -6 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.
@@ -38,18 +38,18 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-ini_set('display_errors',1);
+ini_set('display_errors', 1);
 
 global $beanList;
 global $beanFiles;
 
 
-if(empty($_REQUEST['module']))
+if (empty($_REQUEST['module']))
 {
 	die("'module' was not defined");
 }
 
-if(!isset($beanList[$_REQUEST['module']]))
+if (!isset($beanList[$_REQUEST['module']]))
 {
 	die("'".$_REQUEST['module']."' is not defined in \$beanList");
 }
@@ -66,11 +66,11 @@ 
 
 include('include/SubPanel/SubPanel.php');
 $layout_def_key = '';
-if(!empty($_REQUEST['layout_def_key'])){
+if (!empty($_REQUEST['layout_def_key'])) {
 	$layout_def_key = $_REQUEST['layout_def_key'];
 }
 
-$subpanel_object = new CustomSubPanel($module, $record, $subpanel,null, $layout_def_key, $collection);
+$subpanel_object = new CustomSubPanel($module, $record, $subpanel, null, $layout_def_key, $collection);
 
 echo $subpanel_object->getSearchForm();
 

include/SubPanel/SubPanelDefinitions.php

Spacing +212 added lines, -212 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.
@@ -54,13 +54,13 @@ 
 class aSubPanel
 {
 
-	var $name ;
-	var $_instance_properties ;
+	var $name;
+	var $_instance_properties;
 
-	var $mod_strings ;
-	var $panel_definition ;
-	var $sub_subpanels ;
-	var $parent_bean ;
+	var $mod_strings;
+	var $panel_definition;
+	var $sub_subpanels;
+	var $parent_bean;
 
     /**
      * Can we display this subpanel?
@@ -73,53 +73,53 @@ 
     var $canDisplay = true;
 
 	//module's table name and column fields.
-	var $table_name ;
-	var $db_fields ;
-	var $bean_name ;
-	var $template_instance ;
+	var $table_name;
+	var $db_fields;
+	var $bean_name;
+	var $template_instance;
 
 	var $search_query;
 	var $base_collection_list = array();
 
-	function aSubPanel ($name , $instance_properties , $parent_bean , $reload = false , $original_only = false, $search_query = '', $collections = array() ){
+	function aSubPanel($name, $instance_properties, $parent_bean, $reload = false, $original_only = false, $search_query = '', $collections = array()) {
 
-		$this->_instance_properties = $instance_properties ;
+		$this->_instance_properties = $instance_properties;
 
-		if(isset($instance_properties['collection_list' ])) $this->base_collection_list = $instance_properties['collection_list' ];
+		if (isset($instance_properties['collection_list'])) $this->base_collection_list = $instance_properties['collection_list'];
 
-		if(!empty($collections) && isset($instance_properties['collection_list' ])){
-			foreach($instance_properties['collection_list' ] as $cname => $value){
-				if(!in_array($value['module'], $collections)){
+		if (!empty($collections) && isset($instance_properties['collection_list'])) {
+			foreach ($instance_properties['collection_list'] as $cname => $value) {
+				if (!in_array($value['module'], $collections)) {
 					unset($instance_properties['collection_list'][$cname]);
 				}
 			}
 		}
-		if (!$this->isCollection()){
+		if (!$this->isCollection()) {
 			$table = strtolower($instance_properties['module']);
-			$search_query = str_replace('meetings',$table,$search_query);
+			$search_query = str_replace('meetings', $table, $search_query);
 		}
 
 		$this->search_query = $search_query;
-		$this->name = $name ;
-		$this->parent_bean = $parent_bean ;
+		$this->name = $name;
+		$this->parent_bean = $parent_bean;
 
 		//set language
-		global $current_language ;
-		if (! isset ( $parent_bean->mbvardefs ))
+		global $current_language;
+		if (!isset ($parent_bean->mbvardefs))
 		{
-			$mod_strings = return_module_language ( $current_language, $parent_bean->module_dir ) ;
+			$mod_strings = return_module_language($current_language, $parent_bean->module_dir);
 		}
-		$this->mod_strings = $mod_strings ;
+		$this->mod_strings = $mod_strings;
 
-        if ($this->isCollection ())
+        if ($this->isCollection())
 		{
-			$this->canDisplay = $this->load_sub_subpanels () ; //load sub-panel definition.
+			$this->canDisplay = $this->load_sub_subpanels(); //load sub-panel definition.
 		} else
 		{
-			if (!is_dir('modules/' . $this->_instance_properties [ 'module' ])){
+			if (!is_dir('modules/'.$this->_instance_properties ['module'])) {
 				_pstack_trace();
 			}
-			$def_path = 'modules/' . $this->_instance_properties [ 'module' ] . '/metadata/subpanels/' . $this->_instance_properties [ 'subpanel_name' ] . '.php' ;
+			$def_path = 'modules/'.$this->_instance_properties ['module'].'/metadata/subpanels/'.$this->_instance_properties ['subpanel_name'].'.php';
 
 			$orig_exists = is_file($def_path);
 			$loaded = false;
@@ -128,16 +128,16 @@ 
 				require ($def_path);
 				$loaded = true;
 			}
-			if (is_file("custom/$def_path") && (!$original_only  || !$orig_exists))
+			if (is_file("custom/$def_path") && (!$original_only || !$orig_exists))
 			{
 				require ("custom/$def_path");
 				$loaded = true;
 			}
 
-			if (! $original_only && isset ( $this->_instance_properties [ 'override_subpanel_name' ] ) && file_exists ( 'custom/modules/' . $this->_instance_properties [ 'module' ] . '/metadata/subpanels/' . $this->_instance_properties [ 'override_subpanel_name' ] . '.php' ))
+			if (!$original_only && isset ($this->_instance_properties ['override_subpanel_name']) && file_exists('custom/modules/'.$this->_instance_properties ['module'].'/metadata/subpanels/'.$this->_instance_properties ['override_subpanel_name'].'.php'))
 			{
-				$cust_def_path = 'custom/modules/' . $this->_instance_properties [ 'module' ] . '/metadata/subpanels/' . $this->_instance_properties [ 'override_subpanel_name' ] . '.php' ;
-				require ($cust_def_path) ;
+				$cust_def_path = 'custom/modules/'.$this->_instance_properties ['module'].'/metadata/subpanels/'.$this->_instance_properties ['override_subpanel_name'].'.php';
+				require ($cust_def_path);
 				$loaded = true;
 			}
 
@@ -168,7 +168,7 @@ 
      */
     public function isDefaultHidden()
     {
-        if(isset($this->_instance_properties['default_hidden']) && $this->_instance_properties['default_hidden'] == true) {
+        if (isset($this->_instance_properties['default_hidden']) && $this->_instance_properties['default_hidden'] == true) {
             return true;
         }
 
@@ -176,63 +176,63 @@ 
     }
 
 
-	function distinct_query ()
+	function distinct_query()
 	{
-		if (isset ( $this->_instance_properties [ 'get_distinct_data' ] ))
+		if (isset ($this->_instance_properties ['get_distinct_data']))
 		{
 			return !empty($this->_instance_properties['get_distinct_data']) ? true : false;
 		}
-		return false ;
+		return false;
 	}
 
 	//return the translated header value.
-	function get_title ()
+	function get_title()
 	{
-		if (empty ( $this->mod_strings [ $this->_instance_properties [ 'title_key' ] ] ))
+		if (empty ($this->mod_strings [$this->_instance_properties ['title_key']]))
 		{
-			return translate ( $this->_instance_properties [ 'title_key' ], $this->_instance_properties [ 'module' ] ) ;
+			return translate($this->_instance_properties ['title_key'], $this->_instance_properties ['module']);
 		}
-		return $this->mod_strings [ $this->_instance_properties [ 'title_key' ] ] ;
+		return $this->mod_strings [$this->_instance_properties ['title_key']];
 	}
 
 	//return the definition of buttons. looks for buttons in 2 locations.
-	function get_buttons ()
+	function get_buttons()
 	{
-		$buttons = array ( ) ;
-		if (isset ( $this->_instance_properties [ 'top_buttons' ] ))
+		$buttons = array( );
+		if (isset ($this->_instance_properties ['top_buttons']))
 		{
 			//this will happen only in the case of sub-panels with multiple sources(activities).
-			$buttons = $this->_instance_properties [ 'top_buttons' ] ;
+			$buttons = $this->_instance_properties ['top_buttons'];
 		} else
 		{
-			$buttons = $this->panel_definition [ 'top_buttons' ] ;
+			$buttons = $this->panel_definition ['top_buttons'];
 		}
 
 		// permissions. hide SubPanelTopComposeEmailButton from activities if email module is disabled.
 		//only email is  being tested becuase other submodules in activites/history such as notes, tasks, meetings and calls cannot be disabled.
 		//as of today these are the only 2 sub-panels that use the union clause.
-		$mod_name = $this->get_module_name () ;
+		$mod_name = $this->get_module_name();
 		if ($mod_name == 'Activities' || $mod_name == 'History')
 		{
-			global $modListHeader ;
-			global $modules_exempt_from_availability_check ;
-			if (isset ( $modListHeader ) && (! (array_key_exists ( 'Emails', $modListHeader ) or array_key_exists ( 'Emails', $modules_exempt_from_availability_check ))))
+			global $modListHeader;
+			global $modules_exempt_from_availability_check;
+			if (isset ($modListHeader) && (!(array_key_exists('Emails', $modListHeader) or array_key_exists('Emails', $modules_exempt_from_availability_check))))
 			{
-				foreach ( $buttons as $key => $button )
+				foreach ($buttons as $key => $button)
 				{
-					foreach ( $button as $property => $value )
+					foreach ($button as $property => $value)
 					{
 						if ($value === 'SubPanelTopComposeEmailButton' || $value === 'SubPanelTopArchiveEmailButton')
 						{
 							//remove this button from the array.
-							unset ( $buttons [ $key ] ) ;
+							unset ($buttons [$key]);
 						}
 					}
 				}
 			}
 		}
 
-		return $buttons ;
+		return $buttons;
 	}
 
 
@@ -244,67 +244,67 @@ 
      * @return bool         True by default if the subpanel was loaded.  Will return false if none in the collection are
      *                      allowed by the current user.
      */
-	function load_sub_subpanels ()
+	function load_sub_subpanels()
 	{
 
-		global $modListHeader ;
+		global $modListHeader;
 		// added a check for security of tabs to see if an user has access to them
 		// this prevents passing an "unseen" tab to the query string and pulling up its contents
-		if (! isset ( $modListHeader ))
+		if (!isset ($modListHeader))
 		{
-			global $current_user ;
-			if (isset ( $current_user ))
+			global $current_user;
+			if (isset ($current_user))
 			{
-				$modListHeader = query_module_access_list ( $current_user ) ;
+				$modListHeader = query_module_access_list($current_user);
 			}
 		}
 
 		//by default all the activities modules are exempt, so hiding them won't affect their appearance unless the 'activity' subpanel itself is hidden.
 		//add email to the list temporarily so it is not affected in activities subpanel
-		global $modules_exempt_from_availability_check ;
+		global $modules_exempt_from_availability_check;
 		$modules_exempt_from_availability_check['Emails'] = 'Emails';
 
 		$listFieldMap = array();
 
-		if (empty ( $this->sub_subpanels ))
+		if (empty ($this->sub_subpanels))
 		{
-			$panels = $this->get_inst_prop_value ( 'collection_list' ) ;
-			foreach ( $panels as $panel => $properties )
+			$panels = $this->get_inst_prop_value('collection_list');
+			foreach ($panels as $panel => $properties)
 			{
-				if (array_key_exists ( $properties [ 'module' ], $modListHeader ) or array_key_exists ( $properties [ 'module' ], $modules_exempt_from_availability_check ))
+				if (array_key_exists($properties ['module'], $modListHeader) or array_key_exists($properties ['module'], $modules_exempt_from_availability_check))
 				{
-					$this->sub_subpanels [ $panel ] = new aSubPanel ( $panel, $properties, $this->parent_bean, false, false, $this->search_query ) ;
+					$this->sub_subpanels [$panel] = new aSubPanel($panel, $properties, $this->parent_bean, false, false, $this->search_query);
 				}
 			}
 			// if it's empty just dump out as there is nothing to process.
-			if(empty($this->sub_subpanels)) return false;
+			if (empty($this->sub_subpanels)) return false;
 			//Sync displayed list fields across the subpanels
 			$display_fields = $this->getDisplayFieldsFromCollection($this->sub_subpanels);
 			$query_fields = array();
-			foreach ( $this->sub_subpanels as $key => $subpanel )
+			foreach ($this->sub_subpanels as $key => $subpanel)
 			{
 				$list_fields = $subpanel->get_list_fields();
 				$listFieldMap[$key] = array();
 				$index = 0;
-				foreach($list_fields as $field => $def)
+				foreach ($list_fields as $field => $def)
 				{
 					if (isset($def['vname']) && isset($def['width']))
 					{
 						$index++;
-						if(!empty($def['alias']))
+						if (!empty($def['alias']))
 							$listFieldMap[$key][$def['alias']] = $field;
 						else
 							$listFieldMap[$key][$field] = $field;
 						if (!isset($display_fields[$def['vname']]))
 						{
-							if(sizeof($display_fields) > $index)
+							if (sizeof($display_fields) > $index)
 							{
 								//Try to insert the new field in an order that makes sense
 								$start = array_slice($display_fields, 0, $index);
 								$end = array_slice($display_fields, $index);
 								$display_fields = array_merge(
 									$start,
-									array($def['vname'] => array('name' => $field, 'vname' => $def['vname'], 'width' => $def['width'] )),
+									array($def['vname'] => array('name' => $field, 'vname' => $def['vname'], 'width' => $def['width'])),
 									$end
 								);
 							} else
@@ -321,10 +321,10 @@ 
 					}
 				}
 			}
-			foreach ( $this->sub_subpanels as $key => $subpanel )
+			foreach ($this->sub_subpanels as $key => $subpanel)
 			{
 				$list_fields = array();
-				foreach($display_fields as $vname => $def)
+				foreach ($display_fields as $vname => $def)
 				{
 					$field = $def['name'];
 					$list_key = isset($listFieldMap[$key][$field]) ? $listFieldMap[$key][$field] : $field;
@@ -342,7 +342,7 @@ 
 						$list_fields[$field] = $display_fields[$vname];
 					}
 				}
-				foreach($query_fields as $field => $def)
+				foreach ($query_fields as $field => $def)
 				{
 					if (isset($subpanel->panel_definition['list_fields'][$field]))
 					{
@@ -362,25 +362,25 @@ 
 	protected function getDisplayFieldsFromCollection($sub_subpanels)
 	{
 		$display_fields = array();
-		foreach ($sub_subpanels as $key => $subpanel )
+		foreach ($sub_subpanels as $key => $subpanel)
 		{
 			$list_fields = $subpanel->get_list_fields();
 			$index = 0;
-			foreach($list_fields as $field => $def)
+			foreach ($list_fields as $field => $def)
 			{
 				if (isset($def['vname']) && isset($def['width']))
 				{
 					$index++;
 					if (!isset($display_fields[$def['vname']]))
 					{
-						if(sizeof($display_fields) > $index)
+						if (sizeof($display_fields) > $index)
 						{
 							//Try to insert the new field in an order that makes sense
 							$start = array_slice($display_fields, 0, $index);
 							$end = array_slice($display_fields, $index);
 							$display_fields = array_merge(
 								$start,
-								array($def['vname'] => array('name' => $field, 'vname' => $def['vname'], 'width' => $def['width'] )),
+								array($def['vname'] => array('name' => $field, 'vname' => $def['vname'], 'width' => $def['width'])),
 								$end
 							);
 						} else
@@ -397,13 +397,13 @@ 
 		}
 	}
 
-	function isDatasourceFunction ()
+	function isDatasourceFunction()
 	{
-		if (strpos ( $this->get_inst_prop_value ( 'get_subpanel_data' ), 'function' ) === false)
+		if (strpos($this->get_inst_prop_value('get_subpanel_data'), 'function') === false)
 		{
-			return false ;
+			return false;
 		}
-		return true ;
+		return true;
 	}
 
     /**
@@ -411,159 +411,159 @@ 
      *
      * @return bool
      */
-	function isCollection ()
+	function isCollection()
 	{
-		return ($this->get_inst_prop_value ( 'type' ) == 'collection');
+		return ($this->get_inst_prop_value('type') == 'collection');
 	}
 
 	//get value of a property defined at the panel instance level.
-	function get_inst_prop_value ( $name )
+	function get_inst_prop_value($name)
 	{
-		return isset($this->_instance_properties[$name]) ? $this->_instance_properties [ $name ] : null;
+		return isset($this->_instance_properties[$name]) ? $this->_instance_properties [$name] : null;
 	}
 	//get value of a property defined at the panel definition level.
-	function get_def_prop_value ( $name )
+	function get_def_prop_value($name)
 	{
-		if (isset ( $this->panel_definition [ $name ] ))
+		if (isset ($this->panel_definition [$name]))
 		{
-			return $this->panel_definition [ $name ] ;
+			return $this->panel_definition [$name];
 		} else
 		{
-			return null ;
+			return null;
 		}
 	}
 
 	//if datasource is of the type function then return the function name
 	//else return the value as is.
-	function get_function_parameters ()
+	function get_function_parameters()
 	{
-		$parameters = array ( ) ;
-		if ($this->isDatasourceFunction ())
+		$parameters = array( );
+		if ($this->isDatasourceFunction())
 		{
-			$parameters = $this->get_inst_prop_value ( 'function_parameters' ) ;
+			$parameters = $this->get_inst_prop_value('function_parameters');
 		}
-		return $parameters ;
+		return $parameters;
 	}
 
-	function get_data_source_name ( $check_set_subpanel_data = false )
+	function get_data_source_name($check_set_subpanel_data = false)
 	{
-		$prop_value = null ;
+		$prop_value = null;
 		if ($check_set_subpanel_data)
 		{
-			$prop_value = $this->get_inst_prop_value ( 'set_subpanel_data' ) ;
+			$prop_value = $this->get_inst_prop_value('set_subpanel_data');
 		}
-		if (! empty ( $prop_value ))
+		if (!empty ($prop_value))
 		{
-			return $prop_value ;
+			return $prop_value;
 		} else
 		{
 			//fall back to default behavior.
 		}
-		if ($this->isDatasourceFunction ())
+		if ($this->isDatasourceFunction())
 		{
-			return (substr_replace ( $this->get_inst_prop_value ( 'get_subpanel_data' ), '', 0, 9 )) ;
+			return (substr_replace($this->get_inst_prop_value('get_subpanel_data'), '', 0, 9));
 		} else
 		{
-			return $this->get_inst_prop_value ( 'get_subpanel_data' ) ;
+			return $this->get_inst_prop_value('get_subpanel_data');
 		}
 	}
 
 	//returns the where clause for the query.
-	function get_where ()
+	function get_where()
 	{
-		if($this->get_def_prop_value ( 'where' ) != '' && $this->search_query != ''){
-			return $this->get_def_prop_value ( 'where' ).' AND '.$this->search_query;
-		} else if($this->search_query != ''){
+		if ($this->get_def_prop_value('where') != '' && $this->search_query != '') {
+			return $this->get_def_prop_value('where').' AND '.$this->search_query;
+		} else if ($this->search_query != '') {
 			return $this->search_query;
 		}
-		return $this->get_def_prop_value ( 'where' ) ;
+		return $this->get_def_prop_value('where');
 	}
 
-	function is_fill_in_additional_fields ()
+	function is_fill_in_additional_fields()
 	{
 		// do both. inst_prop returns values from metadata/subpaneldefs.php and def_prop returns from subpanel/default.php
-		$temp = $this->get_inst_prop_value ( 'fill_in_additional_fields' ) || $this->get_def_prop_value ( 'fill_in_additional_fields' ) ;
-		return $temp ;
+		$temp = $this->get_inst_prop_value('fill_in_additional_fields') || $this->get_def_prop_value('fill_in_additional_fields');
+		return $temp;
 	}
 
-	function get_list_fields ()
+	function get_list_fields()
 	{
-		if (isset ( $this->panel_definition [ 'list_fields' ] ))
+		if (isset ($this->panel_definition ['list_fields']))
 		{
-			return $this->panel_definition [ 'list_fields' ] ;
+			return $this->panel_definition ['list_fields'];
 		} else
 		{
-			return array ( ) ;
+			return array( );
 		}
 	}
 
-	function get_module_name ()
+	function get_module_name()
 	{
-		return $this->get_inst_prop_value ( 'module' ) ;
+		return $this->get_inst_prop_value('module');
 	}
 
-	function get_name ()
+	function get_name()
 	{
-		return $this->name ;
+		return $this->name;
 	}
 
 	//load subpanel module's table name and column fields.
-	function load_module_info ()
+	function load_module_info()
 	{
-		global $beanList ;
-		global $beanFiles ;
+		global $beanList;
+		global $beanFiles;
 
-		$module_name = $this->get_module_name () ;
-		if (! empty ( $module_name ))
+		$module_name = $this->get_module_name();
+		if (!empty ($module_name))
 		{
 
-			$bean_name = $beanList [ $this->get_module_name () ] ;
+			$bean_name = $beanList [$this->get_module_name()];
 
-			$this->bean_name = $bean_name ;
+			$this->bean_name = $bean_name;
 
-			include_once ($beanFiles [ $bean_name ]) ;
-			$this->template_instance = new $bean_name ( ) ;
-			$this->template_instance->force_load_details = true ;
-			$this->table_name = $this->template_instance->table_name ;
+			include_once ($beanFiles [$bean_name]);
+			$this->template_instance = new $bean_name( );
+			$this->template_instance->force_load_details = true;
+			$this->table_name = $this->template_instance->table_name;
 			//$this->db_fields=$this->template_instance->column_fields;
 		}
 	}
 	//this function is to be used only with sub-panels that are based
 	//on collections.
-	function get_header_panel_def ()
+	function get_header_panel_def()
 	{
-		if (! empty ( $this->sub_subpanels ))
+		if (!empty ($this->sub_subpanels))
 		{
-			if (! empty ( $this->_instance_properties [ 'header_definition_from_subpanel' ] ) && ! empty ( $this->sub_subpanels [ $this->_instance_properties [ 'header_definition_from_subpanel' ] ] ))
+			if (!empty ($this->_instance_properties ['header_definition_from_subpanel']) && !empty ($this->sub_subpanels [$this->_instance_properties ['header_definition_from_subpanel']]))
 			{
-				return $this->sub_subpanels [ $this->_instance_properties [ 'header_definition_from_subpanel' ] ] ;
+				return $this->sub_subpanels [$this->_instance_properties ['header_definition_from_subpanel']];
 			} else
 			{
 				$display_fields = array();
 				//If we are not pulling from a specific subpanel, create a list of all list fields and use that.
-				foreach($this->sub_subpanels as $subpanel)
+				foreach ($this->sub_subpanels as $subpanel)
 				{
 					$list_fields = $subpanel->get_list_fields();
-					foreach($list_fields as $field => $def)
+					foreach ($list_fields as $field => $def)
 					{
 
 					}
 				}
 
-				reset ( $this->sub_subpanels ) ;
-				return current ( $this->sub_subpanels ) ;
+				reset($this->sub_subpanels);
+				return current($this->sub_subpanels);
 			}
 		}
-		return null ;
+		return null;
 	}
 
 	/**
 	 * Returns an array of current properties of the class.
 	 * It will simply give the class name for instances of classes.
 	 */
-	function _to_array ()
+	function _to_array()
 	{
-		return array ( '_instance_properties' => $this->_instance_properties , 'db_fields' => $this->db_fields , 'mod_strings' => $this->mod_strings , 'name' => $this->name , 'panel_definition' => $this->panel_definition , 'parent_bean' => get_class ( $this->parent_bean ) , 'sub_subpanels' => $this->sub_subpanels , 'table_name' => $this->table_name , 'template_instance' => get_class ( $this->template_instance ) ) ;
+		return array('_instance_properties' => $this->_instance_properties, 'db_fields' => $this->db_fields, 'mod_strings' => $this->mod_strings, 'name' => $this->name, 'panel_definition' => $this->panel_definition, 'parent_bean' => get_class($this->parent_bean), 'sub_subpanels' => $this->sub_subpanels, 'table_name' => $this->table_name, 'template_instance' => get_class($this->template_instance));
 	}
 
     /**
@@ -582,10 +582,10 @@ 
 class SubPanelDefinitions
 {
 
-	var $_focus ;
-	var $_visible_tabs_array ;
-	var $panels ;
-	var $layout_defs ;
+	var $_focus;
+	var $_visible_tabs_array;
+	var $panels;
+	var $layout_defs;
 
 	/**
 	 * Enter description here...
@@ -595,16 +595,16 @@ 
 	 * @param ARRAY $layout_def_override - if you wish to override the default loaded layout defs you pass them in here.
 	 * @return SubPanelDefinitions
 	 */
-	function SubPanelDefinitions ( $focus , $layout_def_key = '' , $layout_def_override = '' )
+	function SubPanelDefinitions($focus, $layout_def_key = '', $layout_def_override = '')
 	{
-		$this->_focus = $focus ;
-		if (! empty ( $layout_def_override ))
+		$this->_focus = $focus;
+		if (!empty ($layout_def_override))
 		{
-			$this->layout_defs = $layout_def_override ;
+			$this->layout_defs = $layout_def_override;
 
 		} else
 		{
-			$this->open_layout_defs ( false, $layout_def_key ) ;
+			$this->open_layout_defs(false, $layout_def_key);
 		}
 	}
 
@@ -619,68 +619,68 @@ 
 	 * @param boolean 	Optional - include the subpanel title label in the return array (false)
 	 * @return array	All tabs that pass an ACL check
 	 */
-	function get_available_tabs ($FromGetModuleSubpanels=false)
+	function get_available_tabs($FromGetModuleSubpanels = false)
 	{
-		global $modListHeader ;
-		global $modules_exempt_from_availability_check ;
+		global $modListHeader;
+		global $modules_exempt_from_availability_check;
 
-		if (isset ( $this->_visible_tabs_array ))
-			return $this->_visible_tabs_array ;
+		if (isset ($this->_visible_tabs_array))
+			return $this->_visible_tabs_array;
 
 		if (empty($modListHeader))
 		    $modListHeader = query_module_access_list($GLOBALS['current_user']);
 
-		$this->_visible_tabs_array = array ( ) ; // bug 16820 - make sure this is an array for the later ksort
+		$this->_visible_tabs_array = array( ); // bug 16820 - make sure this is an array for the later ksort
 
-		if (isset ( $this->layout_defs [ 'subpanel_setup' ] )) // bug 17434 - belts-and-braces - check that we have some subpanels first
+		if (isset ($this->layout_defs ['subpanel_setup'])) // bug 17434 - belts-and-braces - check that we have some subpanels first
 		{
 			//retrieve list of hidden subpanels
 			$hidden_panels = $this->get_hidden_subpanels();
 
 			//activities is a special use case in that if it is hidden,
 			//then the history tab should be hidden too.
-			if(!empty($hidden_panels) && is_array($hidden_panels) && in_array('activities',$hidden_panels)){
+			if (!empty($hidden_panels) && is_array($hidden_panels) && in_array('activities', $hidden_panels)) {
 				//add history to list hidden_panels
 				$hidden_panels['history'] = 'history';
 			}
 
-			foreach ( $this->layout_defs [ 'subpanel_setup' ] as $key => $values_array )
+			foreach ($this->layout_defs ['subpanel_setup'] as $key => $values_array)
 			{
 				//exclude if this subpanel is hidden from admin screens
                 $module = $key;
-                if ( isset($values_array['module']) )
+                if (isset($values_array['module']))
                     $module = strtolower($values_array['module']);
-				 if ($hidden_panels && is_array($hidden_panels) && (in_array($module, $hidden_panels) || array_key_exists($module, $hidden_panels)) ){
+				 if ($hidden_panels && is_array($hidden_panels) && (in_array($module, $hidden_panels) || array_key_exists($module, $hidden_panels))) {
 				 	//this panel is hidden, skip it
 				 	continue;
 				 }
 
 				// make sure the module attribute is set, else none of this works...
-				if ( !isset($values_array [ 'module' ])) {
-					$GLOBALS['log']->debug("SubPanelDefinitions->get_available_tabs(): no module defined in subpaneldefs for '$key' =>" . var_export($values_array,true) . " - ingoring subpanel defintion") ;
+				if (!isset($values_array ['module'])) {
+					$GLOBALS['log']->debug("SubPanelDefinitions->get_available_tabs(): no module defined in subpaneldefs for '$key' =>".var_export($values_array, true)." - ingoring subpanel defintion");
 					continue;
 				}
 
 				//check permissions.
-				$exempt = array_key_exists ( $values_array [ 'module' ], $modules_exempt_from_availability_check ) ;
-				$ok = $exempt || ( (! ACLController::moduleSupportsACL ( $values_array [ 'module' ] ) || ACLController::checkAccess ( $values_array [ 'module' ], 'list', true ) ) ) ;
+				$exempt = array_key_exists($values_array ['module'], $modules_exempt_from_availability_check);
+				$ok = $exempt || ((!ACLController::moduleSupportsACL($values_array ['module']) || ACLController::checkAccess($values_array ['module'], 'list', true)));
 
-				$GLOBALS [ 'log' ]->debug ( "SubPanelDefinitions->get_available_tabs(): " . $key . "= " . ( $exempt ? "exempt " : "not exempt " .( $ok ? " ACL OK" : "" ) ) ) ;
+				$GLOBALS ['log']->debug("SubPanelDefinitions->get_available_tabs(): ".$key."= ".($exempt ? "exempt " : "not exempt ".($ok ? " ACL OK" : "")));
 
-				if ( $ok )
+				if ($ok)
 				{
-					while ( ! empty ( $this->_visible_tabs_array [ $values_array [ 'order' ] ] ) )
+					while (!empty ($this->_visible_tabs_array [$values_array ['order']]))
 					{
-						$values_array [ 'order' ] ++ ;
+						$values_array ['order']++;
 					}
 
-					$this->_visible_tabs_array [ $values_array ['order'] ] = ($FromGetModuleSubpanels) ? array($key=>$values_array['title_key']) : $key ;
+					$this->_visible_tabs_array [$values_array ['order']] = ($FromGetModuleSubpanels) ? array($key=>$values_array['title_key']) : $key;
 				}
 			}
 		}
 
-		ksort ( $this->_visible_tabs_array ) ;
-		return $this->_visible_tabs_array ;
+		ksort($this->_visible_tabs_array);
+		return $this->_visible_tabs_array;
 	}
 
 	/**
@@ -694,15 +694,15 @@ 
      * @return boolean|aSubPanel        Returns aSubPanel object or boolean false if one is not found or it can't be
      *      displayed due to ACL reasons.
 	 */
-	function load_subpanel ( $name , $reload = false , $original_only = false, $search_query = '', $collections = array() )
+	function load_subpanel($name, $reload = false, $original_only = false, $search_query = '', $collections = array())
 	{
-		if (!is_dir('modules/' . $this->layout_defs [ 'subpanel_setup' ][ strtolower ( $name ) ] [ 'module' ]))
+		if (!is_dir('modules/'.$this->layout_defs ['subpanel_setup'][strtolower($name)] ['module']))
 			return false;
 
-		$subpanel = new aSubPanel ( $name, $this->layout_defs [ 'subpanel_setup' ] [ strtolower ( $name ) ], $this->_focus, $reload, $original_only, $search_query, $collections ) ;
+		$subpanel = new aSubPanel($name, $this->layout_defs ['subpanel_setup'] [strtolower($name)], $this->_focus, $reload, $original_only, $search_query, $collections);
 
 		// only return the subpanel object if we can display it.
-		if($subpanel->canDisplay == true) {
+		if ($subpanel->canDisplay == true) {
 			return $subpanel;
 		}
 
@@ -713,23 +713,23 @@ 
 	/**
 	 * Load the layout def file and associate the definition with a variable in the file.
 	 */
-	function open_layout_defs ( $reload = false , $layout_def_key = '' , $original_only = false )
+	function open_layout_defs($reload = false, $layout_def_key = '', $original_only = false)
 	{
-		$layout_defs [ $this->_focus->module_dir ] = array ( ) ;
-		$layout_defs [ $layout_def_key ] = array ( ) ;
+		$layout_defs [$this->_focus->module_dir] = array( );
+		$layout_defs [$layout_def_key] = array( );
 
-		if (empty ( $this->layout_defs ) || $reload || (! empty ( $layout_def_key ) && ! isset ( $layout_defs [ $layout_def_key ] )))
+		if (empty ($this->layout_defs) || $reload || (!empty ($layout_def_key) && !isset ($layout_defs [$layout_def_key])))
 		{
-			if (file_exists ( 'modules/' . $this->_focus->module_dir . '/metadata/subpaneldefs.php' ))
-				require ('modules/' . $this->_focus->module_dir . '/metadata/subpaneldefs.php') ;
+			if (file_exists('modules/'.$this->_focus->module_dir.'/metadata/subpaneldefs.php'))
+				require ('modules/'.$this->_focus->module_dir.'/metadata/subpaneldefs.php');
 
-			if (! $original_only && file_exists ( 'custom/modules/' . $this->_focus->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php' ))
-				require ('custom/modules/' . $this->_focus->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php') ;
+			if (!$original_only && file_exists('custom/modules/'.$this->_focus->module_dir.'/Ext/Layoutdefs/layoutdefs.ext.php'))
+				require ('custom/modules/'.$this->_focus->module_dir.'/Ext/Layoutdefs/layoutdefs.ext.php');
 
-			if (! empty ( $layout_def_key ))
-				$this->layout_defs = $layout_defs [ $layout_def_key ] ;
+			if (!empty ($layout_def_key))
+				$this->layout_defs = $layout_defs [$layout_def_key];
 			else
-				$this->layout_defs = $layout_defs [ $this->_focus->module_dir ] ;
+				$this->layout_defs = $layout_defs [$this->_focus->module_dir];
 
 		}
 
@@ -740,24 +740,24 @@ 
 	 * Returns true if successful, false otherwise.
 	 * Hint: Used by Campaign's DetailView.
 	 */
-	function exclude_tab ( $tab_name )
+	function exclude_tab($tab_name)
 	{
-		$result = false ;
+		$result = false;
 		//unset layout definition
-		if (! empty ( $this->layout_defs [ 'subpanel_setup' ] [ $tab_name ] ))
+		if (!empty ($this->layout_defs ['subpanel_setup'] [$tab_name]))
 		{
-			unset ( $this->layout_defs [ 'subpanel_setup' ] [ $tab_name ] ) ;
+			unset ($this->layout_defs ['subpanel_setup'] [$tab_name]);
 		}
 		//unset instance from _visible_tab_array
-		if (! empty ( $this->_visible_tabs_array ))
+		if (!empty ($this->_visible_tabs_array))
 		{
-			$key = array_search ( $tab_name, $this->_visible_tabs_array ) ;
+			$key = array_search($tab_name, $this->_visible_tabs_array);
 			if ($key !== false)
 			{
-				unset ( $this->_visible_tabs_array [ $key ] ) ;
+				unset ($this->_visible_tabs_array [$key]);
 			}
 		}
-		return $result ;
+		return $result;
 	}
 
 
@@ -765,7 +765,7 @@ 
 	 * return all available subpanels that belong to the list of tab modules.  You can optionally return all
 	 * available subpanels, and also optionally group by module (prepends the key with the bean class name).
 	 */
-	function get_all_subpanels( $return_tab_modules_only = true, $group_by_module = false )
+	function get_all_subpanels($return_tab_modules_only = true, $group_by_module = false)
 	{
 		global $moduleList, $beanFiles, $beanList, $module;
 
@@ -782,36 +782,36 @@ 
 		$spd = '';
 		$spd_arr = array();
 		//iterate through modules and build subpanel array
-		foreach($modules_to_check as $mod_name){
+		foreach ($modules_to_check as $mod_name) {
 
 			//skip if module name is not in bean list, otherwise get the bean class name
-			if(!isset($beanList[$mod_name])) continue;
+			if (!isset($beanList[$mod_name])) continue;
 			$class = $beanList[$mod_name];
 
 			//skip if class name is not in file list, otherwise require the bean file and create new class
-			if(!isset($beanFiles[$class]) || !file_exists($beanFiles[$class])) continue;
+			if (!isset($beanFiles[$class]) || !file_exists($beanFiles[$class])) continue;
 
 			//retrieve subpanels for this bean
 			require_once($beanFiles[$class]);
 			$bean_class = new $class();
 
 			//create new subpanel definition instance and get list of tabs
-			$spd = new SubPanelDefinitions($bean_class) ;
+			$spd = new SubPanelDefinitions($bean_class);
 			$sub_tabs = $spd->get_available_tabs();
 
 			//add each subpanel to array of total subpanles
-			foreach( $sub_tabs as $panel_key){
+			foreach ($sub_tabs as $panel_key) {
 				$panel_key = strtolower($panel_key);
                 $panel_module = $panel_key;
-                if ( isset($spd->layout_defs['subpanel_setup'][$panel_key]['module']) )
+                if (isset($spd->layout_defs['subpanel_setup'][$panel_key]['module']))
                     $panel_module = strtolower($spd->layout_defs['subpanel_setup'][$panel_key]['module']);
                 //if module_only flag is set, only if it is also in module array
-				if($return_tab_modules_only && !array_key_exists($panel_module, $modules_to_check)) continue;
+				if ($return_tab_modules_only && !array_key_exists($panel_module, $modules_to_check)) continue;
 				$panel_key_name = $panel_module;
 
 				//group_by_key_name is set to true, then array will hold an entry for each
 				//subpanel, with the module name prepended in the key
-				if($group_by_module) $panel_key_name = $class.'_'.$panel_key_name;
+				if ($group_by_module) $panel_key_name = $class.'_'.$panel_key_name;
 				//add panel name to subpanel array
 				$spd_arr[$panel_key_name] = $panel_module;
 			}
@@ -822,7 +822,7 @@ 
 	/*
 	 * save array of hidden panels to mysettings category in config table
 	 */
-	function set_hidden_subpanels($panels){
+	function set_hidden_subpanels($panels) {
 		$administration = new Administration();
 		$serialized = base64_encode(serialize($panels));
 		$administration->saveSetting('MySettings', 'hide_subpanels', $serialized);
@@ -831,26 +831,26 @@ 
 	/*
 	 * retrieve hidden subpanels
 	 */
-	function get_hidden_subpanels(){
+	function get_hidden_subpanels() {
 		global $moduleList;
 
 		//create variable as static to minimize queries
 		static $hidden_subpanels = null;
 
 		// if the static value is not already cached, then retrieve it.
-		if(empty($hidden_subpanels))
+		if (empty($hidden_subpanels))
 		{
 
 			//create Administration object and retrieve any settings for panels
 			$administration = new Administration();
 			$administration->retrieveSettings('MySettings');
 
-			if(isset($administration->settings) && isset($administration->settings['MySettings_hide_subpanels'])){
+			if (isset($administration->settings) && isset($administration->settings['MySettings_hide_subpanels'])) {
 				$hidden_subpanels = $administration->settings['MySettings_hide_subpanels'];
 				$hidden_subpanels = trim($hidden_subpanels);
 
 				//make sure serialized string is not empty
-				if (!empty($hidden_subpanels)){
+				if (!empty($hidden_subpanels)) {
 					//decode and unserialize to retrieve the array
 					$hidden_subpanels = base64_decode($hidden_subpanels);
 					$hidden_subpanels = unserialize($hidden_subpanels);
@@ -859,12 +859,12 @@ 
 					//get user preference
 					//unserialize and add to array if not empty
 					$pref_hidden = array();
-					foreach($pref_hidden as $id => $pref_hidden_panel) {
+					foreach ($pref_hidden as $id => $pref_hidden_panel) {
 						$hidden_subpanels[] = $pref_hidden_panel;
 					}
 
 
-				}else{
+				} else {
 					//no settings found, return empty
 					return $hidden_subpanels;
 				}

include/SubPanel/SubPanel.php

Spacing +83 added lines, -83 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.
@@ -48,24 +48,24 @@ 
 	var $hideNewButton = false;
 	var $subpanel_id;
 	var $parent_record_id;
-	var $parent_module;  // the name of the parent module
-	var $parent_bean;  // the instantiated bean of the parent
+	var $parent_module; // the name of the parent module
+	var $parent_bean; // the instantiated bean of the parent
 	var $template_file;
 	var $linked_fields;
 	var $action = 'DetailView';
 	var $show_select_button = true;
-	var $subpanel_define = null;  // contains the layout_def.php
+	var $subpanel_define = null; // contains the layout_def.php
 	var $subpanel_defs;
-	var $subpanel_query=null;
-    var $layout_def_key='';
-	var $search_query='';
+	var $subpanel_query = null;
+    var $layout_def_key = '';
+	var $search_query = '';
 	var $collections = array();
 
-	function SubPanel($module, $record_id, $subpanel_id, $subpanelDef, $layout_def_key='', $collections = array() )
+	function SubPanel($module, $record_id, $subpanel_id, $subpanelDef, $layout_def_key = '', $collections = array())
 	{
 		global $beanList, $beanFiles, $focus, $app_strings;
 
-		$this->subpanel_defs=$subpanelDef;
+		$this->subpanel_defs = $subpanelDef;
 		$this->subpanel_id = $subpanel_id;
 		$this->parent_record_id = $record_id;
 		$this->parent_module = $module;
@@ -75,7 +75,7 @@ 
 		$this->parent_bean = $focus;
 		$result = $focus;
 
-		if(empty($result))
+		if (empty($result))
 		{
 			$parent_bean_name = $beanList[$module];
 			$parent_bean_file = $beanFiles[$parent_bean_name];
@@ -85,7 +85,7 @@ 
 			$result = $this->parent_bean;
 		}
 
-		if($record_id!='fab4' && $result == null)
+		if ($record_id != 'fab4' && $result == null)
 		{
 			sugar_die($app_strings['ERROR_NO_RECORD']);
 		}
@@ -93,11 +93,11 @@ 
 		if (empty($subpanelDef)) {
 			//load the subpanel by name.
 			if (!class_exists('MyClass')) {
-				require_once 'include/SubPanel/SubPanelDefinitions.php' ;
+				require_once 'include/SubPanel/SubPanelDefinitions.php';
 			}
-			$panelsdef=new SubPanelDefinitions($result,$layout_def_key);
-			$subpanelDef=$panelsdef->load_subpanel($subpanel_id, false, false, $this->search_query,$collections);
-			$this->subpanel_defs=$subpanelDef;
+			$panelsdef = new SubPanelDefinitions($result, $layout_def_key);
+			$subpanelDef = $panelsdef->load_subpanel($subpanel_id, false, false, $this->search_query, $collections);
+			$this->subpanel_defs = $subpanelDef;
 
 		}
 	}
@@ -107,38 +107,38 @@ 
 		$this->template_file = $template_file;
 	}
 
-	function setBeanList(&$value){
-		$this->bean_list =$value;
+	function setBeanList(&$value) {
+		$this->bean_list = $value;
 	}
 
-	function setHideNewButton($value){
+	function setHideNewButton($value) {
 		$this->hideNewButton = $value;
 	}
 
 
-	function getHeaderText( $currentModule){
+	function getHeaderText($currentModule) {
 	}
 
-	function get_buttons( $panel_query=null)
+	function get_buttons($panel_query = null)
 	{
 
-		$thisPanel =& $this->subpanel_defs;
+		$thisPanel = & $this->subpanel_defs;
 		$subpanel_def = $thisPanel->get_buttons();
 
-		if(!isset($this->listview)){
+		if (!isset($this->listview)) {
 			$this->listview = new ListView();
 		}
 		$layout_manager = $this->listview->getLayoutManager();
 		$widget_contents = '<div><table cellpadding="0" cellspacing="0"><tr>';
-		foreach($subpanel_def as $widget_data)
+		foreach ($subpanel_def as $widget_data)
 		{
 			$widget_data['action'] = $_REQUEST['action'];
-			$widget_data['module'] =  $thisPanel->get_inst_prop_value('module');
+			$widget_data['module'] = $thisPanel->get_inst_prop_value('module');
 			$widget_data['focus'] = $this->parent_bean;
 			$widget_data['subpanel_definition'] = $thisPanel;
-			$widget_contents .= '<td style="padding-right: 2px; padding-bottom: 2px;">' . "\n";
+			$widget_contents .= '<td style="padding-right: 2px; padding-bottom: 2px;">'."\n";
 
-			if(empty($widget_data['widget_class']))
+			if (empty($widget_data['widget_class']))
 			{
 				$widget_contents .= "widget_class not defined for top subpanel buttons";
 			}
@@ -161,33 +161,33 @@ 
 		global $current_user;
 		global $sugar_config;
 
-		if(isset($this->listview)){
-			$ListView =& $this->listview;
-		}else{
+		if (isset($this->listview)) {
+			$ListView = & $this->listview;
+		} else {
 			$ListView = new ListView();
 		}
-		$ListView->initNewXTemplate($xTemplatePath,$this->subpanel_defs->mod_strings);
+		$ListView->initNewXTemplate($xTemplatePath, $this->subpanel_defs->mod_strings);
 		$ListView->xTemplateAssign("RETURN_URL", "&return_module=".$this->parent_module."&return_action=DetailView&return_id=".$this->parent_bean->id);
-		$ListView->xTemplateAssign("RELATED_MODULE", $this->parent_module);  // TODO: what about unions?
+		$ListView->xTemplateAssign("RELATED_MODULE", $this->parent_module); // TODO: what about unions?
 		$ListView->xTemplateAssign("RECORD_ID", $this->parent_bean->id);
-		$ListView->xTemplateAssign("EDIT_INLINE_PNG", SugarThemeRegistry::current()->getImage('edit_inline','align="absmiddle"  border="0"',null,null,'.gif',$app_strings['LNK_EDIT']));
-		$ListView->xTemplateAssign("DELETE_INLINE_PNG", SugarThemeRegistry::current()->getImage('delete_inline','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LBL_DELETE_INLINE']));
-		$ListView->xTemplateAssign("REMOVE_INLINE_PNG", SugarThemeRegistry::current()->getImage('delete_inline','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LBL_ID_FF_REMOVE']));
-		$header_text= '';
+		$ListView->xTemplateAssign("EDIT_INLINE_PNG", SugarThemeRegistry::current()->getImage('edit_inline', 'align="absmiddle"  border="0"', null, null, '.gif', $app_strings['LNK_EDIT']));
+		$ListView->xTemplateAssign("DELETE_INLINE_PNG", SugarThemeRegistry::current()->getImage('delete_inline', 'align="absmiddle" border="0"', null, null, '.gif', $app_strings['LBL_DELETE_INLINE']));
+		$ListView->xTemplateAssign("REMOVE_INLINE_PNG", SugarThemeRegistry::current()->getImage('delete_inline', 'align="absmiddle" border="0"', null, null, '.gif', $app_strings['LBL_ID_FF_REMOVE']));
+		$header_text = '';
 
 		$ListView->xTemplateAssign("SUBPANEL_ID", $this->subpanel_id);
 		$ListView->xTemplateAssign("SUBPANEL_SEARCH", $this->getSearchForm());
 		$display_sps = '';
-		if($this->search_query == '' && empty($this->collections)) $display_sps = 'display:none';
-		$ListView->xTemplateAssign("DISPLAY_SPS",$display_sps);
+		if ($this->search_query == '' && empty($this->collections)) $display_sps = 'display:none';
+		$ListView->xTemplateAssign("DISPLAY_SPS", $display_sps);
 
-		if(is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace']))
+		if (is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace']))
 		{
 			$exploded = explode('/', $xTemplatePath);
 			$file_name = $exploded[sizeof($exploded) - 1];
-			$mod_name =  $exploded[sizeof($exploded) - 2];
-			$header_text= "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=$file_name&from_module=$mod_name&mod_lang="
-				.$_REQUEST['module']."'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif','Edit Layout')."</a>";
+			$mod_name = $exploded[sizeof($exploded) - 2];
+			$header_text = "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=$file_name&from_module=$mod_name&mod_lang="
+				.$_REQUEST['module']."'>".SugarThemeRegistry::current()->getImage("EditLayout", "border='0' align='bottom'", null, null, '.gif', 'Edit Layout')."</a>";
 		}
 		$ListView->setHeaderTitle('');
 		$ListView->setHeaderText('');
@@ -202,7 +202,7 @@ 
 		$ListView->start_link_wrapper = "javascript:showSubPanel('".$this->subpanel_id."','";
 		$ListView->subpanel_id = $this->subpanel_id;
 		$ListView->end_link_wrapper = "',true);";
-		if ( !empty($this->layout_def_key) ) {
+		if (!empty($this->layout_def_key)) {
 			$ListView->end_link_wrapper = '&layout_def_key='.$this->layout_def_key.$ListView->end_link_wrapper;
 		}
 
@@ -212,8 +212,8 @@ 
 
 		//function returns the query that was used to populate sub-panel data.
 
-		$query=$ListView->process_dynamic_listview($this->parent_module, $this->parent_bean,$this->subpanel_defs);
-		$this->subpanel_query=$query;
+		$query = $ListView->process_dynamic_listview($this->parent_module, $this->parent_bean, $this->subpanel_defs);
+		$this->subpanel_query = $query;
 		$ob_contents = ob_get_contents();
 		ob_end_clean();
 		return $ob_contents;
@@ -223,7 +223,7 @@ 
 	{
 		$result_array = array();
 
-		$return_string = $this->ProcessSubPanelListView($this->template_file,$result_array);
+		$return_string = $this->ProcessSubPanelListView($this->template_file, $result_array);
 
 		print $return_string;
 	}
@@ -233,9 +233,9 @@ 
 		global $beanList;
 		$dir = dir('modules');
 		$modules = array();
-		while($entry = $dir->read())
+		while ($entry = $dir->read())
 		{
-			if(file_exists('modules/' . $entry . '/layout_defs.php'))
+			if (file_exists('modules/'.$entry.'/layout_defs.php'))
 			{
 				$modules[$entry] = $entry;
 			}
@@ -243,10 +243,10 @@ 
 		return $modules;
 	}
 
-  static function getModuleSubpanels($module){
+  static function getModuleSubpanels($module) {
   	require_once('include/SubPanel/SubPanelDefinitions.php');
   		global $beanList, $beanFiles;
-  		if(!isset($beanList[$module])){
+  		if (!isset($beanList[$module])) {
   			return array();
   		}
 
@@ -257,9 +257,9 @@ 
   		$tabs = $spd->get_available_tabs(true);
   		$ret_tabs = array();
   		$reject_tabs = array('history'=>1, 'activities'=>1);
-  		foreach($tabs as $key=>$tab){
-  		    foreach($tab as $k=>$v){
-                if (! isset ( $reject_tabs [$k] )) {
+  		foreach ($tabs as $key=>$tab) {
+  		    foreach ($tab as $k=>$v) {
+                if (!isset ($reject_tabs [$k])) {
                     $ret_tabs [$k] = $v;
                 }
             }
@@ -271,50 +271,50 @@ 
   }
 
   //saves overrides for defs
-  function saveSubPanelDefOverride( $panel, $subsection, $override){
+  function saveSubPanelDefOverride($panel, $subsection, $override) {
   		global $layout_defs, $beanList;
 
   		//save the new subpanel
   		$name = "subpanel_layout['list_fields']";
 
   		//bugfix: load looks for moduleName/metadata/subpanels, not moduleName/subpanels
-  		$path = 'custom/modules/'. $panel->_instance_properties['module'] . '/metadata/subpanels';
+  		$path = 'custom/modules/'.$panel->_instance_properties['module'].'/metadata/subpanels';
 
   		//bug# 40171: "Custom subpanels not working as expected"
   		//each custom subpanel needs to have a unique custom def file
-  		$filename = $panel->parent_bean->object_name . "_subpanel_" . $panel->name; //bug 42262 (filename with $panel->_instance_properties['get_subpanel_data'] can create problem if had word "function" in it)
-  		$oldName1 = '_override' . $panel->parent_bean->object_name .$panel->_instance_properties['module'] . $panel->_instance_properties['subpanel_name'] ;
-  		$oldName2 = '_override' . $panel->parent_bean->object_name .$panel->_instance_properties['get_subpanel_data'] ;
-  		if (file_exists('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$oldName1.php")){
-  		  unlink('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$oldName1.php");
+  		$filename = $panel->parent_bean->object_name."_subpanel_".$panel->name; //bug 42262 (filename with $panel->_instance_properties['get_subpanel_data'] can create problem if had word "function" in it)
+  		$oldName1 = '_override'.$panel->parent_bean->object_name.$panel->_instance_properties['module'].$panel->_instance_properties['subpanel_name'];
+  		$oldName2 = '_override'.$panel->parent_bean->object_name.$panel->_instance_properties['get_subpanel_data'];
+  		if (file_exists('custom/Extension/modules/'.$panel->parent_bean->module_dir."/Ext/Layoutdefs/$oldName1.php")) {
+  		  unlink('custom/Extension/modules/'.$panel->parent_bean->module_dir."/Ext/Layoutdefs/$oldName1.php");
   		}
-  		if (file_exists('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$oldName2.php")){
-         unlink('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$oldName2.php");
+  		if (file_exists('custom/Extension/modules/'.$panel->parent_bean->module_dir."/Ext/Layoutdefs/$oldName2.php")) {
+         unlink('custom/Extension/modules/'.$panel->parent_bean->module_dir."/Ext/Layoutdefs/$oldName2.php");
   		}
   		$extname = '_override'.$filename;
   		//end of bug# 40171
 
   		mkdir_recursive($path, true);
-  		write_array_to_file( $name, $override,$path.'/' . $filename .'.php');
+  		write_array_to_file($name, $override, $path.'/'.$filename.'.php');
 
   		//save the override for the layoutdef
         //tyoung 10.12.07 pushed panel->name to lowercase to match case in subpaneldefs.php files -
         //gave error on bad index 'module' as this override key didn't match the key in the subpaneldefs
-  		$name = "layout_defs['".  $panel->parent_bean->module_dir. "']['subpanel_setup']['" .strtolower($panel->name). "']";
+  		$name = "layout_defs['".$panel->parent_bean->module_dir."']['subpanel_setup']['".strtolower($panel->name)."']";
 //  	$GLOBALS['log']->debug('SubPanel.php->saveSubPanelDefOverride(): '.$name);
   		$newValue = override_value_to_string($name, 'override_subpanel_name', $filename);
-  		mkdir_recursive('custom/Extension/modules/'. $panel->parent_bean->module_dir . '/Ext/Layoutdefs', true);
-  		$fp = sugar_fopen('custom/Extension/modules/'. $panel->parent_bean->module_dir . "/Ext/Layoutdefs/$extname.php", 'w');
+  		mkdir_recursive('custom/Extension/modules/'.$panel->parent_bean->module_dir.'/Ext/Layoutdefs', true);
+  		$fp = sugar_fopen('custom/Extension/modules/'.$panel->parent_bean->module_dir."/Ext/Layoutdefs/$extname.php", 'w');
   		fwrite($fp, "<?php\n//auto-generated file DO NOT EDIT\n$newValue\n?>");
   		fclose($fp);
   		require_once('ModuleInstall/ModuleInstaller.php');
   		$moduleInstaller = new ModuleInstaller();
   		$moduleInstaller->silent = true; // make sure that the ModuleInstaller->log() function doesn't echo while rebuilding the layoutdefs
   		$moduleInstaller->rebuild_layoutdefs();
-  		if (file_exists('modules/'.  $panel->parent_bean->module_dir . '/layout_defs.php'))
-  			include('modules/'.  $panel->parent_bean->module_dir . '/layout_defs.php');
-  		if (file_exists('custom/modules/'.  $panel->parent_bean->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php'))
-  			include('custom/modules/'.  $panel->parent_bean->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php');
+  		if (file_exists('modules/'.$panel->parent_bean->module_dir.'/layout_defs.php'))
+  			include('modules/'.$panel->parent_bean->module_dir.'/layout_defs.php');
+  		if (file_exists('custom/modules/'.$panel->parent_bean->module_dir.'/Ext/Layoutdefs/layoutdefs.ext.php'))
+  			include('custom/modules/'.$panel->parent_bean->module_dir.'/Ext/Layoutdefs/layoutdefs.ext.php');
   }
 
 	function get_subpanel_setup($module)
@@ -322,7 +322,7 @@ 
 		$subpanel_setup = '';
 		$layout_defs = get_layout_defs();
 
-		if(!empty($layout_defs) && !empty($layout_defs[$module]['subpanel_setup']))
+		if (!empty($layout_defs) && !empty($layout_defs[$module]['subpanel_setup']))
       {
       	$subpanel_setup = $layout_defs[$module]['subpanel_setup'];
       }
@@ -340,9 +340,9 @@ 
 
 		$subpanel_define = array_merge($default_subpanel_define, $custom_subpanel_define);
 
-		if(empty($subpanel_define))
+		if (empty($subpanel_define))
 		{
-			print('Could not load subpanel definition for: ' . $subpanel_id);
+			print('Could not load subpanel definition for: '.$subpanel_id);
 		}
 
 		return $subpanel_define;
@@ -352,11 +352,11 @@ 
 	{
 		$ret_val = array();
 
-		if($subpanel_id != '')
+		if ($subpanel_id != '')
 		{
 			$layout_defs = get_layout_defs();
 
-			if(!empty($layout_defs[$module]['custom_subpanel_defines'][$subpanel_id]))
+			if (!empty($layout_defs[$module]['custom_subpanel_defines'][$subpanel_id]))
 			{
 				$ret_val = $layout_defs[$module]['custom_subpanel_defines'][$subpanel_id];
 			}
@@ -369,11 +369,11 @@ 
 	{
 		$ret_val = array();
 
-		if($subpanel_id != '')
+		if ($subpanel_id != '')
 		{
 	  		$layout_defs = get_layout_defs();
 
-			if(!empty($layout_defs[$subpanel_id]['default_subpanel_define']))
+			if (!empty($layout_defs[$subpanel_id]['default_subpanel_define']))
 			{
 				$ret_val = $layout_defs[$subpanel_id]['default_subpanel_define'];
 			}
@@ -400,20 +400,20 @@ 
 
 		$where_clauses = $searchForm->generateSearchWhere(true, $seed->module_dir);
 
-		if (count($where_clauses) > 0 )$this->search_query = '('. implode(' ) AND ( ', $where_clauses) . ')';
+		if (count($where_clauses) > 0)$this->search_query = '('.implode(' ) AND ( ', $where_clauses).')';
 		$GLOBALS['log']->info("Subpanel Where Clause: $this->search_query");
 
-		return print_r($where_clauses,true);
+		return print_r($where_clauses, true);
 	}
 
 	function get_searchdefs($module)
 	{
-		$thisPanel =& $this->subpanel_defs;
+		$thisPanel = & $this->subpanel_defs;
 		$subpanel_defs = $thisPanel->_instance_properties;
 
-		if(isset($subpanel_defs['searchdefs'])){
+		if (isset($subpanel_defs['searchdefs'])) {
 			$searchdefs[$module]['layout']['basic_search'] = $subpanel_defs['searchdefs'];
-			$searchdefs[$module]['templateMeta'] = Array ('maxColumns' => 3, 'maxColumnsBasic' => 4, 'widths' => Array ( 'label' => 10, 'field' => 30 )) ;
+			$searchdefs[$module]['templateMeta'] = Array('maxColumns' => 3, 'maxColumnsBasic' => 4, 'widths' => Array('label' => 10, 'field' => 30));
 			return $searchdefs;
 		}
 
@@ -432,11 +432,11 @@ 
 
 		$searchMetaData = $searchForm->retrieveSearchDefs($module);
 
-		if ($subpanel_searchMetaData = $this->get_searchdefs($module)){
+		if ($subpanel_searchMetaData = $this->get_searchdefs($module)) {
 
 			$searchForm->setup($subpanel_searchMetaData, $searchMetaData['searchFields'], 'SubpanelSearchFormGeneric.tpl', 'basic_search');
 
-			if(!empty($this->collections))
+			if (!empty($this->collections))
 				$searchForm->searchFields['collection'] = array();
 
 			$searchForm->populateFromRequest();

include/SubPanel/SubPanelTilesTabs.php

Spacing +46 added lines, -46 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.
@@ -48,7 +48,7 @@ 
 class SubPanelTilesTabs extends SubPanelTiles
 {
 
-	function SubPanelTiles(&$focus, $layout_def_key='', $layout_def_override = '')
+	function SubPanelTiles(&$focus, $layout_def_key = '', $layout_def_override = '')
 	{
 
 		$this->focus = $focus;
@@ -64,7 +64,7 @@ 
 
         $layoutParams = $this->module;
         //WDong Bug: 12258 "All" tab in the middle of a record's detail view is not localized.
-        if($selectedGroup != translate('LBL_TABGROUP_ALL'))
+        if ($selectedGroup != translate('LBL_TABGROUP_ALL'))
         {
             $layoutParams .= ':'.$selectedGroup;
         }
@@ -73,15 +73,15 @@ 
         return $current_user->getPreference('subpanelLayout', $layoutParams);
     }
 
-    function applyUserCustomLayoutToTabs($tabs, $key='All')
+    function applyUserCustomLayoutToTabs($tabs, $key = 'All')
     {
         //WDong Bug: 12258 "All" tab in the middle of a record's detail view is not localized.
-        if($key=='All')
+        if ($key == 'All')
     	{
-    		$key=translate('LBL_TABGROUP_ALL');
+    		$key = translate('LBL_TABGROUP_ALL');
     	}
         $usersCustomLayout = SubPanelTilesTabs::getSubpanelGroupLayout($key);
-        if(!empty($usersCustomLayout))
+        if (!empty($usersCustomLayout))
         {
             /* Return elements of the custom layout
              * which occur in $tabs in unchanged order.
@@ -89,9 +89,9 @@ 
              * not included in the layout. */
             $diff = array_diff($tabs, $usersCustomLayout);
             $tabs = array_intersect($usersCustomLayout, $tabs);
-            foreach($diff as $subpanel)
+            foreach ($diff as $subpanel)
             {
-            	$tabs []= $subpanel;
+            	$tabs [] = $subpanel;
             }
         }
 
@@ -104,15 +104,15 @@ 
      * @param boolean $showTabs	Call the view code to display the generated tabs
      * @param string $selectedGroup	(Optional) Name of any selected tab (defaults to 'All')
      */
-    function getTabs($showTabs = true, $selectedGroup='') {
+    function getTabs($showTabs = true, $selectedGroup = '') {
         $args = func_get_args();
         return call_user_func_array(array($this, '_getTabs'), $args);
     }
-    function _getTabs($tabs, $showTabs = true, $selectedGroup='All')
+    function _getTabs($tabs, $showTabs = true, $selectedGroup = 'All')
     {
         //WDong Bug: 12258 "All" tab in the middle of a record's detail view is not localized.
-        if($selectedGroup=='All')
-        	$selectedGroup=translate('LBL_TABGROUP_ALL');
+        if ($selectedGroup == 'All')
+        	$selectedGroup = translate('LBL_TABGROUP_ALL');
 
     	// Set up a mapping from subpanelID, found in the $tabs list, to the source module name
     	// As the $GLOBALS['tabStructure'] array holds the Group Tabs by module name we need to efficiently convert between the two
@@ -121,58 +121,58 @@ 
     	// for use when constructing the module by module tabs, not the subpanel tabs, as we move away from using module names to represent
     	// subpanels, and use unique subpanel IDs instead.
 
-    	$moduleNames = array () ;
-    	foreach ( $tabs as $subpanelID )
+    	$moduleNames = array();
+    	foreach ($tabs as $subpanelID)
     	{
             // Bug #44344 : Custom relationships under same module only show once in subpanel tabs
             // use object property instead new object to have ability run unit test (can override subpanel_definitions)
-            $subpanel =  $this->subpanel_definitions->load_subpanel( $subpanelID );
+            $subpanel = $this->subpanel_definitions->load_subpanel($subpanelID);
     		if ($subpanel !== false)
-    		  $moduleNames [ $subpanelID ] = $subpanel->get_module_name() ;
+    		  $moduleNames [$subpanelID] = $subpanel->get_module_name();
     	}
 
-    	$groups =  array () ;
-    	$found = array () ;
+    	$groups = array();
+    	$found = array();
 
-        foreach( $GLOBALS['tabStructure'] as $mainTab => $subModules)
+        foreach ($GLOBALS['tabStructure'] as $mainTab => $subModules)
         {
-            foreach( $subModules['modules'] as $key => $subModule )
+            foreach ($subModules['modules'] as $key => $subModule)
             {
-    			foreach ( $tabs as $subpanelID )
-                    if (isset($moduleNames[ $subpanelID ] ) && strcasecmp( $subModule , $moduleNames[ $subpanelID ] ) === 0)
+    			foreach ($tabs as $subpanelID)
+                    if (isset($moduleNames[$subpanelID]) && strcasecmp($subModule, $moduleNames[$subpanelID]) === 0)
                     {
                         // Bug #44344 : Custom relationships under same module only show once in subpanel tabs
-                        $groups [ translate ( $mainTab ) ] [ 'modules' ] [] = $subpanelID ;
-                    	$found [ $subpanelID ] = true ;
+                        $groups [translate($mainTab)] ['modules'] [] = $subpanelID;
+                    	$found [$subpanelID] = true;
                 	}
             }
         }
 
         // Put all the remaining subpanels into the 'Other' tab.
 
-        foreach( $tabs as $subpanelID )
+        foreach ($tabs as $subpanelID)
         {
-        	if ( ! isset ( $found [ $subpanelID ] ) )
-	        	$groups [ translate ('LBL_TABGROUP_OTHER') ]['modules'] [] = $subpanelID ;
+        	if (!isset ($found [$subpanelID]))
+	        	$groups [translate('LBL_TABGROUP_OTHER')]['modules'] [] = $subpanelID;
         }
 
         /* Move history to same tab as activities */
-        if(in_array('history', $tabs) && in_array('activities', $tabs))
+        if (in_array('history', $tabs) && in_array('activities', $tabs))
         {
-            foreach($groups as $mainTab => $group)
+            foreach ($groups as $mainTab => $group)
             {
-            	if(in_array('activities', array_map('strtolower', $group['modules'])))
+            	if (in_array('activities', array_map('strtolower', $group['modules'])))
                 {
-                	if(!in_array('history', array_map('strtolower', $group['modules'])))
+                	if (!in_array('history', array_map('strtolower', $group['modules'])))
                     {
                     	/* Move hist from there to here */
-                        $groups[$mainTab]['modules'] []= 'history';
+                        $groups[$mainTab]['modules'] [] = 'history';
                     }
                 }
-                else if(false !== ($i = array_search('history', array_map('strtolower', $group['modules']))))
+                else if (false !== ($i = array_search('history', array_map('strtolower', $group['modules']))))
                 {
                     unset($groups[$mainTab]['modules'][$i]);
-                    if(empty($groups[$mainTab]['modules']))
+                    if (empty($groups[$mainTab]['modules']))
                     {
                     	unset($groups[$mainTab]);
                     }
@@ -184,7 +184,7 @@ 
          * Note that if a tab group already exists with the name 'All',
          * it will be overwritten in this union operation.
          */
-        if(count($groups) <= 1)
+        if (count($groups) <= 1)
         	$groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs));
         else
             $groups = array(translate('LBL_TABGROUP_ALL') => array('label' => translate('LBL_TABGROUP_ALL'), 'modules' => $tabs)) + $groups;
@@ -195,7 +195,7 @@ 
          */
 
         $retTabs = array();
-        if($showTabs)
+        if ($showTabs)
         {
         	require_once('include/SubPanel/SugarTab.php');
         	$sugarTab = new SugarTab();
@@ -206,9 +206,9 @@ 
     	    foreach ($groups as $key=>$tab)
     		{
                 $display = false;
-                foreach($tab['modules'] as $subkey=>$subtab)
+                foreach ($tab['modules'] as $subkey=>$subtab)
                 {
-                    if(in_array(strtolower($subtab), $tabs))
+                    if (in_array(strtolower($subtab), $tabs))
                     {
                         $display = true;
                         break;
@@ -217,30 +217,30 @@ 
 
                 $selected = '';
 
-                if($selectedGroup == $key)
+                if ($selectedGroup == $key)
                 {
                     $selected = 'current';
                 }
 
-                if($display)
+                if ($display)
                 {
                     $relevantTabs = SubPanelTilesTabs::applyUserCustomLayoutToTabs($tabs, $key);
 
                     $sugarTabs[$key] = array(//'url'=>'index.php?module=' . $_REQUEST['module'] . '&record=' . $_REQUEST['record'] . '&action=' . $_REQUEST['action']. '&subpanel=' . $key.'#tabs',
                                          //'url'=>"javascript:SUGAR.util.retrieveAndFill('index.php?to_pdf=1&module=MySettings&action=LoadTabSubpanels&loadModule={$_REQUEST['module']}&record={$_REQUEST['record']}&subpanel=$key','subpanel_list',null,null,null);",
-                                         'label'=>( !empty($tab['label']) ? $tab['label']: $key ),
+                                         'label'=>(!empty($tab['label']) ? $tab['label'] : $key),
                                          'type'=>$selected);
 
                     $otherTabs[$key] = array('key'=>$key, 'tabs'=>array());
 
                     $orderedTabs = array_intersect($relevantTabs, array_map('strtolower', $groups[$key]['modules']));
 
-                    foreach($orderedTabs as $subkey => $subtab)
+                    foreach ($orderedTabs as $subkey => $subtab)
                     {
                         $otherTabs[$key]['tabs'][$subkey] = array('key'=>$subtab, 'label'=>translate($this->subpanel_definitions->layout_defs['subpanel_setup'][$subtab]['title_key']));
                     }
 
-                    if($selectedGroup == $key)
+                    if ($selectedGroup == $key)
                     {
                         $displayTabs = $otherTabs[$key]['tabs'];
                         $retTabs = $orderedTabs;
@@ -248,7 +248,7 @@ 
                 }
     		}
 
-            if(empty($displayTabs) && !empty($otherTabs))
+            if (empty($displayTabs) && !empty($otherTabs))
             {
                 //WDong Bug: 12258 "All" tab in the middle of a record's detail view is not localized.
                 $selectedGroup = translate('LBL_TABGROUP_ALL');
@@ -257,7 +257,7 @@ 
                 $retTabs = array_intersect($tabs, array_map('strtolower', $groups[$selectedGroup]['modules']));
             }
 
-            if (!empty($sugarTabs) || !empty($otherTabs) ) {
+            if (!empty($sugarTabs) || !empty($otherTabs)) {
             	$sugarTab->setup($sugarTabs, $otherTabs, $displayTabs, $selectedGroup);
             	$sugarTab->display();
             }

include/generic/SugarWidgets/SugarWidgetSubPanelGetLatestButton.php

Spacing +15 added lines, -15 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.
@@ -55,27 +55,27 @@ 
 		//if the contract has been executed or selected_revision is same as latest revision
 		//then hide the latest button. 		
 		//if the contract state is executed or document is not a template hide this action.
-		if ((!empty($layout_def['fields']['CONTRACT_STATUS']) && $layout_def['fields']['CONTRACT_STATUS']=='executed') or
-			$layout_def['fields']['SELECTED_REVISION_ID']== $layout_def['fields']['LATEST_REVISION_ID']) {
+		if ((!empty($layout_def['fields']['CONTRACT_STATUS']) && $layout_def['fields']['CONTRACT_STATUS'] == 'executed') or
+			$layout_def['fields']['SELECTED_REVISION_ID'] == $layout_def['fields']['LATEST_REVISION_ID']) {
 			return "";
 		}
 		
 		global $app_strings;
 		
 
-		$href = 'index.php?module=' . $layout_def['module']
-			. '&action=' . 'GetLatestRevision'
-			. '&record=' . $layout_def['fields']['ID']
-			. '&return_module=' . $_REQUEST['module']
-			. '&return_action=' . 'DetailView'
-			. '&return_id=' . $_REQUEST['record']
-			. '&get_latest_for_id=' . $layout_def['fields']['LINKED_ID'];
+		$href = 'index.php?module='.$layout_def['module']
+			. '&action='.'GetLatestRevision'
+			. '&record='.$layout_def['fields']['ID']
+			. '&return_module='.$_REQUEST['module']
+			. '&return_action='.'DetailView'
+			. '&return_id='.$_REQUEST['record']
+			. '&get_latest_for_id='.$layout_def['fields']['LINKED_ID'];
 
-		$edit_icon_html = SugarThemeRegistry::current()->getImage( 'getLatestDocument','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LNK_GET_LATEST']);
-		if($layout_def['EditView']){
-			return '<a href="' . $href . '"' . "title ='". $app_strings['LNK_GET_LATEST_TOOLTIP']  ."'"
-			. 'class="listViewTdToolsS1">' . $edit_icon_html . '&nbsp;' . $app_strings['LNK_GET_LATEST'] .'</a>&nbsp;';
-		}else{
+		$edit_icon_html = SugarThemeRegistry::current()->getImage('getLatestDocument', 'align="absmiddle" border="0"', null, null, '.gif', $app_strings['LNK_GET_LATEST']);
+		if ($layout_def['EditView']) {
+			return '<a href="'.$href.'"'."title ='".$app_strings['LNK_GET_LATEST_TOOLTIP']."'"
+			. 'class="listViewTdToolsS1">'.$edit_icon_html.'&nbsp;'.$app_strings['LNK_GET_LATEST'].'</a>&nbsp;';
+		} else {
 			return '';
 		}
 	}

include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateLeadNameButton.php

Spacing +22 added lines, -22 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.
@@ -60,7 +60,7 @@ 
 		//$accesskey = $app_strings['LBL_NEW_BUTTON_KEY'];
 		$value = $app_strings['LBL_NEW_BUTTON_LABEL'];
 		$this->module = 'Leads';
-		if( ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true)){
+		if (ACLController::moduleSupportsACL($defines['module']) && !ACLController::checkAccess($defines['module'], 'edit', true)) {
 			$button = "<input title='$title'class='button' type='button' name='button' value='  $value  ' disabled/>\n";
 			return $button;
 		}
@@ -69,52 +69,52 @@ 
 		
 		//from accounts
 		if ($defines['focus']->object_name == 'Account') {
-			if(isset($defines['focus']->billing_address_street)) 
+			if (isset($defines['focus']->billing_address_street)) 
 				$additionalFormFields['primary_address_street'] = $defines['focus']->billing_address_street;
-			if(isset($defines['focus']->billing_address_city)) 
+			if (isset($defines['focus']->billing_address_city)) 
 				$additionalFormFields['primary_address_city'] = $defines['focus']->billing_address_city;						  		
-			if(isset($defines['focus']->billing_address_state)) 
+			if (isset($defines['focus']->billing_address_state)) 
 				$additionalFormFields['primary_address_state'] = $defines['focus']->billing_address_state;
-			if(isset($defines['focus']->billing_address_country)) 
+			if (isset($defines['focus']->billing_address_country)) 
 				$additionalFormFields['primary_address_country'] = $defines['focus']->billing_address_country;
-			if(isset($defines['focus']->billing_address_postalcode)) 
+			if (isset($defines['focus']->billing_address_postalcode)) 
 				$additionalFormFields['primary_address_postalcode'] = $defines['focus']->billing_address_postalcode;
-			if(isset($defines['focus']->phone_office)) 
+			if (isset($defines['focus']->phone_office)) 
 				$additionalFormFields['phone_work'] = $defines['focus']->phone_office;
-			if(isset($defines['focus']->id)) 
+			if (isset($defines['focus']->id)) 
 				$additionalFormFields['account_id'] = $defines['focus']->id;
 		}
 		//from contacts
 		if ($defines['focus']->object_name == 'Contact') {
-			if(isset($defines['focus']->salutation)) 
+			if (isset($defines['focus']->salutation)) 
 				$additionalFormFields['salutation'] = $defines['focus']->salutation;
-			if(isset($defines['focus']->first_name)) 
+			if (isset($defines['focus']->first_name)) 
 				$additionalFormFields['first_name'] = $defines['focus']->first_name;
-			if(isset($defines['focus']->last_name)) 
+			if (isset($defines['focus']->last_name)) 
 				$additionalFormFields['last_name'] = $defines['focus']->last_name;
-			if(isset($defines['focus']->primary_address_street)) 
+			if (isset($defines['focus']->primary_address_street)) 
 				$additionalFormFields['primary_address_street'] = $defines['focus']->primary_address_street;
-			if(isset($defines['focus']->primary_address_city)) 
+			if (isset($defines['focus']->primary_address_city)) 
 				$additionalFormFields['primary_address_city'] = $defines['focus']->primary_address_city;						  		
-			if(isset($defines['focus']->primary_address_state)) 
+			if (isset($defines['focus']->primary_address_state)) 
 				$additionalFormFields['primary_address_state'] = $defines['focus']->primary_address_state;
-			if(isset($defines['focus']->primary_address_country)) 
+			if (isset($defines['focus']->primary_address_country)) 
 				$additionalFormFields['primary_address_country'] = $defines['focus']->primary_address_country;
-			if(isset($defines['focus']->primary_address_postalcode)) 
+			if (isset($defines['focus']->primary_address_postalcode)) 
 				$additionalFormFields['primary_address_postalcode'] = $defines['focus']->primary_address_postalcode;
-			if(isset($defines['focus']->phone_work)) 
+			if (isset($defines['focus']->phone_work)) 
 				$additionalFormFields['phone_work'] = $defines['focus']->phone_work;
-			if(isset($defines['focus']->id)) 
+			if (isset($defines['focus']->id)) 
 				$additionalFormFields['contact_id'] = $defines['focus']->id;
 		}
 		
 		//from opportunities
 		if ($defines['focus']->object_name == 'Opportunity') {
-			if(isset($defines['focus']->id)) 
+			if (isset($defines['focus']->id)) 
 				$additionalFormFields['opportunity_id'] = $defines['focus']->id;
-			if(isset($defines['focus']->account_name)) 
+			if (isset($defines['focus']->account_name)) 
 				$additionalFormFields['account_name'] = $defines['focus']->account_name;
-			if(isset($defines['focus']->account_id)) 
+			if (isset($defines['focus']->account_id)) 
 				$additionalFormFields['account_id'] = $defines['focus']->account_id;
 		}
 		

include/generic/SugarWidgets/SugarWidgetFieldrelate.php

Spacing +13 added lines, -13 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,18 +58,18 @@ 
         {
             $values[] = $layout_def['input_name0'];
         }
-        $html = '<select name="' . $layout_def['name'] . '[]" multiple="true">';
+        $html = '<select name="'.$layout_def['name'].'[]" multiple="true">';
 
         $query = $this->displayInputQuery($layout_def);
         $result = $this->reporter->db->query($query);
         while ($row = $this->reporter->db->fetchByAssoc($result))
         {
-            $html .= '<option value="' . $row['id'] . '"';
+            $html .= '<option value="'.$row['id'].'"';
             if (in_array($row['id'], $values))
             {
                 $html .= ' selected="selected"';
             }
-            $html .= '>' . htmlspecialchars($row['title']) . '</option>';
+            $html .= '>'.htmlspecialchars($row['title']).'</option>';
         }
 
         $html .= '</select>';
@@ -134,7 +134,7 @@ 
             $ids[] = $row['id'];
         }
         $layout_def['name'] = 'id';
-        return $this->_get_column_select($layout_def) . " IN ('" . implode("', '", $ids) . "')";
+        return $this->_get_column_select($layout_def)." IN ('".implode("', '", $ids)."')";
     }
 
     /**
@@ -154,7 +154,7 @@ 
         $module = isset($layout_def['custom_module']) ? $layout_def['custom_module'] : $layout_def['module'];
         $seed = BeanFactory::getBean($module);
 
-        foreach($layout_def['input_name0'] as $beanId)
+        foreach ($layout_def['input_name0'] as $beanId)
         {
             if (!empty($relation->lhs_module) && !empty($relation->rhs_module)
                 && $relation->lhs_module == $relation->rhs_module) {
@@ -171,7 +171,7 @@ 
         }
         $ids = array_unique($ids);
         $layout_def['name'] = 'id';
-        return $this->_get_column_select($layout_def) . " IN ('" . implode("', '", $ids) . "')";
+        return $this->_get_column_select($layout_def)." IN ('".implode("', '", $ids)."')";
     }
 
 	//for to_pdf/to_csv
@@ -180,14 +180,14 @@ 
 		$field_def = $reporter->all_fields[$layout_def['column_key']];
 		$display = strtoupper($field_def['secondary_table'].'_name');
 		//#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
-		if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
+		if (!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])) {
 			$display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
 		}
-        elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
+        elseif (isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
         {
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]['join_table_alias'].'_name');
         }
-		elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
+		elseif (!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])) {
 			$display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']]['join_table_alias'].'_name');
 		}
 		$cell = $layout_def['fields'][$display];
@@ -200,14 +200,14 @@ 
         $display = strtoupper($field_def['secondary_table'].'_name');
 
         //#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
-        if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
+        if (!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])) {
              $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
         }
-        elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
+        elseif (isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
         {
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]['join_table_alias'].'_name');
         }
-        elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
+        elseif (!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])) {
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']]['join_table_alias'].'_name');
         }
         $recordField = $this->getTruncatedColumnAlias(strtoupper($layout_def['table_alias']).'_'.strtoupper($layout_def['name']));

include/generic/SugarWidgets/SugarWidgetSubPanelCheck.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.
@@ -45,16 +45,16 @@ 
 {
     function displayListPlain($layout_def) {
 
-        $value= $this->_get_list_value($layout_def);
+        $value = $this->_get_list_value($layout_def);
 
-        if (isset($layout_def['widget_type']) && $layout_def['widget_type'] =='checkbox') {
+        if (isset($layout_def['widget_type']) && $layout_def['widget_type'] == 'checkbox') {
 
-            if ($value != '' &&  ($value == 'on' || intval($value) == 1 || $value == 'yes'))
+            if ($value != '' && ($value == 'on' || intval($value) == 1 || $value == 'yes'))
             {
                 return "&nbsp;<input name='checkbox_display' class='checkbox' type='checkbox' disabled='true' checked>";
             }
             //Modification to allow checkboxes to be displayed correctly in subpanel
-            if ($layout_def['checkbox_value']=='true'){
+            if ($layout_def['checkbox_value'] == 'true') {
                 return "&nbsp;<input name='".$layout_def['module']."checkbox_display[]' class='checkbox' type='checkbox' id='".$layout_def['module']."checkbox_display_id[]' value=\"".$layout_def['fields']['ID']."\" onclick=''>";
             }
 

include/generic/SugarWidgets/SugarWidgetSubPanelTopArchiveEmailButton.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.
@@ -47,8 +47,8 @@ 
 {
 	function display($defines, $additionalFormFields = NULL, $nonbutton = false)
 	{
-		if((ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true) ||
-			$defines['module'] == "History" & !ACLController::checkAccess("Emails", 'edit', true))){
+		if ((ACLController::moduleSupportsACL($defines['module']) && !ACLController::checkAccess($defines['module'], 'edit', true) ||
+			$defines['module'] == "History" & !ACLController::checkAccess("Emails", 'edit', true))) {
 			$temp = '';
 			return $temp;
 		}
@@ -68,11 +68,11 @@ 
 		$additionalFormFields['parent_id'] = $defines['focus']->id;
 		$additionalFormFields['parent_name'] = $defines['focus']->name;
 
-		if(isset($defines['focus']->email1))
+		if (isset($defines['focus']->email1))
 		{
 			$additionalFormFields['to_email_addrs'] = $defines['focus']->email1;
 		}
-		if(ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true)){
+		if (ACLController::moduleSupportsACL($defines['module']) && !ACLController::checkAccess($defines['module'], 'edit', true)) {
 			$button = "<input id='".preg_replace('[ ]', '', $value)."_button'  title='$title' class='button' type='button' name='".preg_replace('[ ]', '', mb_strtolower($value, 'UTF-8'))."_button' value='$value' disabled/>\n";
 			return $button;
 		}