adamjakab / SuiteCRM

modules/Meetings/SubPanelViewInvitees.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -79,14 +79,14 @@ 
 
 // Stick the form header out there.
 echo get_form_header($mod_strings['LBL_INVITEE'], $button, false);
-$xtpl=new XTemplate ('modules/Meetings/SubPanelViewInvitees.html');
+$xtpl = new XTemplate('modules/Meetings/SubPanelViewInvitees.html');
 $xtpl->assign("MOD", $mod_strings);
 $xtpl->assign("APP", $app_strings);
 $xtpl->assign("RETURN_URL", "&return_module=$currentModule&return_action=DetailView&return_id=$focus->id");
 $xtpl->assign("MEETING_ID", $focus->id);
 
 $oddRow = true;
-foreach($focus_users_list as $user)
+foreach ($focus_users_list as $user)
 {
 	$user_fields = array(
 		'USER_NAME' => $user->user_name,
@@ -98,7 +98,7 @@ 
 
 	$xtpl->assign("USER", $user_fields);
 
-	if($oddRow)
+	if ($oddRow)
     {
         //todo move to themes
 		$xtpl->assign("ROW_COLOR", 'oddListRow');
@@ -118,7 +118,7 @@ 
 $xtpl->out("users");
 
 $oddRow = true;
-foreach($focus_contacts_list as $contact)
+foreach ($focus_contacts_list as $contact)
 {
 	$contact_fields = array(
 		'FIRST_NAME' => $contact->first_name,
@@ -131,7 +131,7 @@ 
 
 	$xtpl->assign("CONTACT", $contact_fields);
 
-	if($oddRow)
+	if ($oddRow)
     {
         //todo move to themes
 		$xtpl->assign("ROW_COLOR", 'oddListRow');

Indentation +27 added lines, -27 removed lines

@@ -88,29 +88,29 @@ 
 $oddRow = true;
 foreach($focus_users_list as $user)
 {
-	$user_fields = array(
-		'USER_NAME' => $user->user_name,
-		'FULL_NAME' => $locale->getLocaleFormattedName($user->first_name, $user->last_name),
-		'ID' => $user->id,
-		'EMAIL' => $user->email1,
-		'PHONE_WORK' => $user->phone_work
-	);
+    $user_fields = array(
+        'USER_NAME' => $user->user_name,
+        'FULL_NAME' => $locale->getLocaleFormattedName($user->first_name, $user->last_name),
+        'ID' => $user->id,
+        'EMAIL' => $user->email1,
+        'PHONE_WORK' => $user->phone_work
+    );
 
-	$xtpl->assign("USER", $user_fields);
+    $xtpl->assign("USER", $user_fields);
 
-	if($oddRow)
+    if($oddRow)
     {
         //todo move to themes
-		$xtpl->assign("ROW_COLOR", 'oddListRow');
+        $xtpl->assign("ROW_COLOR", 'oddListRow');
     }
     else
     {
         //todo move to themes
-		$xtpl->assign("ROW_COLOR", 'evenListRow');
+        $xtpl->assign("ROW_COLOR", 'evenListRow');
     }
     $oddRow = !$oddRow;
 
-	$xtpl->parse("users.row");
+    $xtpl->parse("users.row");
 // Put the rows in.
 }
 
@@ -120,30 +120,30 @@ 
 $oddRow = true;
 foreach($focus_contacts_list as $contact)
 {
-	$contact_fields = array(
-		'FIRST_NAME' => $contact->first_name,
-		'LAST_NAME' => $contact->last_name,
-		'ACCOUNT_NAME' => $contact->account_name,
-		'ID' => $contact->id,
-		'EMAIL' => $contact->email1,
-		'PHONE_WORK' => $contact->phone_work
-	);
-
-	$xtpl->assign("CONTACT", $contact_fields);
-
-	if($oddRow)
+    $contact_fields = array(
+        'FIRST_NAME' => $contact->first_name,
+        'LAST_NAME' => $contact->last_name,
+        'ACCOUNT_NAME' => $contact->account_name,
+        'ID' => $contact->id,
+        'EMAIL' => $contact->email1,
+        'PHONE_WORK' => $contact->phone_work
+    );
+
+    $xtpl->assign("CONTACT", $contact_fields);
+
+    if($oddRow)
     {
         //todo move to themes
-		$xtpl->assign("ROW_COLOR", 'oddListRow');
+        $xtpl->assign("ROW_COLOR", 'oddListRow');
     }
     else
     {
         //todo move to themes
-		$xtpl->assign("ROW_COLOR", 'evenListRow');
+        $xtpl->assign("ROW_COLOR", 'evenListRow');
     }
     $oddRow = !$oddRow;
 
-	$xtpl->parse("contacts.row");
+    $xtpl->parse("contacts.row");
 // Put the rows in.
 }
 

Braces +13 added lines, -8 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.
@@ -65,14 +67,19 @@ 
 
 $button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
 $button .= "<input type='hidden' name='module' value='Contacts'>\n";
-if ($currentModule == 'Accounts') $button .= "<input type='hidden' name='account_id' value='$focus->id'>\n<input type='hidden' name='account_name' value='$focus->name'>\n";
+if ($currentModule == 'Accounts') {
+    $button .= "<input type='hidden' name='account_id' value='$focus->id'>\n<input type='hidden' name='account_name' value='$focus->name'>\n";
+}
 $button .= "<input type='hidden' name='return_module' value='".$currentModule."'>\n";
 $button .= "<input type='hidden' name='return_action' value='".$action."'>\n";
 $button .= "<input type='hidden' name='return_id' value='".$focus->id."'>\n";
 $button .= "<input type='hidden' name='action'>\n";
 $button .= "<tr><td>&nbsp;</td>";
-if ($focus->parent_type == "Accounts") $button .= "<td><input title='".$app_strings['LBL_SELECT_CONTACT_BUTTON_TITLE']."' type='button' class='button' value='".$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Contacts&action=Popup&html=Popup_picker&form=DetailView&form_submit=true&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name)."\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
-else $button .= "<td><input title='".$app_strings['LBL_SELECT_CONTACT_BUTTON_TITLE']."'  type='button' class='button' value='".$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Contacts&action=Popup&html=Popup_picker&form=DetailView&form_submit=true\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
+if ($focus->parent_type == "Accounts") {
+    $button .= "<td><input title='".$app_strings['LBL_SELECT_CONTACT_BUTTON_TITLE']."' type='button' class='button' value='".$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Contacts&action=Popup&html=Popup_picker&form=DetailView&form_submit=true&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name)."\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
+} else {
+    $button .= "<td><input title='".$app_strings['LBL_SELECT_CONTACT_BUTTON_TITLE']."'  type='button' class='button' value='".$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Contacts&action=Popup&html=Popup_picker&form=DetailView&form_submit=true\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
+}
 $button .= "<td><input title='".$app_strings['LBL_SELECT_USER_BUTTON_TITLE']."'  type='button' class='button' value='".$app_strings['LBL_SELECT_USER_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Users&action=Popup&html=Popup_picker&form=DetailView&form_submit=true\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
 $button .= "</tr></form></table>\n";
 
@@ -102,8 +109,7 @@ 
     {
         //todo move to themes
 		$xtpl->assign("ROW_COLOR", 'oddListRow');
-    }
-    else
+    } else
     {
         //todo move to themes
 		$xtpl->assign("ROW_COLOR", 'evenListRow');
@@ -135,8 +141,7 @@ 
     {
         //todo move to themes
 		$xtpl->assign("ROW_COLOR", 'oddListRow');
-    }
-    else
+    } else
     {
         //todo move to themes
 		$xtpl->assign("ROW_COLOR", 'evenListRow');

modules/Meetings/Meeting.php

Indentation +633 added lines, -633 removed lines

@@ -40,136 +40,136 @@ 
 
 
 class Meeting extends SugarBean {
-	// Stored fields
-	var $id;
-	var $date_entered;
-	var $date_modified;
-	var $assigned_user_id;
-	var $modified_user_id;
-	var $created_by;
-	var $created_by_name;
-	var $modified_by_name;
-	var $description;
-	var $name;
-	var $location;
-	var $status;
-	var $type;
-	var $date_start;
-	var $time_start;
-	var $date_end;
-	var $duration_hours;
-	var $duration_minutes;
-	var $time_meridiem;
-	var $parent_type;
-	var $parent_type_options;
-	var $parent_id;
-	var $field_name_map;
-	var $contact_id;
-	var $user_id;
-	var $meeting_id;
-	var $reminder_time;
-	var $reminder_checked;
-	var $email_reminder_time;
-	var $email_reminder_checked;
-	var $email_reminder_sent;
-	var $required;
-	var $accept_status;
-	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 $outlook_id;
-	var $sequence;
-	var $syncing = false;
-	var $recurring_source;
-
-	var $update_vcal = true;
-	var $contacts_arr;
-	var $users_arr;
-	var $meetings_arr;
-	// when assoc w/ a user/contact:
-	var $minutes_value_default = 15;
-	var $minutes_values = array('0'=>'00','15'=>'15','30'=>'30','45'=>'45');
-	var $table_name = "meetings";
-	var $rel_users_table = "meetings_users";
-	var $rel_contacts_table = "meetings_contacts";
-	var $rel_leads_table = "meetings_leads";
-	var $module_dir = "Meetings";
-	var $object_name = "Meeting";
-
-	var $importable = true;
-	// 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', 'accept_status');
-	var $relationship_fields = array('account_id'=>'accounts','opportunity_id'=>'opportunity','case_id'=>'case',
-									 'assigned_user_id'=>'users','contact_id'=>'contacts', 'user_id'=>'users', 'meeting_id'=>'meetings');
-	// so you can run get_users() twice and run query only once
-	var $cached_get_users = null;
-	var $new_schema = true;
+    // Stored fields
+    var $id;
+    var $date_entered;
+    var $date_modified;
+    var $assigned_user_id;
+    var $modified_user_id;
+    var $created_by;
+    var $created_by_name;
+    var $modified_by_name;
+    var $description;
+    var $name;
+    var $location;
+    var $status;
+    var $type;
+    var $date_start;
+    var $time_start;
+    var $date_end;
+    var $duration_hours;
+    var $duration_minutes;
+    var $time_meridiem;
+    var $parent_type;
+    var $parent_type_options;
+    var $parent_id;
+    var $field_name_map;
+    var $contact_id;
+    var $user_id;
+    var $meeting_id;
+    var $reminder_time;
+    var $reminder_checked;
+    var $email_reminder_time;
+    var $email_reminder_checked;
+    var $email_reminder_sent;
+    var $required;
+    var $accept_status;
+    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 $outlook_id;
+    var $sequence;
+    var $syncing = false;
+    var $recurring_source;
+
+    var $update_vcal = true;
+    var $contacts_arr;
+    var $users_arr;
+    var $meetings_arr;
+    // when assoc w/ a user/contact:
+    var $minutes_value_default = 15;
+    var $minutes_values = array('0'=>'00','15'=>'15','30'=>'30','45'=>'45');
+    var $table_name = "meetings";
+    var $rel_users_table = "meetings_users";
+    var $rel_contacts_table = "meetings_contacts";
+    var $rel_leads_table = "meetings_leads";
+    var $module_dir = "Meetings";
+    var $object_name = "Meeting";
+
+    var $importable = true;
+    // 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', 'accept_status');
+    var $relationship_fields = array('account_id'=>'accounts','opportunity_id'=>'opportunity','case_id'=>'case',
+                                        'assigned_user_id'=>'users','contact_id'=>'contacts', 'user_id'=>'users', 'meeting_id'=>'meetings');
+    // so you can run get_users() twice and run query only once
+    var $cached_get_users = null;
+    var $new_schema = true;
     var $date_changed = false;
 
-	/**
-	 * sole constructor
-	 */
-	function Meeting() {
-		parent::SugarBean();
-		$this->setupCustomFields('Meetings');
-		foreach($this->field_defs as $field) {
-			$this->field_name_map[$field['name']] = $field;
-		}
+    /**
+     * sole constructor
+     */
+    function Meeting() {
+        parent::SugarBean();
+        $this->setupCustomFields('Meetings');
+        foreach($this->field_defs as $field) {
+            $this->field_name_map[$field['name']] = $field;
+        }
 //		$this->fill_in_additional_detail_fields();
         if(!empty($GLOBALS['app_list_strings']['duration_intervals'])) {
             $this->minutes_values = $GLOBALS['app_list_strings']['duration_intervals'];
         }
-	}
-
-	/**
-	 * Disable edit if meeting 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 meeting 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);
-	}
-
-	/**
-	 * Stub for integration
-	 * @return bool
-	 */
-	function hasIntegratedMeeting() {
-		return false;
-	}
-
-	// save date_end by calculating user input
-	// this is for calendar
-	function save($check_notify = FALSE) {
-		global $timedate;
-		global $current_user;
-
-		global $disable_date_format;
+    }
+
+    /**
+     * Disable edit if meeting 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 meeting 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);
+    }
+
+    /**
+     * Stub for integration
+     * @return bool
+     */
+    function hasIntegratedMeeting() {
+        return false;
+    }
+
+    // save date_end by calculating user input
+    // this is for calendar
+    function save($check_notify = FALSE) {
+        global $timedate;
+        global $current_user;
+
+        global $disable_date_format;
 
         if(isset($this->date_start))
         {
             $td = $timedate->fromDb($this->date_start);
             if(!$td){
-            		$this->date_start = $timedate->to_db($this->date_start);
-            		$td = $timedate->fromDb($this->date_start);
+                    $this->date_start = $timedate->to_db($this->date_start);
+                    $td = $timedate->fromDb($this->date_start);
             }
             if($td)
             {
@@ -185,30 +185,30 @@ 
             }
         }
 
-		$check_notify =(!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') ? true : false;
-		if(empty($_REQUEST['send_invites'])) {
-			if(!empty($this->id)) {
-				$old_record = new Meeting();
-				$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;
-				$check_notify = true;
+        $check_notify =(!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') ? true : false;
+        if(empty($_REQUEST['send_invites'])) {
+            if(!empty($this->id)) {
+                $old_record = new Meeting();
+                $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;
+                $check_notify = true;
                 if(isset($_REQUEST['assigned_user_name'])) {
                     $this->new_assigned_user_name = $_REQUEST['assigned_user_name'];
                 }
-			}
-		}
-		/*nsingh 7/3/08  commenting out as bug #20814 is invalid
+            }
+        }
+        /*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');
 		}*/
 
-		// 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;
+        // 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;
 
         if (empty($this->status) ) {
             $this->status = $this->getDefaultStatus();
@@ -229,8 +229,8 @@ 
         }
 
         if (empty($this->type)) {
-			$this->type = 'Sugar';
-		}
+            $this->type = 'Sugar';
+        }
 
         if ( isset($api) && is_a($api,'WebMeeting') && empty($this->in_relationship_update) ) {
             // Make sure the API initialized and it supports Web Meetings
@@ -258,175 +258,175 @@ 
             $api->logoff();
         }
 
-		$return_id = parent::save($check_notify);
+        $return_id = parent::save($check_notify);
 
-		if($this->update_vcal) {
-			vCal::cache_sugar_vcal($current_user);
-		}
+        if($this->update_vcal) {
+            vCal::cache_sugar_vcal($current_user);
+        }
 
-		if(isset($_REQUEST['reminders_data'])) {
-			Reminder::saveRemindersDataJson('Meetings', $return_id, html_entity_decode($_REQUEST['reminders_data']));
-		}
+        if(isset($_REQUEST['reminders_data'])) {
+            Reminder::saveRemindersDataJson('Meetings', $return_id, html_entity_decode($_REQUEST['reminders_data']));
+        }
 
 
-		return $return_id;
-	}
+        return $return_id;
+    }
 
-	// this is for calendar
-	function mark_deleted($id) {
+    // this is for calendar
+    function mark_deleted($id) {
 
-		require_once("modules/Calendar/CalendarUtils.php");
-		CalendarUtils::correctRecurrences($this, $id);		
+        require_once("modules/Calendar/CalendarUtils.php");
+        CalendarUtils::correctRecurrences($this, $id);		
 		
-		global $current_user;
+        global $current_user;
 
-		parent::mark_deleted($id);
+        parent::mark_deleted($id);
 
-		if($this->update_vcal) {
-			vCal::cache_sugar_vcal($current_user);
-		}
-	}
+        if($this->update_vcal) {
+            vCal::cache_sugar_vcal($current_user);
+        }
+    }
 
-	function get_summary_text() {
-		return "$this->name";
-	}
+    function get_summary_text() {
+        return "$this->name";
+    }
 
     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 meetings.*, contacts.first_name, contacts.last_name, contacts.assigned_user_id contact_name_owner, users.user_name as assigned_user_name   ";
+        if($contact_required) {
+            $query = "SELECT meetings.*, contacts.first_name, contacts.last_name, contacts.assigned_user_id contact_name_owner, users.user_name as assigned_user_name   ";
             $query .= $custom_join['select'];
-			$query .= " FROM contacts, meetings, meetings_contacts ";
-			$where_auto = " meetings_contacts.contact_id = contacts.id AND meetings_contacts.meeting_id = meetings.id AND meetings.deleted=0 AND contacts.deleted=0";
-		} else {
-			$query = 'SELECT meetings.*, users.user_name as assigned_user_name  ';
+            $query .= " FROM contacts, meetings, meetings_contacts ";
+            $where_auto = " meetings_contacts.contact_id = contacts.id AND meetings_contacts.meeting_id = meetings.id AND meetings.deleted=0 AND contacts.deleted=0";
+        } else {
+            $query = 'SELECT meetings.*, users.user_name as assigned_user_name  ';
             $query .= $custom_join['select'];
-			$query .= ' FROM meetings ';
-			$where_auto = "meetings.deleted=0";
-		}
-		$query .= "  LEFT JOIN users ON meetings.assigned_user_id=users.id ";
+            $query .= ' FROM meetings ';
+            $where_auto = "meetings.deleted=0";
+        }
+        $query .= "  LEFT JOIN users ON meetings.assigned_user_id=users.id ";
 
         $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)) {
             $query .= ' ORDER BY ' . $order_by;
         }
 
-		return $query;
-	}
-
-
-
-	function fill_in_additional_detail_fields() {
-		global $locale;
-		// Fill in the assigned_user_name
-		$this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
-
-		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: ");
+        return $query;
+    }
 
-			// 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");
-			}
-		}
 
 
+    function fill_in_additional_detail_fields() {
+        global $locale;
+        // Fill in the assigned_user_name
+        $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
 
-		$this->created_by_name = get_assigned_user_name($this->created_by);
-		$this->modified_by_name = get_assigned_user_name($this->modified_user_id);
-		$this->fill_in_additional_parent_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: ");
 
-		if (!isset($this->time_hour_start)) {
-			$this->time_start_hour = intval(substr($this->time_start, 0, 2));
-		} //if-else
+            // 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->time_minute_start)) {
-			$time_start_minutes = $this->time_minute_start;
-		} else {
-			$time_start_minutes = substr($this->time_start, 3, 5);
-			if ($time_start_minutes > 0 && $time_start_minutes < 15) {
-				$time_start_minutes = "15";
-			} else if ($time_start_minutes > 15 && $time_start_minutes < 30) {
-				$time_start_minutes = "30";
-			} else if ($time_start_minutes > 30 && $time_start_minutes < 45) {
-				$time_start_minutes = "45";
-			} else if ($time_start_minutes > 45) {
-				$this->time_start_hour += 1;
-				$time_start_minutes = "00";
-		    } //if-else
-		} //if-else
 
 
-		if (isset($this->time_hour_start)) {
-			$time_start_hour = $this->time_hour_start;
-		} else {
-			$time_start_hour = intval(substr($this->time_start, 0, 2));
-		}
+        $this->created_by_name = get_assigned_user_name($this->created_by);
+        $this->modified_by_name = get_assigned_user_name($this->modified_user_id);
+        $this->fill_in_additional_parent_fields();
+
+        if (!isset($this->time_hour_start)) {
+            $this->time_start_hour = intval(substr($this->time_start, 0, 2));
+        } //if-else
+
+        if (isset($this->time_minute_start)) {
+            $time_start_minutes = $this->time_minute_start;
+        } else {
+            $time_start_minutes = substr($this->time_start, 3, 5);
+            if ($time_start_minutes > 0 && $time_start_minutes < 15) {
+                $time_start_minutes = "15";
+            } else if ($time_start_minutes > 15 && $time_start_minutes < 30) {
+                $time_start_minutes = "30";
+            } else if ($time_start_minutes > 30 && $time_start_minutes < 45) {
+                $time_start_minutes = "45";
+            } else if ($time_start_minutes > 45) {
+                $this->time_start_hour += 1;
+                $time_start_minutes = "00";
+            } //if-else
+        } //if-else
+
+
+        if (isset($this->time_hour_start)) {
+            $time_start_hour = $this->time_hour_start;
+        } else {
+            $time_start_hour = intval(substr($this->time_start, 0, 2));
+        }
 
-		global $timedate;
+        global $timedate;
         $this->time_meridiem = $timedate->AMPMMenu('', $this->time_start, 'onchange="SugarWidgetScheduler.update_time();"');
-		$hours_arr = array ();
-		$num_of_hours = 13;
-		$start_at = 1;
-
-		if (empty ($time_meridiem)) {
-			$num_of_hours = 24;
-			$start_at = 0;
-		} //if
-
-		for ($i = $start_at; $i < $num_of_hours; $i ++) {
-			$i = $i."";
-			if (strlen($i) == 1) {
-				$i = "0".$i;
-			}
-			$hours_arr[$i] = $i;
-		} //for
+        $hours_arr = array ();
+        $num_of_hours = 13;
+        $start_at = 1;
+
+        if (empty ($time_meridiem)) {
+            $num_of_hours = 24;
+            $start_at = 0;
+        } //if
+
+        for ($i = $start_at; $i < $num_of_hours; $i ++) {
+            $i = $i."";
+            if (strlen($i) == 1) {
+                $i = "0".$i;
+            }
+            $hours_arr[$i] = $i;
+        } //for
 
         if (!isset($this->duration_minutes)) {
-			$this->duration_minutes = $this->minutes_value_default;
-		}
+            $this->duration_minutes = $this->minutes_value_default;
+        }
 
         //setting default date and time
-		if (is_null($this->date_start))
-			$this->date_start = $timedate->now();
-		if (is_null($this->time_start))
-			$this->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
-		if (is_null($this->duration_hours)) {
-			$this->duration_hours = "0";
-		}
-		if (is_null($this->duration_minutes))
-			$this->duration_minutes = "1";
-
-		if(empty($this->id) && !empty($_REQUEST['date_start'])){
-			$this->date_start = $_REQUEST['date_start'];
-		}
+        if (is_null($this->date_start))
+            $this->date_start = $timedate->now();
+        if (is_null($this->time_start))
+            $this->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+        if (is_null($this->duration_hours)) {
+            $this->duration_hours = "0";
+        }
+        if (is_null($this->duration_minutes))
+            $this->duration_minutes = "1";
+
+        if(empty($this->id) && !empty($_REQUEST['date_start'])){
+            $this->date_start = $_REQUEST['date_start'];
+        }
         if(!empty($this->date_start))
         {
             $td = SugarDateTime::createFromFormat($GLOBALS['timedate']->get_date_time_format(),$this->date_start);
             if (!empty($td)) 
             {
-    	        if (!empty($this->duration_hours) && $this->duration_hours != '')
+                if (!empty($this->duration_hours) && $this->duration_hours != '')
                 {
-		            $td = $td->modify("+{$this->duration_hours} hours");
-		        }
+                    $td = $td->modify("+{$this->duration_hours} hours");
+                }
                 if (!empty($this->duration_minutes) && $this->duration_minutes != '')
                 {
                     $td = $td->modify("+{$this->duration_minutes} mins");
@@ -437,77 +437,77 @@ 
             {
                 $GLOBALS['log']->fatal("Meeting::save: Bad date {$this->date_start} for format ".$GLOBALS['timedate']->get_date_time_format());
             }
-		}
-
-		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']) && empty($this->parent_type)) {
-			$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() {
-		$meeting_fields = $this->get_list_view_array();
-
-		global $app_list_strings, $focus, $action, $currentModule;
-		if(isset($this->parent_type))
-			$meeting_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";
+        }
+
+        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']) && empty($this->parent_type)) {
+            $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() {
+        $meeting_fields = $this->get_list_view_array();
+
+        global $app_list_strings, $focus, $action, $currentModule;
+        if(isset($this->parent_type))
+            $meeting_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')) {
                 $meeting_fields['SET_COMPLETE'] = $setCompleteUrl . SugarThemeRegistry::current()->getImage("close_inline"," border='0'",null,null,'.gif',translate('LBL_CLOSEINLINE'))."</a>";
             } else {
                 $meeting_fields['SET_COMPLETE'] = '';
             }
-		}
-		global $timedate;
-		$today = $timedate->nowDb();
-		$nextday = $timedate->asDbDate($timedate->getNow()->get("+1 day"));
-		$mergeTime = $meeting_fields['DATE_START']; //$timedate->merge_date_time($meeting_fields['DATE_START'], $meeting_fields['TIME_START']);
-		$date_db = $timedate->to_db($mergeTime);
-		if($date_db	< $today	) {
-			$meeting_fields['DATE_START']= "<font class='overdueTask'>".$meeting_fields['DATE_START']."</font>";
-		}else if($date_db	< $nextday) {
-			$meeting_fields['DATE_START'] = "<font class='todaysTask'>".$meeting_fields['DATE_START']."</font>";
-		} else {
-			$meeting_fields['DATE_START'] = "<font class='futureTask'>".$meeting_fields['DATE_START']."</font>";
-		}
-		$this->fill_in_additional_detail_fields();
+        }
+        global $timedate;
+        $today = $timedate->nowDb();
+        $nextday = $timedate->asDbDate($timedate->getNow()->get("+1 day"));
+        $mergeTime = $meeting_fields['DATE_START']; //$timedate->merge_date_time($meeting_fields['DATE_START'], $meeting_fields['TIME_START']);
+        $date_db = $timedate->to_db($mergeTime);
+        if($date_db	< $today	) {
+            $meeting_fields['DATE_START']= "<font class='overdueTask'>".$meeting_fields['DATE_START']."</font>";
+        }else if($date_db	< $nextday) {
+            $meeting_fields['DATE_START'] = "<font class='todaysTask'>".$meeting_fields['DATE_START']."</font>";
+        } else {
+            $meeting_fields['DATE_START'] = "<font class='futureTask'>".$meeting_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))
@@ -523,342 +523,342 @@ 
 
         $meeting_fields['CONTACT_ID'] = $this->contact_id;
         $meeting_fields['CONTACT_NAME'] = $this->contact_name;
