adamjakab / SuiteCRM

modules/Calls/Call.php

Indentation +526 added lines, -526 removed lines

@@ -47,176 +47,176 @@ 
  ********************************************************************************/
 
 class Call extends SugarBean {
-	var $field_name_map;
-	// Stored fields
-	var $id;
-	var $json_id;
-	var $date_entered;
-	var $date_modified;
-	var $assigned_user_id;
-	var $modified_user_id;
-	var $description;
-	var $name;
-	var $status;
-	var $date_start;
-	var $time_start;
-	var $duration_hours;
-	var $duration_minutes;
-	var $date_end;
-	var $parent_type;
-	var $parent_type_options;
-	var $parent_id;
-	var $contact_id;
-	var $user_id;
-	var $lead_id;
-	var $direction;
-	var $reminder_time;
-	var $reminder_time_options;
-	var $reminder_checked;
-	var $email_reminder_time;
-	var $email_reminder_checked;
-	var $email_reminder_sent;
-	var $required;
-	var $accept_status;
-	var $created_by;
-	var $created_by_name;
-	var $modified_by_name;
-	var $parent_name;
-	var $contact_name;
-	var $contact_phone;
-	var $contact_email;
-	var $account_id;
-	var $opportunity_id;
-	var $case_id;
-	var $assigned_user_name;
-	var $note_id;
+    var $field_name_map;
+    // Stored fields
+    var $id;
+    var $json_id;
+    var $date_entered;
+    var $date_modified;
+    var $assigned_user_id;
+    var $modified_user_id;
+    var $description;
+    var $name;
+    var $status;
+    var $date_start;
+    var $time_start;
+    var $duration_hours;
+    var $duration_minutes;
+    var $date_end;
+    var $parent_type;
+    var $parent_type_options;
+    var $parent_id;
+    var $contact_id;
+    var $user_id;
+    var $lead_id;
+    var $direction;
+    var $reminder_time;
+    var $reminder_time_options;
+    var $reminder_checked;
+    var $email_reminder_time;
+    var $email_reminder_checked;
+    var $email_reminder_sent;
+    var $required;
+    var $accept_status;
+    var $created_by;
+    var $created_by_name;
+    var $modified_by_name;
+    var $parent_name;
+    var $contact_name;
+    var $contact_phone;
+    var $contact_email;
+    var $account_id;
+    var $opportunity_id;
+    var $case_id;
+    var $assigned_user_name;
+    var $note_id;
     var $outlook_id;
-	var $update_vcal = true;
-	var $contacts_arr;
-	var $users_arr;
-	var $leads_arr;
-	var $default_call_name_values = array('Assemble catalogs', 'Make travel arrangements', 'Send a letter', 'Send contract', 'Send fax', 'Send a follow-up letter', 'Send literature', 'Send proposal', 'Send quote');
-	var $minutes_value_default = 15;
-	var $minutes_values = array('0'=>'00','15'=>'15','30'=>'30','45'=>'45');
-	var $table_name = "calls";
-	var $rel_users_table = "calls_users";
-	var $rel_contacts_table = "calls_contacts";
+    var $update_vcal = true;
+    var $contacts_arr;
+    var $users_arr;
+    var $leads_arr;
+    var $default_call_name_values = array('Assemble catalogs', 'Make travel arrangements', 'Send a letter', 'Send contract', 'Send fax', 'Send a follow-up letter', 'Send literature', 'Send proposal', 'Send quote');
+    var $minutes_value_default = 15;
+    var $minutes_values = array('0'=>'00','15'=>'15','30'=>'30','45'=>'45');
+    var $table_name = "calls";
+    var $rel_users_table = "calls_users";
+    var $rel_contacts_table = "calls_contacts";
     var $rel_leads_table = "calls_leads";
-	var $module_dir = 'Calls';
-	var $object_name = "Call";
-	var $new_schema = true;
-	var $importable = true;
-	var $syncing = false;
-	var $recurring_source;
-
-	// This is used to retrieve related fields from form posts.
-	var $additional_column_fields = array('assigned_user_name', 'assigned_user_id', 'contact_id', 'user_id', 'contact_name');
-	var $relationship_fields = array(	'account_id'		=> 'accounts',
-										'opportunity_id'	=> 'opportunities',
-										'contact_id'		=> 'contacts',
-										'case_id'			=> 'cases',
-										'user_id'			=> 'users',
-										'assigned_user_id'	=> 'users',
-										'note_id'			=> 'notes',
+    var $module_dir = 'Calls';
+    var $object_name = "Call";
+    var $new_schema = true;
+    var $importable = true;
+    var $syncing = false;
+    var $recurring_source;
+
+    // This is used to retrieve related fields from form posts.
+    var $additional_column_fields = array('assigned_user_name', 'assigned_user_id', 'contact_id', 'user_id', 'contact_name');
+    var $relationship_fields = array(	'account_id'		=> 'accounts',
+                                        'opportunity_id'	=> 'opportunities',
+                                        'contact_id'		=> 'contacts',
+                                        'case_id'			=> 'cases',
+                                        'user_id'			=> 'users',
+                                        'assigned_user_id'	=> 'users',
+                                        'note_id'			=> 'notes',
                                         'lead_id'			=> 'leads',
-								);
-
-	public function __construct() {
-		parent::__construct();
-		global $app_list_strings;
-
-       	$this->setupCustomFields('Calls');
-
-		foreach ($this->field_defs as $field) {
-			$this->field_name_map[$field['name']] = $field;
-		}
-
-
-
-
-         if(!empty($GLOBALS['app_list_strings']['duration_intervals']))
-        	$this->minutes_values = $GLOBALS['app_list_strings']['duration_intervals'];
-	}
-
-	/**
-	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
-	 */
-	public function Call(){
-		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
-			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
-			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
-		}
-		self::__construct();
-	}
-
-	/**
-	 * Disable edit if call is recurring and source is not Sugar. It should be edited only from Outlook.
-	 * @param $view string
-	 * @param $is_owner bool
-	 */
-	function ACLAccess($view,$is_owner='not_set',$in_group='not_set'){
-		// don't check if call is being synced from Outlook
-		if($this->syncing == false){
-			$view = strtolower($view);
-			switch($view){
-				case 'edit':
-				case 'save':
-				case 'editview':
-				case 'delete':
-					if(!empty($this->recurring_source) && $this->recurring_source != "Sugar"){
-						return false;
-					}
-			}
-		}
-		return parent::ACLAccess($view,$is_owner,$in_group);
-	}
+                                );
+
+    public function __construct() {
+        parent::__construct();
+        global $app_list_strings;
+
+            $this->setupCustomFields('Calls');
+
+        foreach ($this->field_defs as $field) {
+            $this->field_name_map[$field['name']] = $field;
+        }
+
+
+
+
+            if(!empty($GLOBALS['app_list_strings']['duration_intervals']))
+            $this->minutes_values = $GLOBALS['app_list_strings']['duration_intervals'];
+    }
+
+    /**
+     * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
+     */
+    public function Call(){
+        $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
+        if(isset($GLOBALS['log'])) {
+            $GLOBALS['log']->deprecated($deprecatedMessage);
+        }
+        else {
+            trigger_error($deprecatedMessage, E_USER_DEPRECATED);
+        }
+        self::__construct();
+    }
+
+    /**
+     * Disable edit if call is recurring and source is not Sugar. It should be edited only from Outlook.
+     * @param $view string
+     * @param $is_owner bool
+     */
+    function ACLAccess($view,$is_owner='not_set',$in_group='not_set'){
+        // don't check if call is being synced from Outlook
+        if($this->syncing == false){
+            $view = strtolower($view);
+            switch($view){
+                case 'edit':
+                case 'save':
+                case 'editview':
+                case 'delete':
+                    if(!empty($this->recurring_source) && $this->recurring_source != "Sugar"){
+                        return false;
+                    }
+            }
+        }
+        return parent::ACLAccess($view,$is_owner,$in_group);
+    }
     // save date_end by calculating user input
     // this is for calendar
