adamjakab / SuiteCRM

data/SugarBean.php

Indentation +738 added lines, -738 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,17 +2340,17 @@ 
             $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)
-         {
-             if (! empty($this->$rel_field_name['name']))
-             {
-                 $this->fetched_rel_row[$rel_field_name['name']] = $this->$rel_field_name['name'];
-             }
-         }
+            foreach ($this->get_related_fields() as $rel_field_name)
+            {
+                if (! empty($this->$rel_field_name['name']))
+                {
+                    $this->fetched_rel_row[$rel_field_name['name']] = $this->$rel_field_name['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 )
@@ -2363,7 +2363,7 @@ 
                 }
                 else
                     $this->rel_fields_before_value[$key]=null;
-           }
+            }
         }
         if (isset($this->relationship_fields) && is_array($this->relationship_fields))
         {
@@ -2418,14 +2418,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();
@@ -2434,15 +2434,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
@@ -2495,21 +2495,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'");
@@ -2539,15 +2539,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))
@@ -2621,21 +2621,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'");
@@ -2659,25 +2659,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
@@ -2687,16 +2687,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)
     {
@@ -3072,13 +3072,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'");
@@ -3106,7 +3106,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();
@@ -3126,41 +3126,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 ';
@@ -3246,24 +3246,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)
         {
@@ -3296,7 +3296,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]))
@@ -3306,8 +3306,8 @@ 
                     }
                 }
 		
-            	if (!$process_field)
-                	continue;
+                if (!$process_field)
+                    continue;
             }
 
             if(  (!isset($data['source']) || $data['source'] == 'db') && (!empty($alias) || !empty($filter) ))
@@ -3414,27 +3414,27 @@ 
                     $rel_module = $this->$data['link']->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)
                             {
@@ -3546,42 +3546,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)
                     {
@@ -3610,12 +3610,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)
@@ -3650,18 +3650,18 @@ 
         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']) )
-				return $field_def;
-		}
+    // 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']) )
+                return $field_def;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * Returns parent record data for objects that store relationship information
@@ -3768,8 +3768,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)
@@ -3897,13 +3897,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;
@@ -3945,8 +3945,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;
@@ -4184,7 +4184,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)
@@ -4334,28 +4334,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.
@@ -4368,12 +4368,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();
@@ -4381,12 +4381,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)){
@@ -4394,20 +4394,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){
@@ -4448,8 +4448,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)
@@ -4473,7 +4473,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])){
@@ -4499,7 +4499,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;
@@ -4517,8 +4517,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");
@@ -4530,21 +4530,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']) ) {
@@ -4577,16 +4577,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();
 
@@ -4594,17 +4594,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
@@ -4784,16 +4784,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);
@@ -4829,17 +4829,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);
@@ -4900,7 +4900,7 @@ 
     }
 
     return $list;