-		$meeting_fields['PARENT_NAME'] = $this->parent_name;
+        $meeting_fields['PARENT_NAME'] = $this->parent_name;
         $meeting_fields['REMINDER_CHECKED'] = $this->reminder_time==-1 ? false : true;
         $meeting_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time==-1 ? false : true;
 
 
-		return $meeting_fields;
-	}
-
-	function set_notification_body($xtpl, &$meeting) {
-		global $sugar_config;
-		global $app_list_strings;
-		global $current_user;
-		global $timedate;
-
-
-		// cn: bug 9494 - passing a contact breaks this call
-		$notifyUser =($meeting->current_notify_user->object_name == 'User') ? $meeting->current_notify_user : $current_user;
-		// cn: bug 8078 - fixed call to $timedate
-		if(strtolower(get_class($meeting->current_notify_user)) == 'contact') {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-							'/index.php?entryPoint=acceptDecline&module=Meetings&contact_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
-		} elseif(strtolower(get_class($meeting->current_notify_user)) == 'lead') {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-							'/index.php?entryPoint=acceptDecline&module=Meetings&lead_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
-		} else {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-							'/index.php?entryPoint=acceptDecline&module=Meetings&user_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
-		}
-		$xtpl->assign("MEETING_TO", $meeting->current_notify_user->new_assigned_user_name);
-		$xtpl->assign("MEETING_SUBJECT", trim($meeting->name));
-		$xtpl->assign("MEETING_STATUS",(isset($meeting->status)? $app_list_strings['meeting_status_dom'][$meeting->status]:""));
-		$typekey = strtolower($meeting->type);
-		if(isset($meeting->type)) {
-		    if(!empty($app_list_strings['eapm_list'][$typekey])) {
-    		    $typestring = $app_list_strings['eapm_list'][$typekey];
-	    	} else {
-		        $typestring = $app_list_strings['meeting_type_dom'][$meeting->type];
-		    }
-		}
-		$xtpl->assign("MEETING_TYPE", isset($meeting->type)? $typestring:"");
-		$startdate = $timedate->fromDb($meeting->date_start);
-		$xtpl->assign("MEETING_STARTDATE", $timedate->asUser($startdate, $notifyUser)." ".TimeDate::userTimezoneSuffix($startdate, $notifyUser));
-		$enddate = $timedate->fromDb($meeting->date_end);
-		$xtpl->assign("MEETING_ENDDATE", $timedate->asUser($enddate, $notifyUser)." ".TimeDate::userTimezoneSuffix($enddate, $notifyUser));		
-		$xtpl->assign("MEETING_HOURS", $meeting->duration_hours);
-		$xtpl->assign("MEETING_MINUTES", $meeting->duration_minutes);
-		$xtpl->assign("MEETING_DESCRIPTION", $meeting->description);
+        return $meeting_fields;
+    }
+
+    function set_notification_body($xtpl, &$meeting) {
+        global $sugar_config;
+        global $app_list_strings;
+        global $current_user;
+        global $timedate;
+
+
+        // cn: bug 9494 - passing a contact breaks this call
+        $notifyUser =($meeting->current_notify_user->object_name == 'User') ? $meeting->current_notify_user : $current_user;
+        // cn: bug 8078 - fixed call to $timedate
+        if(strtolower(get_class($meeting->current_notify_user)) == 'contact') {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                            '/index.php?entryPoint=acceptDecline&module=Meetings&contact_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
+        } elseif(strtolower(get_class($meeting->current_notify_user)) == 'lead') {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                            '/index.php?entryPoint=acceptDecline&module=Meetings&lead_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
+        } else {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                            '/index.php?entryPoint=acceptDecline&module=Meetings&user_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
+        }
+        $xtpl->assign("MEETING_TO", $meeting->current_notify_user->new_assigned_user_name);
+        $xtpl->assign("MEETING_SUBJECT", trim($meeting->name));
+        $xtpl->assign("MEETING_STATUS",(isset($meeting->status)? $app_list_strings['meeting_status_dom'][$meeting->status]:""));
+        $typekey = strtolower($meeting->type);
+        if(isset($meeting->type)) {
+            if(!empty($app_list_strings['eapm_list'][$typekey])) {
+                $typestring = $app_list_strings['eapm_list'][$typekey];
+            } else {
+                $typestring = $app_list_strings['meeting_type_dom'][$meeting->type];
+            }
+        }
+        $xtpl->assign("MEETING_TYPE", isset($meeting->type)? $typestring:"");
+        $startdate = $timedate->fromDb($meeting->date_start);
+        $xtpl->assign("MEETING_STARTDATE", $timedate->asUser($startdate, $notifyUser)." ".TimeDate::userTimezoneSuffix($startdate, $notifyUser));
+        $enddate = $timedate->fromDb($meeting->date_end);
+        $xtpl->assign("MEETING_ENDDATE", $timedate->asUser($enddate, $notifyUser)." ".TimeDate::userTimezoneSuffix($enddate, $notifyUser));		
+        $xtpl->assign("MEETING_HOURS", $meeting->duration_hours);
+        $xtpl->assign("MEETING_MINUTES", $meeting->duration_minutes);
+        $xtpl->assign("MEETING_DESCRIPTION", $meeting->description);
         if ( !empty($meeting->join_url) ) {
             $xtpl->assign('MEETING_URL', $meeting->join_url);
             $xtpl->parse('Meeting.Meeting_External_API');
         }
 
-		return $xtpl;
-	}
+        return $xtpl;
+    }
 	