-	function save($check_notify = FALSE) {
-		global $timedate,$current_user;
+    function save($check_notify = FALSE) {
+        global $timedate,$current_user;
 
-	    if(isset($this->date_start) && isset($this->duration_hours) && isset($this->duration_minutes))
+        if(isset($this->date_start) && isset($this->duration_hours) && isset($this->duration_minutes))
         {
-    	    $td = $timedate->fromDb($this->date_start);
-    	    if($td)
-    	    {
-	        	$this->date_end = $td->modify("+{$this->duration_hours} hours {$this->duration_minutes} mins")->asDb();
-    	    }
+            $td = $timedate->fromDb($this->date_start);
+            if($td)
+            {
+                $this->date_end = $td->modify("+{$this->duration_hours} hours {$this->duration_minutes} mins")->asDb();
+            }
         }
 
-		if(!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') {
-			$check_notify = true;
+        if(!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') {
+            $check_notify = true;
         } else {
-			$check_notify = false;
-		}
-		if(empty($_REQUEST['send_invites'])) {
-			if(!empty($this->id)) {
-				$old_record = new Call();
-				$old_record->retrieve($this->id);
-				$old_assigned_user_id = $old_record->assigned_user_id;
-			}
-			if((empty($this->id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $GLOBALS['current_user']->id != $_REQUEST['assigned_user_id']) || (isset($old_assigned_user_id) && !empty($old_assigned_user_id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $old_assigned_user_id != $_REQUEST['assigned_user_id']) ){
-				$this->special_notification = true;
-				if(!isset($GLOBALS['resavingRelatedBeans']) || $GLOBALS['resavingRelatedBeans'] == false) {
-					$check_notify = true;
-				}
+            $check_notify = false;
+        }
+        if(empty($_REQUEST['send_invites'])) {
+            if(!empty($this->id)) {
+                $old_record = new Call();
+                $old_record->retrieve($this->id);
+                $old_assigned_user_id = $old_record->assigned_user_id;
+            }
+            if((empty($this->id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $GLOBALS['current_user']->id != $_REQUEST['assigned_user_id']) || (isset($old_assigned_user_id) && !empty($old_assigned_user_id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $old_assigned_user_id != $_REQUEST['assigned_user_id']) ){
+                $this->special_notification = true;
+                if(!isset($GLOBALS['resavingRelatedBeans']) || $GLOBALS['resavingRelatedBeans'] == false) {
+                    $check_notify = true;
+                }
                 if(isset($_REQUEST['assigned_user_name'])) {
                     $this->new_assigned_user_name = $_REQUEST['assigned_user_name'];
                 }
-			}
-		}
+            }
+        }
         if (empty($this->status) ) {
             $this->status = $this->getDefaultStatus();
         }
 
-		// prevent a mass mailing for recurring meetings created in Calendar module
-		if (empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id)) {
-			$check_notify = false;
-		}
-		/*nsingh 7/3/08  commenting out as bug #20814 is invalid
+        // prevent a mass mailing for recurring meetings created in Calendar module
+        if (empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id)) {
+            $check_notify = false;
+        }
+        /*nsingh 7/3/08  commenting out as bug #20814 is invalid
 		if($current_user->getPreference('reminder_time')!= -1 &&  isset($_POST['reminder_checked']) && isset($_POST['reminder_time']) && $_POST['reminder_checked']==0  && $_POST['reminder_time']==-1){
 			$this->reminder_checked = '1';
 			$this->reminder_time = $current_user->getPreference('reminder_time');
@@ -227,87 +227,87 @@ 
 
 
         if($this->update_vcal) {
-			vCal::cache_sugar_vcal($current_user);
+            vCal::cache_sugar_vcal($current_user);
         }
 
-		if(isset($_REQUEST['reminders_data'])) {
-			Reminder::saveRemindersDataJson('Calls', $return_id, html_entity_decode($_REQUEST['reminders_data']));
-		}
+        if(isset($_REQUEST['reminders_data'])) {
+            Reminder::saveRemindersDataJson('Calls', $return_id, html_entity_decode($_REQUEST['reminders_data']));
+        }
 
         return $return_id;
-	}
+    }
 
-	/** Returns a list of the associated contacts
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	*/
-	function get_contacts()
-	{
-		// First, get the list of IDs.
-		$query = "SELECT contact_id as id from calls_contacts where call_id='$this->id' AND deleted=0";
+    /** Returns a list of the associated contacts
+     * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+     * All Rights Reserved..
+     * Contributor(s): ______________________________________..
+     */
+    function get_contacts()
+    {
+        // First, get the list of IDs.
+        $query = "SELECT contact_id as id from calls_contacts where call_id='$this->id' AND deleted=0";
 
-		return $this->build_related_list($query, new Contact());
-	}
+        return $this->build_related_list($query, new Contact());
+    }
 
 
-	function get_summary_text()
-	{
-		return "$this->name";
-	}
+    function get_summary_text()
+    {
+        return "$this->name";
+    }
 
-	function create_list_query($order_by, $where, $show_deleted=0)
-	{
+    function create_list_query($order_by, $where, $show_deleted=0)
+    {
         $custom_join = $this->getCustomJoin();
                 $query = "SELECT ";
-		$query .= "
+        $query .= "
 			calls.*,";
-			if ( preg_match("/calls_users\.user_id/",$where))
-			{
-				$query .= "calls_users.required,
+            if ( preg_match("/calls_users\.user_id/",$where))
+            {
+                $query .= "calls_users.required,
 				calls_users.accept_status,";
-			}
+            }
 
-			$query .= "
+            $query .= "
 			users.user_name as assigned_user_name";
         $query .= $custom_join['select'];
 
-			// this line will help generate a GMT-metric to compare to a locale's timezone
+            // this line will help generate a GMT-metric to compare to a locale's timezone
 
-			if ( preg_match("/contacts/",$where)){
-				$query .= ", contacts.first_name, contacts.last_name";
-				$query .= ", contacts.assigned_user_id contact_name_owner";
-			}
-			$query .= " FROM calls ";
+            if ( preg_match("/contacts/",$where)){
+                $query .= ", contacts.first_name, contacts.last_name";
+                $query .= ", contacts.assigned_user_id contact_name_owner";
+            }
+            $query .= " FROM calls ";
 
-			if ( preg_match("/contacts/",$where)){
-				$query .=	"LEFT JOIN calls_contacts
+            if ( preg_match("/contacts/",$where)){
+                $query .=	"LEFT JOIN calls_contacts
 	                    ON calls.id=calls_contacts.call_id
 	                    LEFT JOIN contacts
 	                    ON calls_contacts.contact_id=contacts.id ";
-			}
-			if ( preg_match('/calls_users\.user_id/',$where))
-			{
-		$query .= "LEFT JOIN calls_users
+            }
+            if ( preg_match('/calls_users\.user_id/',$where))
+            {
+        $query .= "LEFT JOIN calls_users
 			ON calls.id=calls_users.call_id and calls_users.deleted=0 ";
-			}
-			$query .= "
+            }
+            $query .= "
 			LEFT JOIN users
 			ON calls.assigned_user_id=users.id ";
         $query .= $custom_join['join'];
-			$where_auto = '1=1';
-       		 if($show_deleted == 0){
-            	$where_auto = " $this->table_name.deleted=0  ";
-			}else if($show_deleted == 1){
-				$where_auto = " $this->table_name.deleted=1 ";
-			}
+            $where_auto = '1=1';
+                if($show_deleted == 0){
+                $where_auto = " $this->table_name.deleted=0  ";
+            }else if($show_deleted == 1){
+                $where_auto = " $this->table_name.deleted=1 ";
+            }
 
-			//$where_auto .= " GROUP BY calls.id";
+            //$where_auto .= " GROUP BY calls.id";
 
-		if($where != "")
-			$query .= "where $where AND ".$where_auto;
-		else
-			$query .= "where ".$where_auto;
+        if($where != "")
+            $query .= "where $where AND ".$where_auto;
+        else
+            $query .= "where ".$where_auto;
 
         $order_by = $this->process_order_by($order_by);
         if (empty($order_by)) {
@@ -315,14 +315,14 @@ 
         }
         $query .= ' ORDER BY ' . $order_by;
 
-		return $query;
-	}
+        return $query;
+    }
 
         function create_export_query($order_by, $where, $relate_link_join='')
         {
             $custom_join = $this->getCustomJoin(true, true, $where);
             $custom_join['join'] .= $relate_link_join;
-			$contact_required = stristr($where, "contacts");
+            $contact_required = stristr($where, "contacts");
             if($contact_required)
             {
                     $query = "SELECT calls.*, contacts.first_name, contacts.last_name, users.user_name as assigned_user_name ";
@@ -339,11 +339,11 @@ 
             }
 
 
-			$query .= "  LEFT JOIN users ON calls.assigned_user_id=users.id ";
+            $query .= "  LEFT JOIN users ON calls.assigned_user_id=users.id ";
 
             $query .= $custom_join['join'];
 
-			if($where != "")
+            if($where != "")
                     $query .= "where $where AND ".$where_auto;
             else
                     $query .= "where ".$where_auto;
@@ -361,199 +361,199 @@ 
 
 
 
-	function fill_in_additional_detail_fields()
-	{
-		global $locale;
-		parent::fill_in_additional_detail_fields();
-		if (!empty($this->contact_id)) {
-			$query  = "SELECT first_name, last_name FROM contacts ";
-			$query .= "WHERE id='$this->contact_id' AND deleted=0";
-			$result = $this->db->limitQuery($query,0,1,true," Error filling in additional detail fields: ");
-
-			// Get the contact name.
-			$row = $this->db->fetchByAssoc($result);
-			$GLOBALS['log']->info("additional call fields $query");
-			if($row != null)
-			{
-				$this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name'], '', '');
-				$GLOBALS['log']->debug("Call($this->id): contact_name = $this->contact_name");
-				$GLOBALS['log']->debug("Call($this->id): contact_id = $this->contact_id");
-			}
-		}
-		if (!isset($this->duration_minutes)) {
-			$this->duration_minutes = $this->minutes_value_default;
-		}
+    function fill_in_additional_detail_fields()
+    {
+        global $locale;
+        parent::fill_in_additional_detail_fields();
+        if (!empty($this->contact_id)) {
+            $query  = "SELECT first_name, last_name FROM contacts ";
+            $query .= "WHERE id='$this->contact_id' AND deleted=0";
+            $result = $this->db->limitQuery($query,0,1,true," Error filling in additional detail fields: ");
+
+            // Get the contact name.
+            $row = $this->db->fetchByAssoc($result);
+            $GLOBALS['log']->info("additional call fields $query");
+            if($row != null)
+            {
+                $this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name'], '', '');
+                $GLOBALS['log']->debug("Call($this->id): contact_name = $this->contact_name");
+                $GLOBALS['log']->debug("Call($this->id): contact_id = $this->contact_id");
+            }
+        }
+        if (!isset($this->duration_minutes)) {
+            $this->duration_minutes = $this->minutes_value_default;
+        }
 
         global $timedate;
         //setting default date and time
-		if (is_null($this->date_start)) {
-			$this->date_start = $timedate->now();
-		}
-
-		if (is_null($this->duration_hours))
-			$this->duration_hours = "0";
-		if (is_null($this->duration_minutes))
-			$this->duration_minutes = "1";
-
-		$this->fill_in_additional_parent_fields();
-
-		global $app_list_strings;
-		$parent_types = $app_list_strings['record_type_display'];
-		$disabled_parent_types = ACLController::disabledModuleList($parent_types,false, 'list');
-		foreach($disabled_parent_types as $disabled_parent_type){
-			if($disabled_parent_type != $this->parent_type){
-				unset($parent_types[$disabled_parent_type]);
-			}
-		}
-
-		$this->parent_type_options = get_select_options_with_id($parent_types, $this->parent_type);
-
-		if (empty($this->reminder_time)) {
-			$this->reminder_time = -1;
-		}
-
-		if ( empty($this->id) ) {
-		    $reminder_t = $GLOBALS['current_user']->getPreference('reminder_time');
-		    if ( isset($reminder_t) )
-		        $this->reminder_time = $reminder_t;
-		}
-		$this->reminder_checked = $this->reminder_time == -1 ? false : true;
-
-		if (empty($this->email_reminder_time)) {
-			$this->email_reminder_time = -1;
-		}
-		if(empty($this->id)){
-			$reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
-			if(isset($reminder_t))
-		    		$this->email_reminder_time = $reminder_t;
-		}
-		$this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
-
-		if (isset ($_REQUEST['parent_type']) && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'SubpanelEdits')) {
-			$this->parent_type = $_REQUEST['parent_type'];
-		} elseif (is_null($this->parent_type)) {
-			$this->parent_type = $app_list_strings['record_type_default_key'];
-		}
-	}
-
-
-	function get_list_view_data(){
-		$call_fields = $this->get_list_view_array();
-		global $app_list_strings, $focus, $action, $currentModule;
-		if (isset($focus->id)) $id = $focus->id;
-		else $id = '';
-		if (isset($this->parent_type) && $this->parent_type != null)
-		{
-			$call_fields['PARENT_MODULE'] = $this->parent_type;
-		}
-		if ($this->status == "Planned") {
-			//cn: added this if() to deal with sequential Closes in Meetings.  this is a hack to a hack (formbase.php->handleRedirect)
-			if(empty($action))
-			    $action = "index";
+        if (is_null($this->date_start)) {
+            $this->date_start = $timedate->now();
+        }
+
+        if (is_null($this->duration_hours))
+            $this->duration_hours = "0";
+        if (is_null($this->duration_minutes))
+            $this->duration_minutes = "1";
+
+        $this->fill_in_additional_parent_fields();
+
+        global $app_list_strings;
+        $parent_types = $app_list_strings['record_type_display'];
+        $disabled_parent_types = ACLController::disabledModuleList($parent_types,false, 'list');
+        foreach($disabled_parent_types as $disabled_parent_type){
+            if($disabled_parent_type != $this->parent_type){
+                unset($parent_types[$disabled_parent_type]);
+            }
+        }
+
+        $this->parent_type_options = get_select_options_with_id($parent_types, $this->parent_type);
+
+        if (empty($this->reminder_time)) {
+            $this->reminder_time = -1;
+        }
+
+        if ( empty($this->id) ) {
+            $reminder_t = $GLOBALS['current_user']->getPreference('reminder_time');
+            if ( isset($reminder_t) )
+                $this->reminder_time = $reminder_t;
+        }
+        $this->reminder_checked = $this->reminder_time == -1 ? false : true;
+
+        if (empty($this->email_reminder_time)) {
+            $this->email_reminder_time = -1;
+        }
+        if(empty($this->id)){
+            $reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
+            if(isset($reminder_t))
+                    $this->email_reminder_time = $reminder_t;
+        }
+        $this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
+
+        if (isset ($_REQUEST['parent_type']) && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'SubpanelEdits')) {
+            $this->parent_type = $_REQUEST['parent_type'];
+        } elseif (is_null($this->parent_type)) {
+            $this->parent_type = $app_list_strings['record_type_default_key'];
+        }
+    }
+
+
+    function get_list_view_data(){
+        $call_fields = $this->get_list_view_array();
+        global $app_list_strings, $focus, $action, $currentModule;
+        if (isset($focus->id)) $id = $focus->id;
+        else $id = '';
+        if (isset($this->parent_type) && $this->parent_type != null)
+        {
+            $call_fields['PARENT_MODULE'] = $this->parent_type;
+        }
+        if ($this->status == "Planned") {
+            //cn: added this if() to deal with sequential Closes in Meetings.  this is a hack to a hack (formbase.php->handleRedirect)
+            if(empty($action))
+                $action = "index";
 
             $setCompleteUrl = "<a id='{$this->id}' onclick='SUGAR.util.closeActivityPanel.show(\"{$this->module_dir}\",\"{$this->id}\",\"Held\",\"listview\",\"1\");'>";
-			if ($this->ACLAccess('edit')) {
+            if ($this->ACLAccess('edit')) {
                 $call_fields['SET_COMPLETE'] = $setCompleteUrl . SugarThemeRegistry::current()->getImage("close_inline"," border='0'",null,null,'.gif',translate('LBL_CLOSEINLINE'))."</a>";
             } else {
                 $call_fields['SET_COMPLETE'] = '';
             }
-		}
-		global $timedate;
-		$today = $timedate->nowDb();
-		$nextday = $timedate->asDbDate($timedate->getNow()->modify("+1 day"));
-		$mergeTime = $call_fields['DATE_START']; //$timedate->merge_date_time($call_fields['DATE_START'], $call_fields['TIME_START']);
-		$date_db = $timedate->to_db($mergeTime);
-		if( $date_db	< $today){
-			$call_fields['DATE_START']= "<font class='overdueTask'>".$call_fields['DATE_START']."</font>";
-		}else if($date_db < $nextday){
-			$call_fields['DATE_START'] = "<font class='todaysTask'>".$call_fields['DATE_START']."</font>";
-		}else{
-			$call_fields['DATE_START'] = "<font class='futureTask'>".$call_fields['DATE_START']."</font>";
-		}
-		$this->fill_in_additional_detail_fields();
-
-		//make sure we grab the localized version of the contact name, if a contact is provided
-		if (!empty($this->contact_id)) {
-           // Bug# 46125 - make first name, last name, salutation and title of Contacts respect field level ACLs
+        }
+        global $timedate;
+        $today = $timedate->nowDb();
+        $nextday = $timedate->asDbDate($timedate->getNow()->modify("+1 day"));
+        $mergeTime = $call_fields['DATE_START']; //$timedate->merge_date_time($call_fields['DATE_START'], $call_fields['TIME_START']);
+        $date_db = $timedate->to_db($mergeTime);
+        if( $date_db	< $today){
+            $call_fields['DATE_START']= "<font class='overdueTask'>".$call_fields['DATE_START']."</font>";
+        }else if($date_db < $nextday){
+            $call_fields['DATE_START'] = "<font class='todaysTask'>".$call_fields['DATE_START']."</font>";
+        }else{
+            $call_fields['DATE_START'] = "<font class='futureTask'>".$call_fields['DATE_START']."</font>";
+        }
+        $this->fill_in_additional_detail_fields();
+
+        //make sure we grab the localized version of the contact name, if a contact is provided
+        if (!empty($this->contact_id)) {
+            // Bug# 46125 - make first name, last name, salutation and title of Contacts respect field level ACLs
             $contact_temp = BeanFactory::getBean("Contacts", $this->contact_id);
             if(!empty($contact_temp)) {
                 $contact_temp->_create_proper_name_field();
                 $this->contact_name = $contact_temp->full_name;
             }
-		}
+        }
 
         $call_fields['CONTACT_ID'] = $this->contact_id;
         $call_fields['CONTACT_NAME'] = $this->contact_name;
-		$call_fields['PARENT_NAME'] = $this->parent_name;
+        $call_fields['PARENT_NAME'] = $this->parent_name;
         $call_fields['REMINDER_CHECKED'] = $this->reminder_time==-1 ? false : true;
-	    $call_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time==-1 ? false : true;
+        $call_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time==-1 ? false : true;
 
-		return $call_fields;
-	}
+        return $call_fields;
+    }
 
-	function set_notification_body($xtpl, $call) {
-		global $sugar_config;
-		global $app_list_strings;
-		global $current_user;
-		global $app_list_strings;
-		global $timedate;
+    function set_notification_body($xtpl, $call) {
+        global $sugar_config;
+        global $app_list_strings;
+        global $current_user;
+        global $app_list_strings;
+        global $timedate;
 
         // rrs: bug 42684 - passing a contact breaks this call
-		$notifyUser =($call->current_notify_user->object_name == 'User') ? $call->current_notify_user : $current_user;
-
-
-		// Assumes $call dates are in user format
-		$calldate = $timedate->fromDb($call->date_start);
-		$xOffset = $timedate->asUser($calldate, $notifyUser).' '.$timedate->userTimezoneSuffix($calldate, $notifyUser);
-
-		if ( strtolower(get_class($call->current_notify_user)) == 'contact' ) {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-				  '/index.php?entryPoint=acceptDecline&module=Calls&contact_id='.$call->current_notify_user->id.'&record='.$call->id);
-		} elseif ( strtolower(get_class($call->current_notify_user)) == 'lead' ) {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-				  '/index.php?entryPoint=acceptDecline&module=Calls&lead_id='.$call->current_notify_user->id.'&record='.$call->id);
-		} else {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-				  '/index.php?entryPoint=acceptDecline&module=Calls&user_id='.$call->current_notify_user->id.'&record='.$call->id);
-		}
-
-		$xtpl->assign("CALL_TO", $call->current_notify_user->new_assigned_user_name);
-		$xtpl->assign("CALL_SUBJECT", $call->name);
-		$xtpl->assign("CALL_STARTDATE", $xOffset);
-		$xtpl->assign("CALL_HOURS", $call->duration_hours);
-		$xtpl->assign("CALL_MINUTES", $call->duration_minutes);
-		$xtpl->assign("CALL_STATUS", ((isset($call->status))?$app_list_strings['call_status_dom'][$call->status] : ""));
-		$xtpl->assign("CALL_DESCRIPTION", $call->description);
-
-		return $xtpl;
-	}
-
-
-	function get_call_users() {
-		$template = new User();
-		// First, get the list of IDs.
-		$query = "SELECT calls_users.required, calls_users.accept_status, calls_users.user_id from calls_users where calls_users.call_id='$this->id' AND calls_users.deleted=0";
-		$GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
-		$result = $this->db->query($query, true);
-		$list = Array();
-
-		while($row = $this->db->fetchByAssoc($result)) {
-			$template = new User(); // PHP 5 will retrieve by reference, always over-writing the "old" one
-			$record = $template->retrieve($row['user_id']);
-			$template->required = $row['required'];
-			$template->accept_status = $row['accept_status'];
-
-			if($record != null) {
-			    // this copies the object into the array
-				$list[] = $template;
-			}
-		}
-		return $list;
-	}
-
-
-  function get_invite_calls(&$user)
-  {
+        $notifyUser =($call->current_notify_user->object_name == 'User') ? $call->current_notify_user : $current_user;
+
+
+        // Assumes $call dates are in user format
+        $calldate = $timedate->fromDb($call->date_start);
+        $xOffset = $timedate->asUser($calldate, $notifyUser).' '.$timedate->userTimezoneSuffix($calldate, $notifyUser);
+
+        if ( strtolower(get_class($call->current_notify_user)) == 'contact' ) {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                    '/index.php?entryPoint=acceptDecline&module=Calls&contact_id='.$call->current_notify_user->id.'&record='.$call->id);
+        } elseif ( strtolower(get_class($call->current_notify_user)) == 'lead' ) {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                    '/index.php?entryPoint=acceptDecline&module=Calls&lead_id='.$call->current_notify_user->id.'&record='.$call->id);
+        } else {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                    '/index.php?entryPoint=acceptDecline&module=Calls&user_id='.$call->current_notify_user->id.'&record='.$call->id);
+        }
+
+        $xtpl->assign("CALL_TO", $call->current_notify_user->new_assigned_user_name);
+        $xtpl->assign("CALL_SUBJECT", $call->name);
+        $xtpl->assign("CALL_STARTDATE", $xOffset);
+        $xtpl->assign("CALL_HOURS", $call->duration_hours);
+        $xtpl->assign("CALL_MINUTES", $call->duration_minutes);
+        $xtpl->assign("CALL_STATUS", ((isset($call->status))?$app_list_strings['call_status_dom'][$call->status] : ""));
+        $xtpl->assign("CALL_DESCRIPTION", $call->description);
+
+        return $xtpl;
+    }
+
+
+    function get_call_users() {
+        $template = new User();
+        // First, get the list of IDs.
+        $query = "SELECT calls_users.required, calls_users.accept_status, calls_users.user_id from calls_users where calls_users.call_id='$this->id' AND calls_users.deleted=0";
+        $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
+        $result = $this->db->query($query, true);
+        $list = Array();
+
+        while($row = $this->db->fetchByAssoc($result)) {
+            $template = new User(); // PHP 5 will retrieve by reference, always over-writing the "old" one
+            $record = $template->retrieve($row['user_id']);
+            $template->required = $row['required'];
+            $template->accept_status = $row['accept_status'];
+
+            if($record != null) {
+                // this copies the object into the array
+                $list[] = $template;
+            }
+        }
+        return $list;
+    }
+
+
+    function get_invite_calls(&$user)
+    {
     $template = $this;
     // First, get the list of IDs.
     $query = "SELECT calls_users.required, calls_users.accept_status, calls_users.call_id from calls_users where calls_users.user_id='$user->id' AND ( calls_users.accept_status IS NULL OR  calls_users.accept_status='none') AND calls_users.deleted=0";
@@ -568,182 +568,182 @@ 
 
     while($row = $this->db->fetchByAssoc($result))
     {
-      $record = $template->retrieve($row['call_id']);
-      $template->required = $row['required'];
-      $template->accept_status = $row['accept_status'];
+        $record = $template->retrieve($row['call_id']);
+        $template->required = $row['required'];
+        $template->accept_status = $row['accept_status'];
 
 
-      if($record != null)
-      {
+        if($record != null)
+        {
         // this copies the object into the array
         $list[] = $template;
-      }
+        }
     }
     return $list;
 
-  }
+    }
 
 
-  function set_accept_status(&$user,$status)
-  {
+    function set_accept_status(&$user,$status)
+    {
     if ( $user->object_name == 'User')
     {
-      $relate_values = array('user_id'=>$user->id,'call_id'=>$this->id);
-      $data_values = array('accept_status'=>$status);
-      $this->set_relationship($this->rel_users_table, $relate_values, true, true,$data_values);
-      global $current_user;
+        $relate_values = array('user_id'=>$user->id,'call_id'=>$this->id);
+        $data_values = array('accept_status'=>$status);
+        $this->set_relationship($this->rel_users_table, $relate_values, true, true,$data_values);
+        global $current_user;
 
-      if ( $this->update_vcal )
-      {
+        if ( $this->update_vcal )
+        {
         vCal::cache_sugar_vcal($user);
-      }
+        }
     }
     else if ( $user->object_name == 'Contact')
     {
-      $relate_values = array('contact_id'=>$user->id,'call_id'=>$this->id);
-      $data_values = array('accept_status'=>$status);
-      $this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
+        $relate_values = array('contact_id'=>$user->id,'call_id'=>$this->id);
+        $data_values = array('accept_status'=>$status);
+        $this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
     }
     else if ( $user->object_name == 'Lead')
     {
-      $relate_values = array('lead_id'=>$user->id,'call_id'=>$this->id);
-      $data_values = array('accept_status'=>$status);
-      $this->set_relationship($this->rel_leads_table, $relate_values, true, true,$data_values);
+        $relate_values = array('lead_id'=>$user->id,'call_id'=>$this->id);
+        $data_values = array('accept_status'=>$status);
+        $this->set_relationship($this->rel_leads_table, $relate_values, true, true,$data_values);
+    }
     }
-  }
 
 
 
-	function get_notification_recipients() {
-		if($this->special_notification) {
-			return parent::get_notification_recipients();
-		}
+    function get_notification_recipients() {
+        if($this->special_notification) {
+            return parent::get_notification_recipients();
+        }
 
 //		$GLOBALS['log']->debug('Call.php->get_notification_recipients():'.print_r($this,true));
-		$list = array();
+        $list = array();
         if(!is_array($this->contacts_arr)) {
-			$this->contacts_arr =	array();
-		}
+            $this->contacts_arr =	array();
+        }
 
-		if(!is_array($this->users_arr)) {
-			$this->users_arr =	array();
-		}
+        if(!is_array($this->users_arr)) {
+            $this->users_arr =	array();
+        }
 
         if(!is_array($this->leads_arr)) {
-			$this->leads_arr =	array();
-		}
-
-		foreach($this->users_arr as $user_id) {
-			$notify_user = new User();
-			$notify_user->retrieve($user_id);
-			$notify_user->new_assigned_user_name = $notify_user->full_name;
-			$GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
-			$list[$notify_user->id] = $notify_user;
-		}
-
-		foreach($this->contacts_arr as $contact_id) {
-			$notify_user = new Contact();
-			$notify_user->retrieve($contact_id);
-			$notify_user->new_assigned_user_name = $notify_user->full_name;
-			$GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
-			$list[$notify_user->id] = $notify_user;
-		}
+            $this->leads_arr =	array();
+        }
+
+        foreach($this->users_arr as $user_id) {
+            $notify_user = new User();
+            $notify_user->retrieve($user_id);
+            $notify_user->new_assigned_user_name = $notify_user->full_name;
+            $GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
+            $list[$notify_user->id] = $notify_user;
+        }
+
+        foreach($this->contacts_arr as $contact_id) {
+            $notify_user = new Contact();
+            $notify_user->retrieve($contact_id);
+            $notify_user->new_assigned_user_name = $notify_user->full_name;
+            $GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
+            $list[$notify_user->id] = $notify_user;
+        }
 
         foreach($this->leads_arr as $lead_id) {
-			$notify_user = new Lead();
-			$notify_user->retrieve($lead_id);
-			$notify_user->new_assigned_user_name = $notify_user->full_name;
-			$GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
-			$list[$notify_user->id] = $notify_user;
-		}
-		global $sugar_config;
-		if(isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
-			global $current_user;
-			if(isset($list[$current_user->id]))
-				unset($list[$current_user->id]);
-		}
+            $notify_user = new Lead();
+            $notify_user->retrieve($lead_id);
+            $notify_user->new_assigned_user_name = $notify_user->full_name;
+            $GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
+            $list[$notify_user->id] = $notify_user;
+        }
+        global $sugar_config;
+        if(isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
+            global $current_user;
+            if(isset($list[$current_user->id]))
+                unset($list[$current_user->id]);
+        }
 //		$GLOBALS['log']->debug('Call.php->get_notification_recipients():'.print_r($list,true));
-		return $list;
-	}
+        return $list;
+    }
 
     function bean_implements($interface){
-		switch($interface){
-			case 'ACL':return true;
-		}
-		return false;
-	}
-
-	function listviewACLHelper(){
-		$array_assign = parent::listviewACLHelper();
-		$is_owner = false;
-		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->parent_name)){
-
-			if(!empty($this->parent_name_owner)){
-				global $current_user;
-				$is_owner = $current_user->id == $this->parent_name_owner;
-			}
-			/* BEGIN - SECURITY GROUPS */
-			//parent_name_owner not being set for whatever reason so we need to figure this out
-			else if(!empty($this->parent_type) && !empty($this->parent_id)) {
-				global $current_user;
+        switch($interface){
+            case 'ACL':return true;
+        }
+        return false;
+    }
+
+    function listviewACLHelper(){
+        $array_assign = parent::listviewACLHelper();
+        $is_owner = false;
+        $in_group = false; //SECURITY GROUPS
+        if(!empty($this->parent_name)){
+
+            if(!empty($this->parent_name_owner)){
+                global $current_user;
+                $is_owner = $current_user->id == $this->parent_name_owner;
+            }
+            /* BEGIN - SECURITY GROUPS */
+            //parent_name_owner not being set for whatever reason so we need to figure this out
+            else if(!empty($this->parent_type) && !empty($this->parent_id)) {
+                global $current_user;
                 $parent_bean = BeanFactory::getBean($this->parent_type,$this->parent_id);
                 if($parent_bean !== false) {
-                	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
+                    $is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
-			}
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			$in_group = SecurityGroup::groupHasAccess($this->parent_type, $this->parent_id, 'view');
-        	/* END - SECURITY GROUPS */
-		}
-
-			/* BEGIN - SECURITY GROUPS */
-			/**
+            }
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            $in_group = SecurityGroup::groupHasAccess($this->parent_type, $this->parent_id, 'view');
+            /* END - SECURITY GROUPS */
+        }
+
+            /* BEGIN - SECURITY GROUPS */
+            /**
 			if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner)){
-			*/
-			if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)){
-        	/* END - SECURITY GROUPS */
-				$array_assign['PARENT'] = 'a';
-			}else{
-				$array_assign['PARENT'] = 'span';
-			}
-		$is_owner = false;
-		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->contact_name)){
-
-			if(!empty($this->contact_name_owner)){
-				global $current_user;
-				$is_owner = $current_user->id == $this->contact_name_owner;
-			}
-			/* BEGIN - SECURITY GROUPS */
-			//contact_name_owner not being set for whatever reason so we need to figure this out
-			else {
-				global $current_user;
+             */
+            if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)){
+            /* END - SECURITY GROUPS */
+                $array_assign['PARENT'] = 'a';
+            }else{
+                $array_assign['PARENT'] = 'span';
+            }
+        $is_owner = false;
+        $in_group = false; //SECURITY GROUPS
+        if(!empty($this->contact_name)){
+
+            if(!empty($this->contact_name_owner)){
+                global $current_user;
+                $is_owner = $current_user->id == $this->contact_name_owner;
+            }
+            /* BEGIN - SECURITY GROUPS */
+            //contact_name_owner not being set for whatever reason so we need to figure this out
+            else {
+                global $current_user;
                 $parent_bean = BeanFactory::getBean('Contacts',$this->contact_id);
                 if($parent_bean !== false) {
-                	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
+                    $is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
-			}
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			$in_group = SecurityGroup::groupHasAccess('Contacts', $this->contact_id, 'view');
-        	/* END - SECURITY GROUPS */
-		}
-			/* BEGIN - SECURITY GROUPS */
-			/**
+            }
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            $in_group = SecurityGroup::groupHasAccess('Contacts', $this->contact_id, 'view');
+            /* END - SECURITY GROUPS */
+        }
+            /* BEGIN - SECURITY GROUPS */
+            /**
 			if( ACLController::checkAccess('Contacts', 'view', $is_owner)){
-			*/
-			if( ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)){
-        	/* END - SECURITY GROUPS */
-				$array_assign['CONTACT'] = 'a';
-			}else{
-				$array_assign['CONTACT'] = 'span';
-			}
-
-		return $array_assign;
-	}
-
-	function save_relationship_changes($is_update, $exclude = array()) {
-		if(empty($this->in_workflow))
+             */
+            if( ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)){
+            /* END - SECURITY GROUPS */
+                $array_assign['CONTACT'] = 'a';
+            }else{
+                $array_assign['CONTACT'] = 'span';
+            }
+
+        return $array_assign;
+    }
+
+    function save_relationship_changes($is_update, $exclude = array()) {
+        if(empty($this->in_workflow))
         {
             if(empty($this->in_import))
             {
@@ -751,12 +751,12 @@ 
                 //add assigned_user_id to exclude list and let the logic from MeetingFormBase determine whether assigned user id gets added to the relationship
                 if(!empty($GLOBALS['soap_server_object']))
                 {
-           		    $exclude = array('lead_id', 'contact_id', 'user_id');
-           	    }
+                        $exclude = array('lead_id', 'contact_id', 'user_id');
+                    }
                 else
                 {
-	                $exclude = array('lead_id', 'contact_id', 'user_id', 'assigned_user_id');
-           	    }
+                    $exclude = array('lead_id', 'contact_id', 'user_id', 'assigned_user_id');
+                    }
             }
             else
             {
@@ -765,15 +765,15 @@ 
 
 
         }