-  }
+    }
 
     /**
      * Constructs an comma separated list of ids from passed query results.
@@ -4936,15 +4936,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);
@@ -5117,19 +5117,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)
@@ -5263,8 +5263,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)
@@ -5341,30 +5341,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){
@@ -5428,14 +5428,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;
@@ -5443,61 +5443,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;
@@ -5507,10 +5507,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)){
@@ -5525,32 +5525,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;
@@ -5558,10 +5558,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']))
@@ -5578,11 +5578,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
@@ -5611,11 +5611,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']))
@@ -5630,12 +5630,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();
@@ -5651,10 +5651,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();
@@ -5684,10 +5684,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)
@@ -5705,13 +5705,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;
     }
 
     /**
@@ -5759,18 +5759,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;
@@ -5785,17 +5785,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';
@@ -5849,9 +5849,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)
@@ -5890,8 +5890,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)
@@ -5979,11 +5979,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;
         }
@@ -6000,7 +6000,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;
             }
 
@@ -6011,8 +6011,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
@@ -6033,10 +6033,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

data/Relationships/One2OneBeanRelationship.php

Indentation +2 added lines, -2 removed lines

@@ -102,9 +102,9 @@
 
         //join the related module's table
         $join .= "$join_type $targetTableWithAlias ON $targetTable.$targetKey=$startingTable.$startingKey"
-               . " AND $targetTable.deleted=$deleted\n"
+                . " AND $targetTable.deleted=$deleted\n"
         //Next add any role filters
-               . $this->getRoleWhere();
+                . $this->getRoleWhere();
 
         if($return_array){
             return array(

data/Relationships/One2MBeanRelationship.php

Indentation +2 added lines, -2 removed lines

@@ -295,7 +295,7 @@ 
         //First join the relationship table
         $join .= "$join_type $targetTableWithAlias ON $startingTable.$startingKey=$targetTable.$targetKey AND $targetTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere(($linkIsLHS) ? $targetTable : $startingTable) . "\n";
+                . $this->getRoleWhere(($linkIsLHS) ? $targetTable : $startingTable) . "\n";
 
         if($return_array){
             return array(
@@ -354,7 +354,7 @@ 
 
         $query .= "$join_type $targetTableWithAlias ON $startingTable.$startingKey=$targetTable.$targetKey AND $targetTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere($tableInRoleFilter) . "\n";
+                . $this->getRoleWhere($tableInRoleFilter) . "\n";
 
         if (!empty($params['return_as_array'])) {
             $return_array = true;

data/Relationships/M2MRelationship.php

Indentation +66 added lines, -66 removed lines

@@ -131,28 +131,28 @@ 
         $lhsLinkName = $this->lhsLink;
         $rhsLinkName = $this->rhsLink;
         
-    	/* BEGIN - SECURITY GROUPS */
-    	//Need to hijack this as security groups will not contain a link on the module side
-    	//due to the way the module works. Plus it would remove the relative ease of adding custom module support
+        /* BEGIN - SECURITY GROUPS */
+        //Need to hijack this as security groups will not contain a link on the module side
+        //due to the way the module works. Plus it would remove the relative ease of adding custom module support
     	