-	/**
-	 * Redefine method to attach ics file to notification email
-	 */
-	public function create_notification_email($notify_user){
+    /**
+     * Redefine method to attach ics file to notification email
+     */
+    public function create_notification_email($notify_user){
         // reset acceptance status for non organizer if date is changed
         if (($notify_user->id != $GLOBALS['current_user']->id) && $this->date_changed) {
             $this->set_accept_status($notify_user, 'none');
         }
 
-		$notify_mail = parent::create_notification_email($notify_user);
+        $notify_mail = parent::create_notification_email($notify_user);
 						
-		$path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
+        $path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
 
-		require_once("modules/vCals/vCal.php");
-		$content = vCal::get_ical_event($this, $GLOBALS['current_user']);
+        require_once("modules/vCals/vCal.php");
+        $content = vCal::get_ical_event($this, $GLOBALS['current_user']);
 				
-		if(file_put_contents($path,$content)){
-			$notify_mail->AddAttachment($path, 'meeting.ics', 'base64', 'text/calendar');
-		}
-		return $notify_mail;		
-	}
+        if(file_put_contents($path,$content)){
+            $notify_mail->AddAttachment($path, 'meeting.ics', 'base64', 'text/calendar');
+        }
+        return $notify_mail;		
+    }
 	
-	/**
-	 * Redefine method to remove ics after email is sent
-	 */
-	public function send_assignment_notifications($notify_user, $admin){
-		parent::send_assignment_notifications($notify_user, $admin);
+    /**
+     * Redefine method to remove ics after email is sent
+     */
+    public function send_assignment_notifications($notify_user, $admin){
+        parent::send_assignment_notifications($notify_user, $admin);
 		
-		$path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
-		unlink($path);
-	}
-
-	function get_meeting_users() {
-		$template = new User();
-		// First, get the list of IDs.
-		$query = "SELECT meetings_users.required, meetings_users.accept_status, meetings_users.user_id from meetings_users where meetings_users.meeting_id='$this->id' AND meetings_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_meetings(&$user) {
-		$template = $this;
-		// First, get the list of IDs.
-		$GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
-		$query = "SELECT meetings_users.required, meetings_users.accept_status, meetings_users.meeting_id from meetings_users where meetings_users.user_id='$user->id' AND( meetings_users.accept_status IS NULL OR	meetings_users.accept_status='none') AND meetings_users.deleted=0";
-		$result = $this->db->query($query, true);
-		$list = Array();
-
-		while($row = $this->db->fetchByAssoc($result)) {
-			$record = $template->retrieve($row['meeting_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 set_accept_status(&$user,$status)
-	{
-		if($user->object_name == 'User')
-		{
-			$relate_values = array('user_id'=>$user->id,'meeting_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)
-			{
-				vCal::cache_sugar_vcal($user);
-			}
-		}
-		else if($user->object_name == 'Contact')
-		{
-			$relate_values = array('contact_id'=>$user->id,'meeting_id'=>$this->id);
-			$data_values = array('accept_status'=>$status);
-			$this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
-		}
+        $path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
+        unlink($path);
+    }
+
+    function get_meeting_users() {
+        $template = new User();
+        // First, get the list of IDs.
+        $query = "SELECT meetings_users.required, meetings_users.accept_status, meetings_users.user_id from meetings_users where meetings_users.meeting_id='$this->id' AND meetings_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_meetings(&$user) {
+        $template = $this;
+        // First, get the list of IDs.
+        $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
+        $query = "SELECT meetings_users.required, meetings_users.accept_status, meetings_users.meeting_id from meetings_users where meetings_users.user_id='$user->id' AND( meetings_users.accept_status IS NULL OR	meetings_users.accept_status='none') AND meetings_users.deleted=0";
+        $result = $this->db->query($query, true);
+        $list = Array();
+
+        while($row = $this->db->fetchByAssoc($result)) {
+            $record = $template->retrieve($row['meeting_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 set_accept_status(&$user,$status)
+    {
+        if($user->object_name == 'User')
+        {
+            $relate_values = array('user_id'=>$user->id,'meeting_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)
+            {
+                vCal::cache_sugar_vcal($user);
+            }
+        }
+        else if($user->object_name == 'Contact')
+        {
+            $relate_values = array('contact_id'=>$user->id,'meeting_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,'meeting_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,'meeting_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();
+        }
 
-		$list = array();
-		if(!is_array($this->contacts_arr)) {
-			$this->contacts_arr =	array();
-		}
+        $list = 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();
-		}
-
-		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]);
-		}
-		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;
+            $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]);
+        }
+        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;
                 $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)){
+         */
+        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;
+            $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)) {
+         */
+        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)){//if a meeting is being imported then contact_id  should not be excluded
-           //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'])){
-           		$exclude = array('contact_id', 'user_id');
-           	}else{
-	    		$exclude = array('contact_id', 'user_id','assigned_user_id');
-           	}
-           }
-           else{
-           	$exclude = array('user_id');
-           }
-        }
-       parent::save_relationship_changes($is_update, $exclude);
-	}
-
-
-	/**
-	 * @see SugarBean::afterImportSave()
-	 */
-	public function afterImportSave()
-	{
-	    if ( $this->parent_type == 'Contacts' ) {
-	        $this->load_relationship('contacts');
-	        if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) )
-	            $this->contacts->add($this->parent_id);
-	    }
-	    elseif ( $this->parent_type == 'Leads' ) {
-	        $this->load_relationship('leads');
-	        if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) )
-	            $this->leads->add($this->parent_id);
-	    }
-
-	    parent::afterImportSave();
-	}
+            $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)){//if a meeting is being imported then contact_id  should not be excluded
+            //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'])){
+                    $exclude = array('contact_id', 'user_id');
+                }else{
+                $exclude = array('contact_id', 'user_id','assigned_user_id');
+                }
+            }
+            else{
+                $exclude = array('user_id');
+            }
+        }
+        parent::save_relationship_changes($is_update, $exclude);
+    }
+
+
+    /**
+     * @see SugarBean::afterImportSave()
+     */
+    public function afterImportSave()
+    {
+        if ( $this->parent_type == 'Contacts' ) {
+            $this->load_relationship('contacts');
+            if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) )
+                $this->contacts->add($this->parent_id);
+        }
+        elseif ( $this->parent_type == 'Leads' ) {
+            $this->load_relationship('leads');
+            if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) )
+                $this->leads->add($this->parent_id);
+        }
+
+        parent::afterImportSave();
+    }
 
     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']]);
@@ -874,9 +874,9 @@ 
 //TODO: do we really need focus, name and view params for this function
 function getMeetingsExternalApiDropDown($focus = null, $name = null, $value = null, $view = null)
 {
-	global $dictionary, $app_list_strings;
+    global $dictionary, $app_list_strings;
 
-	$cacheKeyName = 'meetings_type_drop_down';
+    $cacheKeyName = 'meetings_type_drop_down';
 
     $apiList = sugar_cache_retrieve($cacheKeyName);
     if ($apiList === null)
@@ -888,17 +888,17 @@ 
         sugar_cache_put($cacheKeyName, $apiList);
     }
 