-		parent::save_relationship_changes($is_update, $exclude);
-	}
+        parent::save_relationship_changes($is_update, $exclude);
+    }
 
     public function getDefaultStatus()
     {
-         $def = $this->field_defs['status'];
-         if (isset($def['default'])) {
-             return $def['default'];
-         } else {
+            $def = $this->field_defs['status'];
+            if (isset($def['default'])) {
+                return $def['default'];
+            } else {
             $app = return_app_list_strings_language($GLOBALS['current_language']);
             if (isset($def['options']) && isset($app[$def['options']])) {
                 $keys = array_keys($app[$def['options']]);

Spacing +106 added lines, -106 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -97,7 +97,7 @@ 
 	var $leads_arr;
 	var $default_call_name_values = array('Assemble catalogs', 'Make travel arrangements', 'Send a letter', 'Send contract', 'Send fax', 'Send a follow-up letter', 'Send literature', 'Send proposal', 'Send quote');
 	var $minutes_value_default = 15;
-	var $minutes_values = array('0'=>'00','15'=>'15','30'=>'30','45'=>'45');
+	var $minutes_values = array('0'=>'00', '15'=>'15', '30'=>'30', '45'=>'45');
 	var $table_name = "calls";
 	var $rel_users_table = "calls_users";
 	var $rel_contacts_table = "calls_contacts";
@@ -111,7 +111,7 @@ 
 
 	// This is used to retrieve related fields from form posts.
 	var $additional_column_fields = array('assigned_user_name', 'assigned_user_id', 'contact_id', 'user_id', 'contact_name');
-	var $relationship_fields = array(	'account_id'		=> 'accounts',
+	var $relationship_fields = array('account_id'		=> 'accounts',
 										'opportunity_id'	=> 'opportunities',
 										'contact_id'		=> 'contacts',
 										'case_id'			=> 'cases',
@@ -134,16 +134,16 @@ 
 
 
 
-         if(!empty($GLOBALS['app_list_strings']['duration_intervals']))
+         if (!empty($GLOBALS['app_list_strings']['duration_intervals']))
         	$this->minutes_values = $GLOBALS['app_list_strings']['duration_intervals'];
 	}
 
 	/**
 	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
 	 */
-	public function Call(){
+	public function Call() {
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
+		if (isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
 		}
 		else {
@@ -157,58 +157,58 @@ 
 	 * @param $view string
 	 * @param $is_owner bool
 	 */
-	function ACLAccess($view,$is_owner='not_set',$in_group='not_set'){
+	function ACLAccess($view, $is_owner = 'not_set', $in_group = 'not_set') {
 		// don't check if call is being synced from Outlook
-		if($this->syncing == false){
+		if ($this->syncing == false) {
 			$view = strtolower($view);
-			switch($view){
+			switch ($view) {
 				case 'edit':
 				case 'save':
 				case 'editview':
 				case 'delete':
-					if(!empty($this->recurring_source) && $this->recurring_source != "Sugar"){
+					if (!empty($this->recurring_source) && $this->recurring_source != "Sugar") {
 						return false;
 					}
 			}
 		}
-		return parent::ACLAccess($view,$is_owner,$in_group);
+		return parent::ACLAccess($view, $is_owner, $in_group);
 	}
     // save date_end by calculating user input
     // this is for calendar
 	function save($check_notify = FALSE) {
-		global $timedate,$current_user;
+		global $timedate, $current_user;
 
-	    if(isset($this->date_start) && isset($this->duration_hours) && isset($this->duration_minutes))
+	    if (isset($this->date_start) && isset($this->duration_hours) && isset($this->duration_minutes))
         {
     	    $td = $timedate->fromDb($this->date_start);
-    	    if($td)
+    	    if ($td)
     	    {
 	        	$this->date_end = $td->modify("+{$this->duration_hours} hours {$this->duration_minutes} mins")->asDb();
     	    }
         }
 
-		if(!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') {
+		if (!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') {
 			$check_notify = true;
         } else {
 			$check_notify = false;
 		}
-		if(empty($_REQUEST['send_invites'])) {
-			if(!empty($this->id)) {
+		if (empty($_REQUEST['send_invites'])) {
+			if (!empty($this->id)) {
 				$old_record = new Call();
 				$old_record->retrieve($this->id);
 				$old_assigned_user_id = $old_record->assigned_user_id;
 			}
-			if((empty($this->id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $GLOBALS['current_user']->id != $_REQUEST['assigned_user_id']) || (isset($old_assigned_user_id) && !empty($old_assigned_user_id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $old_assigned_user_id != $_REQUEST['assigned_user_id']) ){
+			if ((empty($this->id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $GLOBALS['current_user']->id != $_REQUEST['assigned_user_id']) || (isset($old_assigned_user_id) && !empty($old_assigned_user_id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $old_assigned_user_id != $_REQUEST['assigned_user_id'])) {
 				$this->special_notification = true;
-				if(!isset($GLOBALS['resavingRelatedBeans']) || $GLOBALS['resavingRelatedBeans'] == false) {
+				if (!isset($GLOBALS['resavingRelatedBeans']) || $GLOBALS['resavingRelatedBeans'] == false) {
 					$check_notify = true;
 				}
-                if(isset($_REQUEST['assigned_user_name'])) {
+                if (isset($_REQUEST['assigned_user_name'])) {
                     $this->new_assigned_user_name = $_REQUEST['assigned_user_name'];
                 }
 			}
 		}
-        if (empty($this->status) ) {
+        if (empty($this->status)) {
             $this->status = $this->getDefaultStatus();
         }
 
@@ -226,11 +226,11 @@ 
         global $current_user;
 
 
-        if($this->update_vcal) {
+        if ($this->update_vcal) {
 			vCal::cache_sugar_vcal($current_user);
         }
 
-		if(isset($_REQUEST['reminders_data'])) {
+		if (isset($_REQUEST['reminders_data'])) {
 			Reminder::saveRemindersDataJson('Calls', $return_id, html_entity_decode($_REQUEST['reminders_data']));
 		}
 
@@ -256,13 +256,13 @@ 
 		return "$this->name";
 	}
 
-	function create_list_query($order_by, $where, $show_deleted=0)
+	function create_list_query($order_by, $where, $show_deleted = 0)
 	{
         $custom_join = $this->getCustomJoin();
                 $query = "SELECT ";
 		$query .= "
 			calls.*,";
-			if ( preg_match("/calls_users\.user_id/",$where))
+			if (preg_match("/calls_users\.user_id/", $where))
 			{
 				$query .= "calls_users.required,
 				calls_users.accept_status,";
@@ -274,19 +274,19 @@ 
 
 			// this line will help generate a GMT-metric to compare to a locale's timezone
 
-			if ( preg_match("/contacts/",$where)){
+			if (preg_match("/contacts/", $where)) {
 				$query .= ", contacts.first_name, contacts.last_name";
 				$query .= ", contacts.assigned_user_id contact_name_owner";
 			}
 			$query .= " FROM calls ";
 
-			if ( preg_match("/contacts/",$where)){
-				$query .=	"LEFT JOIN calls_contacts
+			if (preg_match("/contacts/", $where)) {
+				$query .= "LEFT JOIN calls_contacts
 	                    ON calls.id=calls_contacts.call_id
 	                    LEFT JOIN contacts
 	                    ON calls_contacts.contact_id=contacts.id ";
 			}
-			if ( preg_match('/calls_users\.user_id/',$where))
+			if (preg_match('/calls_users\.user_id/', $where))
 			{
 		$query .= "LEFT JOIN calls_users
 			ON calls.id=calls_users.call_id and calls_users.deleted=0 ";
@@ -296,15 +296,15 @@ 
 			ON calls.assigned_user_id=users.id ";
         $query .= $custom_join['join'];
 			$where_auto = '1=1';
-       		 if($show_deleted == 0){
+       		 if ($show_deleted == 0) {
             	$where_auto = " $this->table_name.deleted=0  ";
-			}else if($show_deleted == 1){
+			} else if ($show_deleted == 1) {
 				$where_auto = " $this->table_name.deleted=1 ";
 			}
 
 			//$where_auto .= " GROUP BY calls.id";
 
-		if($where != "")
+		if ($where != "")
 			$query .= "where $where AND ".$where_auto;
 		else
 			$query .= "where ".$where_auto;
@@ -313,17 +313,17 @@ 
         if (empty($order_by)) {
             $order_by = 'calls.name';
         }
-        $query .= ' ORDER BY ' . $order_by;
+        $query .= ' ORDER BY '.$order_by;
 
 		return $query;
 	}
 
-        function create_export_query($order_by, $where, $relate_link_join='')
+        function create_export_query($order_by, $where, $relate_link_join = '')
         {
             $custom_join = $this->getCustomJoin(true, true, $where);
             $custom_join['join'] .= $relate_link_join;
 			$contact_required = stristr($where, "contacts");
-            if($contact_required)
+            if ($contact_required)
             {
                     $query = "SELECT calls.*, contacts.first_name, contacts.last_name, users.user_name as assigned_user_name ";
                     $query .= $custom_join['select'];
@@ -343,7 +343,7 @@ 
 
             $query .= $custom_join['join'];
 
-			if($where != "")
+			if ($where != "")
                     $query .= "where $where AND ".$where_auto;
             else
                     $query .= "where ".$where_auto;
@@ -352,7 +352,7 @@ 
         if (empty($order_by)) {
             $order_by = 'calls.name';
         }
-        $query .= ' ORDER BY ' . $order_by;
+        $query .= ' ORDER BY '.$order_by;
 
             return $query;
         }
@@ -368,12 +368,12 @@ 
 		if (!empty($this->contact_id)) {
 			$query  = "SELECT first_name, last_name FROM contacts ";
 			$query .= "WHERE id='$this->contact_id' AND deleted=0";
-			$result = $this->db->limitQuery($query,0,1,true," Error filling in additional detail fields: ");
+			$result = $this->db->limitQuery($query, 0, 1, true, " Error filling in additional detail fields: ");
 
 			// Get the contact name.
 			$row = $this->db->fetchByAssoc($result);
 			$GLOBALS['log']->info("additional call fields $query");
-			if($row != null)
+			if ($row != null)
 			{
 				$this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name'], '', '');
 				$GLOBALS['log']->debug("Call($this->id): contact_name = $this->contact_name");
@@ -399,9 +399,9 @@ 
 
 		global $app_list_strings;
 		$parent_types = $app_list_strings['record_type_display'];
-		$disabled_parent_types = ACLController::disabledModuleList($parent_types,false, 'list');
-		foreach($disabled_parent_types as $disabled_parent_type){
-			if($disabled_parent_type != $this->parent_type){
+		$disabled_parent_types = ACLController::disabledModuleList($parent_types, false, 'list');
+		foreach ($disabled_parent_types as $disabled_parent_type) {
+			if ($disabled_parent_type != $this->parent_type) {
 				unset($parent_types[$disabled_parent_type]);
 			}
 		}
@@ -412,9 +412,9 @@ 
 			$this->reminder_time = -1;
 		}
 
-		if ( empty($this->id) ) {
+		if (empty($this->id)) {
 		    $reminder_t = $GLOBALS['current_user']->getPreference('reminder_time');
-		    if ( isset($reminder_t) )
+		    if (isset($reminder_t))
 		        $this->reminder_time = $reminder_t;
 		}
 		$this->reminder_checked = $this->reminder_time == -1 ? false : true;
@@ -422,9 +422,9 @@ 
 		if (empty($this->email_reminder_time)) {
 			$this->email_reminder_time = -1;
 		}
-		if(empty($this->id)){
+		if (empty($this->id)) {
 			$reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
-			if(isset($reminder_t))
+			if (isset($reminder_t))
 		    		$this->email_reminder_time = $reminder_t;
 		}
 		$this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
@@ -437,7 +437,7 @@ 
 	}
 
 
-	function get_list_view_data(){
+	function get_list_view_data() {
 		$call_fields = $this->get_list_view_array();
 		global $app_list_strings, $focus, $action, $currentModule;
 		if (isset($focus->id)) $id = $focus->id;
@@ -448,12 +448,12 @@ 
 		}
 		if ($this->status == "Planned") {
 			//cn: added this if() to deal with sequential Closes in Meetings.  this is a hack to a hack (formbase.php->handleRedirect)
-			if(empty($action))
+			if (empty($action))
 			    $action = "index";
 
             $setCompleteUrl = "<a id='{$this->id}' onclick='SUGAR.util.closeActivityPanel.show(\"{$this->module_dir}\",\"{$this->id}\",\"Held\",\"listview\",\"1\");'>";
 			if ($this->ACLAccess('edit')) {
-                $call_fields['SET_COMPLETE'] = $setCompleteUrl . SugarThemeRegistry::current()->getImage("close_inline"," border='0'",null,null,'.gif',translate('LBL_CLOSEINLINE'))."</a>";
+                $call_fields['SET_COMPLETE'] = $setCompleteUrl.SugarThemeRegistry::current()->getImage("close_inline", " border='0'", null, null, '.gif', translate('LBL_CLOSEINLINE'))."</a>";
             } else {
                 $call_fields['SET_COMPLETE'] = '';
             }
@@ -463,11 +463,11 @@ 
 		$nextday = $timedate->asDbDate($timedate->getNow()->modify("+1 day"));
 		$mergeTime = $call_fields['DATE_START']; //$timedate->merge_date_time($call_fields['DATE_START'], $call_fields['TIME_START']);
 		$date_db = $timedate->to_db($mergeTime);
-		if( $date_db	< $today){
-			$call_fields['DATE_START']= "<font class='overdueTask'>".$call_fields['DATE_START']."</font>";
-		}else if($date_db < $nextday){
+		if ($date_db < $today) {
+			$call_fields['DATE_START'] = "<font class='overdueTask'>".$call_fields['DATE_START']."</font>";
+		} else if ($date_db < $nextday) {
 			$call_fields['DATE_START'] = "<font class='todaysTask'>".$call_fields['DATE_START']."</font>";
-		}else{
+		} else {
 			$call_fields['DATE_START'] = "<font class='futureTask'>".$call_fields['DATE_START']."</font>";
 		}
 		$this->fill_in_additional_detail_fields();
@@ -476,7 +476,7 @@ 
 		if (!empty($this->contact_id)) {
            // Bug# 46125 - make first name, last name, salutation and title of Contacts respect field level ACLs
             $contact_temp = BeanFactory::getBean("Contacts", $this->contact_id);
-            if(!empty($contact_temp)) {
+            if (!empty($contact_temp)) {
                 $contact_temp->_create_proper_name_field();
                 $this->contact_name = $contact_temp->full_name;
             }
@@ -485,8 +485,8 @@ 
         $call_fields['CONTACT_ID'] = $this->contact_id;
         $call_fields['CONTACT_NAME'] = $this->contact_name;
 		$call_fields['PARENT_NAME'] = $this->parent_name;
-        $call_fields['REMINDER_CHECKED'] = $this->reminder_time==-1 ? false : true;
-	    $call_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time==-1 ? false : true;
+        $call_fields['REMINDER_CHECKED'] = $this->reminder_time == -1 ? false : true;
+	    $call_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time == -1 ? false : true;
 
 		return $call_fields;
 	}
@@ -499,17 +499,17 @@ 
 		global $timedate;
 
         // rrs: bug 42684 - passing a contact breaks this call
-		$notifyUser =($call->current_notify_user->object_name == 'User') ? $call->current_notify_user : $current_user;
+		$notifyUser = ($call->current_notify_user->object_name == 'User') ? $call->current_notify_user : $current_user;
 
 
 		// Assumes $call dates are in user format
 		$calldate = $timedate->fromDb($call->date_start);
 		$xOffset = $timedate->asUser($calldate, $notifyUser).' '.$timedate->userTimezoneSuffix($calldate, $notifyUser);
 
-		if ( strtolower(get_class($call->current_notify_user)) == 'contact' ) {
+		if (strtolower(get_class($call->current_notify_user)) == 'contact') {
 			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
 				  '/index.php?entryPoint=acceptDecline&module=Calls&contact_id='.$call->current_notify_user->id.'&record='.$call->id);
-		} elseif ( strtolower(get_class($call->current_notify_user)) == 'lead' ) {
+		} elseif (strtolower(get_class($call->current_notify_user)) == 'lead') {
 			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
 				  '/index.php?entryPoint=acceptDecline&module=Calls&lead_id='.$call->current_notify_user->id.'&record='.$call->id);
 		} else {
@@ -522,7 +522,7 @@ 
 		$xtpl->assign("CALL_STARTDATE", $xOffset);
 		$xtpl->assign("CALL_HOURS", $call->duration_hours);
 		$xtpl->assign("CALL_MINUTES", $call->duration_minutes);
-		$xtpl->assign("CALL_STATUS", ((isset($call->status))?$app_list_strings['call_status_dom'][$call->status] : ""));
+		$xtpl->assign("CALL_STATUS", ((isset($call->status)) ? $app_list_strings['call_status_dom'][$call->status] : ""));
 		$xtpl->assign("CALL_DESCRIPTION", $call->description);
 
 		return $xtpl;
@@ -537,13 +537,13 @@ 
 		$result = $this->db->query($query, true);
 		$list = Array();
 
-		while($row = $this->db->fetchByAssoc($result)) {
+		while ($row = $this->db->fetchByAssoc($result)) {
 			$template = new User(); // PHP 5 will retrieve by reference, always over-writing the "old" one
 			$record = $template->retrieve($row['user_id']);
 			$template->required = $row['required'];
 			$template->accept_status = $row['accept_status'];
 
-			if($record != null) {
+			if ($record != null) {
 			    // this copies the object into the array
 				$list[] = $template;
 			}
@@ -566,14 +566,14 @@ 
     $list = Array();
 
 
-    while($row = $this->db->fetchByAssoc($result))
+    while ($row = $this->db->fetchByAssoc($result))
     {
       $record = $template->retrieve($row['call_id']);
       $template->required = $row['required'];
       $template->accept_status = $row['accept_status'];
 
 
-      if($record != null)
+      if ($record != null)
       {
         // this copies the object into the array
         $list[] = $template;
@@ -584,56 +584,56 @@ 
   }
 
 
-  function set_accept_status(&$user,$status)
+  function set_accept_status(&$user, $status)
   {
-    if ( $user->object_name == 'User')
+    if ($user->object_name == 'User')
     {
-      $relate_values = array('user_id'=>$user->id,'call_id'=>$this->id);
+      $relate_values = array('user_id'=>$user->id, 'call_id'=>$this->id);
       $data_values = array('accept_status'=>$status);
-      $this->set_relationship($this->rel_users_table, $relate_values, true, true,$data_values);
+      $this->set_relationship($this->rel_users_table, $relate_values, true, true, $data_values);
       global $current_user;
 
-      if ( $this->update_vcal )
+      if ($this->update_vcal)
       {
         vCal::cache_sugar_vcal($user);
       }
     }
-    else if ( $user->object_name == 'Contact')
+    else if ($user->object_name == 'Contact')
     {
-      $relate_values = array('contact_id'=>$user->id,'call_id'=>$this->id);
+      $relate_values = array('contact_id'=>$user->id, 'call_id'=>$this->id);
       $data_values = array('accept_status'=>$status);
-      $this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
+      $this->set_relationship($this->rel_contacts_table, $relate_values, true, true, $data_values);
     }
-    else if ( $user->object_name == 'Lead')
+    else if ($user->object_name == 'Lead')
     {
-      $relate_values = array('lead_id'=>$user->id,'call_id'=>$this->id);
+      $relate_values = array('lead_id'=>$user->id, 'call_id'=>$this->id);
       $data_values = array('accept_status'=>$status);
-      $this->set_relationship($this->rel_leads_table, $relate_values, true, true,$data_values);
+      $this->set_relationship($this->rel_leads_table, $relate_values, true, true, $data_values);
     }
   }
 
 
 
 	function get_notification_recipients() {
-		if($this->special_notification) {
+		if ($this->special_notification) {
 			return parent::get_notification_recipients();
 		}
 
 //		$GLOBALS['log']->debug('Call.php->get_notification_recipients():'.print_r($this,true));
 		$list = array();
-        if(!is_array($this->contacts_arr)) {
-			$this->contacts_arr =	array();
+        if (!is_array($this->contacts_arr)) {
+			$this->contacts_arr = array();
 		}
 
-		if(!is_array($this->users_arr)) {
-			$this->users_arr =	array();
+		if (!is_array($this->users_arr)) {
+			$this->users_arr = array();
 		}
 
-        if(!is_array($this->leads_arr)) {
-			$this->leads_arr =	array();
+        if (!is_array($this->leads_arr)) {
+			$this->leads_arr = array();
 		}
 
-		foreach($this->users_arr as $user_id) {
+		foreach ($this->users_arr as $user_id) {
 			$notify_user = new User();
 			$notify_user->retrieve($user_id);
 			$notify_user->new_assigned_user_name = $notify_user->full_name;
@@ -641,7 +641,7 @@ 
 			$list[$notify_user->id] = $notify_user;
 		}
 
-		foreach($this->contacts_arr as $contact_id) {
+		foreach ($this->contacts_arr as $contact_id) {
 			$notify_user = new Contact();
 			$notify_user->retrieve($contact_id);
 			$notify_user->new_assigned_user_name = $notify_user->full_name;
@@ -649,7 +649,7 @@ 
 			$list[$notify_user->id] = $notify_user;
 		}
 
-        foreach($this->leads_arr as $lead_id) {
+        foreach ($this->leads_arr as $lead_id) {
 			$notify_user = new Lead();
 			$notify_user->retrieve($lead_id);
 			$notify_user->new_assigned_user_name = $notify_user->full_name;
@@ -657,38 +657,38 @@ 
 			$list[$notify_user->id] = $notify_user;
 		}
 		global $sugar_config;
-		if(isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
+		if (isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
 			global $current_user;
-			if(isset($list[$current_user->id]))
+			if (isset($list[$current_user->id]))
 				unset($list[$current_user->id]);
 		}
 //		$GLOBALS['log']->debug('Call.php->get_notification_recipients():'.print_r($list,true));
 		return $list;
 	}
 
-    function bean_implements($interface){
-		switch($interface){
+    function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL':return true;
 		}
 		return false;
 	}
 
-	function listviewACLHelper(){
+	function listviewACLHelper() {
 		$array_assign = parent::listviewACLHelper();
 		$is_owner = false;
 		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->parent_name)){
+		if (!empty($this->parent_name)) {
 
-			if(!empty($this->parent_name_owner)){
+			if (!empty($this->parent_name_owner)) {
 				global $current_user;
 				$is_owner = $current_user->id == $this->parent_name_owner;
 			}
 			/* BEGIN - SECURITY GROUPS */
 			//parent_name_owner not being set for whatever reason so we need to figure this out
-			else if(!empty($this->parent_type) && !empty($this->parent_id)) {
+			else if (!empty($this->parent_type) && !empty($this->parent_id)) {
 				global $current_user;
-                $parent_bean = BeanFactory::getBean($this->parent_type,$this->parent_id);
-                if($parent_bean !== false) {
+                $parent_bean = BeanFactory::getBean($this->parent_type, $this->parent_id);
+                if ($parent_bean !== false) {
                 	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
 			}
@@ -701,17 +701,17 @@ 
 			/**
 			if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner)){
 			*/
-			if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)){
+			if (!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)) {
         	/* END - SECURITY GROUPS */
 				$array_assign['PARENT'] = 'a';
-			}else{
+			} else {
 				$array_assign['PARENT'] = 'span';
 			}
 		$is_owner = false;
 		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->contact_name)){
+		if (!empty($this->contact_name)) {
 
-			if(!empty($this->contact_name_owner)){
+			if (!empty($this->contact_name_owner)) {
 				global $current_user;
 				$is_owner = $current_user->id == $this->contact_name_owner;
 			}
@@ -719,8 +719,8 @@ 
 			//contact_name_owner not being set for whatever reason so we need to figure this out
 			else {
 				global $current_user;
-                $parent_bean = BeanFactory::getBean('Contacts',$this->contact_id);
-                if($parent_bean !== false) {
+                $parent_bean = BeanFactory::getBean('Contacts', $this->contact_id);
+                if ($parent_bean !== false) {
                 	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
 			}
@@ -732,10 +732,10 @@ 
 			/**
 			if( ACLController::checkAccess('Contacts', 'view', $is_owner)){
 			*/
-			if( ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)){
+			if (ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)) {
         	/* END - SECURITY GROUPS */
 				$array_assign['CONTACT'] = 'a';
-			}else{
+			} else {
 				$array_assign['CONTACT'] = 'span';
 			}
 
@@ -743,13 +743,13 @@ 
 	}
 
 	function save_relationship_changes($is_update, $exclude = array()) {
-		if(empty($this->in_workflow))
+		if (empty($this->in_workflow))
         {
-            if(empty($this->in_import))
+            if (empty($this->in_import))
             {
                 //if the global soap_server_object variable is not empty (as in from a soap/OPI call), then process the assigned_user_id relationship, otherwise
                 //add assigned_user_id to exclude list and let the logic from MeetingFormBase determine whether assigned user id gets added to the relationship
-                if(!empty($GLOBALS['soap_server_object']))
+                if (!empty($GLOBALS['soap_server_object']))
                 {
            		    $exclude = array('lead_id', 'contact_id', 'user_id');
            	    }

Braces +50 added lines, -42 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -134,8 +136,9 @@ 
 
 
 
-         if(!empty($GLOBALS['app_list_strings']['duration_intervals']))
-        	$this->minutes_values = $GLOBALS['app_list_strings']['duration_intervals'];
+         if(!empty($GLOBALS['app_list_strings']['duration_intervals'])) {
+                 	$this->minutes_values = $GLOBALS['app_list_strings']['duration_intervals'];
+         }
 	}
 
 	/**
@@ -145,8 +148,7 @@ 
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
 		if(isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
+		} else {
 			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
 		}
 		self::__construct();
@@ -298,16 +300,17 @@ 
 			$where_auto = '1=1';
        		 if($show_deleted == 0){
             	$where_auto = " $this->table_name.deleted=0  ";
-			}else if($show_deleted == 1){
+			} else if($show_deleted == 1){
 				$where_auto = " $this->table_name.deleted=1 ";
 			}
 
 			//$where_auto .= " GROUP BY calls.id";
 
-		if($where != "")
-			$query .= "where $where AND ".$where_auto;
-		else
-			$query .= "where ".$where_auto;
+		if($where != "") {
+					$query .= "where $where AND ".$where_auto;
+		} else {
+					$query .= "where ".$where_auto;
+		}
 
         $order_by = $this->process_order_by($order_by);
         if (empty($order_by)) {
@@ -329,8 +332,7 @@ 
                     $query .= $custom_join['select'];
                     $query .= " FROM contacts, calls, calls_contacts ";
                     $where_auto = "calls_contacts.contact_id = contacts.id AND calls_contacts.call_id = calls.id AND calls.deleted=0 AND contacts.deleted=0";
-            }
-            else
+            } else
             {
                     $query = 'SELECT calls.*, users.user_name as assigned_user_name ';
                     $query .= $custom_join['select'];
@@ -343,10 +345,11 @@ 
 
             $query .= $custom_join['join'];
 
-			if($where != "")
-                    $query .= "where $where AND ".$where_auto;
-            else
-                    $query .= "where ".$where_auto;
+			if($where != "") {
+			                    $query .= "where $where AND ".$where_auto;
+			} else {
+                                $query .= "where ".$where_auto;
+            }
 
         $order_by = $this->process_order_by($order_by);
         if (empty($order_by)) {
@@ -390,10 +393,12 @@ 
 			$this->date_start = $timedate->now();
 		}
 
-		if (is_null($this->duration_hours))
-			$this->duration_hours = "0";
-		if (is_null($this->duration_minutes))
-			$this->duration_minutes = "1";
+		if (is_null($this->duration_hours)) {
+					$this->duration_hours = "0";
+		}
+		if (is_null($this->duration_minutes)) {
+					$this->duration_minutes = "1";
+		}
 
 		$this->fill_in_additional_parent_fields();
 
@@ -414,8 +419,9 @@ 
 
 		if ( empty($this->id) ) {
 		    $reminder_t = $GLOBALS['current_user']->getPreference('reminder_time');
-		    if ( isset($reminder_t) )
-		        $this->reminder_time = $reminder_t;
+		    if ( isset($reminder_t) ) {
+		    		        $this->reminder_time = $reminder_t;
+		    }
 		}
 		$this->reminder_checked = $this->reminder_time == -1 ? false : true;
 
@@ -424,8 +430,9 @@ 
 		}
 		if(empty($this->id)){
 			$reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
-			if(isset($reminder_t))
-		    		$this->email_reminder_time = $reminder_t;
+			if(isset($reminder_t)) {
+					    		$this->email_reminder_time = $reminder_t;
+			}
 		}
 		$this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
 
@@ -440,16 +447,20 @@ 
 	function get_list_view_data(){
 		$call_fields = $this->get_list_view_array();
 		global $app_list_strings, $focus, $action, $currentModule;
-		if (isset($focus->id)) $id = $focus->id;
-		else $id = '';
+		if (isset($focus->id)) {
+		    $id = $focus->id;
+		} else {
+		    $id = '';
+		}
 		if (isset($this->parent_type) && $this->parent_type != null)
 		{
 			$call_fields['PARENT_MODULE'] = $this->parent_type;
 		}
 		if ($this->status == "Planned") {
 			//cn: added this if() to deal with sequential Closes in Meetings.  this is a hack to a hack (formbase.php->handleRedirect)
-			if(empty($action))
-			    $action = "index";
+			if(empty($action)) {
+						    $action = "index";
+			}
 
             $setCompleteUrl = "<a id='{$this->id}' onclick='SUGAR.util.closeActivityPanel.show(\"{$this->module_dir}\",\"{$this->id}\",\"Held\",\"listview\",\"1\");'>";
 			if ($this->ACLAccess('edit')) {
@@ -465,9 +476,9 @@ 
 		$date_db = $timedate->to_db($mergeTime);
 		if( $date_db	< $today){
 			$call_fields['DATE_START']= "<font class='overdueTask'>".$call_fields['DATE_START']."</font>";
-		}else if($date_db < $nextday){
+		} else if($date_db < $nextday){
 			$call_fields['DATE_START'] = "<font class='todaysTask'>".$call_fields['DATE_START']."</font>";
-		}else{
+		} else{
 			$call_fields['DATE_START'] = "<font class='futureTask'>".$call_fields['DATE_START']."</font>";
 		}
 		$this->fill_in_additional_detail_fields();
@@ -597,14 +608,12 @@ 
       {
         vCal::cache_sugar_vcal($user);
       }
-    }
-    else if ( $user->object_name == 'Contact')
+    } else if ( $user->object_name == 'Contact')
     {
       $relate_values = array('contact_id'=>$user->id,'call_id'=>$this->id);
       $data_values = array('accept_status'=>$status);
       $this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
-    }
-    else if ( $user->object_name == 'Lead')
+    } else if ( $user->object_name == 'Lead')
     {
       $relate_values = array('lead_id'=>$user->id,'call_id'=>$this->id);
       $data_values = array('accept_status'=>$status);
@@ -659,8 +668,9 @@ 
 		global $sugar_config;
 		if(isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
 			global $current_user;
-			if(isset($list[$current_user->id]))
-				unset($list[$current_user->id]);
+			if(isset($list[$current_user->id])) {
+							unset($list[$current_user->id]);
+			}
 		}
 //		$GLOBALS['log']->debug('Call.php->get_notification_recipients():'.print_r($list,true));
 		return $list;
@@ -704,7 +714,7 @@ 
 			if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)){
         	/* END - SECURITY GROUPS */
 				$array_assign['PARENT'] = 'a';
-			}else{
+			} else{
 				$array_assign['PARENT'] = 'span';
 			}
 		$is_owner = false;
@@ -735,7 +745,7 @@ 
 			if( ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)){
         	/* END - SECURITY GROUPS */
 				$array_assign['CONTACT'] = 'a';
-			}else{
+			} else{
 				$array_assign['CONTACT'] = 'span';
 			}
 
@@ -752,13 +762,11 @@ 
                 if(!empty($GLOBALS['soap_server_object']))
                 {
            		    $exclude = array('lead_id', 'contact_id', 'user_id');
-           	    }
-                else
+           	    } else
                 {
 	                $exclude = array('lead_id', 'contact_id', 'user_id', 'assigned_user_id');
            	    }
-            }
-            else
+            } else
             {
                 $exclude = array('user_id');
             }

modules/AOP_Case_Updates/AOP_Case_Updates_sugar.php

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
 	var $table_name = 'aop_case_updates';
 	var $tracker_visibility = false;
 	var $importable = false;
-	var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
+	var $disable_row_level_security = true; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
 		var $id;
 		var $name;
 		var $date_entered;
@@ -53,16 +53,16 @@ 
 		var $assigned_user_name;
 		var $assigned_user_link;
 
-    public function __construct(){
+    public function __construct() {
 		parent::__construct();
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function AOP_Case_Updates_sugar(){
+    public function AOP_Case_Updates_sugar() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -72,8 +72,8 @@ 
     }
 
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL': return true;
 		}
 		return false;

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($seed, $module, $subPanel, $options);

modules/AOP_Case_Updates/AOP_Case_Updates.php

Spacing +44 added lines, -44 removed lines

@@ -30,16 +30,16 @@ 
 require_once 'include/clean.php';
 class AOP_Case_Updates extends AOP_Case_Updates_sugar {
 
-    public function __construct(){
+    public function __construct() {
         parent::__construct();
     }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function AOP_Case_Updates(){
+    public function AOP_Case_Updates() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -49,18 +49,18 @@ 
     }
 
 
-    function save($check_notify = false){
+    function save($check_notify = false) {
         $this->name = SugarCleaner::cleanHtml($this->name);
         $this->description = SugarCleaner::cleanHtml($this->description);
         parent::save($check_notify);
-        if(file_exists('custom/modules/AOP_Case_Updates/CaseUpdatesHook.php')){
+        if (file_exists('custom/modules/AOP_Case_Updates/CaseUpdatesHook.php')) {
             require_once 'custom/modules/AOP_Case_Updates/CaseUpdatesHook.php';
-        }else{
+        } else {
             require_once 'modules/AOP_Case_Updates/CaseUpdatesHook.php';
         }
-        if(class_exists('CustomCaseUpdatesHook')){
+        if (class_exists('CustomCaseUpdatesHook')) {
             $hook = new CustomCaseUpdatesHook();
-        }else{
+        } else {
             $hook = new CaseUpdatesHook();
         }
         $hook->sendCaseUpdate($this);
@@ -70,68 +70,68 @@ 
     /**
      * @return aCase
      */
-    public function getCase(){
-        $case = BeanFactory::getBean("Cases",$this->case_id);
+    public function getCase() {
+        $case = BeanFactory::getBean("Cases", $this->case_id);
         return $case;
     }
 
-    public function getContacts(){
+    public function getContacts() {
         $case = $this->getCase();
-        if($case){
-            return $case->get_linked_beans("contacts","Contacts");
+        if ($case) {
+            return $case->get_linked_beans("contacts", "Contacts");
         }
         return null;
     }
 
-    public function getUpdateContact(){
-        if($this->contact_id){
-            return BeanFactory::getBean("Contacts",$this->contact_id);
+    public function getUpdateContact() {
+        if ($this->contact_id) {
+            return BeanFactory::getBean("Contacts", $this->contact_id);
         }
         return null;
     }
-    public function getUser(){
-        $user = BeanFactory::getBean('Users',$this->getCase()->assigned_user_id);
+    public function getUser() {
+        $user = BeanFactory::getBean('Users', $this->getCase()->assigned_user_id);
         return $user;
     }
-    public function getUpdateUser(){
-        $user = BeanFactory::getBean('Users',$this->assigned_user_id);
+    public function getUpdateUser() {
+        $user = BeanFactory::getBean('Users', $this->assigned_user_id);
         return $user;
     }
 
-    public function getEmailForUser(){
+    public function getEmailForUser() {
         $user = $this->getUser();
-        if($user){
+        if ($user) {
             return array($user->emailAddress->getPrimaryAddress($user));
         }
         return array();
     }
 
-    private function populateTemplate(EmailTemplate $template, $addDelimiter = true, $contactId = null){
+    private function populateTemplate(EmailTemplate $template, $addDelimiter = true, $contactId = null) {
         global $app_strings, $sugar_config;
         //Order of beans seems to matter here so we place contact first.
         $userId = '';
         $user = $this->getUpdateUser();
-        if(!$user){
+        if (!$user) {
             $this->getUser();
         }
-        $beans = array("Contacts" => $contactId,"Cases" => $this->getCase()->id, "Users" => $user->id, "AOP_Case_Updates" => $this->id);
+        $beans = array("Contacts" => $contactId, "Cases" => $this->getCase()->id, "Users" => $user->id, "AOP_Case_Updates" => $this->id);
         $ret = array();
-        $ret['subject'] = from_html(aop_parse_template($template->subject,$beans));
-        $body = aop_parse_template(str_replace("\$sugarurl",$sugar_config['site_url'],$template->body_html),$beans);
-        $bodyAlt = aop_parse_template(str_replace("\$sugarurl",$sugar_config['site_url'],$template->body),$beans);
-        if($addDelimiter){
-            $body = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'] . $body;
-            $bodyAlt = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'] . $bodyAlt;
+        $ret['subject'] = from_html(aop_parse_template($template->subject, $beans));
+        $body = aop_parse_template(str_replace("\$sugarurl", $sugar_config['site_url'], $template->body_html), $beans);
+        $bodyAlt = aop_parse_template(str_replace("\$sugarurl", $sugar_config['site_url'], $template->body), $beans);
+        if ($addDelimiter) {
+            $body = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'].$body;
+            $bodyAlt = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'].$bodyAlt;
         }
         $ret['body'] = from_html($body);
         $ret['body_alt'] = strip_tags(from_html($bodyAlt));
         return $ret;
     }
 
-    public function sendEmail($emails, $template, $signature = array(), $caseId = null, $addDelimiter = true, $contactId = null){
+    public function sendEmail($emails, $template, $signature = array(), $caseId = null, $addDelimiter = true, $contactId = null) {
         $GLOBALS['log']->info("AOPCaseUpdates: sendEmail called");
         require_once("include/SugarPHPMailer.php");
-        $mailer=new SugarPHPMailer();
+        $mailer = new SugarPHPMailer();
         $admin = new Administration();
         $admin->retrieveSettings();
 
@@ -139,35 +139,35 @@ 
         $mailer->setMailerForSystem();
 
         $signatureHTML = "";
-        if($signature && array_key_exists("signature_html",$signature)){
+        if ($signature && array_key_exists("signature_html", $signature)) {
             $signatureHTML = from_html($signature['signature_html']);
         }
         $signaturePlain = "";
-        if($signature && array_key_exists("signature",$signature)){
+        if ($signature && array_key_exists("signature", $signature)) {
             $signaturePlain = $signature['signature'];
         }
         $emailSettings = getPortalEmailSettings();
         $text = $this->populateTemplate($template, $addDelimiter, $contactId);
         $mailer->Subject = $text['subject'];
-        $mailer->Body = $text['body'] . $signatureHTML;
+        $mailer->Body = $text['body'].$signatureHTML;
         $mailer->IsHTML(true);
-        $mailer->AltBody = $text['body_alt'] . $signaturePlain;
+        $mailer->AltBody = $text['body_alt'].$signaturePlain;
         $mailer->From     = $emailSettings['from_address'];
         $mailer->FromName = $emailSettings['from_name'];
-        foreach($emails as $email){
+        foreach ($emails as $email) {
             $mailer->AddAddress($email);
         }
-        if ($mailer->Send()){
+        if ($mailer->Send()) {
             require_once('modules/Emails/Email.php');
             $emailObj = new Email();
-            $emailObj->to_addrs = implode(",",$emails);
-            $emailObj->type= 'out';
+            $emailObj->to_addrs = implode(",", $emails);
+            $emailObj->type = 'out';
             $emailObj->deleted = '0';
             $emailObj->name = $mailer->Subject;
             $emailObj->description = $mailer->AltBody;
             $emailObj->description_html = $mailer->Body;
             $emailObj->from_addr = $mailer->From;
-            if ( $caseId) {
+            if ($caseId) {
                 $emailObj->parent_type = "Cases";
                 $emailObj->parent_id = $caseId;
             }
@@ -176,8 +176,8 @@ 
             $emailObj->created_by = '1';
             $emailObj->status = 'sent';
             $emailObj->save();
-        }else{
-            $GLOBALS['log']->info("AOPCaseUpdates: Could not send email:  " . $mailer->ErrorInfo);
+        } else {
+            $GLOBALS['log']->info("AOPCaseUpdates: Could not send email:  ".$mailer->ErrorInfo);
             return false;
         }
         return true;

Braces +4 added lines, -5 removed lines

@@ -41,8 +41,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -55,12 +54,12 @@ 
         parent::save($check_notify);
         if(file_exists('custom/modules/AOP_Case_Updates/CaseUpdatesHook.php')){
             require_once 'custom/modules/AOP_Case_Updates/CaseUpdatesHook.php';
-        }else{
+        } else{
             require_once 'modules/AOP_Case_Updates/CaseUpdatesHook.php';
         }
         if(class_exists('CustomCaseUpdatesHook')){
             $hook = new CustomCaseUpdatesHook();
-        }else{
+        } else{
             $hook = new CaseUpdatesHook();
         }
         $hook->sendCaseUpdate($this);
@@ -176,7 +175,7 @@ 
             $emailObj->created_by = '1';
             $emailObj->status = 'sent';
             $emailObj->save();
-        }else{
+        } else{
             $GLOBALS['log']->info("AOPCaseUpdates: Could not send email:  " . $mailer->ErrorInfo);
             return false;
         }

modules/AOR_Reports/AOR_Report.php

Spacing +265 added lines, -265 removed lines

@@ -28,7 +28,7 @@ 
 	var $object_name = 'AOR_Report';
 	var $table_name = 'aor_reports';
 	var $importable = true;
-	var $disable_row_level_security = true ;
+	var $disable_row_level_security = true;
 
 	var $id;
 	var $name;
@@ -47,7 +47,7 @@ 
 	var $assigned_user_link;
 	var $report_module;
 
-	function __construct(){
+	function __construct() {
 		parent::__construct();
         $this->load_report_beans();
         require_once('modules/AOW_WorkFlow/aow_utils.php');
@@ -57,9 +57,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function AOR_Report(){
+    function AOR_Report() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -69,19 +69,19 @@ 
     }
 
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL': return true;
 		}
 		return false;
 	}
 
-    function save($check_notify = FALSE){
+    function save($check_notify = FALSE) {
 
         // TODO: process of saveing the fields and conditions is too long so we will have to make some optimization on save_lines functions
         set_time_limit(3600);
 
-        if (empty($this->id)){
+        if (empty($this->id)) {
             unset($_POST['aor_conditions_id']);
             unset($_POST['aor_fields_id']);
         }
@@ -101,13 +101,13 @@ 
         $chart->save_lines($_POST, $this, 'aor_chart_');
     }
 
-    function load_report_beans(){
+    function load_report_beans() {
         global $beanList, $app_list_strings;
 
         $app_list_strings['aor_moduleList'] = $app_list_strings['moduleList'];
 
-        foreach($app_list_strings['aor_moduleList'] as $mkey => $mvalue){
-            if(!isset($beanList[$mkey]) || str_begin($mkey, 'AOR_') || str_begin($mkey, 'AOW_')){
+        foreach ($app_list_strings['aor_moduleList'] as $mkey => $mvalue) {
+            if (!isset($beanList[$mkey]) || str_begin($mkey, 'AOR_') || str_begin($mkey, 'AOW_')) {
                 unset($app_list_strings['aor_moduleList'][$mkey]);
             }
         }
@@ -118,12 +118,12 @@ 
     }
 
 
-    function getReportFields(){
+    function getReportFields() {
         $fields = array();
-        foreach($this->get_linked_beans('aor_fields','AOR_Fields') as $field){
+        foreach ($this->get_linked_beans('aor_fields', 'AOR_Fields') as $field) {
             $fields[] = $field;
         }
-        usort($fields,function($a,$b){
+        usort($fields, function($a, $b) {
             return $a->field_order - $b->field_order;
         });
         return $fields;
@@ -134,10 +134,10 @@ 
     const CHART_TYPE_RGRAPH = 'rgraph';
 
 
-    function build_report_chart($chartIds = null, $chartType = self::CHART_TYPE_PCHART){
+    function build_report_chart($chartIds = null, $chartType = self::CHART_TYPE_PCHART) {
         global $beanList;
-        $linkedCharts = $this->get_linked_beans('aor_charts','AOR_Charts');
-	if(!$linkedCharts){
+        $linkedCharts = $this->get_linked_beans('aor_charts', 'AOR_Charts');
+	if (!$linkedCharts) {
             //No charts to display
             return '';
         }
@@ -161,16 +161,16 @@ 
 
             $field_module = $this->report_module;
             $field_alias = $field_bean->table_name;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    if(empty($rel)){
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    if (empty($rel)) {
                         continue;
                     }
-                    $field_module = getRelatedModule($field_module,$rel);
-                    $field_alias = $field_alias . ':'.$rel;
+                    $field_module = getRelatedModule($field_module, $rel);
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
-            $label = str_replace(' ','_',$field->label).$i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['label'] = $field->label;
             $fields[$label]['display'] = $field->display;
@@ -185,10 +185,10 @@ 
 
             // get the main group
 
-            if($field->group_display) {
+            if ($field->group_display) {
 
                 // if we have a main group already thats wrong cause only one main grouping field possible
-                if(!is_null($mainGroupField)) {
+                if (!is_null($mainGroupField)) {
                     $GLOBALS['log']->fatal('main group already found');
                 }
 
@@ -203,18 +203,18 @@ 
         $query = $this->build_report_query();
         $result = $this->db->query($query);
         $data = array();
-        while($row = $this->db->fetchByAssoc($result, false))
+        while ($row = $this->db->fetchByAssoc($result, false))
         {
-            foreach($fields as $name => $att){
+            foreach ($fields as $name => $att) {
 
                 $currency_id = isset($row[$att['alias'].'_currency_id']) ? $row[$att['alias'].'_currency_id'] : '';
 
-                switch ($att['function']){
+                switch ($att['function']) {
                     case 'COUNT':
                         break;
                     default:
-                        if(!is_numeric($row[$name])) {
-                            $row[$name] = trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name], '', $currency_id,$att['params'])));
+                        if (!is_numeric($row[$name])) {
+                            $row[$name] = trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name], '', $currency_id, $att['params'])));
 
                         }
                         break;
@@ -224,7 +224,7 @@ 
         }
         $fields = $this->getReportFields();
 
-        switch($chartType) {
+        switch ($chartType) {
             case self::CHART_TYPE_PCHART:
                 $html = '<script src="modules/AOR_Charts/lib/pChart/imagemap.js"></script>';
                 break;
@@ -232,17 +232,17 @@ 
                 $html = '<script src="modules/AOR_Reports/js/Chart.js"></script>';
                 break;
             case self::CHART_TYPE_RGRAPH:
-                if($_REQUEST['module']!= 'Home')//Need the require_once for the rgraphincludes as they are only loaded when the home page is hit
+                if ($_REQUEST['module'] != 'Home')//Need the require_once for the rgraphincludes as they are only loaded when the home page is hit
                     require_once('include/SuiteGraphs/RGraphIncludes.php');
 
                 break;
         }
         $x = 0;
-        foreach($linkedCharts as $chart){
-            if($chartIds !== null && !in_array($chart->id,$chartIds)){
+        foreach ($linkedCharts as $chart) {
+            if ($chartIds !== null && !in_array($chart->id, $chartIds)) {
                 continue;
             }
-            $html .= $chart->buildChartHTML($data,$fields,$x, $chartType, $mainGroupField);
+            $html .= $chart->buildChartHTML($data, $fields, $x, $chartType, $mainGroupField);
             $x++;
         }
         return $html;
@@ -254,12 +254,12 @@ 
 
         $rows = $this->getGroupDisplayFieldByReportId($this->id, $level);
 
-        if(count($rows) > 1) {
-            $GLOBALS['log']->fatal('ambiguous group display for report ' . $this->id);
+        if (count($rows) > 1) {
+            $GLOBALS['log']->fatal('ambiguous group display for report '.$this->id);
         }
-        else if(count($rows) == 1){
+        else if (count($rows) == 1) {
             $rows[0]['module_path'] = unserialize(base64_decode($rows[0]['module_path']));
-            if(!$rows[0]['module_path'][0]) {
+            if (!$rows[0]['module_path'][0]) {
                 $module = new $beanList[$this->report_module]();
                 $rows[0]['field_id_name'] = $module->field_defs[$rows[0]['field']]['id_name'] ? $module->field_defs[$rows[0]['field']]['id_name'] : $module->field_defs[$rows[0]['field']]['name'];
                 $rows[0]['module_path'][0] = $module->table_name;
@@ -269,23 +269,23 @@ 
             }
             $path[] = $rows[0];
 
-            if($level>10) {
+            if ($level > 10) {
                 $msg = 'Too many nested groups';
                 $GLOBALS['log']->fatal($msg);
                 return null;
             }
 
-            return $this->buildMultiGroupReport($offset, $links, $level+1, $path);
+            return $this->buildMultiGroupReport($offset, $links, $level + 1, $path);
         }
-        else if(!$rows) {
-            if($path) {
+        else if (!$rows) {
+            if ($path) {
                 $html = '';
                 foreach ($path as $pth) {
                     $_fieldIdName = $this->db->quoteIdentifier($pth['field_id_name']);
-                    $query = "SELECT $_fieldIdName FROM " . $this->db->quoteIdentifier($pth['module_path'][0]) . " GROUP BY $_fieldIdName;";
+                    $query = "SELECT $_fieldIdName FROM ".$this->db->quoteIdentifier($pth['module_path'][0])." GROUP BY $_fieldIdName;";
                     $values = $this->dbSelect($query);
 
-                    foreach($values as $value) {
+                    foreach ($values as $value) {
 
                         //$where = [ $this->db->quote($pth['module_path'][0]) . '.' . $_fieldIdName . ' = \'' . $this->db->quote($value[$pth['field_id_name']]) . '\'' ];
 
@@ -321,7 +321,7 @@ 
         // escape values for query
 
         $_id = $this->db->quote($reportId);
-        $_level = (int) $level;
+        $_level = (int)$level;
 
         // get results array
 
@@ -336,7 +336,7 @@ 
         $results = $this->db->query($query);
 
         $rows = array();
-        while($row = $this->db->fetchByAssoc($results)) {
+        while ($row = $this->db->fetchByAssoc($results)) {
             $rows[] = $row;
         }
 
@@ -345,20 +345,20 @@ 
 
     private function getMultiGroupFrameHTML($header, $body) {
         $html = '<div class="multi-group-list" style="border: 1px solid black; padding: 10px;">
-                    <h3>' . $header . '</h3>
-                    <div class="multi-group-list-inner">' . $body . '</div>
+                    <h3>' . $header.'</h3>
+                    <div class="multi-group-list-inner">' . $body.'</div>
                 </div>';
         return $html;
     }
 
     private function addDataIdValueToInnertext($html) {
         preg_match('/\sdata-id-value\s*=\s*"([^"]*)"/', $html, $match);
-        $html = preg_replace('/(>)([^<]*)(<\/\w+>$)/', '$1$2' . $match[1] . '$3', $html);
+        $html = preg_replace('/(>)([^<]*)(<\/\w+>$)/', '$1$2'.$match[1].'$3', $html);
         return $html;
     }
 
 
-    function build_group_report($offset = -1, $links = true, $extra = array()){
+    function build_group_report($offset = -1, $links = true, $extra = array()) {
         global $beanList;
 
         $html = '';
@@ -369,23 +369,23 @@ 
         $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '".$this->id."' AND group_display = 1 AND deleted = 0 ORDER BY field_order ASC";
         $field_id = $this->db->getOne($sql);
 
-        if(!$field_id) {
-            $query_array['select'][] = $module->table_name . ".id AS '" . $module->table_name . "_id'";
+        if (!$field_id) {
+            $query_array['select'][] = $module->table_name.".id AS '".$module->table_name."_id'";
         }
 
-        if($field_id != ''){
+        if ($field_id != '') {
             $field = new AOR_Field();
             $field->retrieve($field_id);
 
-            $field_label = str_replace(' ','_',$field->label);
+            $field_label = str_replace(' ', '_', $field->label);
 
             $path = unserialize(base64_decode($field->module_path));
 
             $field_module = $module;
             $table_alias = $field_module->table_name;
-            if(!empty($path[0]) && $path[0] != $module->module_dir){
-                foreach($path as $rel){
-                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir,$rel)];
+            if (!empty($path[0]) && $path[0] != $module->module_dir) {
+                foreach ($path as $rel) {
+                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $rel)];
                     $oldAlias = $table_alias;
                     $table_alias = $table_alias.":".$rel;
 
@@ -399,71 +399,71 @@ 
 
             $data = $field_module->field_defs[$field->field];
 
-            if($data['type'] == 'relate' && isset($data['id_name'])) {
+            if ($data['type'] == 'relate' && isset($data['id_name'])) {
                 $field->field = $data['id_name'];
             }
 
-            if($data['type'] == 'currency' && !stripos($field->field, '_USD') && isset($field_module->field_defs['currency_id'])) {
-                if((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
+            if ($data['type'] == 'currency' && !stripos($field->field, '_USD') && isset($field_module->field_defs['currency_id'])) {
+                if ((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
                     $query['select'][$table_alias.'_currency_id'] = $table_alias.'_cstm'.".currency_id AS '".$table_alias."_currency_id'";
                 } else {
-                    $query_array['select'][$table_alias . '_currency_id'] = $table_alias . ".currency_id AS '" . $table_alias . "_currency_id'";
+                    $query_array['select'][$table_alias.'_currency_id'] = $table_alias.".currency_id AS '".$table_alias."_currency_id'";
                 }
             }
 
-            if(  (isset($data['source']) && $data['source'] == 'custom_fields')) {
+            if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
                 $select_field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$field->field;
                 // Fix for #1251 - added a missing parameter to the function call
                 $query_array = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm', $table_alias, $field_module, 'custom', $query);
             } else {
-                $select_field= $this->db->quoteIdentifier($table_alias).'.'.$field->field;
+                $select_field = $this->db->quoteIdentifier($table_alias).'.'.$field->field;
             }
 
-            if($field->sort_by != ''){
+            if ($field->sort_by != '') {
                 $query_array['sort_by'][] = $field_label.' '.$field->sort_by;
             }
 
-            if($field->group_by == 1){
+            if ($field->group_by == 1) {
                 $query_array['group_by'][] = $select_field;
             }
 
-            if($field->field_function != null){
+            if ($field->field_function != null) {
                 $select_field = $field->field_function.'('.$select_field.')';
             }
 
-            $query_array['select'][] = $select_field ." AS '".$field_label."'";
-            if(isset($extra['select']) && $extra['select']) {
-                foreach($extra['select'] as $selectField => $selectAlias) {
-                    if($selectAlias) {
-                        $query_array['select'][] = $selectField . " AS " . $selectAlias;
+            $query_array['select'][] = $select_field." AS '".$field_label."'";
+            if (isset($extra['select']) && $extra['select']) {
+                foreach ($extra['select'] as $selectField => $selectAlias) {
+                    if ($selectAlias) {
+                        $query_array['select'][] = $selectField." AS ".$selectAlias;
                     }
                     else {
                         $query_array['select'][] = $selectField;
                     }
                 }
             }
-            $query_array['where'][] = $select_field ." IS NOT NULL AND ";
-            if(isset($extra['where']) && $extra['where']) {
-                $query_array['where'][] = implode(' AND ', $extra['where']) . ' AND ';
+            $query_array['where'][] = $select_field." IS NOT NULL AND ";
+            if (isset($extra['where']) && $extra['where']) {
+                $query_array['where'][] = implode(' AND ', $extra['where']).' AND ';
             }
 
             $query_array = $this->build_report_query_where($query_array);
 
-            foreach ($query_array['select'] as $select){
-                $query .=  ($query == '' ? 'SELECT ' : ', ').$select;
+            foreach ($query_array['select'] as $select) {
+                $query .= ($query == '' ? 'SELECT ' : ', ').$select;
             }
 
             $query .= ' FROM '.$module->table_name.' ';
 
-            if(isset($query_array['join'])){
-                foreach ($query_array['join'] as $join){
+            if (isset($query_array['join'])) {
+                foreach ($query_array['join'] as $join) {
                     $query .= $join;
                 }
             }
-            if(isset($query_array['where'])){
+            if (isset($query_array['where'])) {
                 $query_where = '';
-                foreach ($query_array['where'] as $where){
-                    $query_where .=  ($query_where == '' ? 'WHERE ' : ' ').$where;
+                foreach ($query_array['where'] as $where) {
+                    $query_where .= ($query_where == '' ? 'WHERE ' : ' ').$where;
                 }
 
                 $query_where = $this->queryWhereRepair($query_where);
@@ -471,41 +471,41 @@ 
                 $query .= ' '.$query_where;
             }
 
-            if(isset($query_array['group_by'])){
+            if (isset($query_array['group_by'])) {
                 $query_group_by = '';
-                foreach ($query_array['group_by'] as $group_by){
-                    $query_group_by .=  ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
+                foreach ($query_array['group_by'] as $group_by) {
+                    $query_group_by .= ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
                 }
                 $query .= ' '.$query_group_by;
             }
 
-            if(isset($query_array['sort_by'])){
+            if (isset($query_array['sort_by'])) {
                 $query_sort_by = '';
-                foreach ($query_array['sort_by'] as $sort_by){
-                    $query_sort_by .=  ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
+                foreach ($query_array['sort_by'] as $sort_by) {
+                    $query_sort_by .= ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
                 }
                 $query .= ' '.$query_sort_by;
             }
 
-            $query .= ' group by ' . $field_label;
+            $query .= ' group by '.$field_label;
 
             $result = $this->db->query($query);
 
             while ($row = $this->db->fetchByAssoc($result)) {
-                if($html != '') $html .= '<br />';
+                if ($html != '') $html .= '<br />';
 
                $html .= $this->build_report_html($offset, $links, $row[$field_label], '', $extra);
 
             }
         }
 
-        if($html == '') $html = $this->build_report_html($offset, $links);
+        if ($html == '') $html = $this->build_report_html($offset, $links);
         return $html;
 
     }
 
 
-    function build_report_html($offset = -1, $links = true, $group_value = '', $tableIdentifier = '', $extra = array()){
+    function build_report_html($offset = -1, $links = true, $group_value = '', $tableIdentifier = '', $extra = array()) {
 
         global $beanList, $sugar_config;
 
@@ -514,7 +514,7 @@ 
         $report_sql = $this->build_report_query($_group_value, $extra);
 
         // Fix for issue 1232 - items listed in a single report, should adhere to the same standard as ListView items.
-        if($sugar_config['list_max_entries_per_page']!='') {
+        if ($sugar_config['list_max_entries_per_page'] != '') {
             $max_rows = $sugar_config['list_max_entries_per_page'];
         } else {
             $max_rows = 20;
@@ -527,22 +527,22 @@ 
         // We have a count query.  Run it and get the results.
         $result = $this->db->query($count_query);
         $assoc = $this->db->fetchByAssoc($result);
-        if(!empty($assoc['c']))
+        if (!empty($assoc['c']))
         {
             $total_rows = $assoc['c'];
         }
 
         $html = "<table class='list' id='report_table".$group_value."' width='100%' cellspacing='0' cellpadding='0' border='0' repeat_header='1'>";
 
-        if($offset >= 0){
+        if ($offset >= 0) {
             $start = 0;
             $end = 0;
             $previous_offset = 0;
             $next_offset = 0;
             $last_offset = 0;
 
-            if($total_rows > 0){
-                $start = $offset +1;
+            if ($total_rows > 0) {
+                $start = $offset + 1;
                 $end = (($offset + $max_rows) < $total_rows) ? $offset + $max_rows : $total_rows;
                 $previous_offset = ($offset - $max_rows) < 0 ? 0 : $offset - $max_rows;
                 $next_offset = $offset + $max_rows;
@@ -554,36 +554,36 @@ 
 
             $moduleFieldByGroupValue = $this->getModuleFieldByGroupValue($beanList, $group_value);
 
-            $html .="<td colspan='18'>
+            $html .= "<td colspan='18'>
                        <table class='paginationTable' border='0' cellpadding='0' cellspacing='0' width='100%'>
                         <td style='text-align:left' ><H3><a href=\"javascript:void(0)\" class=\"collapseLink\" onclick=\"groupedReportToggler.toggleList(this);\"><img border=\"0\" id=\"detailpanel_1_img_hide\" src=\"themes/SuiteR/images/basic_search.gif\"></a>$moduleFieldByGroupValue</H3></td>
                         <td class='paginationChangeButtons' align='right' nowrap='nowrap' width='1%'>";
 
-            if($offset == 0){
-                $html .="<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' disabled='disabled'>
+            if ($offset == 0) {
+                $html .= "<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' disabled='disabled'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('start_off.gif')."' alt='Start' align='absmiddle' border='0'>
                 </button>
                 <button type='button' id='listViewPrevButton_top' name='listViewPrevButton' class='button' title='Previous' disabled='disabled'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('previous_off.gif')."' alt='Previous' align='absmiddle' border='0'>
                 </button>";
             } else {
-                $html .="<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' onclick='changeReportPage(\"".$this->id."\",0,\"".$group_value."\",\"".$tableIdentifier."\")'>
+                $html .= "<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' onclick='changeReportPage(\"".$this->id."\",0,\"".$group_value."\",\"".$tableIdentifier."\")'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('start.gif')."' alt='Start' align='absmiddle' border='0'>
                 </button>
                 <button type='button' id='listViewPrevButton_top' name='listViewPrevButton' class='button' title='Previous' onclick='changeReportPage(\"".$this->id."\",".$previous_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('previous.gif')."' alt='Previous' align='absmiddle' border='0'>
                 </button>";
             }
-            $html .=" <span class='pageNumbers'>(".$start ." - ".$end ." of ". $total_rows .")</span>";
-            if($next_offset < $total_rows){
-                $html .="<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button' onclick='changeReportPage(\"".$this->id."\",".$next_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
+            $html .= " <span class='pageNumbers'>(".$start." - ".$end." of ".$total_rows.")</span>";
+            if ($next_offset < $total_rows) {
+                $html .= "<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button' onclick='changeReportPage(\"".$this->id."\",".$next_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
                         <img src='".SugarThemeRegistry::current()->getImageURL('next.gif')."' alt='Next' align='absmiddle' border='0'>
                     </button>
                      <button type='button' id='listViewEndButton_top' name='listViewEndButton' title='End' class='button' onclick='changeReportPage(\"".$this->id."\",".$last_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
                         <img src='".SugarThemeRegistry::current()->getImageURL('end.gif')."' alt='End' align='absmiddle' border='0'>
                     </button>";
             } else {
-                $html .="<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button'  disabled='disabled'>
+                $html .= "<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button'  disabled='disabled'>
                         <img src='".SugarThemeRegistry::current()->getImageURL('next_off.gif')."' alt='Next' align='absmiddle' border='0'>
                     </button>
                      <button type='button' id='listViewEndButton_top' name='listViewEndButton' title='End' class='button'  disabled='disabled'>
@@ -592,12 +592,12 @@ 
 
             }
 
-            $html .="</td>
+            $html .= "</td>
                        </table>
                       </td>";
 
-            $html .="</tr></thead>";
-        } else{
+            $html .= "</tr></thead>";
+        } else {
 
             $moduleFieldByGroupValue = $this->getModuleFieldByGroupValue($beanList, $group_value);
 
@@ -623,16 +623,16 @@ 
 
             $field_module = $this->report_module;
             $field_alias = $field_bean->table_name;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    if(empty($rel)){
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    if (empty($rel)) {
                         continue;
                     }
-                    $field_module = getRelatedModule($field_module,$rel);
-                    $field_alias = $field_alias . ':'.$rel;
+                    $field_module = getRelatedModule($field_module, $rel);
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
-            $label = str_replace(' ','_',$field->label).$i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['label'] = $field->label;
             $fields[$label]['display'] = $field->display;
@@ -645,7 +645,7 @@ 
             $fields[$label]['params'] = array("date_format" => $field->format);
 
 
-            if($fields[$label]['display']){
+            if ($fields[$label]['display']) {
                 $html .= "<th scope='col'>";
                 $html .= "<div style='white-space: normal;' width='100%' align='left'>";
                 $html .= $field->label;
@@ -658,7 +658,7 @@ 
         $html .= "</thead>";
         $html .= "<tbody>";
 
-        if($offset >= 0){
+        if ($offset >= 0) {
             $result = $this->db->limitQuery($report_sql, $offset, $max_rows);
         } else {
             $result = $this->db->query($report_sql);
@@ -671,39 +671,39 @@ 
         while ($row = $this->db->fetchByAssoc($result)) {
             $html .= "<tr class='".$row_class."' height='20'>";
 
-            foreach($fields as $name => $att){
-                if($att['display']){
+            foreach ($fields as $name => $att) {
+                if ($att['display']) {
                     $html .= "<td class='' valign='top' align='left'>";
-                    if($att['link'] && $links){
-                        $html .= "<a href='" . $sugar_config['site_url'] . "/index.php?module=".$att['module']."&action=DetailView&record=".$row[$att['alias'].'_id']."'>";
+                    if ($att['link'] && $links) {
+                        $html .= "<a href='".$sugar_config['site_url']."/index.php?module=".$att['module']."&action=DetailView&record=".$row[$att['alias'].'_id']."'>";
                     }
 
                     $currency_id = isset($row[$att['alias'].'_currency_id']) ? $row[$att['alias'].'_currency_id'] : '';
 
-                    switch ($att['function']){
+                    switch ($att['function']) {
                         case 'COUNT':
                         //case 'SUM':
                             $html .= $row[$name];
                             break;
                         default:
 
-                            $html .= getModuleField($att['module'], $att['field'], $att['field'], 'DetailView',$row[$name],'',$currency_id, $att['params']);
+                            $html .= getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name], '', $currency_id, $att['params']);
                             break;
                     }
-                    if($att['total']){
+                    if ($att['total']) {
                         $totals[$name][] = $row[$name];
                     }
-                    if($att['link'] && $links) $html .= "</a>";
+                    if ($att['link'] && $links) $html .= "</a>";
                     $html .= "</td>";
                 }
             }
             $html .= "</tr>";
 
-            $row_class = $row_class == 'oddListRowS1' ?  'evenListRowS1':'oddListRowS1';
+            $row_class = $row_class == 'oddListRowS1' ? 'evenListRowS1' : 'oddListRowS1';
         }
         $html .= "</tbody>";
 
-        $html .= $this->getTotalHtml($fields,$totals);
+        $html .= $this->getTotalHtml($fields, $totals);
 
         $html .= "</table>";
 
@@ -746,13 +746,13 @@ 
 
             $field_module = $this->report_module;
             $field_alias = $field_bean->table_name;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    if(empty($rel)){
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    if (empty($rel)) {
                         continue;
                     }
-                    $field_module = getRelatedModule($field_module,$rel);
-                    $field_alias = $field_alias . ':'.$rel;
+                    $field_module = getRelatedModule($field_module, $rel);
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
 
@@ -765,31 +765,31 @@ 
         return $moduleFieldByGroupValue;
     }
 
-    function getTotalHTML($fields,$totals){
+    function getTotalHTML($fields, $totals) {
         global $app_list_strings;
         $html = '';
         $html .= "<tbody>";
         $html .= "<tr>";
-        foreach($fields as $label => $field){
-            if(!$field['display']){
+        foreach ($fields as $label => $field) {
+            if (!$field['display']) {
                 continue;
             }
-            if($field['total']){
-                $totalLabel = $field['label'] ." ".$app_list_strings['aor_total_options'][$field['total']];
+            if ($field['total']) {
+                $totalLabel = $field['label']." ".$app_list_strings['aor_total_options'][$field['total']];
                 $html .= "<th>{$totalLabel}</th>";
-            }else{
+            } else {
                 $html .= "<th></th>";
             }
         }
         $html .= "</tr>";
         $html .= "<tr>";
-        foreach($fields as $label => $field){
-            if(!$field['display']){
+        foreach ($fields as $label => $field) {
+            if (!$field['display']) {
                 continue;
             }
-            if($field['total'] && isset($totals[$label])){
-                $html .= "<td>".$this->calculateTotal($field['total'],$totals[$label])."</td>";
-            }else{
+            if ($field['total'] && isset($totals[$label])) {
+                $html .= "<td>".$this->calculateTotal($field['total'], $totals[$label])."</td>";
+            } else {
                 $html .= "<td></td>";
             }
         }
@@ -798,24 +798,24 @@ 
         return $html;
     }
 
-    function calculateTotal($type, $totals){
-        switch($type){
+    function calculateTotal($type, $totals) {
+        switch ($type) {
             case 'SUM':
                 return array_sum($totals);
             case 'COUNT':
                 return count($totals);
             case 'AVG':
-                return array_sum($totals)/count($totals);
+                return array_sum($totals) / count($totals);
             default:
                 return '';
         }
     }
 
-    private function encloseForCSV($field){
+    private function encloseForCSV($field) {
         return '"'.$field.'"';
     }
 
-    function build_report_csv(){
+    function build_report_csv() {
 
         ini_set('zlib.output_compression', 'Off');
 
@@ -839,20 +839,20 @@ 
             $path = unserialize(base64_decode($field->module_path));
 
             $field_module = $this->report_module;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    $field_module = getRelatedModule($field_module,$rel);
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    $field_module = getRelatedModule($field_module, $rel);
                 }
             }
-            $label = str_replace(' ','_',$field->label).$i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['display'] = $field->display;
             $fields[$label]['function'] = $field->field_function;
             $fields[$label]['module'] = $field_module;
 
 
-            if($field->display){
-                $csv.= $this->encloseForCSV($field->label);
+            if ($field->display) {
+                $csv .= $this->encloseForCSV($field->label);
                 $csv .= $delimiter;
             }
             ++$i;
@@ -863,30 +863,30 @@ 
 
         while ($row = $this->db->fetchByAssoc($result)) {
             $csv .= "\r\n";
-            foreach($fields as $name => $att){
-                if($att['display']){
-                    if($att['function'] != '' )
+            foreach ($fields as $name => $att) {
+                if ($att['display']) {
+                    if ($att['function'] != '')
                         $csv .= $this->encloseForCSV($row[$name]);
                     else
-                        $csv .= $this->encloseForCSV(trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView',$row[$name]))));
+                        $csv .= $this->encloseForCSV(trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name]))));
                     $csv .= $delimiter;
                 }
             }
         }
 
-        $csv= $GLOBALS['locale']->translateCharset($csv, 'UTF-8', $GLOBALS['locale']->getExportCharset());
+        $csv = $GLOBALS['locale']->translateCharset($csv, 'UTF-8', $GLOBALS['locale']->getExportCharset());
 
         ob_clean();
         header("Pragma: cache");
         header("Content-type: text/comma-separated-values; charset=".$GLOBALS['locale']->getExportCharset());
         header("Content-Disposition: attachment; filename=\"{$this->name}.csv\"");
         header("Content-transfer-encoding: binary");
-        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
-        header("Last-Modified: " . TimeDate::httpTime() );
-        header("Cache-Control: post-check=0, pre-check=0", false );
+        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+        header("Last-Modified: ".TimeDate::httpTime());
+        header("Cache-Control: post-check=0, pre-check=0", false);
         header("Content-Length: ".mb_strlen($csv, '8bit'));
         if (!empty($sugar_config['export_excel_compatible'])) {
-            $csv==chr(255) . chr(254) . mb_convert_encoding($csv, 'UTF-16LE', 'UTF-8');
+            $csv == chr(255).chr(254).mb_convert_encoding($csv, 'UTF-16LE', 'UTF-8');
         }
         print $csv;
 
@@ -895,7 +895,7 @@ 
 
 
 
-    function build_report_query($group_value ='', $extra = array()){
+    function build_report_query($group_value = '', $extra = array()) {
         global $beanList;
 
         $module = new $beanList[$this->report_module]();
@@ -904,26 +904,26 @@ 
         $query_array = array();
 
         $query_array = $this->build_report_query_select($query_array, $group_value);
-        if(isset($extra['where']) && $extra['where']) {
-            $query_array['where'][] = implode(' AND ', $extra['where']) . ' AND ';
+        if (isset($extra['where']) && $extra['where']) {
+            $query_array['where'][] = implode(' AND ', $extra['where']).' AND ';
         }
         $query_array = $this->build_report_query_where($query_array);
 
-        foreach ($query_array['select'] as $select){
-            $query .=  ($query == '' ? 'SELECT ' : ', ').$select;
+        foreach ($query_array['select'] as $select) {
+            $query .= ($query == '' ? 'SELECT ' : ', ').$select;
         }
 
         $query .= ' FROM '.$this->db->quoteIdentifier($module->table_name).' ';
 
-        if(isset($query_array['join'])){
-            foreach ($query_array['join'] as $join){
+        if (isset($query_array['join'])) {
+            foreach ($query_array['join'] as $join) {
                 $query .= $join;
             }
         }
-        if(isset($query_array['where'])){
+        if (isset($query_array['where'])) {
             $query_where = '';
-            foreach ($query_array['where'] as $where){
-                $query_where .=  ($query_where == '' ? 'WHERE ' : ' ').$where;
+            foreach ($query_array['where'] as $where) {
+                $query_where .= ($query_where == '' ? 'WHERE ' : ' ').$where;
             }
 
             $query_where = $this->queryWhereRepair($query_where);
@@ -931,18 +931,18 @@ 
             $query .= ' '.$query_where;
         }
 
-        if(isset($query_array['group_by'])){
+        if (isset($query_array['group_by'])) {
             $query_group_by = '';
-            foreach ($query_array['group_by'] as $group_by){
-                $query_group_by .=  ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
+            foreach ($query_array['group_by'] as $group_by) {
+                $query_group_by .= ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
             }
             $query .= ' '.$query_group_by;
         }
 
-        if(isset($query_array['sort_by'])){
+        if (isset($query_array['sort_by'])) {
             $query_sort_by = '';
-            foreach ($query_array['sort_by'] as $sort_by){
-                $query_sort_by .=  ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
+            foreach ($query_array['sort_by'] as $sort_by) {
+                $query_sort_by .= ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
             }
             $query .= ' '.$query_sort_by;
         }
@@ -956,11 +956,11 @@ 
 
         $safe = 0;
         $query_where_clean = '';
-        while($query_where_clean != $query_where) {
+        while ($query_where_clean != $query_where) {
             $query_where_clean = $query_where;
             $query_where = preg_replace('/\b(AND|OR)\s*\(\s*\)|[^\w+\s*]\(\s*\)/i', '', $query_where_clean);
             $safe++;
-            if($safe>100){
+            if ($safe > 100) {
                 $GLOBALS['log']->fatal('Invalid report query conditions');
                 break;
             }
@@ -969,10 +969,10 @@ 
         return $query_where;
     }
 
-    function build_report_query_select($query = array(), $group_value =''){
+    function build_report_query_select($query = array(), $group_value = '') {
         global $beanList;
 
-        if($beanList[$this->report_module]){
+        if ($beanList[$this->report_module]) {
             $module = new $beanList[$this->report_module]();
 
             $query['select'][] = $this->db->quoteIdentifier($module->table_name).".id AS '".$module->table_name."_id'";
@@ -985,16 +985,16 @@ 
                 $field = new AOR_Field();
                 $field->retrieve($row['id']);
 
-                $field->label = str_replace(' ','_',$field->label).$i;
+                $field->label = str_replace(' ', '_', $field->label).$i;
 
                 $path = unserialize(base64_decode($field->module_path));
 
                 $field_module = $module;
                 $table_alias = $field_module->table_name;
                 $oldAlias = $table_alias;
-                if(!empty($path[0]) && $path[0] != $module->module_dir){
-                    foreach($path as $rel){
-                        $new_field_module = new $beanList[getRelatedModule($field_module->module_dir,$rel)];
+                if (!empty($path[0]) && $path[0] != $module->module_dir) {
+                    foreach ($path as $rel) {
+                        $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $rel)];
                         $oldAlias = $table_alias;
                         $table_alias = $table_alias.":".$rel;
                         $query = $this->build_report_query_join($rel, $table_alias, $oldAlias, $field_module, 'relationship', $query, $new_field_module);
@@ -1005,54 +1005,54 @@ 
 
                 $data = $field_module->field_defs[$field->field];
 
-                if($data['type'] == 'relate' && isset($data['id_name'])) {
+                if ($data['type'] == 'relate' && isset($data['id_name'])) {
                     $field->field = $data['id_name'];
                     $data_new = $field_module->field_defs[$field->field];
-                    if(isset($data_new['source']) && $data_new['source'] == 'non-db' && $data_new['type'] != 'link' && isset($data['link'])){
+                    if (isset($data_new['source']) && $data_new['source'] == 'non-db' && $data_new['type'] != 'link' && isset($data['link'])) {
                         $data_new['type'] = 'link';
                         $data_new['relationship'] = $data['link'];
                     }
                     $data = $data_new;
                 }
 
-                if($data['type'] == 'link' && $data['source'] == 'non-db') {
-                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir,$data['relationship'])];
+                if ($data['type'] == 'link' && $data['source'] == 'non-db') {
+                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $data['relationship'])];
                     $table_alias = $data['relationship'];
-                    $query = $this->build_report_query_join($data['relationship'],$table_alias, $oldAlias, $field_module, 'relationship', $query, $new_field_module);
+                    $query = $this->build_report_query_join($data['relationship'], $table_alias, $oldAlias, $field_module, 'relationship', $query, $new_field_module);
                     $field_module = $new_field_module;
                     $field->field = 'id';
                 }
 
-                if($data['type'] == 'currency' && isset($field_module->field_defs['currency_id'])) {
-                    if((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
+                if ($data['type'] == 'currency' && isset($field_module->field_defs['currency_id'])) {
+                    if ((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
                         $query['select'][$table_alias.'_currency_id'] = $this->db->quoteIdentifier($table_alias.'_cstm').".currency_id AS '".$table_alias."_currency_id'";
                     } else {
                         $query['select'][$table_alias.'_currency_id'] = $this->db->quoteIdentifier($table_alias).".currency_id AS '".$table_alias."_currency_id'";
                     }
                 }
 
-                if((isset($data['source']) && $data['source'] == 'custom_fields')) {
+                if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
                     $select_field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$field->field;
-                    $query = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm',$table_alias, $field_module, 'custom', $query);
+                    $query = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm', $table_alias, $field_module, 'custom', $query);
                 } else {
-                    $select_field= $this->db->quoteIdentifier($table_alias).'.'.$field->field;
+                    $select_field = $this->db->quoteIdentifier($table_alias).'.'.$field->field;
                 }
 
-                if($field->sort_by != ''){
+                if ($field->sort_by != '') {
                     $query['sort_by'][] = $select_field." ".$field->sort_by;
                 }
 
-                if($field->group_by == 1){
-                    $query['group_by'][] = $field->format ? str_replace('(%1)', '(' . $select_field . ')', preg_replace(array('/\s+/', '/Y/', '/m/', '/d/'), array(', ', 'YEAR(%1)', 'MONTH(%1)', 'DAY(%1)'), trim(preg_replace('/[^Ymd]/', ' ', $field->format)))) : $select_field;
+                if ($field->group_by == 1) {
+                    $query['group_by'][] = $field->format ? str_replace('(%1)', '('.$select_field.')', preg_replace(array('/\s+/', '/Y/', '/m/', '/d/'), array(', ', 'YEAR(%1)', 'MONTH(%1)', 'DAY(%1)'), trim(preg_replace('/[^Ymd]/', ' ', $field->format)))) : $select_field;
                 }
 
-                if($field->field_function != null){
+                if ($field->field_function != null) {
                     $select_field = $field->field_function.'('.$select_field.')';
                 }
 
-                $query['select'][] = $select_field ." AS '".$field->label."'";
+                $query['select'][] = $select_field." AS '".$field->label."'";
 
-                if($field->group_display == 1 && $group_value) $query['where'][] = $select_field." = '".$group_value."' AND ";
+                if ($field->group_display == 1 && $group_value) $query['where'][] = $select_field." = '".$group_value."' AND ";
                     ++$i;
             }
         }
@@ -1060,30 +1060,30 @@ 
     }
 
 
-    function build_report_query_join($name, $alias, $parentAlias, SugarBean $module, $type, $query = array(),SugarBean $rel_module = null ){
+    function build_report_query_join($name, $alias, $parentAlias, SugarBean $module, $type, $query = array(), SugarBean $rel_module = null) {
 
-        if(!isset($query['join'][$alias])){
+        if (!isset($query['join'][$alias])) {
 
-            switch ($type){
+            switch ($type) {
                 case 'custom':
-                    $query['join'][$alias] = 'LEFT JOIN '.$this->db->quoteIdentifier($module->get_custom_table_name()).' '.$this->db->quoteIdentifier($name).' ON '.$this->db->quoteIdentifier($parentAlias).'.id = '. $this->db->quoteIdentifier($name).'.id_c ';
+                    $query['join'][$alias] = 'LEFT JOIN '.$this->db->quoteIdentifier($module->get_custom_table_name()).' '.$this->db->quoteIdentifier($name).' ON '.$this->db->quoteIdentifier($parentAlias).'.id = '.$this->db->quoteIdentifier($name).'.id_c ';
                     break;
 
                 case 'relationship':
-                    if($module->load_relationship($name)){
+                    if ($module->load_relationship($name)) {
                         $params['join_type'] = 'LEFT JOIN';
-                        if($module->$name->relationship_type != 'one-to-many'){
-                            if($module->$name->getSide() == REL_LHS){
+                        if ($module->$name->relationship_type != 'one-to-many') {
+                            if ($module->$name->getSide() == REL_LHS) {
                                 $params['right_join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['left_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
-                            }else{
+                            } else {
                                 $params['right_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
                                 $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['left_join_table_alias'] = $this->db->quoteIdentifier($alias);
                             }
 
-                        }else{
+                        } else {
                             $params['right_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
                             $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                             $params['left_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
@@ -1092,7 +1092,7 @@ 
                         $params['join_table_link_alias'] = $this->db->quoteIdentifier($linkAlias);
                         $join = $module->$name->getJoin($params, true);
                         $query['join'][$alias] = $join['join'];
-                        if($rel_module != null) {
+                        if ($rel_module != null) {
                             $query['join'][$alias] .= $this->build_report_access_query($rel_module, $name);
                         }
                         $query['select'][] = $join['select']." AS '".$alias."_id'";
@@ -1107,11 +1107,11 @@ 
         return $query;
     }
 
-    function build_report_access_query(SugarBean $module, $alias){
+    function build_report_access_query(SugarBean $module, $alias) {
 
         $module->table_name = $alias;
         $where = '';
-        if($module->bean_implements('ACL') && ACLController::requireOwner($module->module_dir, 'list') )
+        if ($module->bean_implements('ACL') && ACLController::requireOwner($module->module_dir, 'list'))
         {
             global $current_user;
             $owner_where = $module->getOwnerWhere($current_user->id);
@@ -1119,18 +1119,18 @@ 
 
         }
 
-        if(file_exists('modules/SecurityGroups/SecurityGroup.php')){
+        if (file_exists('modules/SecurityGroups/SecurityGroup.php')) {
             /* BEGIN - SECURITY GROUPS */
-            if($module->bean_implements('ACL') && ACLController::requireSecurityGroup($module->module_dir, 'list') )
+            if ($module->bean_implements('ACL') && ACLController::requireSecurityGroup($module->module_dir, 'list'))
             {
                 require_once('modules/SecurityGroups/SecurityGroup.php');
                 global $current_user;
                 $owner_where = $module->getOwnerWhere($current_user->id);
-                $group_where = SecurityGroup::getGroupWhere($alias,$module->module_dir,$current_user->id);
-                if(!empty($owner_where)){
-                    $where .= " AND (".  $owner_where." or ".$group_where.") ";
+                $group_where = SecurityGroup::getGroupWhere($alias, $module->module_dir, $current_user->id);
+                if (!empty($owner_where)) {
+                    $where .= " AND (".$owner_where." or ".$group_where.") ";
                 } else {
-                    $where .= ' AND '.  $group_where;
+                    $where .= ' AND '.$group_where;
                 }
             }
             /* END - SECURITY GROUPS */
@@ -1143,16 +1143,16 @@ 
      * @param array $query
      * @return array
      */
-    function build_report_query_where($query = array()){
+    function build_report_query_where($query = array()) {
         global $beanList, $app_list_strings, $sugar_config;
 
         $closure = false;
-        if(!empty($query['where'])) {
+        if (!empty($query['where'])) {
             $query['where'][] = '(';
             $closure = true;
         }
 
-        if($beanList[$this->report_module]){
+        if ($beanList[$this->report_module]) {
             $module = new $beanList[$this->report_module]();
 
             $sql = "SELECT id FROM aor_conditions WHERE aor_report_id = '".$this->id."' AND deleted = 0 ORDER BY condition_order ASC";
@@ -1169,21 +1169,21 @@ 
                 $condition_module = $module;
                 $table_alias = $condition_module->table_name;
                 $oldAlias = $table_alias;
-                if(!empty($path[0]) && $path[0] != $module->module_dir){
-                    foreach($path as $rel){
-                        if(empty($rel)){
+                if (!empty($path[0]) && $path[0] != $module->module_dir) {
+                    foreach ($path as $rel) {
+                        if (empty($rel)) {
                             continue;
                         }
                         // Bug: Prevents relationships from loading.
                         //$rel = strtolower($rel);
-                        $new_condition_module = new $beanList[getRelatedModule($condition_module->module_dir,$rel)];
+                        $new_condition_module = new $beanList[getRelatedModule($condition_module->module_dir, $rel)];
                         $oldAlias = $table_alias;
                         $table_alias = $table_alias.":".$rel;
                         $query = $this->build_report_query_join($rel, $table_alias, $oldAlias, $condition_module, 'relationship', $query, $new_condition_module);
                         $condition_module = $new_condition_module;
                     }
                 }
-                if(isset($app_list_strings['aor_sql_operator_list'][$condition->operator])) {
+                if (isset($app_list_strings['aor_sql_operator_list'][$condition->operator])) {
                     $where_set = false;
 
                     $data = $condition_module->field_defs[$condition->field];
@@ -1198,24 +1198,24 @@ 
                         $data = $data_new;
                     }
 
-                    if($data['type'] == 'link' && $data['source'] == 'non-db') {
-                        $new_field_module = new $beanList[getRelatedModule($condition_module->module_dir,$data['relationship'])];
+                    if ($data['type'] == 'link' && $data['source'] == 'non-db') {
+                        $new_field_module = new $beanList[getRelatedModule($condition_module->module_dir, $data['relationship'])];
                         $table_alias = $data['relationship'];
-                        $query = $this->build_report_query_join($data['relationship'],$table_alias, $oldAlias, $condition_module, 'relationship', $query, $new_field_module);
+                        $query = $this->build_report_query_join($data['relationship'], $table_alias, $oldAlias, $condition_module, 'relationship', $query, $new_field_module);
                         $condition_module = $new_field_module;
 
                         // Debugging: security groups conditions - It's a hack to just get the query working
-                        if($condition_module->module_dir = 'SecurityGroups' && count($path) > 1) {
+                        if ($condition_module->module_dir = 'SecurityGroups' && count($path) > 1) {
 //                            $table_alias = 'opportunities:assigned_user_link:SecurityGroups' ;
-                            $table_alias = $oldAlias. ':' .$rel;
+                            $table_alias = $oldAlias.':'.$rel;
                         }
                         $condition->field = 'id';
                     }
                     if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                        $field = $this->db->quoteIdentifier($table_alias . '_cstm') . '.' . $condition->field;
-                        $query = $this->build_report_query_join($table_alias . '_cstm', $table_alias . '_cstm', $oldAlias, $condition_module, 'custom', $query);
+                        $field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$condition->field;
+                        $query = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm', $oldAlias, $condition_module, 'custom', $query);
                     } else {
-                        $field = $this->db->quoteIdentifier($table_alias) . '.' . $condition->field;
+                        $field = $this->db->quoteIdentifier($table_alias).'.'.$condition->field;
                     }
 
                     if (!empty($this->user_parameters[$condition->id]) && $condition->parameter) {
@@ -1247,10 +1247,10 @@ 
                                 $condition->field = 'id';
                             }
                             if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                                $value = $condition_module->table_name . '_cstm.' . $condition->value;
-                                $query = $this->build_report_query_join($condition_module->table_name . '_cstm', $table_alias . '_cstm', $table_alias, $condition_module, 'custom', $query);
+                                $value = $condition_module->table_name.'_cstm.'.$condition->value;
+                                $query = $this->build_report_query_join($condition_module->table_name.'_cstm', $table_alias.'_cstm', $table_alias, $condition_module, 'custom', $query);
                             } else {
-                                $value = ($table_alias ? "`$table_alias`" : $condition_module->table_name) . '.' . $condition->value;
+                                $value = ($table_alias ? "`$table_alias`" : $condition_module->table_name).'.'.$condition->value;
                             }
                             break;
 
@@ -1262,10 +1262,10 @@ 
                                 } else {
                                     $value = 'NOW()';
                                 }
-                            } else if($params[0] == 'today'){
-                                if($sugar_config['dbconfig']['db_type'] == 'mssql'){
+                            } else if ($params[0] == 'today') {
+                                if ($sugar_config['dbconfig']['db_type'] == 'mssql') {
                                     //$field =
-                                    $value  = 'CAST(GETDATE() AS DATE)';
+                                    $value = 'CAST(GETDATE() AS DATE)';
                                 } else {
                                     $field = 'DATE('.$field.')';
                                     $value = 'Curdate()';
@@ -1273,10 +1273,10 @@ 
                             } else {
                                 $data = $condition_module->field_defs[$params[0]];
                                 if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                                    $value = $condition_module->table_name . '_cstm.' . $params[0];
-                                    $query = $this->build_report_query_join($condition_module->table_name . '_cstm', $table_alias . '_cstm', $table_alias, $condition_module, 'custom', $query);
+                                    $value = $condition_module->table_name.'_cstm.'.$params[0];
+                                    $query = $this->build_report_query_join($condition_module->table_name.'_cstm', $table_alias.'_cstm', $table_alias, $condition_module, 'custom', $query);
                                 } else {
-                                    $value = $condition_module->table_name . '.' . $params[0];
+                                    $value = $condition_module->table_name.'.'.$params[0];
                                 }
                             }
 
@@ -1287,9 +1287,9 @@ 
                                         $params[3] = 'hours';
                                     default:
                                         if ($sugar_config['dbconfig']['db_type'] == 'mssql') {
-                                            $value = "DATEADD(" . $params[3] . ",  " . $app_list_strings['aor_date_operator'][$params[1]] . " $params[2], $value)";
+                                            $value = "DATEADD(".$params[3].",  ".$app_list_strings['aor_date_operator'][$params[1]]." $params[2], $value)";
                                         } else {
-                                            $value = "DATE_ADD($value, INTERVAL " . $app_list_strings['aor_date_operator'][$params[1]] . " $params[2] " . $params[3] . ")";
+                                            $value = "DATE_ADD($value, INTERVAL ".$app_list_strings['aor_date_operator'][$params[1]]." $params[2] ".$params[3].")";
                                         }
                                         break;
                                 }
@@ -1304,11 +1304,11 @@ 
                                 $value = '(';
                                 foreach ($multi_values as $multi_value) {
                                     if ($value != '(') $value .= $sep;
-                                    $value .= $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . " '" . $multi_value . "'";
+                                    $value .= $field.' '.$app_list_strings['aor_sql_operator_list'][$condition->operator]." '".$multi_value."'";
                                 }
                                 $value .= ')';
                             }
-                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ': 'AND ')) . $value;
+                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$value;
                             $where_set = true;
                             break;
                         case "Period":
@@ -1317,20 +1317,20 @@ 
                             } else {
                                 $params = base64_decode($condition->value);
                             }
-                            $value = '"' . getPeriodDate($params)->format('Y-m-d H:i:s') . '"';
+                            $value = '"'.getPeriodDate($params)->format('Y-m-d H:i:s').'"';
                             break;
                         case "CurrentUserID":
                             global $current_user;
-                            $value = '"' . $current_user->id . '"';
+                            $value = '"'.$current_user->id.'"';
                             break;
                         case 'Value':
                         default:
-                            $value = "'" . $this->db->quote($condition->value) . "'";
+                            $value = "'".$this->db->quote($condition->value)."'";
                             break;
                     }
 
                     //handle like conditions
-                    Switch($condition->operator) {
+                    Switch ($condition->operator) {
                         case 'Contains':
                             $value = "CONCAT('%', ".$value." ,'%')";
                             break;
@@ -1342,11 +1342,11 @@ 
                             break;
                     }
 
-                    if($condition->value_type == 'Value' && !$condition->value && $condition->operator == 'Equal_To') {
+                    if ($condition->value_type == 'Value' && !$condition->value && $condition->operator == 'Equal_To') {
                         $value = "{$value} OR {$field} IS NULL";
                     }
 
-                    if($tiltLogicOp) {
+                    if ($tiltLogicOp) {
                         if ($condition->value_type == "Period") {
                             if (array_key_exists($condition->value, $app_list_strings['date_time_period_list'])) {
                                 $params = $condition->value;
@@ -1354,32 +1354,32 @@ 
                                 $params = base64_decode($condition->value);
                             }
                             $date = getPeriodEndDate($params)->format('Y-m-d H:i:s');
-                            $value = '"' . getPeriodDate($params)->format('Y-m-d H:i:s') . '"';
+                            $value = '"'.getPeriodDate($params)->format('Y-m-d H:i:s').'"';
 
                             switch ($app_list_strings['aor_sql_operator_list'][$condition->operator]) {
                                 case "=":
-                                    $query['where'][] = $field . ' BETWEEN ' . $value .  ' AND ' . '"' . $date . '"';
+                                    $query['where'][] = $field.' BETWEEN '.$value.' AND '.'"'.$date.'"';
                                     break;
                                 case "!=":
-                                    $query['where'][] = $field . ' NOT BETWEEN ' . $value .  ' AND ' . '"' . $date . '"';
+                                    $query['where'][] = $field.' NOT BETWEEN '.$value.' AND '.'"'.$date.'"';
                                     break;
                                 case ">":
                                 case "<":
                                 case ">=":
                                 case "<=":
-                                    $query['where'][] = $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . ' ' . $value;
+                                    $query['where'][] = $field.' '.$app_list_strings['aor_sql_operator_list'][$condition->operator].' '.$value;
                                     break;
                             }
                         } else {
-                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ': 'AND ')) . $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . ' ' . $value;
+                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$field.' '.$app_list_strings['aor_sql_operator_list'][$condition->operator].' '.$value;
                         }
                     }
 
                     $tiltLogicOp = false;
                 }
-                else if($condition->parenthesis) {
-                    if($condition->parenthesis == 'START') {
-                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) .  '(';
+                else if ($condition->parenthesis) {
+                    if ($condition->parenthesis == 'START') {
+                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).'(';
                         $tiltLogicOp = true;
                     }
                     else {
@@ -1393,7 +1393,7 @@ 
 
             }
 
-            if(isset($query['where']) && $query['where']) {
+            if (isset($query['where']) && $query['where']) {
                 array_unshift($query['where'], '(');
                 $query['where'][] = ') AND ';
             }
@@ -1401,7 +1401,7 @@ 
 
         }
 
-        if($closure) {
+        if ($closure) {
             $query['where'][] = ')';
         }
 

Braces +40 added lines, -35 removed lines

@@ -61,8 +61,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -232,8 +231,10 @@ 
                 $html = '<script src="modules/AOR_Reports/js/Chart.js"></script>';
                 break;
             case self::CHART_TYPE_RGRAPH:
-                if($_REQUEST['module']!= 'Home')//Need the require_once for the rgraphincludes as they are only loaded when the home page is hit
+                if($_REQUEST['module']!= 'Home') {
+                    //Need the require_once for the rgraphincludes as they are only loaded when the home page is hit
                     require_once('include/SuiteGraphs/RGraphIncludes.php');
+                }
 
                 break;
         }
@@ -256,15 +257,13 @@ 
 
         if(count($rows) > 1) {
             $GLOBALS['log']->fatal('ambiguous group display for report ' . $this->id);
-        }
-        else if(count($rows) == 1){
+        } else if(count($rows) == 1){
             $rows[0]['module_path'] = unserialize(base64_decode($rows[0]['module_path']));
             if(!$rows[0]['module_path'][0]) {
                 $module = new $beanList[$this->report_module]();
                 $rows[0]['field_id_name'] = $module->field_defs[$rows[0]['field']]['id_name'] ? $module->field_defs[$rows[0]['field']]['id_name'] : $module->field_defs[$rows[0]['field']]['name'];
                 $rows[0]['module_path'][0] = $module->table_name;
-            }
-            else {
+            } else {
                 $rows[0]['field_id_name'] = $rows[0]['field'];
             }
             $path[] = $rows[0];
@@ -276,8 +275,7 @@ 
             }
 
             return $this->buildMultiGroupReport($offset, $links, $level+1, $path);
-        }
-        else if(!$rows) {
+        } else if(!$rows) {
             if($path) {
                 $html = '';
                 foreach ($path as $pth) {
@@ -295,12 +293,10 @@ 
                     }
                 }
                 return $html;
-            }
-            else {
+            } else {
                 return $this->build_group_report($offset, $links);
             }
-        }
-        else {
+        } else {
             throw new Exception('incorrect results');
         }
         throw new Exception('incorrect state');
@@ -436,8 +432,7 @@ 
                 foreach($extra['select'] as $selectField => $selectAlias) {
                     if($selectAlias) {
                         $query_array['select'][] = $selectField . " AS " . $selectAlias;
-                    }
-                    else {
+                    } else {
                         $query_array['select'][] = $selectField;
                     }
                 }
@@ -492,14 +487,18 @@ 
             $result = $this->db->query($query);
 
             while ($row = $this->db->fetchByAssoc($result)) {
-                if($html != '') $html .= '<br />';
+                if($html != '') {
+                    $html .= '<br />';
+                }
 
                $html .= $this->build_report_html($offset, $links, $row[$field_label], '', $extra);
 
             }
         }
 
-        if($html == '') $html = $this->build_report_html($offset, $links);
+        if($html == '') {
+            $html = $this->build_report_html($offset, $links);
+        }
         return $html;
 
     }
@@ -693,7 +692,9 @@ 
                     if($att['total']){
                         $totals[$name][] = $row[$name];
                     }
-                    if($att['link'] && $links) $html .= "</a>";
+                    if($att['link'] && $links) {
+                        $html .= "</a>";
+                    }
                     $html .= "</td>";
                 }
             }
@@ -777,7 +778,7 @@ 
             if($field['total']){
                 $totalLabel = $field['label'] ." ".$app_list_strings['aor_total_options'][$field['total']];
                 $html .= "<th>{$totalLabel}</th>";
-            }else{
+            } else{
                 $html .= "<th></th>";
             }
         }
@@ -789,7 +790,7 @@ 
             }
             if($field['total'] && isset($totals[$label])){
                 $html .= "<td>".$this->calculateTotal($field['total'],$totals[$label])."</td>";
-            }else{
+            } else{
                 $html .= "<td></td>";
             }
         }
@@ -865,10 +866,11 @@ 
             $csv .= "\r\n";
             foreach($fields as $name => $att){
                 if($att['display']){
-                    if($att['function'] != '' )
-                        $csv .= $this->encloseForCSV($row[$name]);
-                    else
-                        $csv .= $this->encloseForCSV(trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView',$row[$name]))));
+                    if($att['function'] != '' ) {
+                                            $csv .= $this->encloseForCSV($row[$name]);
+                    } else {
+                                            $csv .= $this->encloseForCSV(trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView',$row[$name]))));
+                    }
                     $csv .= $delimiter;
                 }
             }
@@ -1052,7 +1054,9 @@ 
 
                 $query['select'][] = $select_field ." AS '".$field->label."'";
 
-                if($field->group_display == 1 && $group_value) $query['where'][] = $select_field." = '".$group_value."' AND ";
+                if($field->group_display == 1 && $group_value) {
+                    $query['where'][] = $select_field." = '".$group_value."' AND ";
+                }
                     ++$i;
             }
         }
@@ -1077,13 +1081,13 @@ 
                                 $params['right_join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['left_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
-                            }else{
+                            } else{
                                 $params['right_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
                                 $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['left_join_table_alias'] = $this->db->quoteIdentifier($alias);
                             }
 
-                        }else{
+                        } else{
                             $params['right_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
                             $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                             $params['left_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
@@ -1298,12 +1302,16 @@ 
 
                         case 'Multi':
                             $sep = ' AND ';
-                            if ($condition->operator == 'Equal_To') $sep = ' OR ';
+                            if ($condition->operator == 'Equal_To') {
+                                $sep = ' OR ';
+                            }
                             $multi_values = unencodeMultienum($condition->value);
                             if (!empty($multi_values)) {
                                 $value = '(';
                                 foreach ($multi_values as $multi_value) {
-                                    if ($value != '(') $value .= $sep;
+                                    if ($value != '(') {
+                                        $value .= $sep;
+                                    }
                                     $value .= $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . " '" . $multi_value . "'";
                                 }
                                 $value .= ')';
@@ -1376,18 +1384,15 @@ 
                     }
 
                     $tiltLogicOp = false;
-                }
-                else if($condition->parenthesis) {
+                } else if($condition->parenthesis) {
                     if($condition->parenthesis == 'START') {
                         $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) .  '(';
                         $tiltLogicOp = true;
-                    }
-                    else {
+                    } else {
                         $query['where'][] = ')';
                         $tiltLogicOp = false;
                     }
-                }
-                else {
+                } else {
                     $GLOBALS['log']->debug('illegal condition');
                 }
 

modules/AOR_Reports/Dashlets/AORReportsDashlet/AORReportsDashlet.php

Spacing +24 added lines, -24 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 
 require_once('include/Dashlets/Dashlet.php');
@@ -17,14 +17,14 @@ 
         parent::__construct($id);
         $this->isConfigurable = true;
         $this->def = $def;
-        if(empty($def['dashletTitle'])) {
+        if (empty($def['dashletTitle'])) {
             $this->title = translate('LBL_AOR_REPORTS_DASHLET', 'AOR_Reports');
-        } else{
+        } else {
             $this->title = $def['dashletTitle'];
         }
 
         $this->params = array();
-        if(!empty($def['parameter_id'])) {
+        if (!empty($def['parameter_id'])) {
             foreach ($def['parameter_id'] as $key => $parameterId) {
                 $this->params[$parameterId] = array(
                     'id' => $parameterId,
@@ -33,7 +33,7 @@ 
                     'value' => $def['parameter_value'][$key]);
             }
         }
-        if(!empty($def['aor_report_id'])) {
+        if (!empty($def['aor_report_id'])) {
             $this->report = BeanFactory::getBean('AOR_Reports', $def['aor_report_id']);
             $this->report->user_parameters = $this->params;
         }
@@ -44,9 +44,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function AORReportsDashlet($id, $def = array()){
+    function AORReportsDashlet($id, $def = array()) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -60,12 +60,12 @@ 
         $mod_strings = return_module_language($current_language, 'AOR_Reports');
         $dashletSmarty = new Sugar_Smarty();
         $dashletTemplate = get_custom_file_if_exists('modules/AOR_Reports/Dashlets/AORReportsDashlet/dashlet.tpl');
-        $dashletSmarty->assign('MOD',$mod_strings);
-        $dashletSmarty->assign('dashlet_id',$this->id);
-        $dashletSmarty->assign('report_id',$this->report->id);
-        $dashletSmarty->assign('chartHTML',$this->getChartHTML());
+        $dashletSmarty->assign('MOD', $mod_strings);
+        $dashletSmarty->assign('dashlet_id', $this->id);
+        $dashletSmarty->assign('report_id', $this->report->id);
+        $dashletSmarty->assign('chartHTML', $this->getChartHTML());
         $dashletSmarty->assign('onlyCharts', $this->onlyCharts);
-        $dashletSmarty->assign('parameters',json_encode(array(
+        $dashletSmarty->assign('parameters', json_encode(array(
                                             'ids' => isset($this->def['parameter_id']) ? $this->def['parameter_id'] : null,
                                             'operators' => isset($this->def['parameter_operator']) ? $this->def['parameter_operator'] : null,
                                             'types' => isset($this->def['parameter_type']) ? $this->def['parameter_type'] : null,
@@ -73,11 +73,11 @@ 
         return $dashletSmarty->fetch($dashletTemplate);
     }
 
-    function getChartHTML(){
-        if(!empty($this->report->id)) {
+    function getChartHTML() {
+        if (!empty($this->report->id)) {
             //return $this->report->build_report_chart($this->charts, AOR_Report::CHART_TYPE_CHARTJS);
             return $this->report->build_report_chart($this->charts, AOR_Report::CHART_TYPE_RGRAPH);
-        }else{
+        } else {
             return '';
         }
     }
@@ -90,7 +90,7 @@ 
         global $current_language, $app_list_strings, $datetime;
         $mod_strings = return_module_language($current_language, 'AOR_Reports');
         $optionsSmarty = new Sugar_Smarty();
-        $optionsSmarty->assign('MOD',$mod_strings);
+        $optionsSmarty->assign('MOD', $mod_strings);
         $optionsSmarty->assign('id', $this->id);
         $optionsSmarty->assign('dashletTitle', $this->title);
         $optionsSmarty->assign('aor_report_id', $this->report->id);
@@ -103,16 +103,16 @@ 
         $optionsSmarty->assign('date_time_period_list', $app_list_strings['date_time_period_list']);
 
         $charts = array();
-        if(!empty($this->report->id)){
-            foreach($this->report->get_linked_beans('aor_charts','AOR_Charts') as $chart){
+        if (!empty($this->report->id)) {
+            foreach ($this->report->get_linked_beans('aor_charts', 'AOR_Charts') as $chart) {
                 $charts[$chart->id] = $chart->name;
             }
         }
         $conditions = getConditionsAsParameters($this->report, $this->params);
         $i = 0;
-        foreach($conditions as $condition) {
-            if($condition["value_type"] == "Date"){
-                if($condition["additionalConditions"][0] == "now") {
+        foreach ($conditions as $condition) {
+            if ($condition["value_type"] == "Date") {
+                if ($condition["additionalConditions"][0] == "now") {
                     $conditions[$i]["value"] = date("d/m/Y");
                 }
             }
@@ -120,7 +120,7 @@ 
             $i++;
         }
         $optionsSmarty->assign('parameters', $conditions);
-        $chartOptions = get_select_options_with_id($charts,$this->charts);
+        $chartOptions = get_select_options_with_id($charts, $this->charts);
         $optionsSmarty->assign('chartOptions', $chartOptions);
         $optionsTemplate = get_custom_file_if_exists('modules/AOR_Reports/Dashlets/AORReportsDashlet/dashletConfigure.tpl');
         ob_clean();
@@ -133,8 +133,8 @@ 
 //            $req['parameter_value'][0] = $secondValue;
 //            $req['parameter_value'][1] = $firstValue;
 //        }
-        $allowedKeys = array_flip(array('aor_report_id','dashletTitle','charts','onlyCharts','parameter_id','parameter_value','parameter_type','parameter_operator'));
-        $intersected = array_intersect_key($req,$allowedKeys);
+        $allowedKeys = array_flip(array('aor_report_id', 'dashletTitle', 'charts', 'onlyCharts', 'parameter_id', 'parameter_value', 'parameter_type', 'parameter_operator'));
+        $intersected = array_intersect_key($req, $allowedKeys);
         return $intersected;
     }
 

Braces +5 added lines, -4 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 
 require_once('include/Dashlets/Dashlet.php');
@@ -48,8 +50,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($id, $def);
@@ -77,7 +78,7 @@ 
         if(!empty($this->report->id)) {
             //return $this->report->build_report_chart($this->charts, AOR_Report::CHART_TYPE_CHARTJS);
             return $this->report->build_report_chart($this->charts, AOR_Report::CHART_TYPE_RGRAPH);
-        }else{
+        } else{
             return '';
         }
     }

modules/jjwg_Areas/jjwg_Areas_sugar.php

Spacing +2 added lines, -2 removed lines

@@ -35,9 +35,9 @@
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function jjwg_Areas_sugar(){
+    function jjwg_Areas_sugar() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($seed, $module, $subPanel, $options);

modules/ACLRoles/Popup_picker.php

Indentation +88 added lines, -88 removed lines

@@ -50,13 +50,13 @@ 
 {
 
 
-	/*
+    /*
 	 *
 	 */
-	function __construct()
-	{
+    function __construct()
+    {
 
-	}
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
@@ -73,91 +73,91 @@ 
     }
 
 
-	/*
-	 *
-	 */
-	function _get_where_clause()
-	{
-		$where = '';
-		if(isset($_REQUEST['query']))
-		{
-			$where_clauses = array();
-			append_where_clause($where_clauses, "name", "acl_roles.name");
-			$where = generate_where_statement($where_clauses);
-		}
-
-		return $where;
-	}
-
-	/**
+    /*
 	 *
 	 */
-	function process_page()
-	{
-		global $mod_strings;
-		global $app_strings;
-		global $currentModule;
-		global $sugar_version, $sugar_config;
-
-		$output_html = '';
-		$where = '';
-
-		$where = $this->_get_where_clause();
-
-		$name = empty($_REQUEST['name']) ? '' : $_REQUEST['name'];
-		$request_data = empty($_REQUEST['request_data']) ? '' : $_REQUEST['request_data'];
-		$hide_clear_button = empty($_REQUEST['hide_clear_button']) ? false : true;
-
-		$button  = "<form action='index.php' method='post' name='form' id='form'>\n";
-		if(!$hide_clear_button)
-		{
-			$button .= "<input type='button' name='button' class='button' onclick=\"send_back('','');\" title='"
-				.$app_strings['LBL_CLEAR_BUTTON_TITLE']."' value='  "
-				.$app_strings['LBL_CLEAR_BUTTON_LABEL']."  ' />\n";
-		}
-		$button .= "<input type='submit' name='button' class='button' onclick=\"window.close();\" title='"
-			.$app_strings['LBL_CANCEL_BUTTON_TITLE']."'  value='  "
-			.$app_strings['LBL_CANCEL_BUTTON_LABEL']."  ' />\n";
-		$button .= "</form>\n";
-
-		$form = new XTemplate('modules/ACLRoles/Popup_picker.html');
-		$form->assign('MOD', $mod_strings);
-		$form->assign('APP', $app_strings);
-		$form->assign('MODULE_NAME', $currentModule);
-		$form->assign('NAME', $name);
-		$form->assign('request_data', $request_data);
-
-		ob_start();
-		insert_popup_header();
-		$output_html .= ob_get_contents();
-		ob_end_clean();
-
-		$output_html .= get_form_header($mod_strings['LBL_SEARCH_FORM_TITLE'], '', false);
-
-		$form->parse('main.SearchHeader');
-		$output_html .= $form->text('main.SearchHeader');
-
-		// Reset the sections that are already in the page so that they do not print again later.
-		$form->reset('main.SearchHeader');
-
-		// create the listview
-		$seed_bean = new ACLRole();
-		$ListView = new ListView();
-		$ListView->show_export_button = false;
-		$ListView->process_for_popups = true;
-		$ListView->setXTemplate($form);
-		$ListView->setHeaderTitle($mod_strings['LBL_ROLE']);
-		$ListView->setHeaderText($button);
-		$ListView->setQuery($where, '', 'name', 'ROLE');
-		$ListView->setModStrings($mod_strings);
-
-		ob_start();
-		$ListView->processListView($seed_bean, 'main', 'ROLE');
-		$output_html .= ob_get_contents();
-		ob_end_clean();
-
-		$output_html .= insert_popup_footer();
-		return $output_html;
-	}
+    function _get_where_clause()
+    {
+        $where = '';
+        if(isset($_REQUEST['query']))
+        {
+            $where_clauses = array();
+            append_where_clause($where_clauses, "name", "acl_roles.name");
+            $where = generate_where_statement($where_clauses);
+        }
+
+        return $where;
+    }
+
+    /**
+     *
+     */
+    function process_page()
+    {
+        global $mod_strings;
+        global $app_strings;
+        global $currentModule;
+        global $sugar_version, $sugar_config;
+
+        $output_html = '';
+        $where = '';
+
+        $where = $this->_get_where_clause();
+
+        $name = empty($_REQUEST['name']) ? '' : $_REQUEST['name'];
+        $request_data = empty($_REQUEST['request_data']) ? '' : $_REQUEST['request_data'];
+        $hide_clear_button = empty($_REQUEST['hide_clear_button']) ? false : true;
+
+        $button  = "<form action='index.php' method='post' name='form' id='form'>\n";
+        if(!$hide_clear_button)
+        {
+            $button .= "<input type='button' name='button' class='button' onclick=\"send_back('','');\" title='"
+                .$app_strings['LBL_CLEAR_BUTTON_TITLE']."' value='  "
+                .$app_strings['LBL_CLEAR_BUTTON_LABEL']."  ' />\n";
+        }
+        $button .= "<input type='submit' name='button' class='button' onclick=\"window.close();\" title='"
+            .$app_strings['LBL_CANCEL_BUTTON_TITLE']."'  value='  "
+            .$app_strings['LBL_CANCEL_BUTTON_LABEL']."  ' />\n";
+        $button .= "</form>\n";
+
+        $form = new XTemplate('modules/ACLRoles/Popup_picker.html');
+        $form->assign('MOD', $mod_strings);
+        $form->assign('APP', $app_strings);
+        $form->assign('MODULE_NAME', $currentModule);
+        $form->assign('NAME', $name);
+        $form->assign('request_data', $request_data);
+
+        ob_start();
+        insert_popup_header();
+        $output_html .= ob_get_contents();
+        ob_end_clean();
+
+        $output_html .= get_form_header($mod_strings['LBL_SEARCH_FORM_TITLE'], '', false);
+
+        $form->parse('main.SearchHeader');
+        $output_html .= $form->text('main.SearchHeader');
+
+        // Reset the sections that are already in the page so that they do not print again later.
+        $form->reset('main.SearchHeader');
+
+        // create the listview
+        $seed_bean = new ACLRole();
+        $ListView = new ListView();
+        $ListView->show_export_button = false;
+        $ListView->process_for_popups = true;
+        $ListView->setXTemplate($form);
+        $ListView->setHeaderTitle($mod_strings['LBL_ROLE']);
+        $ListView->setHeaderText($button);
+        $ListView->setQuery($where, '', 'name', 'ROLE');
+        $ListView->setModStrings($mod_strings);
+
+        ob_start();
+        $ListView->processListView($seed_bean, 'main', 'ROLE');
+        $output_html .= ob_get_contents();
+        ob_end_clean();
+
+        $output_html .= insert_popup_footer();
+        return $output_html;
+    }
 } // end of class Popup_Picker
 ?>
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -61,9 +61,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function Popup_Picker(){
+    function Popup_Picker() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -79,7 +79,7 @@ 
 	function _get_where_clause()
 	{
 		$where = '';
-		if(isset($_REQUEST['query']))
+		if (isset($_REQUEST['query']))
 		{
 			$where_clauses = array();
 			append_where_clause($where_clauses, "name", "acl_roles.name");
@@ -108,8 +108,8 @@ 
 		$request_data = empty($_REQUEST['request_data']) ? '' : $_REQUEST['request_data'];
 		$hide_clear_button = empty($_REQUEST['hide_clear_button']) ? false : true;
 
-		$button  = "<form action='index.php' method='post' name='form' id='form'>\n";
-		if(!$hide_clear_button)
+		$button = "<form action='index.php' method='post' name='form' id='form'>\n";
+		if (!$hide_clear_button)
 		{
 			$button .= "<input type='button' name='button' class='button' onclick=\"send_back('','');\" title='"
 				.$app_strings['LBL_CLEAR_BUTTON_TITLE']."' value='  "

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();

modules/ACLRoles/views/view.classic.php

Spacing +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 require_once('include/MVC/View/views/view.detail.php');
 
 class ACLRolesViewClassic extends ViewDetail {
 
 
- 	function __construct(){
+ 	function __construct() {
  		parent::__construct();
 
         //turn off normal display of subpanels
@@ -16,9 +16,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function ACLRolesViewClassic(){
+    function ACLRolesViewClassic() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -28,14 +28,14 @@ 
     }
 
 
- 	function display(){
+ 	function display() {
 		$this->dv->process();
 
 		$file = SugarController::getActionFilename($this->action);
-		$this->includeClassicFile('modules/'. $this->module . '/'. $file . '.php');
+		$this->includeClassicFile('modules/'.$this->module.'/'.$file.'.php');
  	}
 
- 	function preDisplay(){
+ 	function preDisplay() {
 		parent::preDisplay();
 
 		$this->options['show_subpanels'] = false; //eggsurplus: will display subpanels twice otherwise

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();

modules/ACLRoles/ACLRole.php

Spacing +36 added lines, -36 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 
 
-class ACLRole extends SugarBean{
+class ACLRole extends SugarBean {
     var $module_dir = 'ACLRoles';
     var $object_name = 'ACLRole';
     var $table_name = 'acl_roles';
@@ -52,16 +52,16 @@ 
 
     var $created_by;
 
-    public function __construct(){
+    public function __construct() {
         parent::__construct();
     }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function ACLRole(){
+    public function ACLRole() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -87,10 +87,10 @@ 
  * @param GUID $action_id - the ACL Action id
  * @param int $access - the access level ACL_ALLOW_ALL ACL_ALLOW_NONE ACL_ALLOW_OWNER...
  */
-function setAction($role_id, $action_id, $access){
+function setAction($role_id, $action_id, $access) {
     $relationship_data = array('role_id'=>$role_id, 'action_id'=>$action_id,);
     $additional_data = array('access_override'=>$access);
-    $this->set_relationship('acl_roles_actions',$relationship_data,true, true,$additional_data);
+    $this->set_relationship('acl_roles_actions', $relationship_data, true, true, $additional_data);
 }
 
 
@@ -101,7 +101,7 @@ 
  * @param GUID $user_id
  * @return a list of ACLRole objects
  */
-function getUserRoles($user_id, $getAsNameArray = true){
+function getUserRoles($user_id, $getAsNameArray = true) {
 
         //if we don't have it loaded then lets check against the db
         $additional_where = '';
@@ -114,10 +114,10 @@ 
         $result = $GLOBALS['db']->query($query);
         $user_roles = array();
 
-        while($row = $GLOBALS['db']->fetchByAssoc($result) ){
+        while ($row = $GLOBALS['db']->fetchByAssoc($result)) {
             $role = new ACLRole();
             $role->populateFromRow($row);
-            if($getAsNameArray)
+            if ($getAsNameArray)
                 $user_roles[] = $role->name;
             else
                 $user_roles[] = $role;
@@ -133,11 +133,11 @@ 
  * @param GUID $user_id
  * @return a list of ACLRole Names
  */
-function getUserRoleNames($user_id){
+function getUserRoleNames($user_id) {
 
         $user_roles = sugar_cache_retrieve("RoleMembershipNames_".$user_id);
 
-        if(!$user_roles){
+        if (!$user_roles) {
             //if we don't have it loaded then lets check against the db
             $additional_where = '';
             $query = "SELECT acl_roles.* ".
@@ -149,7 +149,7 @@ 
             $result = $GLOBALS['db']->query($query);
             $user_roles = array();
 
-            while($row = $GLOBALS['db']->fetchByAssoc($result) ){
+            while ($row = $GLOBALS['db']->fetchByAssoc($result)) {
                 $user_roles[] = $row['name'];
             }
 
@@ -166,7 +166,7 @@ 
  * @param boolean $returnAsArray - should it return the results as an array of arrays or as an array of ACLRoles
  * @return either an array of array representations of acl roles or an array of ACLRoles
  */
-function getAllRoles($returnAsArray = false){
+function getAllRoles($returnAsArray = false) {
         $db = DBManagerFactory::getInstance();
         $query = "SELECT acl_roles.* FROM acl_roles
                     WHERE acl_roles.deleted=0 ORDER BY name";
@@ -174,12 +174,12 @@ 
         $result = $db->query($query);
         $roles = array();
 
-        while($row = $db->fetchByAssoc($result) ){
+        while ($row = $db->fetchByAssoc($result)) {
             $role = new ACLRole();
             $role->populateFromRow($row);
-            if($returnAsArray){
+            if ($returnAsArray) {
                 $roles[] = $role->toArray();
-            }else{
+            } else {
                 $roles[] = $role;
             }
 
@@ -197,41 +197,41 @@ 
  * @param GUID $role_id
  * @return array of actions
  */
-function getRoleActions($role_id, $type='module'){
+function getRoleActions($role_id, $type = 'module') {
         global $beanList;
         //if we don't have it loaded then lets check against the db
         $additional_where = '';
         $db = DBManagerFactory::getInstance();
         $query = "SELECT acl_actions.*";
         //only if we have a role id do we need to join the table otherwise lets use the ones defined in acl_actions as the defaults
-        if(!empty($role_id)){
-                $query .=" ,acl_roles_actions.access_override ";
+        if (!empty($role_id)) {
+                $query .= " ,acl_roles_actions.access_override ";
         }
-        $query .=" FROM acl_actions ";
+        $query .= " FROM acl_actions ";
 
-        if(!empty($role_id)){
-            $query .=		" LEFT JOIN acl_roles_actions ON acl_roles_actions.role_id = '$role_id' AND  acl_roles_actions.action_id = acl_actions.id AND acl_roles_actions.deleted = 0";
+        if (!empty($role_id)) {
+            $query .= " LEFT JOIN acl_roles_actions ON acl_roles_actions.role_id = '$role_id' AND  acl_roles_actions.action_id = acl_actions.id AND acl_roles_actions.deleted = 0";
         }
         $query .= " WHERE acl_actions.deleted=0 ORDER BY acl_actions.category, acl_actions.name";
         $result = $db->query($query);
         $role_actions = array();
 
-        while($row = $db->fetchByAssoc($result) ){
+        while ($row = $db->fetchByAssoc($result)) {
             $action = new ACLAction();
             $action->populateFromRow($row);
-            if(!empty($row['access_override'])){
+            if (!empty($row['access_override'])) {
                 $action->aclaccess = $row['access_override'];
-            }else{
+            } else {
                 $action->aclaccess = ACL_ALLOW_DEFAULT;
 
             }
             //#27877 . If  there is no this module in beanlist , we will not show them in UI, no matter this module was deleted or not in ACL_ACTIONS table.
-            if(empty($beanList[$action->category])){
+            if (empty($beanList[$action->category])) {
                 continue;
             }
             //end
 
-            if(!isset($role_actions[$action->category])){
+            if (!isset($role_actions[$action->category])) {
                 $role_actions[$action->category] = array();
             }
 
@@ -263,10 +263,10 @@ 
  *
  * @param ACLRole GUID $id
  */
-function mark_relationships_deleted($id){
+function mark_relationships_deleted($id) {
         //we need to delete the actions relationship by hand (special case)
         $date_modified = db_convert("'".TimeDate::getInstance()->nowDb()."'", 'datetime');
-        $query =  "UPDATE acl_roles_actions SET deleted=1 , date_modified=$date_modified WHERE role_id = '$id' AND deleted=0";
+        $query = "UPDATE acl_roles_actions SET deleted=1 , date_modified=$date_modified WHERE role_id = '$id' AND deleted=0";
         $this->db->query($query);
         parent::mark_relationships_deleted($id);
 }
@@ -277,13 +277,13 @@ 
     *
     * @return array of fields with id, name, description
     */
-    function toArray($dbOnly = false, $stringOnly = false, $upperKeys=false){
+    function toArray($dbOnly = false, $stringOnly = false, $upperKeys = false) {
         $array_fields = array('id', 'name', 'description');
         $arr = array();
-        foreach($array_fields as $field){
-            if(isset($this->$field)){
+        foreach ($array_fields as $field) {
+            if (isset($this->$field)) {
                 $arr[$field] = $this->$field;
-            }else{
+            } else {
                 $arr[$field] = '';
             }
         }
@@ -296,8 +296,8 @@ 
     *
     * @param Array $arr
     */
-    function fromArray($arr){
-        foreach($arr as $name=>$value){
+    function fromArray($arr) {
+        foreach ($arr as $name=>$value) {
             $this->$name = $value;
         }
     }

Braces +15 added lines, -12 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -63,8 +65,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -117,10 +118,11 @@ 
         while($row = $GLOBALS['db']->fetchByAssoc($result) ){
             $role = new ACLRole();
             $role->populateFromRow($row);
-            if($getAsNameArray)
-                $user_roles[] = $role->name;
-            else
-                $user_roles[] = $role;
+            if($getAsNameArray) {
+                            $user_roles[] = $role->name;
+            } else {
+                            $user_roles[] = $role;
+            }
         }
 
         return $user_roles;
@@ -179,7 +181,7 @@ 
             $role->populateFromRow($row);
             if($returnAsArray){
                 $roles[] = $role->toArray();
-            }else{
+            } else{
                 $roles[] = $role;
             }
 
@@ -221,7 +223,7 @@ 
             $action->populateFromRow($row);
             if(!empty($row['access_override'])){
                 $action->aclaccess = $row['access_override'];
-            }else{
+            } else{
                 $action->aclaccess = ACL_ALLOW_DEFAULT;
 
             }
@@ -252,8 +254,9 @@ 
         // Fallback to array key if translation is empty
         $a = empty($app_list_strings['moduleList'][$a]) ? $a : $app_list_strings['moduleList'][$a];
         $b = empty($app_list_strings['moduleList'][$b]) ? $b : $app_list_strings['moduleList'][$b];
-        if ($a == $b)
-            return 0;
+        if ($a == $b) {
+                    return 0;
+        }
         return ($a < $b) ? -1 : 1;
     }
 /**
@@ -283,7 +286,7 @@ 
         foreach($array_fields as $field){
             if(isset($this->$field)){
                 $arr[$field] = $this->$field;
-            }else{
+            } else{
                 $arr[$field] = '';
             }
         }