-    	if(get_class($rhs) != 'User' && get_class($rhs) != 'ACLRole' && get_class($lhs) == 'SecurityGroup') {
-			$rhs->$rhsLinkName->addBean($lhs);			
-			$this->callBeforeAdd($rhs, $lhs, $rhsLinkName);
-
-			$dataToInsert = $this->getRowToInsert($lhs, $rhs, $additionalFields);
-			$this->addRow($dataToInsert);
-    		$rhs->$rhsLinkName->addBean($lhs);
-    		$this->callAfterAdd($lhs, $rhs, $lhsLinkName);
-    	} else if(get_class($lhs) != 'User' && get_class($lhs) != 'ACLRole' && get_class($rhs) == 'SecurityGroup') {
-			$lhs->$lhsLinkName->addBean($rhs);			
-			$this->callBeforeAdd($lhs, $rhs, $lhsLinkName);
-
-			$dataToInsert = $this->getRowToInsert($lhs, $rhs, $additionalFields);
-			$this->addRow($dataToInsert);
-    		$lhs->$lhsLinkName->addBean($rhs);
-    		$this->callAfterAdd($rhs, $lhs, $rhsLinkName);
-    	} else {
-    	/* END - SECURITY GROUPS */
+        if(get_class($rhs) != 'User' && get_class($rhs) != 'ACLRole' && get_class($lhs) == 'SecurityGroup') {
+            $rhs->$rhsLinkName->addBean($lhs);			
+            $this->callBeforeAdd($rhs, $lhs, $rhsLinkName);
+
+            $dataToInsert = $this->getRowToInsert($lhs, $rhs, $additionalFields);
+            $this->addRow($dataToInsert);
+            $rhs->$rhsLinkName->addBean($lhs);
+            $this->callAfterAdd($lhs, $rhs, $lhsLinkName);
+        } else if(get_class($lhs) != 'User' && get_class($lhs) != 'ACLRole' && get_class($rhs) == 'SecurityGroup') {
+            $lhs->$lhsLinkName->addBean($rhs);			
+            $this->callBeforeAdd($lhs, $rhs, $lhsLinkName);
+
+            $dataToInsert = $this->getRowToInsert($lhs, $rhs, $additionalFields);
+            $this->addRow($dataToInsert);
+            $lhs->$lhsLinkName->addBean($rhs);
+            $this->callAfterAdd($rhs, $lhs, $rhsLinkName);
+        } else {
+        /* END - SECURITY GROUPS */
 
         if (empty($lhs->$lhsLinkName) && !$lhs->load_relationship($lhsLinkName))
         {
@@ -262,50 +262,50 @@ 
             return false;
         }
         
-    	/* BEGIN - SECURITY GROUPS */
-    	//Need to hijack this as security groups will not contain a link on the module side
-    	//due to the way the module works. Plus it would remove the relative ease of adding custom module support
+        /* BEGIN - SECURITY GROUPS */
+        //Need to hijack this as security groups will not contain a link on the module side
+        //due to the way the module works. Plus it would remove the relative ease of adding custom module support
     	
-    	if(get_class($lhs) == 'SecurityGroup' || get_class($rhs) == 'SecurityGroup') {
-			$dataToRemove = array(
-				$this->def['join_key_lhs'] => $lhs->id,
-				$this->def['join_key_rhs'] => $rhs->id
-			);
-
-
-              if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
-              {
-                  if (get_class($lhs) != 'SecurityGroup' && $lhs->$lhsLinkName instanceof Link2)
-                  {
-                      $lhs->$lhsLinkName->load();
-                      $this->callBeforeDelete($lhs, $rhs, $lhsLinkName);
-                  }
-
-                  if (get_class($rhs) != 'SecurityGroup' && $rhs->$rhsLinkName instanceof Link2)
-                  {
-                      $rhs->$rhsLinkName->load();
-                      $this->callBeforeDelete($rhs, $lhs, $rhsLinkName);
-                  }
-              }
-
-			$this->removeRow($dataToRemove);
+        if(get_class($lhs) == 'SecurityGroup' || get_class($rhs) == 'SecurityGroup') {
+            $dataToRemove = array(
+                $this->def['join_key_lhs'] => $lhs->id,
+                $this->def['join_key_rhs'] => $rhs->id
+            );
+
+
+                if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
+                {
+                    if (get_class($lhs) != 'SecurityGroup' && $lhs->$lhsLinkName instanceof Link2)
+                    {
+                        $lhs->$lhsLinkName->load();
+                        $this->callBeforeDelete($lhs, $rhs, $lhsLinkName);
+                    }
+
+                    if (get_class($rhs) != 'SecurityGroup' && $rhs->$rhsLinkName instanceof Link2)
+                    {
+                        $rhs->$rhsLinkName->load();
+                        $this->callBeforeDelete($rhs, $lhs, $rhsLinkName);
+                    }
+                }
+
+            $this->removeRow($dataToRemove);
 			
-			if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
-			{
-				if (get_class($lhs) != 'SecurityGroup' && $lhs->$lhsLinkName instanceof Link2)
-				{
-					$lhs->$lhsLinkName->load();
-					$this->callAfterDelete($lhs, $rhs, $lhsLinkName);
-				}
-
-				if (get_class($rhs) != 'SecurityGroup' && $rhs->$rhsLinkName instanceof Link2)
-				{
-					$rhs->$rhsLinkName->load();
-					$this->callAfterDelete($rhs, $lhs, $rhsLinkName);
-				}
-			}
-		} else {
-    	/* END - SECURITY GROUPS */        
+            if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
+            {
+                if (get_class($lhs) != 'SecurityGroup' && $lhs->$lhsLinkName instanceof Link2)
+                {
+                    $lhs->$lhsLinkName->load();
+                    $this->callAfterDelete($lhs, $rhs, $lhsLinkName);
+                }
+
+                if (get_class($rhs) != 'SecurityGroup' && $rhs->$rhsLinkName instanceof Link2)
+                {
+                    $rhs->$rhsLinkName->load();
+                    $this->callAfterDelete($rhs, $lhs, $rhsLinkName);
+                }
+            }
+        } else {
+        /* END - SECURITY GROUPS */        
         if (empty($lhs->$lhsLinkName) && !$lhs->load_relationship($lhsLinkName))
         {
             $GLOBALS['log']->fatal("could not load LHS $lhsLinkName");
@@ -512,9 +512,9 @@ 
         //First join the relationship table
         $join .= "$join_type $joinTableWithAlias ON $join1 AND $joinTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere($joinTable) . "\n"
+                . $this->getRoleWhere($joinTable) . "\n"
         //Then finally join the related module's table
-               . "$join_type $targetTableWithAlias ON $join2 AND $targetTable.deleted=0\n";
+                . "$join_type $targetTableWithAlias ON $join2 AND $targetTable.deleted=0\n";
 
         if($return_array){
             return array(
@@ -566,7 +566,7 @@ 
         //First join the relationship table
         $query .= "$join_type $joinTableWithAlias ON $where AND $joinTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere($joinTable, $ignoreRole) . "\n";
+                . $this->getRoleWhere($joinTable, $ignoreRole) . "\n";
 
         if (!empty($params['return_as_array'])) {
             $return_array = true;

data/Relationships/One2MRelationship.php

Indentation +26 added lines, -26 removed lines

@@ -100,7 +100,7 @@ 
             );
             if (!isset($this->lhsLinkDef['name']) && isset($this->lhsLinkDef[0]))
             {
-              $this->lhsLinkDef = $this->lhsLinkDef[0];
+                $this->lhsLinkDef = $this->lhsLinkDef[0];
             }
             if (!isset($this->rhsLinkDef['name']) && isset($this->rhsLinkDef[0])) {
                 $this->rhsLinkDef = $this->rhsLinkDef[0];
@@ -128,35 +128,35 @@ 
         //If the current data matches the existing data, don't do anything
         if (!$this->checkExisting($dataToInsert))
         {
-			// Pre-load the RHS relationship, which is used later in the add() function and expects a Bean
-			// and we also use it for clearing relationships in case of non self-referencing O2M relations
-			// (should be preloaded because when using the relate_to field for updating/saving relationships,
-			// only the bean id is loaded into $rhs->$rhsLinkName)
-			$rhsLinkName = $this->rhsLink;
-			$rhs->load_relationship($rhsLinkName);
+            // Pre-load the RHS relationship, which is used later in the add() function and expects a Bean
+            // and we also use it for clearing relationships in case of non self-referencing O2M relations
+            // (should be preloaded because when using the relate_to field for updating/saving relationships,
+            // only the bean id is loaded into $rhs->$rhsLinkName)
+            $rhsLinkName = $this->rhsLink;
+            $rhs->load_relationship($rhsLinkName);
         	
-			// If it's a One2Many self-referencing relationship
-        	// the positions of the default One (LHS) and Many (RHS) are swaped
-        	// so we should clear the links from the many (left) side
-        	if ($this->selfReferencing) {
-        		// Load right hand side relationship name
-	            $linkName = $this->rhsLink;
-	            // Load the relationship into the left hand side bean
-	            $lhs->load_relationship($linkName);
+            // If it's a One2Many self-referencing relationship
+            // the positions of the default One (LHS) and Many (RHS) are swaped
+            // so we should clear the links from the many (left) side
+            if ($this->selfReferencing) {
+                // Load right hand side relationship name
+                $linkName = $this->rhsLink;
+                // Load the relationship into the left hand side bean
+                $lhs->load_relationship($linkName);
 	            
-	            // Pick the loaded link
-	            $link = $lhs->$linkName;
-	            // Get many (LHS) side bean
-	            $focus = $link->getFocus();
-	            // Get relations
-	        	$related = $link->getBeans();
+                // Pick the loaded link
+                $link = $lhs->$linkName;
+                // Get many (LHS) side bean
+                $focus = $link->getFocus();
+                // Get relations
+                $related = $link->getBeans();
 	        	
-        		// Clear the relations from many side bean
-	        	foreach($related as $relBean) {
-	        		$this->remove($focus, $relBean);
-	        	}
+                // Clear the relations from many side bean
+                foreach($related as $relBean) {
+                    $this->remove($focus, $relBean);
+                }
             } else { // For non self-referencing, remove all the relationships from the many (RHS) side
-            	$this->removeAll($rhs->$rhsLinkName);
+                $this->removeAll($rhs->$rhsLinkName);
             }
             
             // Add relationship

data/Relationships/RelationshipFactory.php

Indentation +3 added lines, -3 removed lines

@@ -213,9 +213,9 @@
         $buildingRelCache = false;
     }
 
-	protected function getCacheFile() {
-		return sugar_cached("Relationships/relationships.cache.php");
-	}
+    protected function getCacheFile() {
+        return sugar_cached("Relationships/relationships.cache.php");
+    }
 
 
 

soap.php

Indentation +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- if(!defined('sugarEntry'))define('sugarEntry', true);
+    if(!defined('sugarEntry'))define('sugarEntry', true);
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -65,7 +65,7 @@ 
 
 //New API is in these files
 if(!empty($administrator->settings['portal_on'])) {
-	require_once('soap/SoapPortalUsers.php');
+    require_once('soap/SoapPortalUsers.php');
 }
 
 require_once('soap/SoapSugarUsers.php');
@@ -88,9 +88,9 @@ 
 $observers = $resourceManager->getObservers();
 //Call set_soap_server for SoapResourceObserver instance(s)
 foreach($observers as $observer) {
-   if(method_exists($observer, 'set_soap_server')) {
-   	  $observer->set_soap_server($server);
-   }
+    if(method_exists($observer, 'set_soap_server')) {
+            $observer->set_soap_server($server);
+    }
 }
 
 $HTTP_RAW_POST_DATA = isset($HTTP_RAW_POST_DATA) ? $HTTP_RAW_POST_DATA : '';

modules/Connectors/InstallDefaultConnectors.php

Indentation +20 added lines, -20 removed lines

@@ -40,26 +40,26 @@ 
 
 
 $default_modules_sources = array (
-  'Accounts' =>
-  array (
-     'ext_rest_insideview' => 'ext_rest_insideview',
-  ),
-  'Contacts' =>
-  array (
-     'ext_rest_insideview' => 'ext_rest_insideview',
-  ),
-  'Leads' =>
-  array (
-     'ext_rest_insideview' => 'ext_rest_insideview',
-  ),
-  'Prospects' =>
-  array (
+    'Accounts' =>
+    array (
+        'ext_rest_insideview' => 'ext_rest_insideview',
+    ),
+    'Contacts' =>
+    array (
+        'ext_rest_insideview' => 'ext_rest_insideview',
+    ),
+    'Leads' =>
+    array (
+        'ext_rest_insideview' => 'ext_rest_insideview',
+    ),
+    'Prospects' =>
+    array (
 
-  ),
-  'Opportunities' =>
-  array (
+    ),
+    'Opportunities' =>
+    array (
     'ext_rest_insideview' => 'ext_rest_insideview',
-  ),
+    ),
 );
 
 $previous_connectors = array();
@@ -103,11 +103,11 @@ 
 }
 
 if(!file_exists('custom/modules/Connectors/metadata')) {
-   mkdir_recursive('custom/modules/Connectors/metadata');
+    mkdir_recursive('custom/modules/Connectors/metadata');
 }
 
 if(!write_array_to_file('modules_sources', $default_modules_sources, 'custom/modules/Connectors/metadata/display_config.php')) {
-   $GLOBALS['log']->fatal('Cannot write file custom/modules/Connectors/metadata/display_config.php');
+    $GLOBALS['log']->fatal('Cannot write file custom/modules/Connectors/metadata/display_config.php');
 }
 
 ?>

modules/Connectors/ConnectorRecord.php

Indentation +4 added lines, -4 removed lines

@@ -41,14 +41,14 @@
 
 
 
- class ConnectorRecord extends MergeRecord{
-	var $object_name = 'ConnectorRecord';
+    class ConnectorRecord extends MergeRecord{
+    var $object_name = 'ConnectorRecord';
     var $module_dir = 'Connector'; 
     
     
     function ConnectorRecord($merge_module = '', $merge_id = '') {
-       parent::MergeRecord($merge_module, $merge_id);
+        parent::MergeRecord($merge_module, $merge_id);
     }
 
- }
+    }
 ?>