-	if(!empty($value) && empty($apiList[$value]))
-	{
-		$apiList[$value] = $value;
+    if(!empty($value) && empty($apiList[$value]))
+    {
+        $apiList[$value] = $value;
     }
-	//bug 46294: adding list of options to dropdown list (if it is not the default list)
+    //bug 46294: adding list of options to dropdown list (if it is not the default list)
     if ($dictionary['Meeting']['fields']['type']['options'] != "eapm_list")
     {
         $apiList = array_merge(getMeetingTypeOptions($dictionary, $app_list_strings), $apiList);
     }
 
-	return $apiList;
+    return $apiList;
 }
 
 /**
@@ -909,20 +909,20 @@ 
  */
 function getMeetingTypeOptions($dictionary, $app_list_strings)
 {
-	$result = array();
+    $result = array();
 
     // getting name of meeting type to fill dropdown list by its values
     if (isset($dictionary['Meeting']['fields']['type']['options']))
-	{
-    	$typeName = $dictionary['Meeting']['fields']['type']['options'];
+    {
+        $typeName = $dictionary['Meeting']['fields']['type']['options'];
 
         if (!empty($app_list_strings[$typeName]))
-		{
-        	$typeList = $app_list_strings[$typeName];
+        {
+            $typeList = $app_list_strings[$typeName];
 
             foreach ($typeList as $key => $value)
-			{
-				$result[$value] = $value;
+            {
+                $result[$value] = $value;
             }
         }
     }

Spacing +123 added lines, -123 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.
@@ -93,7 +93,7 @@ 
 	var $meetings_arr;
 	// when assoc w/ a user/contact:
 	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 = "meetings";
 	var $rel_users_table = "meetings_users";
 	var $rel_contacts_table = "meetings_contacts";
@@ -104,8 +104,8 @@ 
 	var $importable = true;
 	// 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', 'accept_status');
-	var $relationship_fields = array('account_id'=>'accounts','opportunity_id'=>'opportunity','case_id'=>'case',
-									 'assigned_user_id'=>'users','contact_id'=>'contacts', 'user_id'=>'users', 'meeting_id'=>'meetings');
+	var $relationship_fields = array('account_id'=>'accounts', 'opportunity_id'=>'opportunity', 'case_id'=>'case',
+									 'assigned_user_id'=>'users', 'contact_id'=>'contacts', 'user_id'=>'users', 'meeting_id'=>'meetings');
 	// so you can run get_users() twice and run query only once
 	var $cached_get_users = null;
 	var $new_schema = true;
@@ -117,11 +117,11 @@ 
 	function Meeting() {
 		parent::SugarBean();
 		$this->setupCustomFields('Meetings');
-		foreach($this->field_defs as $field) {
+		foreach ($this->field_defs as $field) {
 			$this->field_name_map[$field['name']] = $field;
 		}
 //		$this->fill_in_additional_detail_fields();
-        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'];
         }
 	}
@@ -131,21 +131,21 @@ 
 	 * @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 meeting 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);
 	}
 
 	/**
@@ -164,14 +164,14 @@ 
 
 		global $disable_date_format;
 
-        if(isset($this->date_start))
+        if (isset($this->date_start))
         {
             $td = $timedate->fromDb($this->date_start);
-            if(!$td){
+            if (!$td) {
             		$this->date_start = $timedate->to_db($this->date_start);
             		$td = $timedate->fromDb($this->date_start);
             }
-            if($td)
+            if ($td)
             {
                 if (isset($this->duration_hours) && $this->duration_hours != '')
                 {
@@ -185,17 +185,17 @@ 
             }
         }
 
-		$check_notify =(!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') ? true : false;
-		if(empty($_REQUEST['send_invites'])) {
-			if(!empty($this->id)) {
+		$check_notify = (!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') ? true : false;
+		if (empty($_REQUEST['send_invites'])) {
+			if (!empty($this->id)) {
 				$old_record = new Meeting();
 				$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;
 				$check_notify = true;
-                if(isset($_REQUEST['assigned_user_name'])) {
+                if (isset($_REQUEST['assigned_user_name'])) {
                     $this->new_assigned_user_name = $_REQUEST['assigned_user_name'];
                 }
 			}
@@ -207,23 +207,23 @@ 
 		}*/
 
 		// 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))
+		if (empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id))
 			$check_notify = false;
 
-        if (empty($this->status) ) {
+        if (empty($this->status)) {
             $this->status = $this->getDefaultStatus();
         }
 
         // Do any external API saving
         // Clear out the old external API stuff if we have changed types
-        if (isset($this->fetched_row) && $this->fetched_row['type'] != $this->type ) {
+        if (isset($this->fetched_row) && $this->fetched_row['type'] != $this->type) {
             $this->join_url = '';
             $this->host_url = '';
             $this->external_id = '';
             $this->creator = '';
         }
 
-        if (!empty($this->type) && $this->type != 'Sugar' ) {
+        if (!empty($this->type) && $this->type != 'Sugar') {
             require_once('include/externalAPI/ExternalAPIFactory.php');
             $api = ExternalAPIFactory::loadAPI($this->type);
         }
@@ -232,27 +232,27 @@ 
 			$this->type = 'Sugar';
 		}
 
-        if ( isset($api) && is_a($api,'WebMeeting') && empty($this->in_relationship_update) ) {
+        if (isset($api) && is_a($api, 'WebMeeting') && empty($this->in_relationship_update)) {
             // Make sure the API initialized and it supports Web Meetings
             // Also make suer we have an ID, the external site needs something to reference
-            if ( !isset($this->id) || empty($this->id) ) {
+            if (!isset($this->id) || empty($this->id)) {
                 $this->id = create_guid();
                 $this->new_with_id = true;
             }
             $response = $api->scheduleMeeting($this);
-            if ( $response['success'] == TRUE ) {
+            if ($response['success'] == TRUE) {
                 // Need to send out notifications
-                if ( $api->canInvite ) {
+                if ($api->canInvite) {
                     $notifyList = $this->get_notification_recipients();
-                    foreach($notifyList as $person) {
-                        $api->inviteAttendee($this,$person,$check_notify);
+                    foreach ($notifyList as $person) {
+                        $api->inviteAttendee($this, $person, $check_notify);
                     }
 
                 }
             } else {
                 // Generic Message Provides no value to End User - Log the issue with message detail and continue
                 // SugarApplication::appendErrorMessage($GLOBALS['app_strings']['ERR_EXTERNAL_API_SAVE_FAIL']);
-                $GLOBALS['log']->warn('ERR_EXTERNAL_API_SAVE_FAIL' . ": " . $this->type . " - " .  $response['errorMessage']);
+                $GLOBALS['log']->warn('ERR_EXTERNAL_API_SAVE_FAIL'.": ".$this->type." - ".$response['errorMessage']);
             }
 
             $api->logoff();
@@ -260,11 +260,11 @@ 
 
 		$return_id = parent::save($check_notify);
 
-		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('Meetings', $return_id, html_entity_decode($_REQUEST['reminders_data']));
 		}
 
@@ -282,7 +282,7 @@ 
 
 		parent::mark_deleted($id);
 
-		if($this->update_vcal) {
+		if ($this->update_vcal) {
 			vCal::cache_sugar_vcal($current_user);
 		}
 	}
@@ -291,13 +291,13 @@ 
 		return "$this->name";
 	}
 
-    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 meetings.*, contacts.first_name, contacts.last_name, contacts.assigned_user_id contact_name_owner, users.user_name as assigned_user_name   ";
             $query .= $custom_join['select'];
 			$query .= " FROM contacts, meetings, meetings_contacts ";
@@ -312,14 +312,14 @@ 
 
         $query .= $custom_join['join'];
 
-		if($where != "")
+		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)) {
-            $query .= ' ORDER BY ' . $order_by;
+            $query .= ' ORDER BY '.$order_by;
         }
 
 		return $query;
@@ -335,12 +335,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");
@@ -383,7 +383,7 @@ 
 
 		global $timedate;
         $this->time_meridiem = $timedate->AMPMMenu('', $this->time_start, 'onchange="SugarWidgetScheduler.update_time();"');
-		$hours_arr = array ();
+		$hours_arr = array();
 		$num_of_hours = 13;
 		$start_at = 1;
 
@@ -392,7 +392,7 @@ 
 			$start_at = 0;
 		} //if
 
-		for ($i = $start_at; $i < $num_of_hours; $i ++) {
+		for ($i = $start_at; $i < $num_of_hours; $i++) {
 			$i = $i."";
 			if (strlen($i) == 1) {
 				$i = "0".$i;
@@ -415,12 +415,12 @@ 
 		if (is_null($this->duration_minutes))
 			$this->duration_minutes = "1";
 
-		if(empty($this->id) && !empty($_REQUEST['date_start'])){
+		if (empty($this->id) && !empty($_REQUEST['date_start'])) {
 			$this->date_start = $_REQUEST['date_start'];
 		}
-        if(!empty($this->date_start))
+        if (!empty($this->date_start))
         {
-            $td = SugarDateTime::createFromFormat($GLOBALS['timedate']->get_date_time_format(),$this->date_start);
+            $td = SugarDateTime::createFromFormat($GLOBALS['timedate']->get_date_time_format(), $this->date_start);
             if (!empty($td)) 
             {
     	        if (!empty($this->duration_hours) && $this->duration_hours != '')
@@ -441,9 +441,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]);
 			}
 		}
@@ -453,9 +453,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;
@@ -463,9 +463,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;
@@ -482,15 +482,15 @@ 
 		$meeting_fields = $this->get_list_view_array();
 
 		global $app_list_strings, $focus, $action, $currentModule;
-		if(isset($this->parent_type))
+		if (isset($this->parent_type))
 			$meeting_fields['PARENT_MODULE'] = $this->parent_type;
-		if($this->status == "Planned") {
+		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')) {
-                $meeting_fields['SET_COMPLETE'] = $setCompleteUrl . SugarThemeRegistry::current()->getImage("close_inline"," border='0'",null,null,'.gif',translate('LBL_CLOSEINLINE'))."</a>";
+                $meeting_fields['SET_COMPLETE'] = $setCompleteUrl.SugarThemeRegistry::current()->getImage("close_inline", " border='0'", null, null, '.gif', translate('LBL_CLOSEINLINE'))."</a>";
             } else {
                 $meeting_fields['SET_COMPLETE'] = '';
             }
@@ -500,9 +500,9 @@ 
 		$nextday = $timedate->asDbDate($timedate->getNow()->get("+1 day"));
 		$mergeTime = $meeting_fields['DATE_START']; //$timedate->merge_date_time($meeting_fields['DATE_START'], $meeting_fields['TIME_START']);
 		$date_db = $timedate->to_db($mergeTime);
-		if($date_db	< $today	) {
-			$meeting_fields['DATE_START']= "<font class='overdueTask'>".$meeting_fields['DATE_START']."</font>";
-		}else if($date_db	< $nextday) {
+		if ($date_db < $today) {
+			$meeting_fields['DATE_START'] = "<font class='overdueTask'>".$meeting_fields['DATE_START']."</font>";
+		} else if ($date_db < $nextday) {
 			$meeting_fields['DATE_START'] = "<font class='todaysTask'>".$meeting_fields['DATE_START']."</font>";
 		} else {
 			$meeting_fields['DATE_START'] = "<font class='futureTask'>".$meeting_fields['DATE_START']."</font>";
@@ -524,8 +524,8 @@ 
         $meeting_fields['CONTACT_ID'] = $this->contact_id;
         $meeting_fields['CONTACT_NAME'] = $this->contact_name;
 		$meeting_fields['PARENT_NAME'] = $this->parent_name;
-        $meeting_fields['REMINDER_CHECKED'] = $this->reminder_time==-1 ? false : true;
-        $meeting_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time==-1 ? false : true;
+        $meeting_fields['REMINDER_CHECKED'] = $this->reminder_time == -1 ? false : true;
+        $meeting_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time == -1 ? false : true;
 
 
 		return $meeting_fields;
@@ -539,12 +539,12 @@ 
 
 
 		// cn: bug 9494 - passing a contact breaks this call
-		$notifyUser =($meeting->current_notify_user->object_name == 'User') ? $meeting->current_notify_user : $current_user;
+		$notifyUser = ($meeting->current_notify_user->object_name == 'User') ? $meeting->current_notify_user : $current_user;
 		// cn: bug 8078 - fixed call to $timedate
-		if(strtolower(get_class($meeting->current_notify_user)) == 'contact') {
+		if (strtolower(get_class($meeting->current_notify_user)) == 'contact') {
 			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
 							'/index.php?entryPoint=acceptDecline&module=Meetings&contact_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
-		} elseif(strtolower(get_class($meeting->current_notify_user)) == 'lead') {
+		} elseif (strtolower(get_class($meeting->current_notify_user)) == 'lead') {
 			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
 							'/index.php?entryPoint=acceptDecline&module=Meetings&lead_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
 		} else {
@@ -553,16 +553,16 @@ 
 		}
 		$xtpl->assign("MEETING_TO", $meeting->current_notify_user->new_assigned_user_name);
 		$xtpl->assign("MEETING_SUBJECT", trim($meeting->name));
-		$xtpl->assign("MEETING_STATUS",(isset($meeting->status)? $app_list_strings['meeting_status_dom'][$meeting->status]:""));
+		$xtpl->assign("MEETING_STATUS", (isset($meeting->status) ? $app_list_strings['meeting_status_dom'][$meeting->status] : ""));
 		$typekey = strtolower($meeting->type);
-		if(isset($meeting->type)) {
-		    if(!empty($app_list_strings['eapm_list'][$typekey])) {
+		if (isset($meeting->type)) {
+		    if (!empty($app_list_strings['eapm_list'][$typekey])) {
     		    $typestring = $app_list_strings['eapm_list'][$typekey];
 	    	} else {
 		        $typestring = $app_list_strings['meeting_type_dom'][$meeting->type];
 		    }
 		}
-		$xtpl->assign("MEETING_TYPE", isset($meeting->type)? $typestring:"");
+		$xtpl->assign("MEETING_TYPE", isset($meeting->type) ? $typestring : "");
 		$startdate = $timedate->fromDb($meeting->date_start);
 		$xtpl->assign("MEETING_STARTDATE", $timedate->asUser($startdate, $notifyUser)." ".TimeDate::userTimezoneSuffix($startdate, $notifyUser));
 		$enddate = $timedate->fromDb($meeting->date_end);
@@ -570,7 +570,7 @@ 
 		$xtpl->assign("MEETING_HOURS", $meeting->duration_hours);
 		$xtpl->assign("MEETING_MINUTES", $meeting->duration_minutes);
 		$xtpl->assign("MEETING_DESCRIPTION", $meeting->description);
-        if ( !empty($meeting->join_url) ) {
+        if (!empty($meeting->join_url)) {
             $xtpl->assign('MEETING_URL', $meeting->join_url);
             $xtpl->parse('Meeting.Meeting_External_API');
         }
@@ -581,7 +581,7 @@ 
 	/**
 	 * Redefine method to attach ics file to notification email
 	 */
-	public function create_notification_email($notify_user){
+	public function create_notification_email($notify_user) {
         // reset acceptance status for non organizer if date is changed
         if (($notify_user->id != $GLOBALS['current_user']->id) && $this->date_changed) {
             $this->set_accept_status($notify_user, 'none');
@@ -589,12 +589,12 @@ 
 
 		$notify_mail = parent::create_notification_email($notify_user);
 						
-		$path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
+		$path = SugarConfig::getInstance()->get('upload_dir', 'upload/').$this->id;
 
 		require_once("modules/vCals/vCal.php");
 		$content = vCal::get_ical_event($this, $GLOBALS['current_user']);
 				
-		if(file_put_contents($path,$content)){
+		if (file_put_contents($path, $content)) {
 			$notify_mail->AddAttachment($path, 'meeting.ics', 'base64', 'text/calendar');
 		}
 		return $notify_mail;		
@@ -603,10 +603,10 @@ 
 	/**
 	 * Redefine method to remove ics after email is sent
 	 */
-	public function send_assignment_notifications($notify_user, $admin){
+	public function send_assignment_notifications($notify_user, $admin) {
 		parent::send_assignment_notifications($notify_user, $admin);
 		
-		$path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
+		$path = SugarConfig::getInstance()->get('upload_dir', 'upload/').$this->id;
 		unlink($path);
 	}
 
@@ -618,13 +618,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;
 			}
@@ -640,13 +640,13 @@ 
 		$result = $this->db->query($query, true);
 		$list = Array();
 
-		while($row = $this->db->fetchByAssoc($result)) {
+		while ($row = $this->db->fetchByAssoc($result)) {
 			$record = $template->retrieve($row['meeting_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;
@@ -656,54 +656,54 @@ 
 	}
 
 
-	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,'meeting_id'=>$this->id);
+			$relate_values = array('user_id'=>$user->id, 'meeting_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,'meeting_id'=>$this->id);
+			$relate_values = array('contact_id'=>$user->id, 'meeting_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,'meeting_id'=>$this->id);
+			$relate_values = array('lead_id'=>$user->id, 'meeting_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();
 		}
 
 		$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;
@@ -711,7 +711,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;
@@ -719,7 +719,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;
@@ -728,9 +728,9 @@ 
 		}
 
 		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]);
 		}
 		return $list;
@@ -738,7 +738,7 @@ 
 
 
 	function bean_implements($interface) {
-		switch($interface) {
+		switch ($interface) {
 			case 'ACL':return true;
 		}
 		return false;
@@ -748,18 +748,18 @@ 
 		$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;
                 }
 			}
@@ -772,7 +772,7 @@ 
 		/**
 		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 {
@@ -782,8 +782,8 @@ 
 		$is_owner = false;
 		$in_group = false; //SECURITY GROUPS
 
-		if(!empty($this->contact_name)) {
-			if(!empty($this->contact_name_owner)) {
+		if (!empty($this->contact_name)) {
+			if (!empty($this->contact_name_owner)) {
 				global $current_user;
 				$is_owner = $current_user->id == $this->contact_name_owner;
 			}
@@ -791,8 +791,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;
                 }
 			}
@@ -805,7 +805,7 @@ 
 		/**
 		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 {
@@ -816,17 +816,17 @@ 
 
 
 	function save_relationship_changes($is_update, $exclude = array()) {
-	    if(empty($this->in_workflow)) {
-           if(empty($this->in_import)){//if a meeting is being imported then contact_id  should not be excluded
+	    if (empty($this->in_workflow)) {
+           if (empty($this->in_import)) {//if a meeting is being imported then contact_id  should not be excluded
            //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('contact_id', 'user_id');
-           	}else{
-	    		$exclude = array('contact_id', 'user_id','assigned_user_id');
+           	} else {
+	    		$exclude = array('contact_id', 'user_id', 'assigned_user_id');
            	}
            }
-           else{
+           else {
            	$exclude = array('user_id');
            }
         }
@@ -839,14 +839,14 @@ 
 	 */
 	public function afterImportSave()
 	{
-	    if ( $this->parent_type == 'Contacts' ) {
+	    if ($this->parent_type == 'Contacts') {
 	        $this->load_relationship('contacts');
-	        if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) )
+	        if (!$this->contacts->relationship_exists('contacts', array('id'=>$this->parent_id)))
 	            $this->contacts->add($this->parent_id);
 	    }
-	    elseif ( $this->parent_type == 'Leads' ) {
+	    elseif ($this->parent_type == 'Leads') {
 	        $this->load_relationship('leads');
-	        if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) )
+	        if (!$this->leads->relationship_exists('leads', array('id'=>$this->parent_id)))
 	            $this->leads->add($this->parent_id);
 	    }
 
@@ -888,7 +888,7 @@ 
         sugar_cache_put($cacheKeyName, $apiList);
     }
 
-	if(!empty($value) && empty($apiList[$value]))
+	if (!empty($value) && empty($apiList[$value]))
 	{
 		$apiList[$value] = $value;
     }

Braces +48 added lines, -39 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.
@@ -207,8 +209,9 @@ 
 		}*/
 
 		// 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;
+		if(empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id)) {
+					$check_notify = false;
+		}
 
         if (empty($this->status) ) {
             $this->status = $this->getDefaultStatus();
@@ -312,10 +315,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)) {
@@ -405,15 +409,18 @@ 
 		}
 
         //setting default date and time
-		if (is_null($this->date_start))
-			$this->date_start = $timedate->now();
-		if (is_null($this->time_start))
-			$this->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+		if (is_null($this->date_start)) {
+					$this->date_start = $timedate->now();
+		}
+		if (is_null($this->time_start)) {
+					$this->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+		}
 		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_minutes)) {
+					$this->duration_minutes = "1";
+		}
 
 		if(empty($this->id) && !empty($_REQUEST['date_start'])){
 			$this->date_start = $_REQUEST['date_start'];
@@ -432,8 +439,7 @@ 
                     $td = $td->modify("+{$this->duration_minutes} mins");
                 }
                 $this->date_end = $td->format($GLOBALS['timedate']->get_date_time_format());
-            } 
-            else 
+            } else 
             {
                 $GLOBALS['log']->fatal("Meeting::save: Bad date {$this->date_start} for format ".$GLOBALS['timedate']->get_date_time_format());
             }
@@ -455,8 +461,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;
 
@@ -465,8 +472,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;
 
@@ -482,12 +490,14 @@ 
 		$meeting_fields = $this->get_list_view_array();
 
 		global $app_list_strings, $focus, $action, $currentModule;
-		if(isset($this->parent_type))
-			$meeting_fields['PARENT_MODULE'] = $this->parent_type;
+		if(isset($this->parent_type)) {
+					$meeting_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')) {
                 $meeting_fields['SET_COMPLETE'] = $setCompleteUrl . SugarThemeRegistry::current()->getImage("close_inline"," border='0'",null,null,'.gif',translate('LBL_CLOSEINLINE'))."</a>";
@@ -502,7 +512,7 @@ 
 		$date_db = $timedate->to_db($mergeTime);
 		if($date_db	< $today	) {
 			$meeting_fields['DATE_START']= "<font class='overdueTask'>".$meeting_fields['DATE_START']."</font>";
-		}else if($date_db	< $nextday) {
+		} else if($date_db	< $nextday) {
 			$meeting_fields['DATE_START'] = "<font class='todaysTask'>".$meeting_fields['DATE_START']."</font>";
 		} else {
 			$meeting_fields['DATE_START'] = "<font class='futureTask'>".$meeting_fields['DATE_START']."</font>";
@@ -669,14 +679,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,'meeting_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,'meeting_id'=>$this->id);
 			$data_values = array('accept_status'=>$status);
@@ -730,8 +738,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]);
+			}
 		}
 		return $list;
 	}
@@ -822,11 +831,10 @@ 
            //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('contact_id', 'user_id');
-           	}else{
+           	} else{
 	    		$exclude = array('contact_id', 'user_id','assigned_user_id');
            	}
-           }
-           else{
+           } else{
            	$exclude = array('user_id');
            }
         }
@@ -841,13 +849,14 @@ 
 	{
 	    if ( $this->parent_type == 'Contacts' ) {
 	        $this->load_relationship('contacts');
-	        if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) )
-	            $this->contacts->add($this->parent_id);
-	    }
-	    elseif ( $this->parent_type == 'Leads' ) {
+	        if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) ) {
+	        	            $this->contacts->add($this->parent_id);
+	        }
+	    } elseif ( $this->parent_type == 'Leads' ) {
 	        $this->load_relationship('leads');
-	        if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) )
-	            $this->leads->add($this->parent_id);
+	        if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) ) {
+	        	            $this->leads->add($this->parent_id);
+	        }
 	    }
 
 	    parent::afterImportSave();

