adamjakab / SuiteCRM

modules/AOR_Charts/AOR_Chart.php

Indentation +21 added lines, -21 removed lines

@@ -25,25 +25,25 @@ 
 class AOR_Chart extends Basic {
 
     var $colours = "['#1f78b4','#a6cee3','#b2df8a','#33a02c','#fb9a99','#e31a1c','#fdbf6f','#ff7f00','#cab2d6','#6a3d9a','#ffff99','#b15928']";
-	var $new_schema = true;
-	var $module_dir = 'AOR_Charts';
-	var $object_name = 'AOR_Chart';
-	var $table_name = 'aor_charts';
-	var $importable = true;
-	var $disable_row_level_security = true ;
+    var $new_schema = true;
+    var $module_dir = 'AOR_Charts';
+    var $object_name = 'AOR_Chart';
+    var $table_name = 'aor_charts';
+    var $importable = true;
+    var $disable_row_level_security = true ;
 	
-	var $id;
-	var $name;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $modified_by_name;
-	var $created_by;
-	var $created_by_name;
-	var $description;
-	var $deleted;
-	var $created_by_link;
-	var $modified_user_link;
+    var $id;
+    var $name;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
+    var $modified_by_name;
+    var $created_by;
+    var $created_by_name;
+    var $description;
+    var $deleted;
+    var $created_by_link;
+    var $modified_user_link;
 
     var $type;
     var $x_field;
@@ -52,9 +52,9 @@ 
 
 
 
-	function AOR_Chart(){
-		parent::Basic();
-	}
+    function AOR_Chart(){
+        parent::Basic();
+    }
 
     function save_lines(array $post,AOR_Report $bean,$postKey){
         $seenIds = array();

modules/AOR_Reports/controller.php

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php
 /**
- * Advanced OpenReports, SugarCRM Reporting.
- * @package Advanced OpenReports for SugarCRM
- * @copyright SalesAgility Ltd http://www.salesagility.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
- * along with this program; if not, see http://www.gnu.org/licenses
- * or write to the Free Software Foundation,Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301  USA
- *
- * @author SalesAgility <info@salesagility.com>
- */
+     * Advanced OpenReports, SugarCRM Reporting.
+     * @package Advanced OpenReports for SugarCRM
+     * @copyright SalesAgility Ltd http://www.salesagility.com
+     *
+     * This program is free software; you can redistribute it and/or modify
+     * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+     * the Free Software Foundation; either version 3 of the License, or
+     * (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+     * along with this program; if not, see http://www.gnu.org/licenses
+     * or write to the Free Software Foundation,Inc., 51 Franklin Street,
+     * Fifth Floor, Boston, MA 02110-1301  USA
+     *
+     * @author SalesAgility <info@salesagility.com>
+     */
 
 /**
  * This file adds support for studio

modules/AOR_Reports/language/en_us.lang.php

Indentation +58 added lines, -58 removed lines

@@ -23,66 +23,66 @@
  */
 
 $mod_strings = array (
-  'LBL_ASSIGNED_TO_ID' => 'Assigned User Id',
-  'LBL_ASSIGNED_TO_NAME' => 'Assigned to',
-  'LBL_ID' => 'ID',
-  'LBL_DATE_ENTERED' => 'Date Created',
-  'LBL_DATE_MODIFIED' => 'Date Modified',
-  'LBL_MODIFIED' => 'Modified By',
-  'LBL_MODIFIED_ID' => 'Modified By Id',
-  'LBL_MODIFIED_NAME' => 'Modified By Name',
-  'LBL_CREATED' => 'Created By',
-  'LBL_CREATED_ID' => 'Created By Id',
-  'LBL_DESCRIPTION' => 'Description',
-  'LBL_DELETED' => 'Deleted',
-  'LBL_NAME' => 'Name',
-  'LBL_CREATED_USER' => 'Created by User',
-  'LBL_MODIFIED_USER' => 'Modified by User',
-  'LBL_LIST_NAME' => 'Name',
-  'LBL_EDIT_BUTTON' => 'Edit',
-  'LBL_REMOVE' => 'Remove',
-  'LBL_LIST_FORM_TITLE' => 'Reports List',
-  'LBL_MODULE_NAME' => 'Reports',
-  'LBL_MODULE_TITLE' => 'Reports',
-  'LBL_HOMEPAGE_TITLE' => 'My Reports',
-  'LNK_NEW_RECORD' => 'Create Report',
-  'LNK_LIST' => 'View Reports',
-  'LNK_IMPORT_AOR_REPORTS' => 'Import Reports',
-  'LBL_SEARCH_FORM_TITLE' => 'Search Reports',
-  'LBL_HISTORY_SUBPANEL_TITLE' => 'View History',
-  'LBL_ACTIVITIES_SUBPANEL_TITLE' => 'Activities',
-  'LBL_AOR_REPORTS_SUBPANEL_TITLE' => 'Reports',
-  'LBL_NEW_FORM_TITLE' => 'New Reports',
-  'LBL_REPORT_MODULE' => 'Report Module',
+    'LBL_ASSIGNED_TO_ID' => 'Assigned User Id',
+    'LBL_ASSIGNED_TO_NAME' => 'Assigned to',
+    'LBL_ID' => 'ID',
+    'LBL_DATE_ENTERED' => 'Date Created',
+    'LBL_DATE_MODIFIED' => 'Date Modified',
+    'LBL_MODIFIED' => 'Modified By',
+    'LBL_MODIFIED_ID' => 'Modified By Id',
+    'LBL_MODIFIED_NAME' => 'Modified By Name',
+    'LBL_CREATED' => 'Created By',
+    'LBL_CREATED_ID' => 'Created By Id',
+    'LBL_DESCRIPTION' => 'Description',
+    'LBL_DELETED' => 'Deleted',
+    'LBL_NAME' => 'Name',
+    'LBL_CREATED_USER' => 'Created by User',
+    'LBL_MODIFIED_USER' => 'Modified by User',
+    'LBL_LIST_NAME' => 'Name',
+    'LBL_EDIT_BUTTON' => 'Edit',
+    'LBL_REMOVE' => 'Remove',
+    'LBL_LIST_FORM_TITLE' => 'Reports List',
+    'LBL_MODULE_NAME' => 'Reports',
+    'LBL_MODULE_TITLE' => 'Reports',
+    'LBL_HOMEPAGE_TITLE' => 'My Reports',
+    'LNK_NEW_RECORD' => 'Create Report',
+    'LNK_LIST' => 'View Reports',
+    'LNK_IMPORT_AOR_REPORTS' => 'Import Reports',
+    'LBL_SEARCH_FORM_TITLE' => 'Search Reports',
+    'LBL_HISTORY_SUBPANEL_TITLE' => 'View History',
+    'LBL_ACTIVITIES_SUBPANEL_TITLE' => 'Activities',
+    'LBL_AOR_REPORTS_SUBPANEL_TITLE' => 'Reports',
+    'LBL_NEW_FORM_TITLE' => 'New Reports',
+    'LBL_REPORT_MODULE' => 'Report Module',
     'LBL_GRAPHS_PER_ROW' => 'Charts per row',
-  'LBL_FIELD_LINES' => 'Display Fields',
-  'LBL_ADD_FIELD' => 'Add Field',
-  'LBL_CONDITION_LINES' => 'Conditions',
-  'LBL_ADD_CONDITION' => 'Add Condition',
-  'LBL_EXPORT' => 'Export',
-  'LBL_DOWNLOAD_PDF' => 'Download PDF',
-  'LBL_ADD_TO_PROSPECT_LIST' => 'Add To Target List',
-  'LBL_AOR_MODULETREE_SUBPANEL_TITLE' => 'Module tree',
-  'LBL_AOR_FIELDS_SUBPANEL_TITLE' => 'Fields',
-  'LBL_AOR_CONDITIONS_SUBPANEL_TITLE' => 'Conditions',
-  'LBL_TOTAL' => 'Total',
-  'LBL_AOR_CHARTS_SUBPANEL_TITLE' => 'Charts',
-  'LBL_ADD_CHART' => 'Add chart',
+    'LBL_FIELD_LINES' => 'Display Fields',
+    'LBL_ADD_FIELD' => 'Add Field',
+    'LBL_CONDITION_LINES' => 'Conditions',
+    'LBL_ADD_CONDITION' => 'Add Condition',
+    'LBL_EXPORT' => 'Export',
+    'LBL_DOWNLOAD_PDF' => 'Download PDF',
+    'LBL_ADD_TO_PROSPECT_LIST' => 'Add To Target List',
+    'LBL_AOR_MODULETREE_SUBPANEL_TITLE' => 'Module tree',
+    'LBL_AOR_FIELDS_SUBPANEL_TITLE' => 'Fields',
+    'LBL_AOR_CONDITIONS_SUBPANEL_TITLE' => 'Conditions',
+    'LBL_TOTAL' => 'Total',
+    'LBL_AOR_CHARTS_SUBPANEL_TITLE' => 'Charts',
+    'LBL_ADD_CHART' => 'Add chart',
     'LBL_ADD_PARENTHESIS' => 'Drop parenthesis',
-  'LBL_CHART_TITLE' => 'Title',
-  'LBL_CHART_TYPE' => 'Type',
-  'LBL_CHART_X_FIELD' => 'X Axis',
-  'LBL_CHART_Y_FIELD' => 'Y Axis',
-  'LBL_AOR_REPORTS_DASHLET' => 'Reports',
-  'LBL_DASHLET_TITLE' => 'Title',
-  'LBL_DASHLET_REPORT' => 'Report',
-  'LBL_DASHLET_CHOOSE_REPORT' => 'Please choose a report',
-  'LBL_DASHLET_SAVE' => 'Save',
-  'LBL_DASHLET_CHARTS' => 'Charts',
-  'LBL_DASHLET_ONLY_CHARTS' => 'Only show charts',
-  'LBL_AOR_SCHEDULED_REPORTS_AOR_REPORTS_FROM_AOR_SCHEDULED_REPORTS_TITLE' => 'Scheduled Reports',
-  'LBL_UPDATE_PARAMETERS' => 'Update',
-  'LBL_PARAMETERS' => 'Parameters',
+    'LBL_CHART_TITLE' => 'Title',
+    'LBL_CHART_TYPE' => 'Type',
+    'LBL_CHART_X_FIELD' => 'X Axis',
+    'LBL_CHART_Y_FIELD' => 'Y Axis',
+    'LBL_AOR_REPORTS_DASHLET' => 'Reports',
+    'LBL_DASHLET_TITLE' => 'Title',
+    'LBL_DASHLET_REPORT' => 'Report',
+    'LBL_DASHLET_CHOOSE_REPORT' => 'Please choose a report',
+    'LBL_DASHLET_SAVE' => 'Save',
+    'LBL_DASHLET_CHARTS' => 'Charts',
+    'LBL_DASHLET_ONLY_CHARTS' => 'Only show charts',
+    'LBL_AOR_SCHEDULED_REPORTS_AOR_REPORTS_FROM_AOR_SCHEDULED_REPORTS_TITLE' => 'Scheduled Reports',
+    'LBL_UPDATE_PARAMETERS' => 'Update',
+    'LBL_PARAMETERS' => 'Parameters',
     'LBL_TOOLTIP_DRAG_DROP_ELEMS' => 'Drag and drop elements into field or condition area',
     'LBL_MAIN_GROUPS' => 'Main Group:',
 );

data/SugarBean.php

Indentation +739 added lines, -739 removed lines

@@ -84,27 +84,27 @@ 
     public $id;
 
     /**
-	 * When createing a bean, you can specify a value in the id column as
-	 * long as that value is unique.  During save, if the system finds an
-	 * id, it assumes it is an update.  Setting new_with_id to true will
-	 * make sure the system performs an insert instead of an update.
-	 *
-	 * @var BOOL -- default false
-	 */
-	var $new_with_id = false;
-
-
-	/**
-	 * How deep logic hooks can go
-	 * @var int
-	 */
-	protected $max_logic_depth = 10;
-
-	/**
-	 * Disble vardefs.  This should be set to true only for beans that do not have varders.  Tracker is an example
-	 *
-	 * @var BOOL -- default false
-	 */
+     * When createing a bean, you can specify a value in the id column as
+     * long as that value is unique.  During save, if the system finds an
+     * id, it assumes it is an update.  Setting new_with_id to true will
+     * make sure the system performs an insert instead of an update.
+     *
+     * @var BOOL -- default false
+     */
+    var $new_with_id = false;
+
+
+    /**
+     * How deep logic hooks can go
+     * @var int
+     */
+    protected $max_logic_depth = 10;
+
+    /**
+     * Disble vardefs.  This should be set to true only for beans that do not have varders.  Tracker is an example
+     *
+     * @var BOOL -- default false
+     */
     var $disable_vardefs = false;
 
 
@@ -116,20 +116,20 @@ 
      */
     var $new_assigned_user_name;
 
-	/**
-	 * An array of booleans.  This array is cleared out when data is loaded.
-	 * As date/times are converted, a "1" is placed under the key, the field is converted.
-	 *
-	 * @var Array of booleans
-	 */
-	var $processed_dates_times = array();
+    /**
+     * An array of booleans.  This array is cleared out when data is loaded.
+     * As date/times are converted, a "1" is placed under the key, the field is converted.
+     *
+     * @var Array of booleans
+     */
+    var $processed_dates_times = array();
 
-	/**
-	 * Whether to process date/time fields for storage in the database in GMT
-	 *
-	 * @var BOOL
-	 */
-	var $process_save_dates =true;
+    /**
+     * Whether to process date/time fields for storage in the database in GMT
+     *
+     * @var BOOL
+     */
+    var $process_save_dates =true;
 
     /**
      * This signals to the bean that it is being saved in a mass mode.
@@ -140,20 +140,20 @@ 
      */
     var $save_from_post = true;
 
-	/**
-	 * When running a query on related items using the method: retrieve_by_string_fields
-	 * this value will be set to true if more than one item matches the search criteria.
-	 *
-	 * @var BOOL
-	 */
-	var $duplicates_found = false;
+    /**
+     * When running a query on related items using the method: retrieve_by_string_fields
+     * this value will be set to true if more than one item matches the search criteria.
+     *
+     * @var BOOL
+     */
+    var $duplicates_found = false;
 
-	/**
-	 * true if this bean has been deleted, false otherwise.
-	 *
-	 * @var BOOL
-	 */
-	var $deleted = 0;
+    /**
+     * true if this bean has been deleted, false otherwise.
+     *
+     * @var BOOL
+     */
+    var $deleted = 0;
 
     /**
      * Should the date modified column of the bean be updated during save?
@@ -201,22 +201,22 @@ 
     var $table_name = '';
 
     /**
-    * This is the singular name of the bean.  (i.e. Contact).
-    *
-    * @var String
-    */
+     * This is the singular name of the bean.  (i.e. Contact).
+     *
+     * @var String
+     */
     var $object_name = '';
 
     /** Set this to true if you query contains a sub-select and bean is converting both select statements
-    * into count queries.
-    */
+     * into count queries.
+     */
     var $ungreedy_count=false;
 
     /**
-    * The name of the module folder for this type of bean.
-    *
-    * @var String
-    */
+     * The name of the module folder for this type of bean.
+     *
+     * @var String
+     */
     var $module_dir = '';
     var $module_name = '';
     var $field_name_map;
@@ -249,8 +249,8 @@ 
     var $importable = false;
 
     /**
-    * Set to true in the child beans if the module use the special notification template
-    */
+     * Set to true in the child beans if the module use the special notification template
+     */
     var $special_notification = false;
 
     /**
@@ -282,7 +282,7 @@ 
      */
     protected $loaded_relationships = array();
 
-	/**
+    /**
      * set to true if dependent fields updated
      */
     protected $is_updated_dependent_fields = false;
@@ -661,7 +661,7 @@ 
             return;
 
         foreach ($this->field_defs as $field => $value) {
-		    if( !empty($this->$field)
+            if( !empty($this->$field)
                   && ((isset($value['default']) && $this->$field == $value['default']) || (!empty($value['display_default']) && $this->$field == $value['display_default']))
                     ) {
                 $this->$field = null;
@@ -710,7 +710,7 @@ 
                             $this->$field = $this->parseDateDefault($value['display_default']);
                         }
                         break;
-                   case 'datetime':
+                    case 'datetime':
                    case 'datetimecombo':
                         if(!empty($value['display_default'])){
                             $this->$field = $this->parseDateDefault($value['display_default'], true);
@@ -723,9 +723,9 @@ 
                             $this->$field = $value['default'];
                         break;
                     case 'bool':
-                    	if(isset($this->$field)){
-                    		break;
-                    	}
+                        if(isset($this->$field)){
+                            break;
+                        }
                     default:
                         if ( isset($value['default']) && $value['default'] !== '' ) {
                             $this->$field = htmlentities($value['default'], ENT_QUOTES, 'UTF-8');
@@ -788,10 +788,10 @@ 
     /**
      * This method has been deprecated.
      *
-    * @see removeRelationshipMeta()
+     * @see removeRelationshipMeta()
      * @deprecated 4.5.1 - Nov 14, 2006
      * @static
-    */
+     */
     static function remove_relationship_meta($key,$db,$log,$tablename,$dictionary,$module_dir)
     {
         SugarBean::removeRelationshipMeta($key,$db,$tablename,$dictionary,$module_dir);
@@ -927,10 +927,10 @@ 
 
     /**
      * This method has been deprecated.
-    * @see createRelationshipMeta()
+     * @see createRelationshipMeta()
      * @deprecated 4.5.1 - Nov 14, 2006
      * @static
-    */
+     */
     static function create_relationship_meta($key,&$db,&$log,$tablename,$dictionary,$module_dir)
     {
         SugarBean::createRelationshipMeta($key,$db,$tablename,$dictionary,$module_dir);
@@ -1084,7 +1084,7 @@ 
 
         $linked_fields=array();
 
- //   	require_once('data/Link.php');
+    //   	require_once('data/Link.php');
 
         $fieldDefs = $this->getFieldDefinitions();
 
@@ -1314,8 +1314,8 @@ 
     }
 
     /**
-    * Cleans char, varchar, text, etc. fields of XSS type materials
-    */
+     * Cleans char, varchar, text, etc. fields of XSS type materials
+     */
     function cleanBean() {
         foreach($this->field_defs as $key => $def) {
 
@@ -1338,14 +1338,14 @@ 
     }
 
     /**
-    * Implements a generic insert and update logic for any SugarBean
-    * This method only works for subclasses that implement the same variable names.
-    * This method uses the presence of an id field that is not null to signify and update.
-    * The id field should not be set otherwise.
-    *
-    * @param boolean $check_notify Optional, default false, if set to true assignee of the record is notified via email.
-    * @todo Add support for field type validation and encoding of parameters.
-    */
+     * Implements a generic insert and update logic for any SugarBean
+     * This method only works for subclasses that implement the same variable names.
+     * This method uses the presence of an id field that is not null to signify and update.
+     * The id field should not be set otherwise.
+     *
+     * @param boolean $check_notify Optional, default false, if set to true assignee of the record is notified via email.
+     * @todo Add support for field type validation and encoding of parameters.
+     */
     function save($check_notify = FALSE)
     {
         $this->in_save = true;
@@ -1362,14 +1362,14 @@ 
             $isUpdate = false;
         }
 
-		if ( $this->new_with_id == true )
-		{
-			$isUpdate = false;
-		}
-		if(empty($this->date_modified) || $this->update_date_modified)
-		{
-			$this->date_modified = $GLOBALS['timedate']->nowDb();
-		}
+        if ( $this->new_with_id == true )
+        {
+            $isUpdate = false;
+        }
+        if(empty($this->date_modified) || $this->update_date_modified)
+        {
+            $this->date_modified = $GLOBALS['timedate']->nowDb();
+        }
 
         $this->_checkOptimisticLocking($action, $isUpdate);
 
@@ -1483,10 +1483,10 @@ 
         }
 
 
-		/* BEGIN - SECURITY GROUPS - inheritance */ 
-		require_once('modules/SecurityGroups/SecurityGroup.php');
-		SecurityGroup::inherit($this,$isUpdate);
-		/* END - SECURITY GROUPS */ 
+        /* BEGIN - SECURITY GROUPS - inheritance */ 
+        require_once('modules/SecurityGroups/SecurityGroup.php');
+        SecurityGroup::inherit($this,$isUpdate);
+        /* END - SECURITY GROUPS */ 
         //If we aren't in setup mode and we have a current user and module, then we track
         if(isset($GLOBALS['current_user']) && isset($this->module_dir))
         {
@@ -1527,8 +1527,8 @@ 
     }
 
     /**
-    * Determines which users receive a notification
-    */
+     * Determines which users receive a notification
+     */
     function get_notification_recipients() {
         $notify_user = new User();
         $notify_user->retrieve($this->assigned_user_id);
@@ -1545,11 +1545,11 @@ 
     }
 
     /**
-    * Handles sending out email notifications when items are first assigned to users
-    *
-    * @param string $notify_user user to notify
-    * @param string $admin the admin user that sends out the notification
-    */
+     * Handles sending out email notifications when items are first assigned to users
+     *
+     * @param string $notify_user user to notify
+     * @param string $admin the admin user that sends out the notification
+     */
     function send_assignment_notifications($notify_user, $admin)
     {
         global $current_user;
@@ -1580,7 +1580,7 @@ 
                 $notify_mail->FromName = $from_name;
             }
 
-           $oe = new OutboundEmail();
+            $oe = new OutboundEmail();
             $oe = $oe->getUserMailerSettings($current_user);
             //only send if smtp server is defined
             if($sendEmail){
@@ -1616,9 +1616,9 @@ 
     }
 
     /**
-    * This function handles create the email notifications email.
-    * @param string $notify_user the user to send the notification email to
-    */
+     * This function handles create the email notifications email.
+     * @param string $notify_user the user to send the notification email to
+     */
     function create_notification_email($notify_user) {
         global $sugar_version;
         global $sugar_config;
@@ -2027,104 +2027,104 @@ 
     }
 
     /**
-    * This function retrieves a record of the appropriate type from the DB.
-    * It fills in all of the fields from the DB into the object it was called on.
-    *
-    * @param $id - If ID is specified, it overrides the current value of $this->id.  If not specified the current value of $this->id will be used.
-    * @return this - The object that it was called apon or null if exactly 1 record was not found.
-    *
-	*/
-
-	function check_date_relationships_load()
-	{
-		global $disable_date_format;
-		global $timedate;
-		if (empty($timedate))
-			$timedate=TimeDate::getInstance();
-
-		if(empty($this->field_defs))
-		{
-			return;
-		}
-		foreach($this->field_defs as $fieldDef)
-		{
-			$field = $fieldDef['name'];
-			if(!isset($this->processed_dates_times[$field]))
-			{
-				$this->processed_dates_times[$field] = '1';
-				if(empty($this->$field)) continue;
-				if($field == 'date_modified' || $field == 'date_entered')
-				{
-					$this->$field = $this->db->fromConvert($this->$field, 'datetime');
-					if(empty($disable_date_format)) {
-						$this->$field = $timedate->to_display_date_time($this->$field);
-					}
-				}
-				elseif(isset($this->field_name_map[$field]['type']))
-				{
-					$type = $this->field_name_map[$field]['type'];
-
-					if($type == 'relate'  && isset($this->field_name_map[$field]['custom_module']))
-					{
-						$type = $this->field_name_map[$field]['type'];
-					}
-
-					if($type == 'date')
-					{
-						if($this->$field == '0000-00-00')
-						{
-							$this->$field = '';
-						} elseif(!empty($this->field_name_map[$field]['rel_field']))
-						{
-							$rel_field = $this->field_name_map[$field]['rel_field'];
-
-							if(!empty($this->$rel_field))
-							{
-								if(empty($disable_date_format)) {
-									$mergetime = $timedate->merge_date_time($this->$field,$this->$rel_field);
-									$this->$field = $timedate->to_display_date($mergetime);
-									$this->$rel_field = $timedate->to_display_time($mergetime);
-								}
-							}
-						}
-						else
-						{
-							if(empty($disable_date_format)) {
-								$this->$field = $timedate->to_display_date($this->$field, false);
-							}
-						}
-					} elseif($type == 'datetime' || $type == 'datetimecombo')
-					{
-						if($this->$field == '0000-00-00 00:00:00')
-						{
-							$this->$field = '';
-						}
-						else
-						{
-							if(empty($disable_date_format)) {
-								$this->$field = $timedate->to_display_date_time($this->$field, true, true);
-							}
-						}
-					} elseif($type == 'time')
-					{
-						if($this->$field == '00:00:00')
-						{
-							$this->$field = '';
-						} else
-						{
-							//$this->$field = from_db_convert($this->$field, 'time');
-							if(empty($this->field_name_map[$field]['rel_field']) && empty($disable_date_format))
-							{
-								$this->$field = $timedate->to_display_time($this->$field,true, false);
-							}
-						}
-					} elseif($type == 'encrypt' && empty($disable_date_format)){
-						$this->$field = $this->decrypt_after_retrieve($this->$field);
-					}
-				}
-			}
-		}
-	}
+     * This function retrieves a record of the appropriate type from the DB.
+     * It fills in all of the fields from the DB into the object it was called on.
+     *
+     * @param $id - If ID is specified, it overrides the current value of $this->id.  If not specified the current value of $this->id will be used.
+     * @return this - The object that it was called apon or null if exactly 1 record was not found.
+     *
+     */
+
+    function check_date_relationships_load()
+    {
+        global $disable_date_format;
+        global $timedate;
+        if (empty($timedate))
+            $timedate=TimeDate::getInstance();
+
+        if(empty($this->field_defs))
+        {
+            return;
+        }
+        foreach($this->field_defs as $fieldDef)
+        {
+            $field = $fieldDef['name'];
+            if(!isset($this->processed_dates_times[$field]))
+            {
+                $this->processed_dates_times[$field] = '1';
+                if(empty($this->$field)) continue;
+                if($field == 'date_modified' || $field == 'date_entered')
+                {
+                    $this->$field = $this->db->fromConvert($this->$field, 'datetime');
+                    if(empty($disable_date_format)) {
+                        $this->$field = $timedate->to_display_date_time($this->$field);
+                    }
+                }
+                elseif(isset($this->field_name_map[$field]['type']))
+                {
+                    $type = $this->field_name_map[$field]['type'];
+
+                    if($type == 'relate'  && isset($this->field_name_map[$field]['custom_module']))
+                    {
+                        $type = $this->field_name_map[$field]['type'];
+                    }
+
+                    if($type == 'date')
+                    {
+                        if($this->$field == '0000-00-00')
+                        {
+                            $this->$field = '';
+                        } elseif(!empty($this->field_name_map[$field]['rel_field']))
+                        {
+                            $rel_field = $this->field_name_map[$field]['rel_field'];
+
+                            if(!empty($this->$rel_field))
+                            {
+                                if(empty($disable_date_format)) {
+                                    $mergetime = $timedate->merge_date_time($this->$field,$this->$rel_field);
+                                    $this->$field = $timedate->to_display_date($mergetime);
+                                    $this->$rel_field = $timedate->to_display_time($mergetime);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if(empty($disable_date_format)) {
+                                $this->$field = $timedate->to_display_date($this->$field, false);
+                            }
+                        }
+                    } elseif($type == 'datetime' || $type == 'datetimecombo')
+                    {
+                        if($this->$field == '0000-00-00 00:00:00')
+                        {
+                            $this->$field = '';
+                        }
+                        else
+                        {
+                            if(empty($disable_date_format)) {
+                                $this->$field = $timedate->to_display_date_time($this->$field, true, true);
+                            }
+                        }
+                    } elseif($type == 'time')
+                    {
+                        if($this->$field == '00:00:00')
+                        {
+                            $this->$field = '';
+                        } else
+                        {
+                            //$this->$field = from_db_convert($this->$field, 'time');
+                            if(empty($this->field_name_map[$field]['rel_field']) && empty($disable_date_format))
+                            {
+                                $this->$field = $timedate->to_display_time($this->$field,true, false);
+                            }
+                        }
+                    } elseif($type == 'encrypt' && empty($disable_date_format)){
+                        $this->$field = $this->decrypt_after_retrieve($this->$field);
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * This function processes the fields before save.
@@ -2136,21 +2136,21 @@ 
     }
 
     /**
-    * Removes formatting from values posted from the user interface.
+     * Removes formatting from values posted from the user interface.
      * It only unformats numbers.  Function relies on user/system prefernce for format strings.
      *
      * Internal Function, do not override.
-    */
+     */
     function unformat_all_fields()
     {
         $GLOBALS['log']->deprecated('SugarBean.php: unformat_all_fields() is deprecated');
     }
 
     /**
-    * This functions adds formatting to all number fields before presenting them to user interface.
+     * This functions adds formatting to all number fields before presenting them to user interface.
      *
      * Internal function, do not override.
-    */
+     */
     function format_all_fields()
     {
         $GLOBALS['log']->deprecated('SugarBean.php: format_all_fields() is deprecated');
@@ -2190,8 +2190,8 @@ 
                 case 'datetimecombo':
                     if(empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
-                    	$this->$field = '';
-                    	break;
+                        $this->$field = '';
+                        break;
                     }
                     if ( ! preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/',$this->$field) ) {
                         // This appears to be formatted in user date/time
@@ -2202,8 +2202,8 @@ 
                 case 'date':
                     if(empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
-                    	$this->$field = '';
-                    	break;
+                        $this->$field = '';
+                        break;
                     }
                     if ( ! preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/',$this->$field) ) {
                         // This date appears to be formatted in the user's format
@@ -2214,8 +2214,8 @@ 
                 case 'time':
                     if(empty($this->$field)) break;
                     if ($this->$field == 'NULL') {
-                    	$this->$field = '';
-                    	break;
+                        $this->$field = '';
+                        break;
                     }
                     if ( preg_match('/(am|pm)/i',$this->$field) ) {
                         // This time appears to be formatted in the user's format
@@ -2235,7 +2235,7 @@ 
                         $reformatted = true;
                     }
                     break;
-               case 'uint':
+                case 'uint':
                case 'ulong':
                case 'long':
                case 'short':
@@ -2248,21 +2248,21 @@ 
                         $this->$field = (int)unformat_number($this->$field);
                         $reformatted = true;
                     }
-                   break;
-               case 'bool':
+                    break;
+                case 'bool':
                    if (empty($this->$field)) {
-                       $this->$field = false;
-                   } else if(true === $this->$field || 1 == $this->$field) {
-                       $this->$field = true;
-                   } else if(in_array(strval($this->$field), $boolean_false_values)) {
-                       $this->$field = false;
-                       $reformatted = true;
-                   } else {
-                       $this->$field = true;
-                       $reformatted = true;
-                   }
-                   break;
-               case 'encrypt':
+                        $this->$field = false;
+                    } else if(true === $this->$field || 1 == $this->$field) {
+                        $this->$field = true;
+                    } else if(in_array(strval($this->$field), $boolean_false_values)) {
+                        $this->$field = false;
+                        $reformatted = true;
+                    } else {
+                        $this->$field = true;
+                        $reformatted = true;
+                    }
+                    break;
+                case 'encrypt':
                     $this->$field = $this->encrpyt_before_save($this->$field);
                     break;
             }
@@ -2284,7 +2284,7 @@ 
      * @param boolean $deleted Optional, default true, if set to false deleted filter will not be added.
      *
      * Internal function, do not override.
-    */
+     */
     function retrieve($id = -1, $encode=true,$deleted=true)
     {
 
@@ -2340,18 +2340,18 @@ 
             $this->custom_fields->fill_relationships();
         }
 
-		$this->is_updated_dependent_fields = false;
+        $this->is_updated_dependent_fields = false;
         $this->fill_in_additional_detail_fields();
         $this->fill_in_relationship_fields();
 // save related fields values for audit
-         foreach ($this->get_related_fields() as $rel_field_name)
-         {
-             $field_name = $rel_field_name['name'];
-             if (! empty($this->$field_name))
-             {
-                 $this->fetched_rel_row[$rel_field_name['name']] = $this->$field_name;
-             }
-         }
+            foreach ($this->get_related_fields() as $rel_field_name)
+            {
+                $field_name = $rel_field_name['name'];
+                if (! empty($this->$field_name))
+                {
+                    $this->fetched_rel_row[$rel_field_name['name']] = $this->$field_name;
+                }
+            }
         //make a copy of fields in the relationship_fields array. These field values will be used to
         //clear relationship.
         foreach ( $this->field_defs as $key => $def )
@@ -2364,7 +2364,7 @@ 
                 }
                 else
                     $this->rel_fields_before_value[$key]=null;
-           }
+            }
         }
         if (isset($this->relationship_fields) && is_array($this->relationship_fields))
         {
@@ -2419,14 +2419,14 @@ 
 
 
     /**
-    * Add any required joins to the list count query.  The joins are required if there
-    * is a field in the $where clause that needs to be joined.
-    *
-    * @param string $query
-    * @param string $where
-    *
-    * Internal Function, do Not override.
-    */
+     * Add any required joins to the list count query.  The joins are required if there
+     * is a field in the $where clause that needs to be joined.
+     *
+     * @param string $query
+     * @param string $where
+     *
+     * Internal Function, do Not override.
+     */
     function add_list_count_joins(&$query, $where)
     {
         $custom_join = $this->getCustomJoin();
@@ -2435,15 +2435,15 @@ 
     }
 
     /**
-    * Changes the select expression of the given query to be 'count(*)' so you
-    * can get the number of items the query will return.  This is used to
-    * populate the upper limit on ListViews.
+     * Changes the select expression of the given query to be 'count(*)' so you
+     * can get the number of items the query will return.  This is used to
+     * populate the upper limit on ListViews.
      *
      * @param string $query Select query string
      * @return string count query
      *
      * Internal function, do not override.
-    */
+     */
     function create_list_count_query($query)
     {
         // remove the 'order by' clause which is expected to be at the end of the query
@@ -2496,21 +2496,21 @@ 
     }
 
     /**
-    * This function returns a paged list of the current object type.  It is intended to allow for
-    * hopping back and forth through pages of data.  It only retrieves what is on the current page.
-    *
-    * @internal This method must be called on a new instance.  It trashes the values of all the fields in the current one.
-    * @param string $order_by
-    * @param string $where Additional where clause
-    * @param int $row_offset Optaional,default 0, starting row number
-    * @param init $limit Optional, default -1
-    * @param int $max Optional, default -1
-    * @param boolean $show_deleted Optional, default 0, if set to 1 system will show deleted records.
-    * @return array Fetched data.
-    *
-    * Internal function, do not override.
-    *
-    */
+     * This function returns a paged list of the current object type.  It is intended to allow for
+     * hopping back and forth through pages of data.  It only retrieves what is on the current page.
+     *
+     * @internal This method must be called on a new instance.  It trashes the values of all the fields in the current one.
+     * @param string $order_by
+     * @param string $where Additional where clause
+     * @param int $row_offset Optaional,default 0, starting row number
+     * @param init $limit Optional, default -1
+     * @param int $max Optional, default -1
+     * @param boolean $show_deleted Optional, default 0, if set to 1 system will show deleted records.
+     * @return array Fetched data.
+     *
+     * Internal function, do not override.
+     *
+     */
     function get_list($order_by = "", $where = "", $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0, $singleSelect=false, $select_fields = array())
     {
         $GLOBALS['log']->debug("get_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
@@ -2540,15 +2540,15 @@ 
     }
 
     /**
-    * Prefixes column names with this bean's table name.
-    *
-    * @param string $order_by  Order by clause to be processed
-    * @param SugarBean $submodule name of the module this order by clause is for
-    * @param boolean $suppress_table_name Whether table name should be suppressed
-    * @return string Processed order by clause
-    *
-    * Internal function, do not override.
-    */
+     * Prefixes column names with this bean's table name.
+     *
+     * @param string $order_by  Order by clause to be processed
+     * @param SugarBean $submodule name of the module this order by clause is for
+     * @param boolean $suppress_table_name Whether table name should be suppressed
+     * @return string Processed order by clause
+     *
+     * Internal function, do not override.
+     */
     public function process_order_by($order_by, $submodule = null, $suppress_table_name = false)
     {
         if (empty($order_by))
@@ -2622,21 +2622,21 @@ 
 
 
     /**
-    * Returns a detail object like retrieving of the current object type.
-    *
-    * It is intended for use in navigation buttons on the DetailView.  It will pass an offset and limit argument to the sql query.
-    * @internal This method must be called on a new instance.  It overrides the values of all the fields in the current one.
-    *
-    * @param string $order_by
-    * @param string $where Additional where clause
-    * @param int $row_offset Optaional,default 0, starting row number
-    * @param init $limit Optional, default -1
-    * @param int $max Optional, default -1
-    * @param boolean $show_deleted Optioanl, default 0, if set to 1 system will show deleted records.
-    * @return array Fetched data.
-    *
-    * Internal function, do not override.
-    */
+     * Returns a detail object like retrieving of the current object type.
+     *
+     * It is intended for use in navigation buttons on the DetailView.  It will pass an offset and limit argument to the sql query.
+     * @internal This method must be called on a new instance.  It overrides the values of all the fields in the current one.
+     *
+     * @param string $order_by
+     * @param string $where Additional where clause
+     * @param int $row_offset Optaional,default 0, starting row number
+     * @param init $limit Optional, default -1
+     * @param int $max Optional, default -1
+     * @param boolean $show_deleted Optioanl, default 0, if set to 1 system will show deleted records.
+     * @return array Fetched data.
+     *
+     * Internal function, do not override.
+     */
     function get_detail($order_by = "", $where = "",  $offset = 0, $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0)
     {
         $GLOBALS['log']->debug("get_detail:  order_by = '$order_by' and where = '$where' and limit = '$limit' and offset = '$offset'");
@@ -2660,25 +2660,25 @@ 
             }
         }
 
-		/* BEGIN - SECURITY GROUPS */
-    	if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
-    	{
-			require_once('modules/SecurityGroups/SecurityGroup.php');
-    		global $current_user;
-    		$owner_where = $this->getOwnerWhere($current_user->id);
-    		$group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
-	    	if(!empty($owner_where)){
-				if(empty($where))
-	    		{
-	    			$where = " (".  $owner_where." or ".$group_where.") ";
-	    		} else {
-	    			$where .= " AND (".  $owner_where." or ".$group_where.") ";
-	    		}
-			} else {
-				$where .= ' AND '.  $group_where;
-			}
-    	}
-    	/* END - SECURITY GROUPS */
+        /* BEGIN - SECURITY GROUPS */
+        if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
+        {
+            require_once('modules/SecurityGroups/SecurityGroup.php');
+            global $current_user;
+            $owner_where = $this->getOwnerWhere($current_user->id);
+            $group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
+            if(!empty($owner_where)){
+                if(empty($where))
+                {
+                    $where = " (".  $owner_where." or ".$group_where.") ";
+                } else {
+                    $where .= " AND (".  $owner_where." or ".$group_where.") ";
+                }
+            } else {
+                $where .= ' AND '.  $group_where;
+            }
+        }
+        /* END - SECURITY GROUPS */
         $query = $this->create_new_list_query($order_by, $where,array(),array(), $show_deleted, $offset);
 
         //Add Limit and Offset to query
@@ -2688,16 +2688,16 @@ 
     }
 
     /**
-    * Fetches data from all related tables.
-    *
-    * @param object $child_seed
-    * @param string $related_field_name relation to fetch data for
-    * @param string $order_by Optional, default empty
-    * @param string $where Optional, additional where clause
-    * @return array Fetched data.
-    *
-    * Internal function, do not override.
-    */
+     * Fetches data from all related tables.
+     *
+     * @param object $child_seed
+     * @param string $related_field_name relation to fetch data for
+     * @param string $order_by Optional, default empty
+     * @param string $where Optional, additional where clause
+     * @return array Fetched data.
+     *
+     * Internal function, do not override.
+     */
     function get_related_list($child_seed,$related_field_name, $order_by = "", $where = "",
     $row_offset = 0, $limit=-1, $max=-1, $show_deleted = 0)
     {
@@ -3073,13 +3073,13 @@ 
 
 
     /**
-    * Returns a full (ie non-paged) list of the current object type.
-    *
-    * @param string $order_by the order by SQL parameter. defaults to ""
-    * @param string $where where clause. defaults to ""
-    * @param boolean $check_dates. defaults to false
-    * @param int $show_deleted show deleted records. defaults to 0
-    */
+     * Returns a full (ie non-paged) list of the current object type.
+     *
+     * @param string $order_by the order by SQL parameter. defaults to ""
+     * @param string $where where clause. defaults to ""
+     * @param boolean $check_dates. defaults to false
+     * @param int $show_deleted show deleted records. defaults to 0
+     */
     function get_full_list($order_by = "", $where = "", $check_dates=false, $show_deleted = 0)
     {
         $GLOBALS['log']->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
@@ -3107,7 +3107,7 @@ 
      * @param boolean $singleSelect Optional, default false.
      * @return String select query string, optionally an array value will be returned if $return_array= true.
      */
-	function create_new_list_query($order_by, $where,$filter=array(),$params=array(), $show_deleted = 0,$join_type='', $return_array = false,$parentbean=null, $singleSelect = false, $ifListForExport = false)
+    function create_new_list_query($order_by, $where,$filter=array(),$params=array(), $show_deleted = 0,$join_type='', $return_array = false,$parentbean=null, $singleSelect = false, $ifListForExport = false)
     {
         global $beanFiles, $beanList;
         $selectedFields = array();
@@ -3127,41 +3127,41 @@ 
                 $where .= ' AND '.  $owner_where;
             }
         }
-		/* BEGIN - SECURITY GROUPS */
-    	global $current_user, $sugar_config;
-    	if($this->module_dir == 'Users' && !is_admin($current_user)
-				&& isset($sugar_config['securitysuite_filter_user_list'])
-				&& $sugar_config['securitysuite_filter_user_list'] == true
-    	) {
-			require_once('modules/SecurityGroups/SecurityGroup.php');
-    		global $current_user;
-    		$group_where = SecurityGroup::getGroupUsersWhere($current_user->id);
-    		//$group_where = "user_name = 'admin'";
-    		if(empty($where))
-    		{
-    			$where = " (".$group_where.") ";
-    		} else {
-    			$where .= " AND (".$group_where.") ";
-    		}
-    	} else
-    	if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
-    	{
-			require_once('modules/SecurityGroups/SecurityGroup.php');
-    		global $current_user;
-    		$owner_where = $this->getOwnerWhere($current_user->id);
-    		$group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
-	    	if(!empty($owner_where)){
-				if(empty($where))
-	    		{
-	    			$where = " (".  $owner_where." or ".$group_where.") ";
-	    		} else {
-	    			$where .= " AND (".  $owner_where." or ".$group_where.") ";
-	    		}
-			} else {
-				$where .= ' AND '.  $group_where;
-			}
-    	}
-    	/* END - SECURITY GROUPS */
+        /* BEGIN - SECURITY GROUPS */
+        global $current_user, $sugar_config;
+        if($this->module_dir == 'Users' && !is_admin($current_user)
+                && isset($sugar_config['securitysuite_filter_user_list'])
+                && $sugar_config['securitysuite_filter_user_list'] == true
+        ) {
+            require_once('modules/SecurityGroups/SecurityGroup.php');
+            global $current_user;
+            $group_where = SecurityGroup::getGroupUsersWhere($current_user->id);
+            //$group_where = "user_name = 'admin'";
+            if(empty($where))
+            {
+                $where = " (".$group_where.") ";
+            } else {
+                $where .= " AND (".$group_where.") ";
+            }
+        } else
+        if($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list') )
+        {
+            require_once('modules/SecurityGroups/SecurityGroup.php');
+            global $current_user;
+            $owner_where = $this->getOwnerWhere($current_user->id);
+            $group_where = SecurityGroup::getGroupWhere($this->table_name,$this->module_dir,$current_user->id);
+            if(!empty($owner_where)){
+                if(empty($where))
+                {
+                    $where = " (".  $owner_where." or ".$group_where.") ";
+                } else {
+                    $where .= " AND (".  $owner_where." or ".$group_where.") ";
+                }
+            } else {
+                $where .= ' AND '.  $group_where;
+            }
+        }
+        /* END - SECURITY GROUPS */
         if(!empty($params['distinct']))
         {
             $distinct = ' DISTINCT ';
@@ -3247,24 +3247,24 @@ 
 
         $used_join_key = array();
 
-	//walk through the fields and for every relationship field add their relationship_info field
-	//relationshipfield-aliases are resolved in SugarBean::create_new_list_query through their relationship_info field
-	$addrelate = array();
-	foreach($fields as $field=>$value)
-	{
-		if (isset($this->field_defs[$field]) && isset($this->field_defs[$field]['source']) && 
-			$this->field_defs[$field]['source'] == 'non-db')
-		{
-			$addrelatefield = $this->get_relationship_field($field);
-			if ($addrelatefield)
-				$addrelate[$addrelatefield] = true;
-		}
-		if(!empty($this->field_defs[$field]['id_name'])){
-			$addrelate[$this->field_defs[$field]['id_name']] = true;
-		}
-	}
-
-	$fields = array_merge($addrelate, $fields);
+    //walk through the fields and for every relationship field add their relationship_info field
+    //relationshipfield-aliases are resolved in SugarBean::create_new_list_query through their relationship_info field
+    $addrelate = array();
+    foreach($fields as $field=>$value)
+    {
+        if (isset($this->field_defs[$field]) && isset($this->field_defs[$field]['source']) && 
+            $this->field_defs[$field]['source'] == 'non-db')
+        {
+            $addrelatefield = $this->get_relationship_field($field);
+            if ($addrelatefield)
+                $addrelate[$addrelatefield] = true;
+        }
+        if(!empty($this->field_defs[$field]['id_name'])){
+            $addrelate[$this->field_defs[$field]['id_name']] = true;
+        }
+    }
+
+    $fields = array_merge($addrelate, $fields);
 
         foreach($fields as $field=>$value)
         {
@@ -3297,7 +3297,7 @@ 
             //in opportunities module remove the contact_role/opportunity_role field.
             if (isset($data['relationship_fields']) and !empty($data['relationship_fields']))
             {
-		$process_field = false;
+        $process_field = false;
                 foreach ($data['relationship_fields'] as $field_name)
                 {
                     if (isset($fields[$field_name]))
@@ -3307,8 +3307,8 @@ 
                     }
                 }
 		
-            	if (!$process_field)
-                	continue;
+                if (!$process_field)
+                    continue;
             }
 
             if(  (!isset($data['source']) || $data['source'] == 'db') && (!empty($alias) || !empty($filter) ))
@@ -3416,27 +3416,27 @@ 
                     $rel_module = $this->$linkField->getRelatedModuleName();
                     $table_joined = !empty($joined_tables[$params['join_table_alias']]) || (!empty($joined_tables[$params['join_table_link_alias']]) && isset($data['link_type']) && $data['link_type'] == 'relationship_info');
 
-					//if rname is set to 'name', and bean files exist, then check if field should be a concatenated name
-					global $beanFiles, $beanList;
+                    //if rname is set to 'name', and bean files exist, then check if field should be a concatenated name
+                    global $beanFiles, $beanList;
                     // °3/21/2014 FIX NS-TEAM - Relationship fields could not be displayed in subpanels
                     //if($data['rname'] && !empty($beanFiles[$beanList[$rel_module]])) {
                     if(isset($data['rname']) && $data['rname'] == 'name' && !empty($beanFiles[$beanList[$rel_module]])) {
 
-						//create an instance of the related bean
-						require_once($beanFiles[$beanList[$rel_module]]);
-						$rel_mod = new $beanList[$rel_module]();
-						//if bean has first and last name fields, then name should be concatenated
-						if(isset($rel_mod->field_name_map['first_name']) && isset($rel_mod->field_name_map['last_name'])){
-								$data['db_concat_fields'] = array(0=>'first_name', 1=>'last_name');
-						}
-					}
+                        //create an instance of the related bean
+                        require_once($beanFiles[$beanList[$rel_module]]);
+                        $rel_mod = new $beanList[$rel_module]();
+                        //if bean has first and last name fields, then name should be concatenated
+                        if(isset($rel_mod->field_name_map['first_name']) && isset($rel_mod->field_name_map['last_name'])){
+                                $data['db_concat_fields'] = array(0=>'first_name', 1=>'last_name');
+                        }
+                    }
 
 
-    				if($join['type'] == 'many-to-many')
-    				{
-    					if(empty($ret_array['secondary_select']))
-    					{
-    						$ret_array['secondary_select'] = " SELECT $this->table_name.id ref_id  ";
+                    if($join['type'] == 'many-to-many')
+                    {
+                        if(empty($ret_array['secondary_select']))
+                        {
+                            $ret_array['secondary_select'] = " SELECT $this->table_name.id ref_id  ";
 
                             if(!empty($beanFiles[$beanList[$rel_module]]) && $join_primary)
                             {
@@ -3548,42 +3548,42 @@ 
                     // and this code changes accounts to jt4 as there is a self join with the accounts table.
                     //Martin fix #27494
                     if(isset($data['db_concat_fields'])){
-                    	$buildWhere = false;
+                        $buildWhere = false;
                         if(in_array('first_name', $data['db_concat_fields']) && in_array('last_name', $data['db_concat_fields']))
-                    	{
-                     	   $exp = '/\(\s*?'.$data['name'].'.*?\%\'\s*?\)/';
-                    	   if(preg_match($exp, $where, $matches))
-                    	   {
-                    	   	  $search_expression = $matches[0];
-                    	   	  //Create three search conditions - first + last, first, last
-                    	   	  $first_name_search = str_replace($data['name'], $params['join_table_alias'] . '.first_name', $search_expression);
-                    	   	  $last_name_search = str_replace($data['name'], $params['join_table_alias'] . '.last_name', $search_expression);
-							  $full_name_search = str_replace($data['name'], $this->db->concat($params['join_table_alias'], $data['db_concat_fields']), $search_expression);
-							  $buildWhere = true;
-							  $where = str_replace($search_expression, '(' . $full_name_search . ' OR ' . $first_name_search . ' OR ' . $last_name_search . ')', $where);
-                    	   }
-                    	}
-
-                    	if(!$buildWhere)
-                    	{
-	                       $db_field = $this->db->concat($params['join_table_alias'], $data['db_concat_fields']);
-	                       $where = preg_replace('/'.$data['name'].'/', $db_field, $where);
-
-				// For relationship fields replace their alias by the corresponsding link table and r_name
-				if(isset($data['relationship_fields']))
-					foreach($data['relationship_fields'] as $r_name=>$alias_name)
-					{
-						$db_field = $this->db->concat($params['join_table_link_alias'], $r_name);
-						$where = preg_replace('/' . $alias_name . '/', $db_field, $where);
-					}
-                    	}
+                        {
+                            $exp = '/\(\s*?'.$data['name'].'.*?\%\'\s*?\)/';
+                            if(preg_match($exp, $where, $matches))
+                            {
+                                    $search_expression = $matches[0];
+                                    //Create three search conditions - first + last, first, last
+                                    $first_name_search = str_replace($data['name'], $params['join_table_alias'] . '.first_name', $search_expression);
+                                    $last_name_search = str_replace($data['name'], $params['join_table_alias'] . '.last_name', $search_expression);
+                                $full_name_search = str_replace($data['name'], $this->db->concat($params['join_table_alias'], $data['db_concat_fields']), $search_expression);
+                                $buildWhere = true;
+                                $where = str_replace($search_expression, '(' . $full_name_search . ' OR ' . $first_name_search . ' OR ' . $last_name_search . ')', $where);
+                            }
+                        }
+
+                        if(!$buildWhere)
+                        {
+                            $db_field = $this->db->concat($params['join_table_alias'], $data['db_concat_fields']);
+                            $where = preg_replace('/'.$data['name'].'/', $db_field, $where);
+
+                // For relationship fields replace their alias by the corresponsding link table and r_name
+                if(isset($data['relationship_fields']))
+                    foreach($data['relationship_fields'] as $r_name=>$alias_name)
+                    {
+                        $db_field = $this->db->concat($params['join_table_link_alias'], $r_name);
+                        $where = preg_replace('/' . $alias_name . '/', $db_field, $where);
+                    }
+                        }
                     }else{
                         $where = preg_replace('/(^|[\s(])' . $data['name'] . '/', '${1}' . $params['join_table_alias'] . '.'.$data['rname'], $where);
 
-			// For relationship fields replace their alias by the corresponsding link table and r_name
-			if(isset($data['relationship_fields']))
-				foreach($data['relationship_fields'] as $r_name=>$alias_name)
-					$where = preg_replace('/(^|[\s(])' . $alias_name . '/', '${1}' . $params['join_table_link_alias'] . '.'.$r_name, $where);
+            // For relationship fields replace their alias by the corresponsding link table and r_name
+            if(isset($data['relationship_fields']))
+                foreach($data['relationship_fields'] as $r_name=>$alias_name)
+                    $where = preg_replace('/(^|[\s(])' . $alias_name . '/', '${1}' . $params['join_table_link_alias'] . '.'.$r_name, $where);
                     }
                     if(!$table_joined)
                     {
@@ -3612,12 +3612,12 @@ 
 
         }
 
-	if ($ifListForExport) {
-		if(isset($this->field_defs['email1'])) {
-			$ret_array['select'].= " ,email_addresses.email_address email1";
-			$ret_array['from'].= " LEFT JOIN email_addr_bean_rel on {$this->table_name}.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='{$this->module_dir}' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1 LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id ";
-		}
-	}
+    if ($ifListForExport) {
+        if(isset($this->field_defs['email1'])) {
+            $ret_array['select'].= " ,email_addresses.email_address email1";
+            $ret_array['from'].= " LEFT JOIN email_addr_bean_rel on {$this->table_name}.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='{$this->module_dir}' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1 LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id ";
+        }
+    }
 
         $where_auto = '1=1';
         if($show_deleted == 0)
@@ -3652,20 +3652,20 @@ 
         return  $ret_array['select'] . $ret_array['from'] . $ret_array['where']. $ret_array['order_by'];
     }
 
-	// Check if field is defined through a relationship_info field, add this field when not present 
-	function get_relationship_field($field)
-	{
-		foreach ($this->field_defs as $field_def => $value)
-		{
-			if (isset($value['relationship_fields']) && 
-				in_array($field, $value['relationship_fields']) &&
+    // Check if field is defined through a relationship_info field, add this field when not present 
+    function get_relationship_field($field)
+    {
+        foreach ($this->field_defs as $field_def => $value)
+        {
+            if (isset($value['relationship_fields']) && 
+                in_array($field, $value['relationship_fields']) &&
                 (!isset($value['link_type']) || $value['link_type'] != 'relationship_info')
             )
-				return $field_def;
-		}
+                return $field_def;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * Returns parent record data for objects that store relationship information
@@ -3772,8 +3772,8 @@ 
         global $sugar_config;
         $db = DBManagerFactory::getInstance('listviews');
         /**
-        * if the row_offset is set to 'end' go to the end of the list
-        */
+         * if the row_offset is set to 'end' go to the end of the list
+         */
         $toEnd = strval($row_offset) == 'end';
         $GLOBALS['log']->debug("process_list_query: ".$query);
         if($max_per_page == -1)
@@ -3901,13 +3901,13 @@ 
     }
 
     /**
-    * Returns the number of rows that the given SQL query should produce
+     * Returns the number of rows that the given SQL query should produce
      *
      * Internal function, do not override.
      * @param string $query valid select  query
      * @param boolean $is_count_query Optional, Default false, set to true if passed query is a count query.
      * @return int count of rows found
-    */
+     */
     function _get_num_rows_in_query($query, $is_count_query=false)
     {
         $num_rows_in_query = 0;
@@ -3949,8 +3949,8 @@ 
     {
         $db = DBManagerFactory::getInstance('listviews');
         /**
-        * if the row_offset is set to 'end' go to the end of the list
-        */
+         * if the row_offset is set to 'end' go to the end of the list
+         */
         $toEnd = strval($row_offset) == 'end';
         global $sugar_config;
         $use_count_query=false;
@@ -4188,7 +4188,7 @@ 
             }
             if(!empty($sugar_config['disable_count_query']) && !empty($limit))
             {
-            	//C.L. Bug 43535 - Use the $index value to set the $rows_found value here
+                //C.L. Bug 43535 - Use the $index value to set the $rows_found value here
                 $rows_found = isset($index) ? $index : $row_offset + count($list);
 
                 if(count($list) >= $limit)
@@ -4338,28 +4338,28 @@ 
     }
 
     /**
-    * Tracks the viewing of a detail record.
-    * This leverages get_summary_text() which is object specific.
-    *
-    * Internal function, do not override.
-    * @param string $user_id - String value of the user that is viewing the record.
-    * @param string $current_module - String value of the module being processed.
-    * @param string $current_view - String value of the current view
-	*/
-	function track_view($user_id, $current_module, $current_view='')
-	{
-	    $trackerManager = TrackerManager::getInstance();
-		if($monitor = $trackerManager->getMonitor('tracker')){
-	        $monitor->setValue('date_modified', $GLOBALS['timedate']->nowDb());
-	        $monitor->setValue('user_id', $user_id);
-	        $monitor->setValue('module_name', $current_module);
-	        $monitor->setValue('action', $current_view);
-	        $monitor->setValue('item_id', $this->id);
-	        $monitor->setValue('item_summary', $this->get_summary_text());
-	        $monitor->setValue('visible', $this->tracker_visibility);
-	        $trackerManager->saveMonitor($monitor);
-		}
-	}
+     * Tracks the viewing of a detail record.
+     * This leverages get_summary_text() which is object specific.
+     *
+     * Internal function, do not override.
+     * @param string $user_id - String value of the user that is viewing the record.
+     * @param string $current_module - String value of the module being processed.
+     * @param string $current_view - String value of the current view
+     */
+    function track_view($user_id, $current_module, $current_view='')
+    {
+        $trackerManager = TrackerManager::getInstance();
+        if($monitor = $trackerManager->getMonitor('tracker')){
+            $monitor->setValue('date_modified', $GLOBALS['timedate']->nowDb());
+            $monitor->setValue('user_id', $user_id);
+            $monitor->setValue('module_name', $current_module);
+            $monitor->setValue('action', $current_view);
+            $monitor->setValue('item_id', $this->id);
+            $monitor->setValue('item_summary', $this->get_summary_text());
+            $monitor->setValue('visible', $this->tracker_visibility);
+            $trackerManager->saveMonitor($monitor);
+        }
+    }
 
     /**
      * Returns the summary text that should show up in the recent history list for this object.
@@ -4372,12 +4372,12 @@ 
     }
 
     /**
-    * This is designed to be overridden and add specific fields to each record.
-    * This allows the generic query to fill in the major fields, and then targeted
-    * queries to get related fields and add them to the record.  The contact's
-    * account for instance.  This method is only used for populating extra fields
-    * in lists.
-    */
+     * This is designed to be overridden and add specific fields to each record.
+     * This allows the generic query to fill in the major fields, and then targeted
+     * queries to get related fields and add them to the record.  The contact's
+     * account for instance.  This method is only used for populating extra fields
+     * in lists.
+     */
     function fill_in_additional_list_fields(){
         if(!empty($this->field_defs['parent_name']) && empty($this->parent_name)){
             $this->fill_in_additional_parent_fields();
@@ -4385,12 +4385,12 @@ 
     }
 
     /**
-    * This is designed to be overridden and add specific fields to each record.
-    * This allows the generic query to fill in the major fields, and then targeted
-    * queries to get related fields and add them to the record.  The contact's
-    * account for instance.  This method is only used for populating extra fields
-    * in the detail form
-    */
+     * This is designed to be overridden and add specific fields to each record.
+     * This allows the generic query to fill in the major fields, and then targeted
+     * queries to get related fields and add them to the record.  The contact's
+     * account for instance.  This method is only used for populating extra fields
+     * in the detail form
+     */
     function fill_in_additional_detail_fields()
     {
         if(!empty($this->field_defs['assigned_user_name']) && !empty($this->assigned_user_id)){
@@ -4398,20 +4398,20 @@ 
             $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
 
         }
-		if(!empty($this->field_defs['created_by']) && !empty($this->created_by))
-		$this->created_by_name = get_assigned_user_name($this->created_by);
-		if(!empty($this->field_defs['modified_user_id']) && !empty($this->modified_user_id))
-		$this->modified_by_name = get_assigned_user_name($this->modified_user_id);
+        if(!empty($this->field_defs['created_by']) && !empty($this->created_by))
+        $this->created_by_name = get_assigned_user_name($this->created_by);
+        if(!empty($this->field_defs['modified_user_id']) && !empty($this->modified_user_id))
+        $this->modified_by_name = get_assigned_user_name($this->modified_user_id);
 
-		if(!empty($this->field_defs['parent_name'])){
-			$this->fill_in_additional_parent_fields();
-		}
+        if(!empty($this->field_defs['parent_name'])){
+            $this->fill_in_additional_parent_fields();
+        }
     }
 
     /**
-    * This is desgined to be overridden or called from extending bean. This method
-    * will fill in any parent_name fields.
-    */
+     * This is desgined to be overridden or called from extending bean. This method
+     * will fill in any parent_name fields.
+     */
     function fill_in_additional_parent_fields() {
 
         if(!empty($this->parent_id) && !empty($this->last_parent_id) && $this->last_parent_id == $this->parent_id){
@@ -4452,8 +4452,8 @@ 
     }
 
     /**
-    * Fill in fields where type = relate
-    */
+     * Fill in fields where type = relate
+     */
     function fill_in_relationship_fields(){
         global $fill_in_rel_depth;
         if(empty($fill_in_rel_depth) || $fill_in_rel_depth < 0)
@@ -4477,7 +4477,7 @@ 
 
                     if (empty($this->$id_name))
                     {
-                       $this->fill_in_link_field($id_name, $field);
+                        $this->fill_in_link_field($id_name, $field);
                     }
                     if(!empty($this->$id_name) && ( $this->object_name != $related_module || ( $this->object_name == $related_module && $this->$id_name != $this->id ))){
                         if(isset($GLOBALS['beanList'][ $related_module])){
@@ -4503,7 +4503,7 @@ 
                     if(!empty($this->$id_name) && isset($this->$name))
                     {
                         if(!isset($field['additionalFields']))
-                           $field['additionalFields'] = array();
+                            $field['additionalFields'] = array();
                         if(!empty($field['rname']))
                         {
                             $field['additionalFields'][$field['rname']]= $name;
@@ -4521,8 +4521,8 @@ 
     }
 
     /**
-    * This is a helper function that is used to quickly created indexes when creating tables.
-    */
+     * This is a helper function that is used to quickly created indexes when creating tables.
+     */
     function create_index($query)
     {
         $GLOBALS['log']->info("create_index: $query");
@@ -4534,21 +4534,21 @@ 
      * This function should be overridden in each module.  It marks an item as deleted.
      *
      * If it is not overridden, then marking this type of item is not allowed
-	 */
-	function mark_deleted($id)
-	{
-		global $current_user;
-		$date_modified = $GLOBALS['timedate']->nowDb();
+     */
+    function mark_deleted($id)
+    {
+        global $current_user;
+        $date_modified = $GLOBALS['timedate']->nowDb();
         $id = $this->db->quote($id);
-		if(isset($_SESSION['show_deleted']))
-		{
-			$this->mark_undeleted($id);
-		}
-		else
-		{
-			// call the custom business logic
-			$custom_logic_arguments['id'] = $id;
-			$this->call_custom_logic("before_delete", $custom_logic_arguments);
+        if(isset($_SESSION['show_deleted']))
+        {
+            $this->mark_undeleted($id);
+        }
+        else
+        {
+            // call the custom business logic
+            $custom_logic_arguments['id'] = $id;
+            $this->call_custom_logic("before_delete", $custom_logic_arguments);
             $this->deleted = 1;
             $this->mark_relationships_deleted($id);
             if ( isset($this->field_defs['modified_user_id']) ) {
@@ -4581,16 +4581,16 @@ 
      * Restores data deleted by call to mark_deleted() function.
      *
      * Internal function, do not override.
-    */
+     */
     function mark_undeleted($id)
     {
         // call the custom business logic
         $custom_logic_arguments['id'] = $id;
         $this->call_custom_logic("before_restore", $custom_logic_arguments);
 
-		$date_modified = $GLOBALS['timedate']->nowDb();
-		$query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='" . $this->db->quote($id) ."'";
-		$this->db->query($query, true,"Error marking record undeleted: ");
+        $date_modified = $GLOBALS['timedate']->nowDb();
+        $query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='" . $this->db->quote($id) ."'";
+        $this->db->query($query, true,"Error marking record undeleted: ");
 
         $this->restoreFiles();
 
@@ -4598,17 +4598,17 @@ 
         $this->call_custom_logic("after_restore", $custom_logic_arguments);
     }
 
-   /**
-    * This function deletes relationships to this object.  It should be overridden
-    * to handle the relationships of the specific object.
-    * This function is called when the item itself is being deleted.
-    *
-    * @param int $id id of the relationship to delete
-    */
-   function mark_relationships_deleted($id)
-   {
+    /**
+     * This function deletes relationships to this object.  It should be overridden
+     * to handle the relationships of the specific object.
+     * This function is called when the item itself is being deleted.
+     *
+     * @param int $id id of the relationship to delete
+     */
+    function mark_relationships_deleted($id)
+    {
     $this->delete_linked($id);
-   }
+    }
 
     /**
      * Returns path for files of bean or false on error
@@ -4788,16 +4788,16 @@ 
     }
 
     /**
-    * This function is used to execute the query and create an array template objects
-    * from the resulting ids from the query.
-    * It is currently used for building sub-panel arrays.
-    *
-    * @param string $query - the query that should be executed to build the list
-    * @param object $template - The object that should be used to copy the records.
-    * @param int $row_offset Optional, default 0
-    * @param int $limit Optional, default -1
-    * @return array
-    */
+     * This function is used to execute the query and create an array template objects
+     * from the resulting ids from the query.
+     * It is currently used for building sub-panel arrays.
+     *
+     * @param string $query - the query that should be executed to build the list
+     * @param object $template - The object that should be used to copy the records.
+     * @param int $row_offset Optional, default 0
+     * @param int $limit Optional, default -1
+     * @return array
+     */
     function build_related_list($query, &$template, $row_offset = 0, $limit = -1)
     {
         $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
@@ -4833,17 +4833,17 @@ 
         return $list;
     }
 
-  /**
-    * This function is used to execute the query and create an array template objects
-    * from the resulting ids from the query.
-    * It is currently used for building sub-panel arrays. It supports an additional
-    * where clause that is executed as a filter on the results
-    *
-    * @param string $query - the query that should be executed to build the list
-    * @param object $template - The object that should be used to copy the records.
-    */
-  function build_related_list_where($query, &$template, $where='', $in='', $order_by, $limit='', $row_offset = 0)
-  {
+    /**
+     * This function is used to execute the query and create an array template objects
+     * from the resulting ids from the query.
+     * It is currently used for building sub-panel arrays. It supports an additional
+     * where clause that is executed as a filter on the results
+     *
+     * @param string $query - the query that should be executed to build the list
+     * @param object $template - The object that should be used to copy the records.
+     */
+    function build_related_list_where($query, &$template, $where='', $in='', $order_by, $limit='', $row_offset = 0)
+    {
     $db = DBManagerFactory::getInstance('listviews');
     // No need to do an additional query
     $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
@@ -4904,7 +4904,7 @@ 
     }
 
     return $list;
-  }
+    }
 
     /**
      * Constructs an comma separated list of ids from passed query results.
@@ -4940,15 +4940,15 @@ 
     }
 
     /**
-    * Optionally copies values from fetched row into the bean.
-    *
-    * Internal function, do not override.
-    *
-    * @param string $query - the query that should be executed to build the list
-    * @param object $template - The object that should be used to copy the records
-    * @param array $field_list List of  fields.
-    * @return array
-    */
+     * Optionally copies values from fetched row into the bean.
+     *
+     * Internal function, do not override.
+     *
+     * @param string $query - the query that should be executed to build the list
+     * @param object $template - The object that should be used to copy the records
+     * @param array $field_list List of  fields.
+     * @return array
+     */
     function build_related_list2($query, &$template, &$field_list)
     {
         $GLOBALS['log']->debug("Finding linked values $this->object_name: ".$query);
@@ -5121,19 +5121,19 @@ 
         $row = $this->convertRow($row);
         $this->fetched_row = $row;
         $this->fromArray($row);
-		$this->is_updated_dependent_fields = false;
+        $this->is_updated_dependent_fields = false;
         $this->fill_in_additional_detail_fields();
         return $this;
     }
 
     /**
-    * This method is called during an import before inserting a bean
-    * Define an associative array called $special_fields
-    * the keys are user defined, and don't directly map to the bean's fields
-    * the value is the method name within that bean that will do extra
-    * processing for that field. example: 'full_name'=>'get_names_from_full_name'
-    *
-    */
+     * This method is called during an import before inserting a bean
+     * Define an associative array called $special_fields
+     * the keys are user defined, and don't directly map to the bean's fields
+     * the value is the method name within that bean that will do extra
+     * processing for that field. example: 'full_name'=>'get_names_from_full_name'
+     *
+     */
     function process_special_fields()
     {
         foreach ($this->special_functions as $func_name)
@@ -5267,8 +5267,8 @@ 
     {
         $where = '';
 
-		// make sure there is a date modified
-		$date_modified = $this->db->convert("'".$GLOBALS['timedate']->nowDb()."'", 'datetime');
+        // make sure there is a date modified
+        $date_modified = $this->db->convert("'".$GLOBALS['timedate']->nowDb()."'", 'datetime');
 
         $row=null;
         if($check_duplicates)
@@ -5345,30 +5345,30 @@ 
     }
 
     /**
-    * Trigger custom logic for this module that is defined for the provided hook
-    * The custom logic file is located under custom/modules/[CURRENT_MODULE]/logic_hooks.php.
-    * That file should define the $hook_version that should be used.
-    * It should also define the $hook_array.  The $hook_array will be a two dimensional array
-    * the first dimension is the name of the event, the second dimension is the information needed
-    * to fire the hook.  Each entry in the top level array should be defined on a single line to make it
-    * easier to automatically replace this file.  There should be no contents of this file that are not replacable.
-    *
-    * $hook_array['before_save'][] = Array(1, testtype, 'custom/modules/Leads/test12.php', 'TestClass', 'lead_before_save_1');
-    * This sample line creates a before_save hook.  The hooks are procesed in the order in which they
-    * are added to the array.  The second dimension is an array of:
-    *		processing index (for sorting before exporting the array)
-    *		A logic type hook
-    *		label/type
-    *		php file to include
-    *		php class the method is in
-    *		php method to call
-    *
-    * The method signature for version 1 hooks is:
-    * function NAME(&$bean, $event, $arguments)
-    * 		$bean - $this bean passed in by reference.
-    *		$event - The string for the current event (i.e. before_save)
-    * 		$arguments - An array of arguments that are specific to the event.
-    */
+     * Trigger custom logic for this module that is defined for the provided hook
+     * The custom logic file is located under custom/modules/[CURRENT_MODULE]/logic_hooks.php.
+     * That file should define the $hook_version that should be used.
+     * It should also define the $hook_array.  The $hook_array will be a two dimensional array
+     * the first dimension is the name of the event, the second dimension is the information needed
+     * to fire the hook.  Each entry in the top level array should be defined on a single line to make it
+     * easier to automatically replace this file.  There should be no contents of this file that are not replacable.
+     *
+     * $hook_array['before_save'][] = Array(1, testtype, 'custom/modules/Leads/test12.php', 'TestClass', 'lead_before_save_1');
+     * This sample line creates a before_save hook.  The hooks are procesed in the order in which they
+     * are added to the array.  The second dimension is an array of:
+     *		processing index (for sorting before exporting the array)
+     *		A logic type hook
+     *		label/type
+     *		php file to include
+     *		php class the method is in
+     *		php method to call
+     *
+     * The method signature for version 1 hooks is:
+     * function NAME(&$bean, $event, $arguments)
+     * 		$bean - $this bean passed in by reference.
+     *		$event - The string for the current event (i.e. before_save)
+     * 		$arguments - An array of arguments that are specific to the event.
+     */
     function call_custom_logic($event, $arguments = null)
     {
         if(!isset($this->processed) || $this->processed == false){
@@ -5432,14 +5432,14 @@ 
         return false;
     }
     /**
-    * Check whether the user has access to a particular view for the current bean/module
-    * @param $view string required, the view to determine access for i.e. DetailView, ListView...
-    * @param $is_owner bool optional, this is part of the ACL check if the current user is an owner they will receive different access
-    */
-	/* BEGIN - SECURITY GROUPS - aclaccess */  
-	/**
+     * Check whether the user has access to a particular view for the current bean/module
+     * @param $view string required, the view to determine access for i.e. DetailView, ListView...
+     * @param $is_owner bool optional, this is part of the ACL check if the current user is an owner they will receive different access
+     */
+    /* BEGIN - SECURITY GROUPS - aclaccess */  
+    /**
     function ACLAccess($view,$is_owner='not_set')
-	*/
+     */
     function ACLAccess($view,$is_owner='not_set',$in_group='not_set')
     {
         global $current_user;
@@ -5447,61 +5447,61 @@ 
             return true;
         }
         $not_set = false;
-		/**
+        /**
         if($is_owner == 'not_set')
-		*/
-    	if($is_owner === 'not_set') //eggsurplus: should be ===
+         */
+        if($is_owner === 'not_set') //eggsurplus: should be ===
         {
             $not_set = true;
             $is_owner = $this->isOwner($current_user->id);
         }
-		// DJM - OBS Customizations - May 2009
-		// Moved this code to convert to lowercase from below.
-		// Added new action variable.
-		$view = strtolower($view);
-		$action = '';
-		// DJM - OBS Customizations - END CHANGE
-    	if($in_group === 'not_set')
-    	{
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			// DJM - OBS Customizations - May 2009
-			// Added the following switch statement to convert the view
-			// into an action value.  As per the switch below.
-			// Added the action parameter to the groupHasAccess call.
-    			switch ($view)
-    			{
-    				case 'list':
-    				case 'index':
-    				case 'listview':
-    					$action = "list";
-					break;
-    				case 'edit':
-    				case 'save':
-		    		case 'popupeditview':
- 		   		case 'editview':
-  		  			$action = "edit";
-					break;
- 		   		case 'view':
- 		   		case 'detail':
- 		   		case 'detailview':
- 		   			$action = "view";
-					break;
- 		   		case 'delete':
- 		   			$action = "delete" ;
-					break;
- 		   		case 'export':
- 		   			$action = "export";
-					break;
- 		   		case 'import':
-  		  			$action = "import";
-					break;
-				default:
-					$action = "";
-					break;
-    			}
-			$in_group = SecurityGroup::groupHasAccess($this->module_dir,$this->id, $action); 
-			// DJM - OBS Customizations - END CHANGE
-    	}
+        // DJM - OBS Customizations - May 2009
+        // Moved this code to convert to lowercase from below.
+        // Added new action variable.
+        $view = strtolower($view);
+        $action = '';
+        // DJM - OBS Customizations - END CHANGE
+        if($in_group === 'not_set')
+        {
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            // DJM - OBS Customizations - May 2009
+            // Added the following switch statement to convert the view
+            // into an action value.  As per the switch below.
+            // Added the action parameter to the groupHasAccess call.
+                switch ($view)
+                {
+                    case 'list':
+                    case 'index':
+                    case 'listview':
+                        $action = "list";
+                    break;
+                    case 'edit':
+                    case 'save':
+                    case 'popupeditview':
+                    case 'editview':
+                        $action = "edit";
+                    break;
+                    case 'view':
+                    case 'detail':
+                    case 'detailview':
+                        $action = "view";
+                    break;
+                    case 'delete':
+                        $action = "delete" ;
+                    break;
+                    case 'export':
+                        $action = "export";
+                    break;
+                    case 'import':
+                        $action = "import";
+                    break;
+                default:
+                    $action = "";
+                    break;
+                }
+            $in_group = SecurityGroup::groupHasAccess($this->module_dir,$this->id, $action); 
+            // DJM - OBS Customizations - END CHANGE
+        }
         //if we don't implent acls return true
         if(!$this->bean_implements('ACL'))
         return true;
@@ -5511,10 +5511,10 @@ 
             case 'list':
             case 'index':
             case 'listview':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'list', true);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'list', true, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'list', true, $this->acltype, $in_group);
             case 'edit':
             case 'save':
                 if( !$is_owner && $not_set && !empty($this->id)){
@@ -5529,32 +5529,32 @@ 
                 }
             case 'popupeditview':
             case 'editview':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'edit', $is_owner, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'edit', $is_owner, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'edit', $is_owner, $this->acltype, $in_group);
             case 'view':
             case 'detail':
             case 'detailview':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'view', $is_owner, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'view', $is_owner, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'view', $is_owner, $this->acltype, $in_group);
             case 'delete':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'delete', $is_owner, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'delete', $is_owner, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'delete', $is_owner, $this->acltype, $in_group);
             case 'export':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'export', $is_owner, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'export', $is_owner, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'export', $is_owner, $this->acltype, $in_group);
             case 'import':
-				/**
+                /**
                 return ACLController::checkAccess($this->module_dir,'import', true, $this->acltype);
-				*/
-    			return ACLController::checkAccess($this->module_dir,'import', true, $this->acltype, $in_group);
+                 */
+                return ACLController::checkAccess($this->module_dir,'import', true, $this->acltype, $in_group);
         }
         //if it is not one of the above views then it should be implemented on the page level
         return true;
@@ -5562,10 +5562,10 @@ 
     /* END - SECURITY GROUPS */
 
     /**
-    * Get owner field
-    *
-    * @return STRING
-    */
+     * Get owner field
+     *
+     * @return STRING
+     */
     function getOwnerField($returnFieldName = false)
     {
         if (isset($this->field_defs['assigned_user_id']))
@@ -5582,11 +5582,11 @@ 
     }
 
     /**
-    * Returns true of false if the user_id passed is the owner
-    *
-    * @param GUID $user_id
-    * @return boolean
-    */
+     * Returns true of false if the user_id passed is the owner
+     *
+     * @param GUID $user_id
+     * @return boolean
+     */
     function isOwner($user_id)
     {
         //if we don't have an id we must be the owner as we are creating it
@@ -5615,11 +5615,11 @@ 
         return false;
     }
     /**
-    * Gets there where statement for checking if a user is an owner
-    *
-    * @param GUID $user_id
-    * @return STRING
-    */
+     * Gets there where statement for checking if a user is an owner
+     *
+     * @param GUID $user_id
+     * @return STRING
+     */
     function getOwnerWhere($user_id)
     {
         if(isset($this->field_defs['assigned_user_id']))
@@ -5634,12 +5634,12 @@ 
     }
 
     /**
-    *
-    * Used in order to manage ListView links and if they should
-    * links or not based on the ACL permissions of the user
-    *
-    * @return ARRAY of STRINGS
-    */
+     *
+     * Used in order to manage ListView links and if they should
+     * links or not based on the ACL permissions of the user
+     *
+     * @return ARRAY of STRINGS
+     */
     function listviewACLHelper()
     {
         $array_assign = array();
@@ -5655,10 +5655,10 @@ 
     }
 
     /**
-    * returns this bean as an array
-    *
-    * @return array of fields with id, name, access and category
-    */
+     * returns this bean as an array
+     *
+     * @return array of fields with id, name, access and category
+     */
     function toArray($dbOnly = false, $stringOnly = false, $upperKeys=false)
     {
         static $cache = array();
@@ -5688,10 +5688,10 @@ 
     }
 
     /**
-    * Converts an array into an acl mapping name value pairs into files
-    *
-    * @param Array $arr
-    */
+     * Converts an array into an acl mapping name value pairs into files
+     *
+     * @param Array $arr
+     */
     function fromArray($arr)
     {
         foreach($arr as $name=>$value)
@@ -5709,13 +5709,13 @@ 
     public function convertRow($row)
     {
         foreach($this->field_defs as $name => $fieldDef)
-		{
-		    // skip empty fields and non-db fields
+        {
+            // skip empty fields and non-db fields
             if (isset($name) && !empty($row[$name])) {
                 $row[$name] = $this->convertField($row[$name], $fieldDef);
             }
         }
-		return $row;
+        return $row;
     }
 
     /**
@@ -5763,18 +5763,18 @@ 
         return !empty($GLOBALS['dictionary'][$this->object_name]['custom_fields']);
     }
 
-   /**
-    * Ensure that fields within order by clauses are properly qualified with
-    * their tablename.  This qualification is a requirement for sql server support.
-    *
-    * @param string $order_by original order by from the query
-    * @param string $qualify prefix for columns in the order by list.
-    * @return  prefixed
-    *
-    * Internal function do not override.
-    */
-   function create_qualified_order_by( $order_by, $qualify)
-   {	// if the column is empty, but the sort order is defined, the value will throw an error, so do not proceed if no order by is given
+    /**
+     * Ensure that fields within order by clauses are properly qualified with
+     * their tablename.  This qualification is a requirement for sql server support.
+     *
+     * @param string $order_by original order by from the query
+     * @param string $qualify prefix for columns in the order by list.
+     * @return  prefixed
+     *
+     * Internal function do not override.
+     */
+    function create_qualified_order_by( $order_by, $qualify)
+    {	// if the column is empty, but the sort order is defined, the value will throw an error, so do not proceed if no order by is given
     if (empty($order_by))
     {
         return $order_by;
@@ -5789,17 +5789,17 @@ 
         $comma = ", ";
     }
     return $order_by_clause;
-   }
+    }
 
-   /**
-    * Combined the contents of street field 2 thru 4 into the main field
-    *
-    * @param string $street_field
-    */
+    /**
+     * Combined the contents of street field 2 thru 4 into the main field
+     *
+     * @param string $street_field
+     */
 
-   function add_address_streets(
-       $street_field
-       )
+    function add_address_streets(
+        $street_field
+        )
     {
         if (isset($this->$street_field)) {
             $street_field_2 = $street_field.'_2';
@@ -5853,9 +5853,9 @@ 
     }
 
     /**
-    * Moved from save() method, functionality is the same, but this is intended to handle
-    * Optimistic locking functionality.
-    */
+     * Moved from save() method, functionality is the same, but this is intended to handle
+     * Optimistic locking functionality.
+     */
     private function _checkOptimisticLocking($action, $isUpdate){
         if($this->optimistic_lock && !isset($_SESSION['o_lock_fs'])){
             if(isset($_SESSION['o_lock_id']) && $_SESSION['o_lock_id'] == $this->id && $_SESSION['o_lock_on'] == $this->object_name)
@@ -5894,8 +5894,8 @@ 
     }
 
     /**
-    * Send assignment notifications and invites for meetings and calls
-    */
+     * Send assignment notifications and invites for meetings and calls
+     */
     private function _sendNotifications($check_notify){
         if($check_notify || (isset($this->notify_inworkflow) && $this->notify_inworkflow == true) // cn: bug 5795 - no invites sent to Contacts, and also bug 25995, in workflow, it will set the notify_on_save=true.
            && !$this->isOwner($this->created_by) )  // cn: bug 42727 no need to send email to owner (within workflow)
@@ -5983,11 +5983,11 @@ 
         $result = sugar_cache_retrieve($cache_key);
         if(!empty($result))
         {
-        	// Use SugarCache::EXTERNAL_CACHE_NULL_VALUE to store null values in the cache.
-        	if($result == SugarCache::EXTERNAL_CACHE_NULL_VALUE)
-        	{
-        		return null;
-        	}
+            // Use SugarCache::EXTERNAL_CACHE_NULL_VALUE to store null values in the cache.
+            if($result == SugarCache::EXTERNAL_CACHE_NULL_VALUE)
+            {
+                return null;
+            }
 
             return $result;
         }
@@ -6004,7 +6004,7 @@ 
             if(empty($moduleDefs[$module]) || empty($moduleDefs[$module][$module][$key]))
             {
                 // It was not loaded....  Fail.  Cache null to prevent future repeats of this calculation
-				sugar_cache_put($cache_key, SugarCache::EXTERNAL_CACHE_NULL_VALUE);
+                sugar_cache_put($cache_key, SugarCache::EXTERNAL_CACHE_NULL_VALUE);
                 return  null;
             }
 
@@ -6015,8 +6015,8 @@ 
 
         // It was not loaded....  Fail.  Cache null to prevent future repeats of this calculation
         sugar_cache_put($cache_key, SugarCache::EXTERNAL_CACHE_NULL_VALUE);
-		return null;
-	}
+        return null;
+    }
 
     /**
      * Returns the ACL category for this module; defaults to the SugarBean::$acl_category if defined
@@ -6037,10 +6037,10 @@ 
      * @param string $where
      * @return string SQL query
      */
-	public function create_export_query($order_by, $where)
-	{
-		return $this->create_new_list_query($order_by, $where, array(), array(), 0, '', false, $this, true, true);
-	}
+    public function create_export_query($order_by, $where)
+    {
+        return $this->create_new_list_query($order_by, $where, array(), array(), 0, '', false, $this, true, true);
+    }
 
     /**
      * Determine whether the given field is a relate field

modules/Users/language/en_us.lang.php

Indentation +2 added lines, -2 removed lines

@@ -48,8 +48,8 @@
 $mod_strings = array (
     'LBL_DELETE_USER_CONFIRM'           => 'When the User record is deleted, the corresponding Employee record will also be deleted. After the user is deleted, any workflow definitions and reports involving the user might need to be updated.<br/><br/> Deleting a User record cannot be undone.',
 
-	'LBL_DELETE_GROUP_CONFIRM'          => 'Are you sure you want to delete this Group User? Click OK to delete the User record.<br/>After clicking OK, you will be given the ability to reassign records assigned to the Group User to another user.',
-	'LBL_DELETE_PORTAL_CONFIRM'         => 'Are you sure you want to delete this Portal API User? Click OK to delete the User record.',
+    'LBL_DELETE_GROUP_CONFIRM'          => 'Are you sure you want to delete this Group User? Click OK to delete the User record.<br/>After clicking OK, you will be given the ability to reassign records assigned to the Group User to another user.',
+    'LBL_DELETE_PORTAL_CONFIRM'         => 'Are you sure you want to delete this Portal API User? Click OK to delete the User record.',
 
 
     'LNK_IMPORT_USERS' => 'Import Users',

modules/ACLActions/ACLAction.php

Indentation +185 added lines, -185 removed lines

@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 /* BEGIN - SECURITY GROUPS */
 if(file_exists("modules/ACLActions/actiondefs.override.php")){
-	require_once("modules/ACLActions/actiondefs.override.php");
+    require_once("modules/ACLActions/actiondefs.override.php");
 } else {
 require_once('modules/ACLActions/actiondefs.php');
 }
@@ -55,12 +55,12 @@ 
     }
 
     /**
-    * static addActions($category, $type='module')
-    * Adds all default actions for a category/type
-    *
-    * @param STRING $category - the category (e.g module name - Accounts, Contacts)
-    * @param STRING $type - the type (e.g. 'module', 'field')
-    */
+     * static addActions($category, $type='module')
+     * Adds all default actions for a category/type
+     *
+     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
+     * @param STRING $type - the type (e.g. 'module', 'field')
+     */
     static function addActions($category, $type='module'){
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
@@ -91,12 +91,12 @@ 
     }
 
     /**
-    * static removeActions($category, $type='module')
-    * Removes all default actions for a category/type
-    *
-    * @param STRING $category - the category (e.g module name - Accounts, Contacts)
-    * @param STRING $type - the type (e.g. 'module', 'field')
-    */
+     * static removeActions($category, $type='module')
+     * Removes all default actions for a category/type
+     *
+     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
+     * @param STRING $type - the type (e.g. 'module', 'field')
+     */
     public static function removeActions($category, $type='module'){
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
@@ -118,13 +118,13 @@ 
     }
 
     /**
-    * static AccessColor($access)
-    *
-    * returns the color associated with an access level
-    * these colors exist in the definitions in modules/ACLActions/actiondefs.php
-    * @param INT $access - the access level you want the color for
-    * @return the color either name or hex representation or false if the level does not exist
-    */
+     * static AccessColor($access)
+     *
+     * returns the color associated with an access level
+     * these colors exist in the definitions in modules/ACLActions/actiondefs.php
+     * @param INT $access - the access level you want the color for
+     * @return the color either name or hex representation or false if the level does not exist
+     */
     protected static function AccessColor($access){
         global $ACLActionAccessLevels;
         if(isset($ACLActionAccessLevels[$access])){
@@ -136,13 +136,13 @@ 
     }
 
     /**
-    * static AccessName($access)
-    *
-    * returns the translated name  associated with an access level
-    * these label definitions  exist in the definitions in modules/ACLActions/actiondefs.php
-    * @param INT $access - the access level you want the color for
-    * @return the translated access level name or false if the level does not exist
-    */
+     * static AccessName($access)
+     *
+     * returns the translated name  associated with an access level
+     * these label definitions  exist in the definitions in modules/ACLActions/actiondefs.php
+     * @param INT $access - the access level you want the color for
+     * @return the translated access level name or false if the level does not exist
+     */
     static function AccessName($access){
         global $ACLActionAccessLevels;
         if(isset($ACLActionAccessLevels[$access])){
@@ -172,10 +172,10 @@ 
     }
 
     /**
-    * static getAccessOptions()
-    * this is used for building select boxes
-    * @return array containg access levels (ints) as keys and access names as values
-    */
+     * static getAccessOptions()
+     * this is used for building select boxes
+     * @return array containg access levels (ints) as keys and access names as values
+     */
     protected static function getAccessOptions( $action, $type='module'){
         global $ACLActions;
         $options = array();
@@ -189,11 +189,11 @@ 
     }
 
     /**
-    * function static getDefaultActions()
-    * This function will return a list of acl actions with their default access levels
-    *
-    *
-    */
+     * function static getDefaultActions()
+     * This function will return a list of acl actions with their default access levels
+     *
+     *
+     */
     public static function getDefaultActions($type='module', $action=''){
         $query = "SELECT * FROM acl_actions WHERE deleted=0 ";
         if(!empty($type)){
@@ -217,14 +217,14 @@ 
 
 
     /**
-    * static getUserActions($user_id,$refresh=false, $category='', $action='')
-    * returns a list of user actions
-    * @param GUID $user_id
-    * @param BOOLEAN $refresh
-    * @param STRING $category
-    * @param STRING $action
-    * @return ARRAY of ACLActionsArray
-    */
+     * static getUserActions($user_id,$refresh=false, $category='', $action='')
+     * returns a list of user actions
+     * @param GUID $user_id
+     * @param BOOLEAN $refresh
+     * @param STRING $category
+     * @param STRING $action
+     * @return ARRAY of ACLActionsArray
+     */
 
     static function getUserActions($user_id,$refresh=false, $category='',$type='', $action=''){
         //check in the session if we already have it loaded
@@ -256,15 +256,15 @@ 
         if(!empty($type)){
             $additional_where .= " AND acl_actions.acltype = '$type' ";
         }
-		/* BEGIN - SECURITY GROUPS */ 
-		/**
+        /* BEGIN - SECURITY GROUPS */ 
+        /**
         $query = "SELECT acl_actions .*, acl_roles_actions.access_override
                     FROM acl_actions
                     LEFT JOIN acl_roles_users ON acl_roles_users.user_id = '$user_id' AND  acl_roles_users.deleted = 0
                     LEFT JOIN acl_roles_actions ON acl_roles_actions.role_id = acl_roles_users.role_id AND acl_roles_actions.action_id = acl_actions.id AND acl_roles_actions.deleted=0
                     WHERE acl_actions.deleted=0 $additional_where ORDER BY category,name";
-		*/
-		$query = "(SELECT acl_actions .*, acl_roles_actions.access_override, 1 as user_role
+         */
+        $query = "(SELECT acl_actions .*, acl_roles_actions.access_override, 1 as user_role
 				FROM acl_actions
 				INNER JOIN acl_roles_users ON acl_roles_users.user_id = '$user_id' AND  acl_roles_users.deleted = 0
 				LEFT JOIN acl_roles_actions ON acl_roles_actions.role_id = acl_roles_users.role_id AND acl_roles_actions.action_id = acl_actions.id AND acl_roles_actions.deleted=0
@@ -286,34 +286,34 @@ 
 				WHERE acl_actions.deleted = 0 )
 
 				ORDER BY user_role desc, category,name,access_override desc"; //want non-null to show first
-		 /* END - SECURITY GROUPS */
+            /* END - SECURITY GROUPS */
         $result = $db->query($query);
         $selected_actions = array();
-		/* BEGIN - SECURITY GROUPS */ 
-		global $sugar_config;
-		$has_user_role = false; //used for user_role_precedence
-		$has_role = false; //used to determine if default actions can be ignored. If a user has a defined role don't use the defaults
-		/* END - SECURITY GROUPS */
+        /* BEGIN - SECURITY GROUPS */ 
+        global $sugar_config;
+        $has_user_role = false; //used for user_role_precedence
+        $has_role = false; //used to determine if default actions can be ignored. If a user has a defined role don't use the defaults
+        /* END - SECURITY GROUPS */
         while($row = $db->fetchByAssoc($result, FALSE) ){
-			/* BEGIN - SECURITY GROUPS */ 
-			if($has_user_role == false && $row['user_role'] == 1) {
-				$has_user_role = true;
-			}
-			if($has_role == false && ($row['user_role'] == 1 || $row['user_role'] ==0)) {
-				$has_role = true;
-			}
-			//if user roles should take precedence over group roles and we have a user role 
-			//break when we get to processing the group roles
-			if($has_user_role == true && $row['user_role'] == 0 
-					&& isset($sugar_config['securitysuite_user_role_precedence'])
-					&& $sugar_config['securitysuite_user_role_precedence'] == true ) 
-			{
-				break; 
-			}
-			if($row['user_role'] == -1 && $has_role == true) {
-				break; //no need for default actions when a role is assigned to the user or user's group already
-			}
-			/* END - SECURITY GROUPS */
+            /* BEGIN - SECURITY GROUPS */ 
+            if($has_user_role == false && $row['user_role'] == 1) {
+                $has_user_role = true;
+            }
+            if($has_role == false && ($row['user_role'] == 1 || $row['user_role'] ==0)) {
+                $has_role = true;
+            }
+            //if user roles should take precedence over group roles and we have a user role 
+            //break when we get to processing the group roles
+            if($has_user_role == true && $row['user_role'] == 0 
+                    && isset($sugar_config['securitysuite_user_role_precedence'])
+                    && $sugar_config['securitysuite_user_role_precedence'] == true ) 
+            {
+                break; 
+            }
+            if($row['user_role'] == -1 && $has_role == true) {
+                break; //no need for default actions when a role is assigned to the user or user's group already
+            }
+            /* END - SECURITY GROUPS */
             $acl = new ACLAction();
             $isOverride  = false;
             $acl->populateFromRow($row);
@@ -326,16 +326,16 @@ 
 
             }
             if(!isset($selected_actions[$acl->category][$acl->acltype][$acl->name])
-				|| (
-					/* BEGIN - SECURITY GROUPS - additive security*/
-					(
-						(isset($sugar_config['securitysuite_additive']) && $sugar_config['securitysuite_additive'] == true
-						&& $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] < $acl->aclaccess) 
-					||
-						((!isset($sugar_config['securitysuite_additive']) || $sugar_config['securitysuite_additive'] == false)
-						&& $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] > $acl->aclaccess) 
-					)
-					/* END - SECURITY GROUPS */
+                || (
+                    /* BEGIN - SECURITY GROUPS - additive security*/
+                    (
+                        (isset($sugar_config['securitysuite_additive']) && $sugar_config['securitysuite_additive'] == true
+                        && $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] < $acl->aclaccess) 
+                    ||
+                        ((!isset($sugar_config['securitysuite_additive']) || $sugar_config['securitysuite_additive'] == false)
+                        && $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] > $acl->aclaccess) 
+                    )
+                    /* END - SECURITY GROUPS */
                     && $isOverride
                     )
                 ||
@@ -388,70 +388,70 @@ 
     }
     
     /**
-    * (static/ non-static)function hasAccess($is_owner= false , $access = 0)
-    * checks if a user has access to this acl if the user is an owner it will check if owners have access
-    *
-    * This function may either be used statically or not. If used staticlly a user must pass in an access level not equal to zero
-    * @param boolean $is_owner
-    * @param int $access
-    * @return true or false
-    */
-	/* BEGIN - SECURITY GROUPS */
-	/**
+     * (static/ non-static)function hasAccess($is_owner= false , $access = 0)
+     * checks if a user has access to this acl if the user is an owner it will check if owners have access
+     *
+     * This function may either be used statically or not. If used staticlly a user must pass in an access level not equal to zero
+     * @param boolean $is_owner
+     * @param int $access
+     * @return true or false
+     */
+    /* BEGIN - SECURITY GROUPS */
+    /**
     static function hasAccess($is_owner=false, $access = 0){
-	*/
-	static function hasAccess($is_owner=false, $in_group=false, $access = 0, ACLAction $action = null){
-		/**
+     */
+    static function hasAccess($is_owner=false, $in_group=false, $access = 0, ACLAction $action = null){
+        /**
         if($access != 0 && $access == ACL_ALLOW_ALL || ($is_owner && $access == ACL_ALLOW_OWNER))return true;
        //if this exists, then this function is not static, so check the aclaccess parameter
         if(isset($this) && isset($this->aclaccess)){
             if($this->aclaccess == ACL_ALLOW_ALL || ($is_owner && $this->aclaccess == ACL_ALLOW_OWNER))
             return true;
         }
-		*/
-		if($access != 0 && ($access == ACL_ALLOW_ALL 
-			|| ($is_owner && ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP) )  //if owner that's better than in group so count it...better way to clean this up?
-			|| ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
-		)) {
-			return true;
-		}
+         */
+        if($access != 0 && ($access == ACL_ALLOW_ALL 
+            || ($is_owner && ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP) )  //if owner that's better than in group so count it...better way to clean this up?
+            || ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
+        )) {
+            return true;
+        }
         if(!is_null($action) && isset($action->aclaccess)){
-			if($action->aclaccess == ACL_ALLOW_ALL
-				|| ($is_owner && $action->aclaccess == ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP))
-				|| ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
-			) {
-            	return true;
-        	}
-		}
+            if($action->aclaccess == ACL_ALLOW_ALL
+                || ($is_owner && $action->aclaccess == ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP))
+                || ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
+            ) {
+                return true;
+            }
+        }
         return false;
     }
-	/* END - SECURITY GROUPS */
-
-	/* BEGIN - SECURITY GROUPS */
-	/**
-	 * STATIC function userNeedsSecurityGroup($user_id, $category, $action,$type='module')
-	 * checks if a user should have ownership to do an action
-	 *
-	 * @param GUID $user_id
-	 * @param STRING $category
-	 * @param STRING $action
-	 * @param STRING $type
-	 * @return boolean
-	 */
-	static function userNeedsSecurityGroup($user_id, $category, $action,$type='module'){
-		//check if we don't have it set in the cache if not lets reload the cache
+    /* END - SECURITY GROUPS */
+
+    /* BEGIN - SECURITY GROUPS */
+    /**
+     * STATIC function userNeedsSecurityGroup($user_id, $category, $action,$type='module')
+     * checks if a user should have ownership to do an action
+     *
+     * @param GUID $user_id
+     * @param STRING $category
+     * @param STRING $action
+     * @param STRING $type
+     * @return boolean
+     */
+    static function userNeedsSecurityGroup($user_id, $category, $action,$type='module'){
+        //check if we don't have it set in the cache if not lets reload the cache
 		
-		if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
-			ACLAction::getUserActions($user_id, false);
+        if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+            ACLAction::getUserActions($user_id, false);
 			
-		}
+        }
 		
-		if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
-			return $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'] == ACL_ALLOW_GROUP;
-		}
+        if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+            return $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'] == ACL_ALLOW_GROUP;
+        }
         return false;
     }
-	/* END - SECURITY GROUPS */	
+    /* END - SECURITY GROUPS */	
 
 
 
@@ -461,20 +461,20 @@ 
 
 
     /**
-    * static function userHasAccess($user_id, $category, $action, $is_owner = false)
-    *
-    * @param GUID $user_id the user id who you want to check access for
-    * @param STRING $category the category you would like to check access for
-    * @param STRING $action the action of that category you would like to check access for
-    * @param BOOLEAN OPTIONAL $is_owner if the object is owned by the user you are checking access for
-    */
-	/* BEGIN - SECURITY GROUPS - added $in_group */
-	/**
+     * static function userHasAccess($user_id, $category, $action, $is_owner = false)
+     *
+     * @param GUID $user_id the user id who you want to check access for
+     * @param STRING $category the category you would like to check access for
+     * @param STRING $action the action of that category you would like to check access for
+     * @param BOOLEAN OPTIONAL $is_owner if the object is owned by the user you are checking access for
+     */
+    /* BEGIN - SECURITY GROUPS - added $in_group */
+    /**
     public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false){
-	*/
-	public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false, $in_group = false){
-       global $current_user;
-       if($current_user->isAdminForModule($category)&& !isset($_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'])){
+     */
+    public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false, $in_group = false){
+        global $current_user;
+        if($current_user->isAdminForModule($category)&& !isset($_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'])){
         return true;
         }
         //check if we don't have it set in the cache if not lets reload the cache
@@ -488,22 +488,22 @@ 
 /**
             return ACLAction::hasAccess($is_owner, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
 */
-			return ACLAction::hasAccess($is_owner, $in_group, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
+            return ACLAction::hasAccess($is_owner, $in_group, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
         }
         return false;
 
     }
-	/* END - SECURITY GROUPS */
+    /* END - SECURITY GROUPS */
     /**
-    * function getUserAccessLevel($user_id, $category, $action,$type='module')
-    * returns the access level for a given category and action
-    *
-    * @param GUID  $user_id
-    * @param STRING $category
-    * @param STRING $action
-    * @param STRING $type
-    * @return INT (ACCESS LEVEL)
-    */
+     * function getUserAccessLevel($user_id, $category, $action,$type='module')
+     * returns the access level for a given category and action
+     *
+     * @param GUID  $user_id
+     * @param STRING $category
+     * @param STRING $action
+     * @param STRING $type
+     * @return INT (ACCESS LEVEL)
+     */
     public static function getUserAccessLevel($user_id, $category, $action,$type='module'){
         if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
             ACLAction::getUserActions($user_id, false);
@@ -520,15 +520,15 @@ 
     }
 
     /**
-    * STATIC function userNeedsOwnership($user_id, $category, $action,$type='module')
-    * checks if a user should have ownership to do an action
-    *
-    * @param GUID $user_id
-    * @param STRING $category
-    * @param STRING $action
-    * @param STRING $type
-    * @return boolean
-    */
+     * STATIC function userNeedsOwnership($user_id, $category, $action,$type='module')
+     * checks if a user should have ownership to do an action
+     *
+     * @param GUID $user_id
+     * @param STRING $category
+     * @param STRING $action
+     * @param STRING $type
+     * @return boolean
+     */
     public static function userNeedsOwnership($user_id, $category, $action,$type='module'){
         //check if we don't have it set in the cache if not lets reload the cache
 
@@ -545,12 +545,12 @@ 
 
     }
     /**
-    *
-    * static pass by ref setupCategoriesMatrix(&$categories)
-    * takes in an array of categories and modifes them adding display information
-    *
-    * @param unknown_type $categories
-    */
+     *
+     * static pass by ref setupCategoriesMatrix(&$categories)
+     * takes in an array of categories and modifes them adding display information
+     *
+     * @param unknown_type $categories
+     */
     public static function setupCategoriesMatrix(&$categories){
         global $ACLActions, $current_user;
         $names = array();
@@ -593,11 +593,11 @@ 
 
 
     /**
-    * function toArray()
-    * returns this acl as an array
-    *
-    * @return array of fields with id, name, access and category
-    */
+     * function toArray()
+     * returns this acl as an array
+     *
+     * @return array of fields with id, name, access and category
+     */
     function toArray($dbOnly = false, $stringOnly = false, $upperKeys = false){
         $array_fields = array('id', 'aclaccess');
         $arr = array();
@@ -608,11 +608,11 @@ 
     }
 
     /**
-    * function fromArray($arr)
-    * converts an array into an acl mapping name value pairs into files
-    *
-    * @param Array $arr
-    */
+     * function fromArray($arr)
+     * converts an array into an acl mapping name value pairs into files
+     *
+     * @param Array $arr
+     */
     function fromArray($arr){
         foreach($arr as $name=>$value){
             $this->$name = $value;
@@ -620,10 +620,10 @@ 
     }
 
     /**
-    * function clearSessionCache()
-    * clears the session variable storing the cache information for acls
-    *
-    */
+     * function clearSessionCache()
+     * clears the session variable storing the cache information for acls
+     *
+     */
     function clearSessionCache(){
         unset($_SESSION['ACL']);
     }

modules/AOR_Reports/AOR_Report.php

Indentation +35 added lines, -35 removed lines

@@ -23,42 +23,42 @@ 
  */
 
 class AOR_Report extends Basic {
-	var $new_schema = true;
-	var $module_dir = 'AOR_Reports';
-	var $object_name = 'AOR_Report';
-	var $table_name = 'aor_reports';
-	var $importable = true;
-	var $disable_row_level_security = true ;
-
-	var $id;
-	var $name;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $modified_by_name;
-	var $created_by;
-	var $created_by_name;
-	var $description;
-	var $deleted;
-	var $created_by_link;
-	var $modified_user_link;
-	var $assigned_user_id;
-	var $assigned_user_name;
-	var $assigned_user_link;
-	var $report_module;
-
-	function AOR_Report(){
-		parent::Basic();
+    var $new_schema = true;
+    var $module_dir = 'AOR_Reports';
+    var $object_name = 'AOR_Report';
+    var $table_name = 'aor_reports';
+    var $importable = true;
+    var $disable_row_level_security = true ;
+
+    var $id;
+    var $name;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
+    var $modified_by_name;
+    var $created_by;
+    var $created_by_name;
+    var $description;
+    var $deleted;
+    var $created_by_link;
+    var $modified_user_link;
+    var $assigned_user_id;
+    var $assigned_user_name;
+    var $assigned_user_link;
+    var $report_module;
+
+    function AOR_Report(){
+        parent::Basic();
         $this->load_report_beans();
         require_once('modules/AOW_WorkFlow/aow_utils.php');
-	}
+    }
 
-	function bean_implements($interface){
-		switch($interface){
-			case 'ACL': return true;
-		}
-		return false;
-	}
+    function bean_implements($interface){
+        switch($interface){
+            case 'ACL': return true;
+        }
+        return false;
+    }
 
     function save($check_notify = FALSE){
 
@@ -121,7 +121,7 @@ 
     function build_report_chart($chartIds = null, $chartType = self::CHART_TYPE_PCHART){
         global $beanList;
         $linkedCharts = $this->get_linked_beans('aor_charts','AOR_Charts');
-	if(!$linkedCharts){
+    if(!$linkedCharts){
             //No charts to display
             return '';
         }
@@ -478,7 +478,7 @@ 
             while ($row = $this->db->fetchByAssoc($result)) {
                 if($html != '') $html .= '<br />';
 
-               $html .= $this->build_report_html($offset, $links, $row[$field_label], '', $extra);
+                $html .= $this->build_report_html($offset, $links, $row[$field_label], '', $extra);
 
             }
         }

modules/AOR_Conditions/vardefs.php

Indentation +29 added lines, -29 removed lines

@@ -23,12 +23,12 @@ 
  */
 
 $dictionary['AOR_Condition'] = array(
-	'table'=>'aor_conditions',
-	'audited'=>false,
-	'duplicate_merge'=>true,
-	'fields'=>array (
-  'aor_report_id' =>
-  array (
+    'table'=>'aor_conditions',
+    'audited'=>false,
+    'duplicate_merge'=>true,
+    'fields'=>array (
+    'aor_report_id' =>
+    array (
     'required' => false,
     'name' => 'aor_report_id',
     'vname' => 'LBL_AOR_REPORT_ID',
@@ -45,9 +45,9 @@ 
     'merge_filter' => 'disabled',
     'len' => 36,
     'size' => '20',
-  ),
-  'condition_order' => 
-  array (
+    ),
+    'condition_order' => 
+    array (
     'required' => false,
     'name' => 'condition_order',
     'vname' => 'LBL_ORDER',
@@ -66,7 +66,7 @@ 
     'size' => '20',
     'enable_range_search' => false,
     'disable_num_format' => '',
-  ),
+    ),
         'logic_op' => array(
             'name' => 'logic_op',
             'vname' => 'LBL_LOGIC_OP',
@@ -78,15 +78,15 @@ 
             'vname' => 'LBL_PARENTHESIS',
             'type' => 'varchar',
         ),
-  'module_path' =>
-  array (
+    'module_path' =>
+    array (
     'name' => 'module_path',
     'type' => 'longtext',
     'vname' => 'LBL_MODULE_PATH',
     'isnull' => true,
-  ),
-  'field' => 
-  array (
+    ),
+    'field' => 
+    array (
     'required' => false,
     'name' => 'field',
     'vname' => 'LBL_FIELD',
@@ -106,9 +106,9 @@ 
     'options' => 'user_type_dom',
     'studio' => 'visible',
     'dependency' => false,
-  ),
-  'operator' => 
-  array (
+    ),
+    'operator' => 
+    array (
     'required' => false,
     'name' => 'operator',
     'vname' => 'LBL_OPERATOR',
@@ -129,7 +129,7 @@ 
     'options' => 'aor_operator_list',
     'studio' => 'visible',
     'dependency' => false,
-  ),
+    ),
     'value_type' =>
     array (
     'required' => false,
@@ -152,9 +152,9 @@ 
     'options' => 'aor_condition_type_list',
     'studio' => 'visible',
     'dependency' => false,
-  ),
-  'value' => 
-  array (
+    ),
+    'value' => 
+    array (
     'required' => false,
     'name' => 'value',
     'vname' => 'LBL_VALUE',
@@ -171,7 +171,7 @@ 
     'merge_filter' => 'disabled',
     'len' => '255',
     'size' => '20',
-  ),
+    ),
         'parameter' =>
             array (
                 'required' => false,
@@ -190,17 +190,17 @@ 
                 'merge_filter' => 'disabled',
                 'studio' => 'visible',
             ),
-  'aor_reports' =>
-  array (
+    'aor_reports' =>
+    array (
     'name' => 'aor_reports',
     'type' => 'link',
     'relationship' => 'aor_report_aor_conditions',
     'module'=>'AOR_Reports',
     'bean_name'=>'AOR_Reports',
     'source'=>'non-db',
-  ),
+    ),
 ),
-	'relationships'=>array (
+    'relationships'=>array (
 ),
     'indices' => array(
         array(
@@ -209,8 +209,8 @@ 
             'fields' => array('aor_report_id'),
         ),
     ),
-	'optimistic_locking'=>true,
-	'unified_search'=>true,
+    'optimistic_locking'=>true,
+    'unified_search'=>true,
 );
 
 if (!class_exists('VardefManager')){

modules/Home/UnifiedSearchAdvanced.php

Indentation +297 added lines, -297 removed lines

@@ -69,95 +69,95 @@ 
         $this->cache_display = sugar_cached('modules/unified_search_modules_display.php');
     }
 
-	function getDropDownDiv($tpl = 'modules/Home/UnifiedSearchAdvanced.tpl') {
-		global $app_list_strings, $app_strings;
+    function getDropDownDiv($tpl = 'modules/Home/UnifiedSearchAdvanced.tpl') {
+        global $app_list_strings, $app_strings;
 
-		if(!file_exists($this->cache_search))
-		{
-			$this->buildCache();
-		}
+        if(!file_exists($this->cache_search))
+        {
+            $this->buildCache();
+        }
 
-		$unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
+        $unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
 
-		global $mod_strings, $modListHeader, $app_list_strings, $current_user, $app_strings, $beanList;
-		$users_modules = $current_user->getPreference('globalSearch', 'search');
+        global $mod_strings, $modListHeader, $app_list_strings, $current_user, $app_strings, $beanList;
+        $users_modules = $current_user->getPreference('globalSearch', 'search');
 
-		// preferences are empty, select all
-		if(empty($users_modules)) {
-			$users_modules = array();
-			foreach($unified_search_modules_display as $module=>$data) {
-				if (!empty($data['visible']) ) {
+        // preferences are empty, select all
+        if(empty($users_modules)) {
+            $users_modules = array();
+            foreach($unified_search_modules_display as $module=>$data) {
+                if (!empty($data['visible']) ) {
                     $users_modules[$module] = $beanList[$module];
                 }
-			}
-			$current_user->setPreference('globalSearch', $users_modules, 0, 'search');
-		}
+            }
+            $current_user->setPreference('globalSearch', $users_modules, 0, 'search');
+        }
 
-		$sugar_smarty = new Sugar_Smarty();
+        $sugar_smarty = new Sugar_Smarty();
 
-		$modules_to_search = array();
+        $modules_to_search = array();
 
-		foreach($users_modules as $key=>$module)
-		{
+        foreach($users_modules as $key=>$module)
+        {
             if(ACLController::checkAccess($key, 'list', true))
             {
                 $modules_to_search[$key]['checked'] = true;
             }
-		}
-
-		if(!empty($this->query_string))
-		{
-			$sugar_smarty->assign('query_string', securexss($this->query_string));
-		} else {
-			$sugar_smarty->assign('query_string', '');
-		}
-
-		$sugar_smarty->assign('MOD', return_module_language($GLOBALS['current_language'], 'Administration'));
-		$sugar_smarty->assign('APP', $app_strings);
-		$sugar_smarty->assign('USE_SEARCH_GIF', 0);
-		$sugar_smarty->assign('LBL_SEARCH_BUTTON_LABEL', $app_strings['LBL_SEARCH_BUTTON_LABEL']);
-		$sugar_smarty->assign('LBL_SEARCH_BUTTON_TITLE', $app_strings['LBL_SEARCH_BUTTON_TITLE']);
-		$sugar_smarty->assign('LBL_SEARCH', $app_strings['LBL_SEARCH']);
-
-		$json_enabled = array();
-		$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)
-		{
-			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']) {
-			   unset($modules_to_search[$module]);
-			}
-		}
-
-		//Create the two lists (doing it this way preserves the user's ordering choice for enabled modules)
-		foreach($modules_to_search as $module=>$data)
-		{
-			$label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
-			if(!empty($data['checked']))
-			{
-				$json_enabled[] = array("module" => $module, 'label' => $label);
-			} else {
-				$json_disabled[] = array("module" => $module, 'label' => $label);
-			}
-		}
-
-		$sugar_smarty->assign('enabled_modules', json_encode($json_enabled));
-		$sugar_smarty->assign('disabled_modules', json_encode($json_disabled));
-
-		$showDiv = $current_user->getPreference('showGSDiv', 'search');
-		if(!isset($showDiv))
-		{
-		   $showDiv = 'no';
-		}
-
-		$sugar_smarty->assign('SHOWGSDIV', $showDiv);
-		$sugar_smarty->debugging = true;
-		return $sugar_smarty->fetch($tpl);
-	}
+        }
+
+        if(!empty($this->query_string))
+        {
+            $sugar_smarty->assign('query_string', securexss($this->query_string));
+        } else {
+            $sugar_smarty->assign('query_string', '');
+        }
+
+        $sugar_smarty->assign('MOD', return_module_language($GLOBALS['current_language'], 'Administration'));
+        $sugar_smarty->assign('APP', $app_strings);
+        $sugar_smarty->assign('USE_SEARCH_GIF', 0);
+        $sugar_smarty->assign('LBL_SEARCH_BUTTON_LABEL', $app_strings['LBL_SEARCH_BUTTON_LABEL']);
+        $sugar_smarty->assign('LBL_SEARCH_BUTTON_TITLE', $app_strings['LBL_SEARCH_BUTTON_TITLE']);
+        $sugar_smarty->assign('LBL_SEARCH', $app_strings['LBL_SEARCH']);
+
+        $json_enabled = array();
+        $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)
+        {
+            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']) {
+                unset($modules_to_search[$module]);
+            }
+        }
+
+        //Create the two lists (doing it this way preserves the user's ordering choice for enabled modules)
+        foreach($modules_to_search as $module=>$data)
+        {
+            $label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
+            if(!empty($data['checked']))
+            {
+                $json_enabled[] = array("module" => $module, 'label' => $label);
+            } else {
+                $json_disabled[] = array("module" => $module, 'label' => $label);
+            }
+        }
+
+        $sugar_smarty->assign('enabled_modules', json_encode($json_enabled));
+        $sugar_smarty->assign('disabled_modules', json_encode($json_disabled));
+
+        $showDiv = $current_user->getPreference('showGSDiv', 'search');
+        if(!isset($showDiv))
+        {
+            $showDiv = 'no';
+        }
+
+        $sugar_smarty->assign('SHOWGSDIV', $showDiv);
+        $sugar_smarty->debugging = true;
+        return $sugar_smarty->fetch($tpl);
+    }
 
 
     /**
@@ -170,70 +170,70 @@ 
      *
      *
      */
-	function search() {
+    function search() {
 
         $unified_search_modules = $this->getUnifiedSearchModules();
-		$unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
+        $unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
 
 
-		require_once 'include/ListView/ListViewSmarty.php';
+        require_once 'include/ListView/ListViewSmarty.php';
 
-		global $modListHeader, $beanList, $beanFiles, $current_language, $app_strings, $current_user, $mod_strings;
-		$home_mod_strings = return_module_language($current_language, 'Home');
+        global $modListHeader, $beanList, $beanFiles, $current_language, $app_strings, $current_user, $mod_strings;
+        $home_mod_strings = return_module_language($current_language, 'Home');
 
-		$this->query_string = $GLOBALS['db']->quote(securexss(from_html(clean_string($this->query_string, 'UNIFIED_SEARCH'))));
+        $this->query_string = $GLOBALS['db']->quote(securexss(from_html(clean_string($this->query_string, 'UNIFIED_SEARCH'))));
 
-		if(!empty($_REQUEST['advanced']) && $_REQUEST['advanced'] != 'false') {
-			$modules_to_search = array();
-			if(!empty($_REQUEST['search_modules']))
-			{
-			    foreach(explode (',', $_REQUEST['search_modules'] ) as $key)
-	            {
+        if(!empty($_REQUEST['advanced']) && $_REQUEST['advanced'] != 'false') {
+            $modules_to_search = array();
+            if(!empty($_REQUEST['search_modules']))
+            {
+                foreach(explode (',', $_REQUEST['search_modules'] ) as $key)
+                {
                     if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible']))
                     {
                         $modules_to_search[$key] = $beanList[$key];
                     }
-	            }
-			}
-
-			$current_user->setPreference('showGSDiv', isset($_REQUEST['showGSDiv']) ? $_REQUEST['showGSDiv'] : 'no', 0, 'search');
-			$current_user->setPreference('globalSearch', $modules_to_search, 0, 'search'); // save selections to user preference
-		} else {
-			$users_modules = $current_user->getPreference('globalSearch', 'search');
-			$modules_to_search = array();
-
-			if(!empty($users_modules)) {
-				// use user's previous selections
-			    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']) ) {
-				        $modules_to_search[$module] = $beanList[$module];
-				    }
-				}
-			}
-			$current_user->setPreference('globalSearch', $modules_to_search, 'search');
-		}
-
-
-		$templateFile = 'modules/Home/UnifiedSearchAdvancedForm.tpl';
-		if(file_exists('custom/' . $templateFile))
-		{
-		   $templateFile = 'custom/'.$templateFile;
-		}
-
-		echo $this->getDropDownDiv($templateFile);
-
-		$module_results = array();
-		$module_counts = array();
-		$has_results = false;
-
-		if(!empty($this->query_string)) {
-			foreach($modules_to_search as $moduleName => $beanName) {
+                }
+            }
+
+            $current_user->setPreference('showGSDiv', isset($_REQUEST['showGSDiv']) ? $_REQUEST['showGSDiv'] : 'no', 0, 'search');
+            $current_user->setPreference('globalSearch', $modules_to_search, 0, 'search'); // save selections to user preference
+        } else {
+            $users_modules = $current_user->getPreference('globalSearch', 'search');
+            $modules_to_search = array();
+
+            if(!empty($users_modules)) {
+                // use user's previous selections
+                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']) ) {
+                        $modules_to_search[$module] = $beanList[$module];
+                    }
+                }
+            }
+            $current_user->setPreference('globalSearch', $modules_to_search, 'search');
+        }
+
+
+        $templateFile = 'modules/Home/UnifiedSearchAdvancedForm.tpl';
+        if(file_exists('custom/' . $templateFile))
+        {
+            $templateFile = 'custom/'.$templateFile;
+        }
+
+        echo $this->getDropDownDiv($templateFile);
+
+        $module_results = array();
+        $module_counts = array();
+        $has_results = false;
+
+        if(!empty($this->query_string)) {
+            foreach($modules_to_search as $moduleName => $beanName) {
                 require_once $beanFiles[$beanName] ;
                 $seed = new $beanName();
 
@@ -243,7 +243,7 @@ 
 
                 //retrieve the original list view defs and store for processing in case of custom layout changes
                 require('modules/'.$seed->module_dir.'/metadata/listviewdefs.php');
-				$orig_listViewDefs = $listViewDefs;
+                $orig_listViewDefs = $listViewDefs;
 
                 if(file_exists('custom/modules/'.$seed->module_dir.'/metadata/listviewdefs.php'))
                 {
@@ -255,20 +255,20 @@ 
                     continue;
                 }
 
-			    $unifiedSearchFields = array () ;
+                $unifiedSearchFields = array () ;
                 $innerJoins = array();
                 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']) ) {
-						//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 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];
-						}
+                    $listViewCheckField = strtoupper($field);
+                    //check to see if the field is in listview defs
+                    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 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];
+                        }
 
-					}
+                    }
 
                     //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.
@@ -302,7 +302,7 @@ 
                 require_once $beanFiles[$beanName] ;
                 $seed = new $beanName();
                 
-				require_once $this->searchFormPath;
+                require_once $this->searchFormPath;
                 $searchForm = new $this->searchFormClass ( $seed, $moduleName ) ;
 
                 $searchForm->setup (array ( $moduleName => array() ) , $unifiedSearchFields , '' , 'saved_views' /* hack to avoid setup doing further unwanted processing */ ) ;
@@ -311,11 +311,11 @@ 
                 $params = array('custom_select' => "");
                 foreach($innerJoins as $field=>$def) {
                     if (isset ($def['db_field'])) {
-                      foreach($def['db_field'] as $dbfield)
-                          $where_clauses[] = $dbfield . " LIKE '" . $this->query_string . "%'";
-                          $params['custom_select'] .= ", $dbfield";
-                          $params['distinct'] = true;
-                          //$filterFields[$dbfield] = $dbfield;
+                        foreach($def['db_field'] as $dbfield)
+                            $where_clauses[] = $dbfield . " LIKE '" . $this->query_string . "%'";
+                            $params['custom_select'] .= ", $dbfield";
+                            $params['distinct'] = true;
+                            //$filterFields[$dbfield] = $dbfield;
                     }
                 }
 
@@ -341,9 +341,9 @@ 
 
                 if(count($displayColumns) > 0)
                 {
-                	$lv->displayColumns = $displayColumns;
+                    $lv->displayColumns = $displayColumns;
                 } else {
-                	$lv->displayColumns = $listViewDefs[$seed->module_dir];
+                    $lv->displayColumns = $listViewDefs[$seed->module_dir];
                 }
 
                 $lv->export = false;
@@ -368,56 +368,56 @@ 
                     $module_results[$moduleName] .= $lv->display(false, false);
                 }
 
-			}
-		}
+            }
+        }
 
-		if($has_results) {
-			foreach($module_counts as $name=>$value) {
-				echo $module_results[$name];
-			}
-		} else if(empty($_REQUEST['form_only'])) {
-			echo $home_mod_strings['LBL_NO_RESULTS'];
-			echo $home_mod_strings['LBL_NO_RESULTS_TIPS'];
-		}
+        if($has_results) {
+            foreach($module_counts as $name=>$value) {
+                echo $module_results[$name];
+            }
+        } else if(empty($_REQUEST['form_only'])) {
+            echo $home_mod_strings['LBL_NO_RESULTS'];
+            echo $home_mod_strings['LBL_NO_RESULTS_TIPS'];
+        }
 
-	}
+    }
 
-	function buildCache()
-	{
+    function buildCache()
+    {
 
-		global $beanList, $beanFiles, $dictionary;
+        global $beanList, $beanFiles, $dictionary;
 
-		$supported_modules = array();
+        $supported_modules = array();
 
-		foreach($beanList as $moduleName=>$beanName)
-		{
-			if (!isset($beanFiles[$beanName]))
-				continue;
+        foreach($beanList as $moduleName=>$beanName)
+        {
+            if (!isset($beanFiles[$beanName]))
+                continue;
 
-			$beanName = BeanFactory::getObjectName($moduleName);
-			$manager = new VardefManager ( );
-			$manager->loadVardef( $moduleName , $beanName ) ;
+            $beanName = BeanFactory::getObjectName($moduleName);
+            $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')){
+            // obtain the field definitions used by generateSearchWhere (duplicate code in view.list.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')){
                 require('modules/'.$moduleName.'/metadata/metafiles.php');
             }
 
 
-			if(!empty($metafiles[$moduleName]['searchfields']))
-			{
-				require $metafiles[$moduleName]['searchfields'] ;
-			} else if(file_exists("modules/{$moduleName}/metadata/SearchFields.php")) {
-				require "modules/{$moduleName}/metadata/SearchFields.php" ;
-			}
+            if(!empty($metafiles[$moduleName]['searchfields']))
+            {
+                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"))
-			{
-				require "custom/modules/{$moduleName}/metadata/SearchFields.php" ;
-			}				
+            //Load custom SearchFields.php if it exists
+            if(file_exists("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]))
@@ -425,34 +425,34 @@ 
                 continue;
             }
 
-			$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)
-			{
-				$fields = array();
-				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)
-					{
-						$field = 'email' ;
-					}
-
-					//bug: 38139 - allow phone to be searched through Global Search
-					if (strpos($field,'phone') !== false)
-					{
-						$field = 'phone' ;
-					}
-
-					if ( !empty($def['unified_search']) && isset ( $searchFields [ $moduleName ] [ $field ]  ))
-					{
-						$fields [ $field ] = $searchFields [ $moduleName ] [ $field ] ;
-					}
-				}
+            $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)
+            {
+                $fields = array();
+                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)
+                    {
+                        $field = 'email' ;
+                    }
+
+                    //bug: 38139 - allow phone to be searched through Global Search
+                    if (strpos($field,'phone') !== false)
+                    {
+                        $field = 'phone' ;
+                    }
+
+                    if ( !empty($def['unified_search']) && isset ( $searchFields [ $moduleName ] [ $field ]  ))
+                    {
+                        $fields [ $field ] = $searchFields [ $moduleName ] [ $field ] ;
+                    }
+                }
 
                 foreach ($searchFields[$moduleName] as $field => $def)
                 {
@@ -465,23 +465,23 @@ 
                     }
                 }
 
-				if(count($fields) > 0) {
-					$supported_modules [$moduleName] ['fields'] = $fields;
-					if (isset($dictionary[$beanName]['unified_search_default_enabled']) && $dictionary[$beanName]['unified_search_default_enabled'] === TRUE)
-					{
+                if(count($fields) > 0) {
+                    $supported_modules [$moduleName] ['fields'] = $fields;
+                    if (isset($dictionary[$beanName]['unified_search_default_enabled']) && $dictionary[$beanName]['unified_search_default_enabled'] === TRUE)
+                    {
                         $supported_modules [$moduleName]['default'] = true;
                     } else {
                         $supported_modules [$moduleName]['default'] = false;
                     }
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		ksort($supported_modules);
-		write_array_to_file('unified_search_modules', $supported_modules, $this->cache_search);
-	}
+        ksort($supported_modules);
+        write_array_to_file('unified_search_modules', $supported_modules, $this->cache_search);
+    }
 
     /**
      * Retrieve the enabled and disabled modules used for global search.
@@ -525,9 +525,9 @@ 
                 $label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
                 if($data['default'])
                 {
-                  $json_enabled[] = array("module" => $module, 'label' => $label);
+                    $json_enabled[] = array("module" => $module, 'label' => $label);
                 } else {
-                  $json_disabled[] = array("module" => $module, 'label' => $label);
+                    $json_disabled[] = array("module" => $module, 'label' => $label);
                 }
             }
         }
@@ -536,47 +536,47 @@ 
     }
 
 
-	/**
-	 * saveGlobalSearchSettings
-	 * This method handles the administrator's request to save the searchable modules selected and stores
-	 * the results in the unified_search_modules_display.php file
-	 *
-	 */
-	function saveGlobalSearchSettings()
-	{
-		if(isset($_REQUEST['enabled_modules']))
-		{
+    /**
+     * saveGlobalSearchSettings
+     * This method handles the administrator's request to save the searchable modules selected and stores
+     * the results in the unified_search_modules_display.php file
+     *
+     */
+    function saveGlobalSearchSettings()
+    {
+        if(isset($_REQUEST['enabled_modules']))
+        {
             $unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
 
-			$new_unified_search_modules_display = array();
+            $new_unified_search_modules_display = array();
 
             foreach(explode (',', $_REQUEST['enabled_modules'] ) as $module)
             {
                 $new_unified_search_modules_display[$module]['visible'] = true;
             }
 
-			foreach($unified_search_modules_display as $module=>$data)
-			{
-				if(!isset($new_unified_search_modules_display[$module]))
-				{
-				   $new_unified_search_modules_display[$module]['visible'] = false;
-				}
-			}
-
-			$this->writeUnifiedSearchModulesDisplayFile($new_unified_search_modules_display);
-		}
-	}
-
-
-	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))
-    	{
-    		$GLOBALS['log']->info("unlink {$cache_search}");
-    		unlink($cache_search);
-    	}
-	}
+            foreach($unified_search_modules_display as $module=>$data)
+            {
+                if(!isset($new_unified_search_modules_display[$module]))
+                {
+                    $new_unified_search_modules_display[$module]['visible'] = false;
+                }
+            }
+
+            $this->writeUnifiedSearchModulesDisplayFile($new_unified_search_modules_display);
+        }
+    }
+
+
+    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))
+        {
+            $GLOBALS['log']->info("unlink {$cache_search}");
+            unlink($cache_search);
+        }
+    }
     
 
     /**
@@ -589,21 +589,21 @@ 
      */
     public function getUnifiedSearchModules()
     {
-		//Make directory if it doesn't exist
+        //Make directory if it doesn't exist
         $cachedir = sugar_cached('modules');
-		if(!file_exists($cachedir))
-		{
-		   mkdir_recursive($cachedir);
-		}
+        if(!file_exists($cachedir))
+        {
+            mkdir_recursive($cachedir);
+        }
 
-		//Load unified_search_modules.php file
+        //Load unified_search_modules.php file
         $cachedFile = sugar_cached('modules/unified_search_modules.php');
-		if(!file_exists($cachedFile))
-		{
-			$this->buildCache();
-		}
+        if(!file_exists($cachedFile))
+        {
+            $this->buildCache();
+        }
 
-		include $cachedFile;
+        include $cachedFile;
         return $unified_search_modules;
     }
 
@@ -618,8 +618,8 @@ 
      */
     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();
@@ -633,13 +633,13 @@ 
             }
 
             $this->writeUnifiedSearchModulesDisplayFile($unified_search_modules_display);
-		}
+        }
 
-		include('custom/modules/unified_search_modules_display.php');
+        include('custom/modules/unified_search_modules_display.php');
         return $unified_search_modules_display;
     }
 
-	/*
+    /*
 	 * writeUnifiedSearchModulesDisplayFile
 	 * Private method to handle writing the unified_search_modules_display value to file
 	 *
@@ -647,35 +647,35 @@ 
 	 * @return boolean value indication whether or not file was successfully written
 	 * @throws Exception Thrown if the file write operation fails
 	 */
-	private function writeUnifiedSearchModulesDisplayFile($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'))
-	    {
-	    	//Log error message and throw Exception
-	    	global $app_strings;
-	    	$msg = string_format($app_strings['ERR_FILE_WRITE'], array('custom/modules/unified_search_modules_display.php'));
-	    	$GLOBALS['log']->error($msg);
-	    	throw new Exception($msg);
-	    }
-
-	    return true;
-	}
+    private function writeUnifiedSearchModulesDisplayFile($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'))
+        {
+            //Log error message and throw Exception
+            global $app_strings;
+            $msg = string_format($app_strings['ERR_FILE_WRITE'], array('custom/modules/unified_search_modules_display.php'));
+            $GLOBALS['log']->error($msg);
+            throw new Exception($msg);
+        }
+
+        return true;
+    }
 }
 
 
 function unified_search_modules_cmp($a, $b) {
-	if(!isset($a['translated']) || !isset($b['translated']))
-	{
-	   return 0;
-	}
+    if(!isset($a['translated']) || !isset($b['translated']))
+    {
+        return 0;
+    }
 
-	$name1 = strtolower($a['translated']);
-	$name2 = strtolower($b['translated']);
+    $name1 = strtolower($a['translated']);
+    $name2 = strtolower($b['translated']);
 
-	return $name1 < $name2 ? -1 : 1;
+    return $name1 < $name2 ? -1 : 1;
 }