Doc Comments +4 added lines, -1 removed lines

@@ -128,7 +128,7 @@ 
 
 	/**
 	 * Disable edit if meeting is recurring and source is not Sugar. It should be edited only from Outlook.
-	 * @param $view string
+	 * @param string $view string
 	 * @param $is_owner bool
 	 */
 	function ACLAccess($view,$is_owner='not_set',$in_group='not_set'){
@@ -656,6 +656,9 @@ 
 	}
 
 
+	/**
+	 * @param string $status
+	 */
 	function set_accept_status(&$user,$status)
 	{
 		if($user->object_name == 'User')

modules/Meetings/metadata/additionalDetails.php

Spacing +23 added lines, -23 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.
@@ -42,7 +42,7 @@ 
 function additionalDetailsMeeting($fields) {
     global $timedate;
     static $mod_strings;
-    if(empty($mod_strings)) {
+    if (empty($mod_strings)) {
         global $current_language;
         $mod_strings = return_module_language($current_language, 'Meetings');
     }
@@ -50,51 +50,51 @@ 
 //    print_r($fields);
     $overlib_string = '';
     $overlib_string .= '<input id="type" type="hidden" value="Meeting"/>';
-    if(!empty($fields['ID'])) {
-        $overlib_string .= '<input id="id" type="hidden" value="'. $fields['ID'];
+    if (!empty($fields['ID'])) {
+        $overlib_string .= '<input id="id" type="hidden" value="'.$fields['ID'];
         $overlib_string .= '"/>';
     }
 
-    $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName=' . SugarThemeRegistry::current()->name .'&imageName=Meetings.gif"/> '.$mod_strings['LBL_MEETING'].'</h2>';
+    $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName='.SugarThemeRegistry::current()->name.'&imageName=Meetings.gif"/> '.$mod_strings['LBL_MEETING'].'</h2>';
 
-    if(!empty($fields['NAME'])) {
-        $overlib_string .= '<b>'.$mod_strings['LBL_SUBJECT'].'</b> <a href="index.php?action=DetailView&module=Meetings&record='.$fields['ID'].'">'. $fields['NAME'] . '</a>';
+    if (!empty($fields['NAME'])) {
+        $overlib_string .= '<b>'.$mod_strings['LBL_SUBJECT'].'</b> <a href="index.php?action=DetailView&module=Meetings&record='.$fields['ID'].'">'.$fields['NAME'].'</a>';
         $overlib_string .= '<br>';
     }
-    if(!empty($fields['DATE_START']))  {
+    if (!empty($fields['DATE_START'])) {
         // Make it easy to select for sorting in schedule bar
         $data_date = $timedate->fromUser($fields['DATE_START'])->format('Y-m-d H:i:s');
         $overlib_string .= '<span data-field="DATE_START" data-date="'.$data_date.'">';
-        $overlib_string .= '<b>'. $mod_strings['LBL_DATE_TIME'] . '</b> ' . $fields['DATE_START'] . ' <br>';
+        $overlib_string .= '<b>'.$mod_strings['LBL_DATE_TIME'].'</b> '.$fields['DATE_START'].' <br>';
         $overlib_string .= '</span>';
     }
 
-    if(isset($fields['DURATION_HOURS']) || isset($fields['DURATION_MINUTES'])) {
-        $overlib_string .= '<b>'. $mod_strings['LBL_DURATION'] . '</b> ';
-        if(isset($fields['DURATION_HOURS'])) {
-            $overlib_string .= $fields['DURATION_HOURS'] . $mod_strings['LBL_HOURS_ABBREV'] . ' ';
+    if (isset($fields['DURATION_HOURS']) || isset($fields['DURATION_MINUTES'])) {
+        $overlib_string .= '<b>'.$mod_strings['LBL_DURATION'].'</b> ';
+        if (isset($fields['DURATION_HOURS'])) {
+            $overlib_string .= $fields['DURATION_HOURS'].$mod_strings['LBL_HOURS_ABBREV'].' ';
         }
-        if(isset($fields['DURATION_MINUTES'])) {
-            $overlib_string .=  $fields['DURATION_MINUTES'] . $mod_strings['LBL_MINSS_ABBREV'];
+        if (isset($fields['DURATION_MINUTES'])) {
+            $overlib_string .= $fields['DURATION_MINUTES'].$mod_strings['LBL_MINSS_ABBREV'];
         }
-        $overlib_string .=  '<br>';
+        $overlib_string .= '<br>';
     }
     if (!empty($fields['PARENT_ID']))
     {
-        $overlib_string .= "<b>". $mod_strings['LBL_RELATED_TO'] . "</b> ".
+        $overlib_string .= "<b>".$mod_strings['LBL_RELATED_TO']."</b> ".
             "<a href='index.php?module=".$fields['PARENT_TYPE']."&action=DetailView&record=".$fields['PARENT_ID']."'>".
-            $fields['PARENT_TYPE'] .' - '. $fields['PARENT_NAME'] . "</a>";
+            $fields['PARENT_TYPE'].' - '.$fields['PARENT_NAME']."</a>";
         $overlib_string .= '<br>';
     }
 
-    if(!empty($fields['STATUS'])) {
-        $overlib_string .= '<b>'. $mod_strings['LBL_STATUS'] . '</b> ' . $fields['STATUS'];
+    if (!empty($fields['STATUS'])) {
+        $overlib_string .= '<b>'.$mod_strings['LBL_STATUS'].'</b> '.$fields['STATUS'];
         $overlib_string .= '<br>';
     }
 
-    if(!empty($fields['DESCRIPTION'])) {
-        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+    if (!empty($fields['DESCRIPTION'])) {
+        $overlib_string .= '<b>'.$mod_strings['LBL_DESCRIPTION'].'</b> '.substr($fields['DESCRIPTION'], 0, 300);
+        if (strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
         $overlib_string .= '<br>';
     }
     $overlib_string .= '<br>';

Braces +6 added lines, -2 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.
@@ -94,7 +96,9 @@ 
 
     if(!empty($fields['DESCRIPTION'])) {
         $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+        if(strlen($fields['DESCRIPTION']) > 300) {
+            $overlib_string .= '...';
+        }
         $overlib_string .= '<br>';
     }
     $overlib_string .= '<br>';

modules/Meetings/metadata/editviewdefs.php

Indentation +82 added lines, -82 removed lines

@@ -39,134 +39,134 @@ 
 
 $viewdefs ['Meetings'] =
 array (
-  'EditView' =>
-  array (
+    'EditView' =>
+    array (
     'templateMeta' =>
     array (
         'includes' => array(
             array('file' => 'modules/Reminders/Reminders.js'),
         ),
-      'maxColumns' => '2',
-      'form' =>
-      array (
+        'maxColumns' => '2',
+        'form' =>
+        array (
         'hidden' =>
         array (
-          0 => '<input type="hidden" name="isSaveAndNew" value="false">',
+            0 => '<input type="hidden" name="isSaveAndNew" value="false">',
         ),
         'buttons' =>
         array (
-          0 =>
-          array (
-			'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_HEADER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
-		  ),
-          1 => 'CANCEL',
-          2 =>
-          array (
-             'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_header" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
-		  ),
-          3 => 
-          array (
+            0 =>
+            array (
+            'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_HEADER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
+            ),
+            1 => 'CANCEL',
+            2 =>
+            array (
+                'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_header" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
+            ),
+            3 => 
+            array (
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" id="close_and_create_new_header" class="button" onclick="SUGAR.meetings.fill_invitees(); document.EditView.status.value=\'Held\'; document.EditView.action.value=\'Save\'; document.EditView.return_module.value=\'Meetings\'; document.EditView.isDuplicate.value=true; document.EditView.isSaveAndNew.value=true; document.EditView.return_action.value=\'EditView\'; document.EditView.return_id.value=\'{$fields.id.value}\'; formSubmitCheck();"type="button" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
-           ),
+            ),
         ),
         'headerTpl' => 'modules/Meetings/tpls/header.tpl',
 
-          'buttons_footer' =>
+            'buttons_footer' =>
         array (
-          0 =>
-          array (
-			'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_FOOTER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
-		  ),
-          1 => 'CANCEL',
-          2 =>
-          array (
-             'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_footer" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
-		  ),
-          3 =>
-          array (
+            0 =>
+            array (
+            'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_FOOTER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
+            ),
+            1 => 'CANCEL',
+            2 =>
+            array (
+                'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_footer" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
+            ),
+            3 =>
+            array (
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" id="close_and_create_new_footer" class="button" onclick="SUGAR.meetings.fill_invitees(); document.EditView.status.value=\'Held\'; document.EditView.action.value=\'Save\'; document.EditView.return_module.value=\'Meetings\'; document.EditView.isDuplicate.value=true; document.EditView.isSaveAndNew.value=true; document.EditView.return_action.value=\'EditView\'; document.EditView.return_id.value=\'{$fields.id.value}\'; formSubmitCheck();"type="button" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
-           ),
+            ),
         ),
         'footerTpl' => 'modules/Meetings/tpls/footer.tpl',
-      ),
-      'widths' =>
-      array (
+        ),
+        'widths' =>
+        array (
         0 =>
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 =>
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>
+        'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>
 {sugar_getscript file="cache/include/javascript/sugar_grp_jsolait.js"}
 <script>toggle_portal_flag();function toggle_portal_flag()  {ldelim} {$TOGGLE_JS} {rdelim} 
 function formSubmitCheck(){ldelim}if(check_form(\'EditView\')){ldelim}document.EditView.submit();{rdelim}{rdelim}</script>',
-      'useTabs' => false,
+        'useTabs' => false,
     ),
     'panels' =>
     array (
-      'lbl_meeting_information' =>
-      array (
+        'lbl_meeting_information' =>
         array (
-          array (
+        array (
+            array (
             'name' => 'name',
 
-          ),
-          array (
+            ),
+            array (
             'name' => 'status',
             'fields' =>
             array (
-              array (
+                array (
                 'name' => 'status',
-              ),
+                ),
+            ),
             ),
-         ),
-      ),
+        ),
       
       
-      array (
-          array (
+        array (
+            array (
             'name' => 'date_start',
             'type' => 'datetimecombo',
             'displayParams' =>
             array (
-              'required' => true,
-              'updateCallback' => 'SugarWidgetScheduler.update_time();',
+                'required' => true,
+                'updateCallback' => 'SugarWidgetScheduler.update_time();',
+            ),
             ),
-          ),
           
-          array (
+            array (
             'name' => 'parent_name',
             'label' => 'LBL_LIST_RELATED_TO',
-          ),
+            ),
         ),
         
         
-      array (
-          array (
+        array (
+            array (
             'name' => 'date_end',
             'type' => 'datetimecombo',
             'displayParams' =>
             array (
-              'required' => true,
-              'updateCallback' => 'SugarWidgetScheduler.update_time();',
+                'required' => true,
+                'updateCallback' => 'SugarWidgetScheduler.update_time();',
+            ),
             ),
-          ),
           
-          array (
+            array (
             'name' => 'location',
             'comment' => 'Meeting location',
             'label' => 'LBL_LOCATION',
-          ),
+            ),
         ),      
         
         array(        
-          array (
+            array (
             'name' => 'duration',
             'customCode' => '
                 @@FIELD@@
@@ -184,7 +184,7 @@ 
                 </script>            
             ',
             'customCodeReadOnly' => '{$fields.duration_hours.value}{$MOD.LBL_HOURS_ABBREV} {$fields.duration_minutes.value}{$MOD.LBL_MINSS_ABBREV} ',
-          ),
+            ),
         ),
 //        array (
 //          array (
@@ -193,31 +193,31 @@ 
 //            'label' => 'LBL_REMINDER',
 //          ),
 //        ),
-          array(
-              array (
-                  'name' => 'reminders',
-                  'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
-                  'label' => 'LBL_REMINDERS',
-              ),
-          ),
+            array(
+                array (
+                    'name' => 'reminders',
+                    'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
+                    'label' => 'LBL_REMINDERS',
+                ),
+            ),
         array (
-          array (
+            array (
             'name' => 'description',
             'comment' => 'Full text of the note',
             'label' => 'LBL_DESCRIPTION',
-          ),
+            ),
+        ),
         ),
-      ),
-      'LBL_PANEL_ASSIGNMENT' =>
-      array (
+        'LBL_PANEL_ASSIGNMENT' =>
         array (
-          array (
+        array (
+            array (
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO_NAME',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

Spacing +38 added lines, -38 removed lines

@@ -38,66 +38,66 @@ 
  ********************************************************************************/
 
 $viewdefs ['Meetings'] =
-array (
+array(
   'EditView' =>
-  array (
+  array(
     'templateMeta' =>
-    array (
+    array(
         'includes' => array(
             array('file' => 'modules/Reminders/Reminders.js'),
         ),
       'maxColumns' => '2',
       'form' =>
-      array (
+      array(
         'hidden' =>
-        array (
+        array(
           0 => '<input type="hidden" name="isSaveAndNew" value="false">',
         ),
         'buttons' =>
-        array (
+        array(
           0 =>
-          array (
+          array(
 			'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_HEADER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
 		  ),
           1 => 'CANCEL',
           2 =>
-          array (
+          array(
              'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_header" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
 		  ),
           3 => 
-          array (
+          array(
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" id="close_and_create_new_header" class="button" onclick="SUGAR.meetings.fill_invitees(); document.EditView.status.value=\'Held\'; document.EditView.action.value=\'Save\'; document.EditView.return_module.value=\'Meetings\'; document.EditView.isDuplicate.value=true; document.EditView.isSaveAndNew.value=true; document.EditView.return_action.value=\'EditView\'; document.EditView.return_id.value=\'{$fields.id.value}\'; formSubmitCheck();"type="button" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
            ),
         ),
         'headerTpl' => 'modules/Meetings/tpls/header.tpl',
 
           'buttons_footer' =>
-        array (
+        array(
           0 =>
-          array (
+          array(
 			'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_FOOTER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
 		  ),
           1 => 'CANCEL',
           2 =>
-          array (
+          array(
              'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_footer" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
 		  ),
           3 =>
-          array (
+          array(
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" id="close_and_create_new_footer" class="button" onclick="SUGAR.meetings.fill_invitees(); document.EditView.status.value=\'Held\'; document.EditView.action.value=\'Save\'; document.EditView.return_module.value=\'Meetings\'; document.EditView.isDuplicate.value=true; document.EditView.isSaveAndNew.value=true; document.EditView.return_action.value=\'EditView\'; document.EditView.return_id.value=\'{$fields.id.value}\'; formSubmitCheck();"type="button" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
            ),
         ),
         'footerTpl' => 'modules/Meetings/tpls/footer.tpl',
       ),
       'widths' =>
-      array (
+      array(
         0 =>
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 =>
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
@@ -109,19 +109,19 @@ 
       'useTabs' => false,
     ),
     'panels' =>
-    array (
+    array(
       'lbl_meeting_information' =>
-      array (
-        array (
-          array (
+      array(
+        array(
+          array(
             'name' => 'name',
 
           ),
-          array (
+          array(
             'name' => 'status',
             'fields' =>
-            array (
-              array (
+            array(
+              array(
                 'name' => 'status',
               ),
             ),
@@ -129,36 +129,36 @@ 
       ),
       
       
-      array (
-          array (
+      array(
+          array(
             'name' => 'date_start',
             'type' => 'datetimecombo',
             'displayParams' =>
-            array (
+            array(
               'required' => true,
               'updateCallback' => 'SugarWidgetScheduler.update_time();',
             ),
           ),
           
-          array (
+          array(
             'name' => 'parent_name',
             'label' => 'LBL_LIST_RELATED_TO',
           ),
         ),
         
         
-      array (
-          array (
+      array(
+          array(
             'name' => 'date_end',
             'type' => 'datetimecombo',
             'displayParams' =>
-            array (
+            array(
               'required' => true,
               'updateCallback' => 'SugarWidgetScheduler.update_time();',
             ),
           ),
           
-          array (
+          array(
             'name' => 'location',
             'comment' => 'Meeting location',
             'label' => 'LBL_LOCATION',
@@ -166,7 +166,7 @@ 
         ),      
         
         array(        
-          array (
+          array(
             'name' => 'duration',
             'customCode' => '
                 @@FIELD@@
@@ -194,14 +194,14 @@ 
 //          ),
 //        ),
           array(
-              array (
+              array(
                   'name' => 'reminders',
                   'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
                   'label' => 'LBL_REMINDERS',
               ),
           ),
-        array (
-          array (
+        array(
+          array(
             'name' => 'description',
             'comment' => 'Full text of the note',
             'label' => 'LBL_DESCRIPTION',
@@ -209,9 +209,9 @@ 
         ),
       ),
       'LBL_PANEL_ASSIGNMENT' =>
-      array (
-        array (
-          array (
+      array(
+        array(
+          array(
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO_NAME',
           ),

modules/Meetings/metadata/searchdefs.php

Indentation +35 added lines, -35 removed lines

@@ -39,85 +39,85 @@
 
 $searchdefs ['Meetings'] = 
 array (
-  'layout' => 
-  array (
+    'layout' => 
+    array (
     'basic_search' => 
     array (
-      'name' => 
-      array (
+        'name' => 
+        array (
         'name' => 'name',
         'default' => true,
         'width' => '10%',
-      ),
-      'current_user_only' => 
-      array (
+        ),
+        'current_user_only' => 
+        array (
         'name' => 'current_user_only',
         'label' => 'LBL_CURRENT_USER_FILTER',
         'type' => 'bool',
         'default' => true,
         'width' => '10%',
-      ),
-      array ('name' => 'open_only', 'label' => 'LBL_OPEN_ITEMS', 'type' => 'bool', 'default' => false, 'width' => '10%'),
-      array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
+        ),
+        array ('name' => 'open_only', 'label' => 'LBL_OPEN_ITEMS', 'type' => 'bool', 'default' => false, 'width' => '10%'),
+        array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
     ),
     'advanced_search' => 
     array (
-      'name' => 
-      array (
+        'name' => 
+        array (
         'name' => 'name',
         'default' => true,
         'width' => '10%',
-      ),
-      'parent_name' => 
-      array (
+        ),
+        'parent_name' => 
+        array (
         'type' => 'parent',
         'label' => 'LBL_LIST_RELATED_TO',
         'width' => '10%',
         'default' => true,
         'name' => 'parent_name',
-      ),
-      'current_user_only' => 
-      array (
+        ),
+        'current_user_only' => 
+        array (
         'name' => 'current_user_only',
         'label' => 'LBL_CURRENT_USER_FILTER',
         'type' => 'bool',
         'default' => true,
         'width' => '10%',
-      ),
-      'status' => 
-      array (
+        ),
+        'status' => 
+        array (
         'name' => 'status',
         'default' => true,
         'width' => '10%',
-      ),
-      'assigned_user_id' => 
-      array (
+        ),
+        'assigned_user_id' => 
+        array (
         'name' => 'assigned_user_id',
         'type' => 'enum',
         'label' => 'LBL_ASSIGNED_TO',
         'function' => 
         array (
-          'name' => 'get_user_array',
-          'params' => 
-          array (
+            'name' => 'get_user_array',
+            'params' => 
+            array (
             0 => false,
-          ),
+            ),
         ),
         'default' => true,
         'width' => '10%',
-      ),
+        ),
       
     ),
-  ),
-  'templateMeta' => 
-  array (
+    ),
+    'templateMeta' => 
+    array (
     'maxColumns' => '3',
     'maxColumnsBasic' => '4', 
     'widths' => 
     array (
-      'label' => '10',
-      'field' => '30',
+        'label' => '10',
+        'field' => '30',
+    ),
     ),
-  ),
 );
 ?>

Spacing +17 added lines, -17 removed lines

@@ -38,38 +38,38 @@ 
  ********************************************************************************/
 
 $searchdefs ['Meetings'] = 
-array (
+array(
   'layout' => 
-  array (
+  array(
     'basic_search' => 
-    array (
+    array(
       'name' => 
-      array (
+      array(
         'name' => 'name',
         'default' => true,
         'width' => '10%',
       ),
       'current_user_only' => 
-      array (
+      array(
         'name' => 'current_user_only',
         'label' => 'LBL_CURRENT_USER_FILTER',
         'type' => 'bool',
         'default' => true,
         'width' => '10%',
       ),
-      array ('name' => 'open_only', 'label' => 'LBL_OPEN_ITEMS', 'type' => 'bool', 'default' => false, 'width' => '10%'),
-      array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
+      array('name' => 'open_only', 'label' => 'LBL_OPEN_ITEMS', 'type' => 'bool', 'default' => false, 'width' => '10%'),
+      array('name' => 'favorites_only', 'label' => 'LBL_FAVORITES_FILTER', 'type' => 'bool',),
     ),
     'advanced_search' => 
-    array (
+    array(
       'name' => 
-      array (
+      array(
         'name' => 'name',
         'default' => true,
         'width' => '10%',
       ),
       'parent_name' => 
-      array (
+      array(
         'type' => 'parent',
         'label' => 'LBL_LIST_RELATED_TO',
         'width' => '10%',
@@ -77,7 +77,7 @@ 
         'name' => 'parent_name',
       ),
       'current_user_only' => 
-      array (
+      array(
         'name' => 'current_user_only',
         'label' => 'LBL_CURRENT_USER_FILTER',
         'type' => 'bool',
@@ -85,21 +85,21 @@ 
         'width' => '10%',
       ),
       'status' => 
-      array (
+      array(
         'name' => 'status',
         'default' => true,
         'width' => '10%',
       ),
       'assigned_user_id' => 
-      array (
+      array(
         'name' => 'assigned_user_id',
         'type' => 'enum',
         'label' => 'LBL_ASSIGNED_TO',
         'function' => 
-        array (
+        array(
           'name' => 'get_user_array',
           'params' => 
-          array (
+          array(
             0 => false,
           ),
         ),
@@ -110,11 +110,11 @@ 
     ),
   ),
   'templateMeta' => 
-  array (
+  array(
     'maxColumns' => '3',
     'maxColumnsBasic' => '4', 
     'widths' => 
-    array (
+    array(
       'label' => '10',
       'field' => '30',
     ),

modules/Meetings/metadata/SearchFields.php

Indentation +24 added lines, -24 removed lines

@@ -40,21 +40,21 @@ 
 global $current_user;
 $module_name = "Meetings";
 $searchFields['Meetings'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
+    array (
+        'name' => array( 'query_type'=>'default'),
         'contact_name' => array( 'query_type'=>'default','db_field'=>array('contacts.first_name','contacts.last_name')),        
         'date_start' => array( 'query_type'=>'default'),
         'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
         'assigned_user_id'=> array('query_type'=>'default'),
         'status'=> array('query_type'=>'default', 'options' => 'meeting_status_dom', 'template_var' => 'STATUS_FILTER'),
         
-		'open_only' => array(
-			'query_type'=>'default',
-			'db_field'=>array('status'),
-			'operator'=>'not in',
-			'closed_values' => array('Held', 'Not Held'),
-			'type'=>'bool',
-		),		
+        'open_only' => array(
+            'query_type'=>'default',
+            'db_field'=>array('status'),
+            'operator'=>'not in',
+            'closed_values' => array('Held', 'Not Held'),
+            'type'=>'bool',
+        ),		
         'favorites_only' => array(
             'query_type'=>'format',
             'operator' => 'subquery',
@@ -63,19 +63,19 @@ 
 			                        and favorites.parent_type = "'.$module_name.'"
 			                        and favorites.assigned_user_id = "' .$current_user->id . '") OR NOT ({0}',
             'db_field'=>array('id')),
-		//Range Search Support
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_end' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
-	    //Range Search Support 				
-	);
+        //Range Search Support
+        'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_end' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+        //Range Search Support 				
+    );
 ?>

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,11 +40,11 @@ 
 global $current_user;
 $module_name = "Meetings";
 $searchFields['Meetings'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
-        'contact_name' => array( 'query_type'=>'default','db_field'=>array('contacts.first_name','contacts.last_name')),        
-        'date_start' => array( 'query_type'=>'default'),
-        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+	array(
+		'name' => array('query_type'=>'default'),
+        'contact_name' => array('query_type'=>'default', 'db_field'=>array('contacts.first_name', 'contacts.last_name')),        
+        'date_start' => array('query_type'=>'default'),
+        'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
         'assigned_user_id'=> array('query_type'=>'default'),
         'status'=> array('query_type'=>'default', 'options' => 'meeting_status_dom', 'template_var' => 'STATUS_FILTER'),
         
@@ -61,21 +61,21 @@ 
             'subquery' => 'SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = "'.$module_name.'"
-			                        and favorites.assigned_user_id = "' .$current_user->id . '") OR NOT ({0}',
+			                        and favorites.assigned_user_id = "' .$current_user->id.'") OR NOT ({0}',
             'db_field'=>array('id')),
 		//Range Search Support
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_end' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_end' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_end' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_end' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	    //Range Search Support 				
 	);
 ?>

Braces +3 added lines, -1 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.

modules/Meetings/metadata/detailviewdefs.php

Indentation +75 added lines, -75 removed lines

@@ -39,56 +39,56 @@ 
 
 $viewdefs ['Meetings'] = 
 array (
-  'DetailView' => 
-  array (
+    'DetailView' => 
+    array (
     'templateMeta' => 
     array (
         'includes' => array(
             array('file' => 'modules/Reminders/Reminders.js'),
         ),
-      'form' => 
-      array (
+        'form' => 
+        array (
         'buttons' => 
         array (
-          0 => 'EDIT',
-          1 => 'DUPLICATE',
-          2 => 'DELETE',
-          3 => 
-          array (
+            0 => 'EDIT',
+            1 => 'DUPLICATE',
+            2 => 'DELETE',
+            3 => 
+            array (
             'customCode' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")} <input type="hidden" name="isSaveAndNew" value="false">  <input type="hidden" name="status" value="">  <input type="hidden" name="isSaveFromDetailView" value="true">  <input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}"   class="button"  onclick="this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.isDuplicate.value=true;this.form.return_id.value=\'{$fields.id.value}\';" id="close_create_button" name="button"  value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}"  type="submit">{/if}',
-              //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
-              'sugar_html' => array(
-                  'type' => 'submit',
-                  'value' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
-                  'htmlOptions' => array(
-                      'title' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
-                      'name' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
-                      'class' => 'button',
-                      'id' => 'close_create_button',
-                      'onclick' => 'this.form.isSaveFromDetailView.value=true; this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.isDuplicate.value=true;this.form.return_id.value=\'{$fields.id.value}\';',
+                //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
+                'sugar_html' => array(
+                    'type' => 'submit',
+                    'value' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
+                    'htmlOptions' => array(
+                        'title' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
+                        'name' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
+                        'class' => 'button',
+                        'id' => 'close_create_button',
+                        'onclick' => 'this.form.isSaveFromDetailView.value=true; this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.isDuplicate.value=true;this.form.return_id.value=\'{$fields.id.value}\';',
 
-                  ),
-                  'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
-              ),
-          ),
-          4 => 
-          array (
+                    ),
+                    'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
+                ),
+            ),
+            4 => 
+            array (
             'customCode' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")} <input type="hidden" name="isSave" value="false">  <input title="{$APP.LBL_CLOSE_BUTTON_TITLE}"  accesskey="{$APP.LBL_CLOSE_BUTTON_KEY}"  class="button"  onclick="this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isSave.value=true;this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\'"  id="close_button" name="button1"  value="{$APP.LBL_CLOSE_BUTTON_TITLE}"  type="submit">{/if}',
-              //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
-              'sugar_html' => array(
-                  'type' => 'submit',
-                  'value' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
-                  'htmlOptions' => array(
-                      'title' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
-                      'accesskey' => '{$APP.LBL_CLOSE_BUTTON_KEY}',
-                      'class' => 'button',
-                      'onclick' => 'this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isSave.value=true;this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\';',
-                      'name' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
-                      'id' => 'close_button',
-                  ),
-                  'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
-              ),
-          ),
+                //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
+                'sugar_html' => array(
+                    'type' => 'submit',
+                    'value' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
+                    'htmlOptions' => array(
+                        'title' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
+                        'accesskey' => '{$APP.LBL_CLOSE_BUTTON_KEY}',
+                        'class' => 'button',
+                        'onclick' => 'this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isSave.value=true;this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\';',
+                        'name' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
+                        'id' => 'close_button',
+                    ),
+                    'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
+                ),
+            ),
         ),
         'hidden' => array(
             '<input type="hidden" name="isSaveAndNew">',
@@ -97,50 +97,50 @@ 
             '<input type="hidden" name="isSave">',
         ),
         'headerTpl' => 'modules/Meetings/tpls/detailHeader.tpl',
-      ),
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        ),
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'useTabs' => false,
+        'useTabs' => false,
     ),
     'panels' => 
     array (
-      'lbl_meeting_information' => 
-      array (
+        'lbl_meeting_information' => 
+        array (
         array (
-          array (
+            array (
             'name' => 'name',
             'label' => 'LBL_SUBJECT',
-          ),
-          'status',
+            ),
+            'status',
         ),
         array (
-          array (
+            array (
             'name' => 'date_start',
             'label' => 'LBL_DATE_TIME',
-          ),
+            ),
         ),
         array (
-          array (
+            array (
             'name' => 'duration',
             'customCode' => '{$fields.duration_hours.value}{$MOD.LBL_HOURS_ABBREV} {$fields.duration_minutes.value}{$MOD.LBL_MINSS_ABBREV} ',
             'label' => 'LBL_DURATION',
-          ),
-          array (
+            ),
+            array (
             'name' => 'parent_name',
             'customLabel' => '{sugar_translate label=\'LBL_MODULE_NAME\' module=$fields.parent_type.value}',
-          ),
+            ),
         ),
         array (
 //          array(
@@ -148,38 +148,38 @@ 
 //            'customCode' => '{include file="modules/Meetings/tpls/reminders.tpl"}',
 //            'label' => 'LBL_REMINDER',
 //            ),
-          array(
+            array(
             'name' => 'reminders',
             'label' => 'LBL_REMINDERS',
             ),
-          'location',
+            'location',
         ),
         array (
-          'description',
+            'description',
+        ),
         ),
-      ),
-      'LBL_PANEL_ASSIGNMENT' => 
-      array (
+        'LBL_PANEL_ASSIGNMENT' => 
         array (
-          array (
+        array (
+            array (
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO',
-          ),
-          array (
+            ),
+            array (
             'name' => 'date_modified',
             'label' => 'LBL_DATE_MODIFIED',
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
-          ),
+            ),
 
         ),
         array (
-          array (
+            array (
             'name' => 'date_entered',
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

Spacing +27 added lines, -27 removed lines

@@ -38,23 +38,23 @@ 
  ********************************************************************************/
 
 $viewdefs ['Meetings'] = 
-array (
+array(
   'DetailView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
         'includes' => array(
             array('file' => 'modules/Reminders/Reminders.js'),
         ),
       'form' => 
-      array (
+      array(
         'buttons' => 
-        array (
+        array(
           0 => 'EDIT',
           1 => 'DUPLICATE',
           2 => 'DELETE',
           3 => 
-          array (
+          array(
             'customCode' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")} <input type="hidden" name="isSaveAndNew" value="false">  <input type="hidden" name="status" value="">  <input type="hidden" name="isSaveFromDetailView" value="true">  <input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}"   class="button"  onclick="this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.isDuplicate.value=true;this.form.return_id.value=\'{$fields.id.value}\';" id="close_create_button" name="button"  value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}"  type="submit">{/if}',
               //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
               'sugar_html' => array(
@@ -72,7 +72,7 @@ 
               ),
           ),
           4 => 
-          array (
+          array(
             'customCode' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")} <input type="hidden" name="isSave" value="false">  <input title="{$APP.LBL_CLOSE_BUTTON_TITLE}"  accesskey="{$APP.LBL_CLOSE_BUTTON_KEY}"  class="button"  onclick="this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isSave.value=true;this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\'"  id="close_button" name="button1"  value="{$APP.LBL_CLOSE_BUTTON_TITLE}"  type="submit">{/if}',
               //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
               'sugar_html' => array(
@@ -100,14 +100,14 @@ 
       ),
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
@@ -115,34 +115,34 @@ 
       'useTabs' => false,
     ),
     'panels' => 
-    array (
+    array(
       'lbl_meeting_information' => 
-      array (
-        array (
-          array (
+      array(
+        array(
+          array(
             'name' => 'name',
             'label' => 'LBL_SUBJECT',
           ),
           'status',
         ),
-        array (
-          array (
+        array(
+          array(
             'name' => 'date_start',
             'label' => 'LBL_DATE_TIME',
           ),
         ),
-        array (
-          array (
+        array(
+          array(
             'name' => 'duration',
             'customCode' => '{$fields.duration_hours.value}{$MOD.LBL_HOURS_ABBREV} {$fields.duration_minutes.value}{$MOD.LBL_MINSS_ABBREV} ',
             'label' => 'LBL_DURATION',
           ),
-          array (
+          array(
             'name' => 'parent_name',
             'customLabel' => '{sugar_translate label=\'LBL_MODULE_NAME\' module=$fields.parent_type.value}',
           ),
         ),
-        array (
+        array(
 //          array(
 //            'name' => 'reminder_time',
 //            'customCode' => '{include file="modules/Meetings/tpls/reminders.tpl"}',
@@ -154,26 +154,26 @@ 
             ),
           'location',
         ),
-        array (
+        array(
           'description',
         ),
       ),
       'LBL_PANEL_ASSIGNMENT' => 
-      array (
-        array (
-          array (
+      array(
+        array(
+          array(
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO',
           ),
-          array (
+          array(
             'name' => 'date_modified',
             'label' => 'LBL_DATE_MODIFIED',
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
           ),
 
         ),
-        array (
-          array (
+        array(
+          array(
             'name' => 'date_entered',
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
           ),

modules/Meetings/metadata/quickcreatedefs.php

Indentation +61 added lines, -61 removed lines

@@ -39,119 +39,119 @@ 
 
 $viewdefs ['Meetings'] =
 array (
-  'QuickCreate' =>
-  array (
+    'QuickCreate' =>
+    array (
     'templateMeta' =>
     array (
         'includes' => array(
             array('file' => 'modules/Reminders/Reminders.js'),
         ),
-      'maxColumns' => '2',
-      'form' =>
-      array (
+        'maxColumns' => '2',
+        'form' =>
+        array (
         'hidden' =>
         array (
-           '<input type="hidden" name="isSaveAndNew" value="false">',
-           '<input type="hidden" name="is_ajax_call" value="1">',
+            '<input type="hidden" name="isSaveAndNew" value="false">',
+            '<input type="hidden" name="is_ajax_call" value="1">',
         ),
         'buttons' =>
         array (
 
-          array (
+            array (
             'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button" onclick="SUGAR.meetings.fill_invitees();this.form.action.value=\'Save\'; this.form.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}this.form.return_id.value=\'\'; {/if}return check_form(\'EditView\');" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
-          ),
-           'CANCEL',
+            ),
+            'CANCEL',
 
-          array (
+            array (
             'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" class="button" onclick="this.form.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();this.form.action.value=\'Save\';this.form.return_action.value=\'EditView\';this.form.return_module.value=\'{$smarty.request.return_module}\';return check_form(\'EditView\');" type="submit" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
-          ),
+            ),
 
-          array (
+            array (
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" accessKey="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_KEY}" class="button" onclick="SUGAR.meetings.fill_invitees(); this.form.status.value=\'Held\'; this.form.action.value=\'Save\'; this.form.return_module.value=\'Meetings\'; this.form.isDuplicate.value=true; this.form.isSaveAndNew.value=true; this.form.return_action.value=\'EditView\'; this.form.return_id.value=\'{$fields.id.value}\'; return check_form(\'EditView\');" type="submit" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
-          ),
+            ),
+        ),
         ),
-      ),
-      'widths' =>
-      array (
+        'widths' =>
+        array (
 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>
+        'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>
 {sugar_getscript file="cache/include/javascript/sugar_grp_jsolait.js"}
 <script>toggle_portal_flag();function toggle_portal_flag()  {literal} { {/literal} {$TOGGLE_JS} {literal} } {/literal} </script>',
-      'useTabs' => false,
+        'useTabs' => false,
     ),
     'panels' =>
     array (
-      'default' =>
-      array (
+        'default' =>
+        array (
 
         array (
 
-          array (
+            array (
             'name' => 'name',
             'displayParams' =>
             array (
-              'required' => true,
+                'required' => true,
+            ),
             ),
-          ),
 
-          array (
+            array (
             'name' => 'status',
             'fields' =>
             array (
 
-              array (
+                array (
                 'name' => 'status',
-              ),
+                ),
+            ),
             ),
-          ),
         ),
         array (
 
-          array (
+            array (
             'name' => 'date_start',
             'type' => 'datetimecombo',
             'displayParams' =>
             array (
-              'required' => true,
-              'updateCallback' => 'SugarWidgetScheduler.update_time();',
+                'required' => true,
+                'updateCallback' => 'SugarWidgetScheduler.update_time();',
+            ),
             ),
-          ),
 
-          array (
+            array (
             'name' => 'parent_name',
             'label' => 'LBL_LIST_RELATED_TO',
-          ),
+            ),
         ),
         
         array (
-          array (
+            array (
             'name' => 'date_end',
             'type' => 'datetimecombo',
             'displayParams' =>
             array (
-              'required' => true,
-              'updateCallback' => 'SugarWidgetScheduler.update_time();',
+                'required' => true,
+                'updateCallback' => 'SugarWidgetScheduler.update_time();',
             ),
-          ),
-          array (
+            ),
+            array (
             'name' => 'location',
             'comment' => 'Meeting location',
             'label' => 'LBL_LOCATION',
-          ),
+            ),
         ),
         
         array(        
-          array (
+            array (
             'name' => 'duration',
             'customCode' => '
                 @@FIELD@@
@@ -168,37 +168,37 @@ 
                     {/literal}
                 </script>            
             ',
-          ),          
+            ),          
 //          array (
 //            'name' => 'reminder_time',
 //            'customCode' => '{include file="modules/Meetings/tpls/reminders.tpl"}',
 //            'label' => 'LBL_REMINDER',
 //          ),
-              array (
-                  'name' => 'reminders',
-                  'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
-                  'label' => 'LBL_REMINDERS',
-              ),
-       ),
-
-         array (
-         	 array (
+                array (
+                    'name' => 'reminders',
+                    'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
+                    'label' => 'LBL_REMINDERS',
+                ),
+        ),
+
+            array (
+                array (
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO_NAME',
-          ),
+            ),
 
         ),
 
         array (
 
-          array (
+            array (
             'name' => 'description',
             'comment' => 'Full text of the note',
             'label' => 'LBL_DESCRIPTION',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

Spacing +34 added lines, -34 removed lines

@@ -38,48 +38,48 @@ 
  ********************************************************************************/
 
 $viewdefs ['Meetings'] =
-array (
+array(
   'QuickCreate' =>
-  array (
+  array(
     'templateMeta' =>
-    array (
+    array(
         'includes' => array(
             array('file' => 'modules/Reminders/Reminders.js'),
         ),
       'maxColumns' => '2',
       'form' =>
-      array (
+      array(
         'hidden' =>
-        array (
+        array(
            '<input type="hidden" name="isSaveAndNew" value="false">',
            '<input type="hidden" name="is_ajax_call" value="1">',
         ),
         'buttons' =>
-        array (
+        array(
 
-          array (
+          array(
             'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button" onclick="SUGAR.meetings.fill_invitees();this.form.action.value=\'Save\'; this.form.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}this.form.return_id.value=\'\'; {/if}return check_form(\'EditView\');" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
           ),
            'CANCEL',
 
-          array (
+          array(
             'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" class="button" onclick="this.form.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();this.form.action.value=\'Save\';this.form.return_action.value=\'EditView\';this.form.return_module.value=\'{$smarty.request.return_module}\';return check_form(\'EditView\');" type="submit" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
           ),
 
-          array (
+          array(
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" accessKey="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_KEY}" class="button" onclick="SUGAR.meetings.fill_invitees(); this.form.status.value=\'Held\'; this.form.action.value=\'Save\'; this.form.return_module.value=\'Meetings\'; this.form.isDuplicate.value=true; this.form.isSaveAndNew.value=true; this.form.return_action.value=\'EditView\'; this.form.return_id.value=\'{$fields.id.value}\'; return check_form(\'EditView\');" type="submit" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
           ),
         ),
       ),
       'widths' =>
-      array (
+      array(
 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
@@ -90,60 +90,60 @@ 
       'useTabs' => false,
     ),
     'panels' =>
-    array (
+    array(
       'default' =>
-      array (
+      array(
 
-        array (
+        array(
 
-          array (
+          array(
             'name' => 'name',
             'displayParams' =>
-            array (
+            array(
               'required' => true,
             ),
           ),
 
-          array (
+          array(
             'name' => 'status',
             'fields' =>
-            array (
+            array(
 
-              array (
+              array(
                 'name' => 'status',
               ),
             ),
           ),
         ),
-        array (
+        array(
 
-          array (
+          array(
             'name' => 'date_start',
             'type' => 'datetimecombo',
             'displayParams' =>
-            array (
+            array(
               'required' => true,
               'updateCallback' => 'SugarWidgetScheduler.update_time();',
             ),
           ),
 
-          array (
+          array(
             'name' => 'parent_name',
             'label' => 'LBL_LIST_RELATED_TO',
           ),
         ),
         
-        array (
-          array (
+        array(
+          array(
             'name' => 'date_end',
             'type' => 'datetimecombo',
             'displayParams' =>
-            array (
+            array(
               'required' => true,
               'updateCallback' => 'SugarWidgetScheduler.update_time();',
             ),
           ),
-          array (
+          array(
             'name' => 'location',
             'comment' => 'Meeting location',
             'label' => 'LBL_LOCATION',
@@ -151,7 +151,7 @@ 
         ),
         
         array(        
-          array (
+          array(
             'name' => 'duration',
             'customCode' => '
                 @@FIELD@@
@@ -174,24 +174,24 @@ 
 //            'customCode' => '{include file="modules/Meetings/tpls/reminders.tpl"}',
 //            'label' => 'LBL_REMINDER',
 //          ),
-              array (
+              array(
                   'name' => 'reminders',
                   'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
                   'label' => 'LBL_REMINDERS',
               ),
        ),
 
-         array (
-         	 array (
+         array(
+         	 array(
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO_NAME',
           ),
 
         ),
 
-        array (
+        array(
 
-          array (
+          array(
             'name' => 'description',
             'comment' => 'Full text of the note',
             'label' => 'LBL_DESCRIPTION',

modules/Meetings/metadata/listviewdefs.php

Indentation +33 added lines, -33 removed lines

@@ -39,8 +39,8 @@ 
 
 $listViewDefs ['Meetings'] = 
 array (
-  'SET_COMPLETE' => 
-  array (
+    'SET_COMPLETE' => 
+    array (
     'width' => '1%',
     'label' => 'LBL_LIST_CLOSE',
     'link' => true,
@@ -48,18 +48,18 @@ 
     'default' => true,
     'related_fields' => 
     array (
-      0 => 'status',
+        0 => 'status',
+    ),
     ),
-  ),
-  'NAME' => 
-  array (
+    'NAME' => 
+    array (
     'width' => '40%',
     'label' => 'LBL_LIST_SUBJECT',
     'link' => true,
     'default' => true,
-  ),
-  'CONTACT_NAME' => 
-  array (
+    ),
+    'CONTACT_NAME' => 
+    array (
     'width' => '20%',
     'label' => 'LBL_LIST_CONTACT',
     'link' => true,
@@ -67,9 +67,9 @@ 
     'module' => 'Contacts',
     'default' => true,
     'ACLTag' => 'CONTACT',
-  ),
-  'PARENT_NAME' => 
-  array (
+    ),
+    'PARENT_NAME' => 
+    array (
     'width' => '20%',
     'label' => 'LBL_LIST_RELATED_TO',
     'dynamic_module' => 'PARENT_TYPE',
@@ -80,47 +80,47 @@ 
     'ACLTag' => 'PARENT',
     'related_fields' => 
     array (
-      0 => 'parent_id',
-      1 => 'parent_type',
+        0 => 'parent_id',
+        1 => 'parent_type',
     ),
-  ),
-  'DATE_START' => 
-  array (
+    ),
+    'DATE_START' => 
+    array (
     'width' => '15%',
     'label' => 'LBL_LIST_DATE',
     'link' => false,
     'default' => true,
     'related_fields' => 
     array (
-      0 => 'time_start',
+        0 => 'time_start',
     ),
-  ),
-  'ASSIGNED_USER_NAME' => 
-  array (
+    ),
+    'ASSIGNED_USER_NAME' => 
+    array (
     'width' => '2%',
     'label' => 'LBL_LIST_ASSIGNED_TO_NAME',
     'module' => 'Employees',
     'id' => 'ASSIGNED_USER_ID',
     'default' => true,
-  ),
-  'DIRECTION' => 
-  array (
+    ),
+    'DIRECTION' => 
+    array (
     'type' => 'enum',
     'label' => 'LBL_LIST_DIRECTION',
     'width' => '10%',
     'default' => false,
-  ),
-  'STATUS' => 
-  array (
+    ),
+    'STATUS' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_LIST_STATUS',
     'link' => false,
     'default' => false,
-  ),
-  'DATE_ENTERED' => array (
-	'width' => '10%',
-	'label' => 'LBL_DATE_ENTERED',
-	'default' => true
-  ),  
+    ),
+    'DATE_ENTERED' => array (
+    'width' => '10%',
+    'label' => 'LBL_DATE_ENTERED',
+    'default' => true
+    ),  
 );
 ?>

Spacing +13 added lines, -13 removed lines

@@ -38,28 +38,28 @@ 
  ********************************************************************************/
 
 $listViewDefs ['Meetings'] = 
-array (
+array(
   'SET_COMPLETE' => 
-  array (
+  array(
     'width' => '1%',
     'label' => 'LBL_LIST_CLOSE',
     'link' => true,
     'sortable' => false,
     'default' => true,
     'related_fields' => 
-    array (
+    array(
       0 => 'status',
     ),
   ),
   'NAME' => 
-  array (
+  array(
     'width' => '40%',
     'label' => 'LBL_LIST_SUBJECT',
     'link' => true,
     'default' => true,
   ),
   'CONTACT_NAME' => 
-  array (
+  array(
     'width' => '20%',
     'label' => 'LBL_LIST_CONTACT',
     'link' => true,
@@ -69,7 +69,7 @@ 
     'ACLTag' => 'CONTACT',
   ),
   'PARENT_NAME' => 
-  array (
+  array(
     'width' => '20%',
     'label' => 'LBL_LIST_RELATED_TO',
     'dynamic_module' => 'PARENT_TYPE',
@@ -79,24 +79,24 @@ 
     'sortable' => false,
     'ACLTag' => 'PARENT',
     'related_fields' => 
-    array (
+    array(
       0 => 'parent_id',
       1 => 'parent_type',
     ),
   ),
   'DATE_START' => 
-  array (
+  array(
     'width' => '15%',
     'label' => 'LBL_LIST_DATE',
     'link' => false,
     'default' => true,
     'related_fields' => 
-    array (
+    array(
       0 => 'time_start',
     ),
   ),
   'ASSIGNED_USER_NAME' => 
-  array (
+  array(
     'width' => '2%',
     'label' => 'LBL_LIST_ASSIGNED_TO_NAME',
     'module' => 'Employees',
@@ -104,20 +104,20 @@ 
     'default' => true,
   ),
   'DIRECTION' => 
-  array (
+  array(
     'type' => 'enum',
     'label' => 'LBL_LIST_DIRECTION',
     'width' => '10%',
     'default' => false,
   ),
   'STATUS' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_LIST_STATUS',
     'link' => false,
     'default' => false,
   ),
-  'DATE_ENTERED' => array (
+  'DATE_ENTERED' => array(
 	'width' => '10%',
 	'label' => 'LBL_DATE_ENTERED',
 	'default' => true