adamjakab / SuiteCRM

modules/FP_events/responseEntryPoint.php

Indentation +52 added lines, -52 removed lines

@@ -1,29 +1,29 @@ 
 <?php
 if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
-	global $db;
+    global $db;
 	 
-	$even_id = $_GET['event'];
-	$delegate_id = $_GET['delegate'];
-	$type = $_GET['type'];
-	$response = $_GET['response'];	
+    $even_id = $_GET['event'];
+    $delegate_id = $_GET['delegate'];
+    $type = $_GET['type'];
+    $response = $_GET['response'];	
 
-	//get event
+    //get event
     $event = new FP_events();
     $event->retrieve($even_id);
     
     if($type == 'c'){
     	
-    	$event->load_relationship('fp_events_contacts'); // get related contacts
+        $event->load_relationship('fp_events_contacts'); // get related contacts
 
-    	if($response == 'accept'){
+        if($response == 'accept'){
 
             //check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_contacts_c WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'"';
-             $check = $db->getOne($check_q);
-    		//update contact to accepted
-    		$query = 'UPDATE fp_events_contacts_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'" AND email_responded="0"';
-    		if($db->query($query) && $check != '1'){
+                $check = $db->getOne($check_q);
+            //update contact to accepted
+            $query = 'UPDATE fp_events_contacts_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'" AND email_responded="0"';
+            if($db->query($query) && $check != '1'){
     			
                 if(!IsNullOrEmptyString($event->accept_redirect)){
                     
@@ -33,17 +33,17 @@ 
                 else{
                     echo 'Thank you for accepting';
                 }   
-    		}
-    		else {
-    			echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
-    		}	
-    	}
-    	else if($response == 'decline'){
-    		//check to see if they have already responded to the email
+            }
+            else {
+                echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
+            }	
+        }
+        else if($response == 'decline'){
+            //check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_contacts_c WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'"';
-             $check = $db->getOne($check_q);
+                $check = $db->getOne($check_q);
             //update contact to accepted
-    		$query = 'UPDATE fp_events_contacts_c SET accept_status="Declined", email_responded="1" WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'" AND email_responded="0"';
+            $query = 'UPDATE fp_events_contacts_c SET accept_status="Declined", email_responded="1" WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'" AND email_responded="0"';
     		
             if($db->query($query) && $check != '1'){
     			
@@ -56,24 +56,24 @@ 
                 else{
                     echo 'Thank you for declining';
                 }
-    		}
-    		else {
-    			echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
-    		}
-    	}
+            }
+            else {
+                echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
+            }
+        }
     }
     if($type == 't'){
     	
-    	$event->load_relationship('fp_events_prospects_1'); //get related targets
+        $event->load_relationship('fp_events_prospects_1'); //get related targets
 
-    	if($response == 'accept'){
+        if($response == 'accept'){
             //check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_prospects_1_c WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'"';
-             $check = $db->getOne($check_q);
+                $check = $db->getOne($check_q);
 
-    		//update contact to accepted
-    		$query = 'UPDATE fp_events_prospects_1_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'" AND email_responded="0"';
-    		if($db->query($query) && $check != '1'){
+            //update contact to accepted
+            $query = 'UPDATE fp_events_prospects_1_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'" AND email_responded="0"';
+            if($db->query($query) && $check != '1'){
                 
                 if(!IsNullOrEmptyString($event->accept_redirect)){
                     
@@ -87,14 +87,14 @@ 
             else {
                 echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
             }   
-    	}
-    	else if($response == 'decline'){
+        }
+        else if($response == 'decline'){
             //check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_prospects_1_c WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'"';
-             $check = $db->getOne($check_q);
-    		//update contact to accepted
-    		$query = 'UPDATE fp_events_prospects_1_c SET accept_status="Declined", email_responded="1" WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'" AND email_responded="0"';
-    		if($db->query($query) && $check != '1'){
+                $check = $db->getOne($check_q);
+            //update contact to accepted
+            $query = 'UPDATE fp_events_prospects_1_c SET accept_status="Declined", email_responded="1" WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'" AND email_responded="0"';
+            if($db->query($query) && $check != '1'){
                 
                 if(!IsNullOrEmptyString($event->decline_redirect)){
 
@@ -109,19 +109,19 @@ 
             else {
                 echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
             }
-    	}
+        }
     }
     if($type == 'l'){
     	
-    	$event->load_relationship('fp_events_leads_1'); //get related leads
+        $event->load_relationship('fp_events_leads_1'); //get related leads
 
-    	if($response == 'accept'){
+        if($response == 'accept'){
             //check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_leads_1_c WHERE ffp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'"';
-             $check = $db->getOne($check_q);
-    		//update contact to accepted
-    		$query = 'UPDATE fp_events_leads_1_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'" AND email_responded="0"';
-    		if($db->query($query) && $check != '1'){
+                $check = $db->getOne($check_q);
+            //update contact to accepted
+            $query = 'UPDATE fp_events_leads_1_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'" AND email_responded="0"';
+            if($db->query($query) && $check != '1'){
                 
                 if(!IsNullOrEmptyString($event->accept_redirect)){
                     
@@ -135,15 +135,15 @@ 
             else {
                 echo 'There was a problem with the link please contact the sender of the invite';
             }   
-    	}
-    	else if($response == 'decline'){
-    		//check to see if they have already responded to the email
+        }
+        else if($response == 'decline'){
+            //check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_leads_1_c WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'"';
-             $check = $db->getOne($check_q);
+                $check = $db->getOne($check_q);
             //update contact to accepted
-    		$query = 'UPDATE fp_events_leads_1_c SET accept_status="Declined", email_responded="1" WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'" AND email_responded="0"';
+            $query = 'UPDATE fp_events_leads_1_c SET accept_status="Declined", email_responded="1" WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'" AND email_responded="0"';
 
-    		if($db->query($query) && $check != '1'){
+            if($db->query($query) && $check != '1'){
                 
                 if(!IsNullOrEmptyString($event->decline_redirect)){
 
@@ -158,7 +158,7 @@ 
             else {
                 echo 'There was a problem with the link please contact the sender of the invite';
             }
-    	}
+        }
     }
     // Function for basic field validation (present and neither empty nor only white space nor just 'http://')
     function IsNullOrEmptyString($question){

modules/Meetings/JoinExternalMeeting.php

Indentation +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     }
 }else{
     if(isset($row['id']) || $meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'],'Meetings')){
-      SugarApplication::redirect($meetingBean->join_url);
+        SugarApplication::redirect($meetingBean->join_url);
     }else{
         //if the user is not invited or the owner of the meeting or an admin then they cannot join the meeting.
         $tplFile = 'modules/Meetings/tpls/extMeetingNotInvited.tpl';

modules/Meetings/language/en_us.lang.php

Indentation +84 added lines, -84 removed lines

@@ -47,75 +47,75 @@ 
  ********************************************************************************/
 
 $mod_strings = array (
-	'ERR_DELETE_RECORD' => 'A record number must be specified to delete the meeting.',
+    'ERR_DELETE_RECORD' => 'A record number must be specified to delete the meeting.',
 
-	'LBL_ACCEPT_THIS'=>'Accept?',
-	'LBL_ADD_BUTTON'=> 'Add',
-	'LBL_ADD_INVITEE' => 'Add Invitees',
-	'LBL_COLON' => ':',
-	'LBL_CONTACT_NAME' => 'Contact:',
-	'LBL_CONTACTS_SUBPANEL_TITLE' => 'Contacts',
-	'LBL_CREATED_BY'=>'Created by',
-	'LBL_DATE_END'=>'End Date',
-	'LBL_DATE_TIME' => 'Start Date & Time:',
-	'LBL_DATE' => 'Start Date:',
-	'LBL_DEFAULT_SUBPANEL_TITLE' => 'Meetings',
-	'LBL_DEL'=> 'Del',
-	'LBL_DESCRIPTION_INFORMATION' => 'Description Information',
-	'LBL_DESCRIPTION' => 'Description:',
+    'LBL_ACCEPT_THIS'=>'Accept?',
+    'LBL_ADD_BUTTON'=> 'Add',
+    'LBL_ADD_INVITEE' => 'Add Invitees',
+    'LBL_COLON' => ':',
+    'LBL_CONTACT_NAME' => 'Contact:',
+    'LBL_CONTACTS_SUBPANEL_TITLE' => 'Contacts',
+    'LBL_CREATED_BY'=>'Created by',
+    'LBL_DATE_END'=>'End Date',
+    'LBL_DATE_TIME' => 'Start Date & Time:',
+    'LBL_DATE' => 'Start Date:',
+    'LBL_DEFAULT_SUBPANEL_TITLE' => 'Meetings',
+    'LBL_DEL'=> 'Del',
+    'LBL_DESCRIPTION_INFORMATION' => 'Description Information',
+    'LBL_DESCRIPTION' => 'Description:',
     'LBL_DIRECTION' => 'Direction:',
-	'LBL_DURATION_HOURS' => 'Duration Hours:',
-	'LBL_DURATION_MINUTES' => 'Duration Minutes:',
-	'LBL_DURATION' => 'Duration:',
-	'LBL_EMAIL' => 'Email',
-	'LBL_FIRST_NAME' => 'First Name',
-	'LBL_HISTORY_SUBPANEL_TITLE' => 'Notes',
-	'LBL_HOURS_ABBREV' => 'h',
-	'LBL_HOURS_MINS' => '(hours/minutes)',
-	'LBL_INVITEE' => 'Invitees',
-	'LBL_LAST_NAME' => 'Last Name',
-	'LBL_ASSIGNED_TO_NAME'=>'Assigned to:',
-	'LBL_LIST_ASSIGNED_TO_NAME' => 'Assigned User',
-	'LBL_LIST_CLOSE' => 'Close',
-	'LBL_LIST_CONTACT' => 'Contact',
-	'LBL_LIST_DATE_MODIFIED'=>'Date Modified',
-	'LBL_LIST_DATE' => 'Start Date',
-	'LBL_LIST_DIRECTION' => 'Direction',
-	'LBL_LIST_DUE_DATE'=>'Due Date',
-	'LBL_LIST_FORM_TITLE' => 'Meeting List',
-	'LBL_LIST_MY_MEETINGS' => 'My Meetings',
-	'LBL_LIST_RELATED_TO' => 'Related to',
-	'LBL_LIST_STATUS'=>'Status',
-	'LBL_LIST_SUBJECT' => 'Subject',
-	'LBL_LIST_TIME' => 'Start Time',
-	'LBL_LEADS_SUBPANEL_TITLE' => 'Leads',
-	'LBL_LOCATION' => 'Location:',
-	'LBL_MEETING' => 'Meeting:',
-	'LBL_MINSS_ABBREV' => 'm',
-	'LBL_MODIFIED_BY'=>'Modified by',
-	'LBL_MODULE_NAME' => 'Meetings',
-	'LBL_MODULE_TITLE' => 'Meetings: Home',
-	'LBL_NAME' => 'Name',
-	'LBL_NEW_FORM_TITLE' => 'Create Appointment',
-	'LBL_OUTLOOK_ID' => 'Outlook ID',
-	'LBL_SEQUENCE' => 'Meeting update sequence',
-	'LBL_PHONE' => 'Phone Office:',
-	'LBL_REMINDER_TIME'=>'Reminder Time',
+    'LBL_DURATION_HOURS' => 'Duration Hours:',
+    'LBL_DURATION_MINUTES' => 'Duration Minutes:',
+    'LBL_DURATION' => 'Duration:',
+    'LBL_EMAIL' => 'Email',
+    'LBL_FIRST_NAME' => 'First Name',
+    'LBL_HISTORY_SUBPANEL_TITLE' => 'Notes',
+    'LBL_HOURS_ABBREV' => 'h',
+    'LBL_HOURS_MINS' => '(hours/minutes)',
+    'LBL_INVITEE' => 'Invitees',
+    'LBL_LAST_NAME' => 'Last Name',
+    'LBL_ASSIGNED_TO_NAME'=>'Assigned to:',
+    'LBL_LIST_ASSIGNED_TO_NAME' => 'Assigned User',
+    'LBL_LIST_CLOSE' => 'Close',
+    'LBL_LIST_CONTACT' => 'Contact',
+    'LBL_LIST_DATE_MODIFIED'=>'Date Modified',
+    'LBL_LIST_DATE' => 'Start Date',
+    'LBL_LIST_DIRECTION' => 'Direction',
+    'LBL_LIST_DUE_DATE'=>'Due Date',
+    'LBL_LIST_FORM_TITLE' => 'Meeting List',
+    'LBL_LIST_MY_MEETINGS' => 'My Meetings',
+    'LBL_LIST_RELATED_TO' => 'Related to',
+    'LBL_LIST_STATUS'=>'Status',
+    'LBL_LIST_SUBJECT' => 'Subject',
+    'LBL_LIST_TIME' => 'Start Time',
+    'LBL_LEADS_SUBPANEL_TITLE' => 'Leads',
+    'LBL_LOCATION' => 'Location:',
+    'LBL_MEETING' => 'Meeting:',
+    'LBL_MINSS_ABBREV' => 'm',
+    'LBL_MODIFIED_BY'=>'Modified by',
+    'LBL_MODULE_NAME' => 'Meetings',
+    'LBL_MODULE_TITLE' => 'Meetings: Home',
+    'LBL_NAME' => 'Name',
+    'LBL_NEW_FORM_TITLE' => 'Create Appointment',
+    'LBL_OUTLOOK_ID' => 'Outlook ID',
+    'LBL_SEQUENCE' => 'Meeting update sequence',
+    'LBL_PHONE' => 'Phone Office:',
+    'LBL_REMINDER_TIME'=>'Reminder Time',
     'LBL_EMAIL_REMINDER_SENT' => 'Email reminder sent',
-	'LBL_REMINDER' => 'Reminders:',
-	'LBL_REMINDER_POPUP' => 'Popup',
-	'LBL_REMINDER_EMAIL' => 'Email',
+    'LBL_REMINDER' => 'Reminders:',
+    'LBL_REMINDER_POPUP' => 'Popup',
+    'LBL_REMINDER_EMAIL' => 'Email',
     'LBL_REMINDER_EMAIL_ALL_INVITEES' => 'Email all invitees',
     'LBL_EMAIL_REMINDER' => 'Email Reminder',
     'LBL_EMAIL_REMINDER_TIME' => 'Email Reminder Time',
     'LBL_REMOVE' => 'rem',
-	'LBL_SCHEDULING_FORM_TITLE' => 'Scheduling',
-	'LBL_SEARCH_BUTTON'=> 'Search',
-	'LBL_SEARCH_FORM_TITLE' => 'Meeting Search',
-	'LBL_SEND_BUTTON_KEY'=>'I',
-	'LBL_SEND_BUTTON_LABEL'=>'Save & Send Invites',
-	'LBL_SEND_BUTTON_TITLE'=>'Save & Send Invites',
-	'LBL_STATUS' => 'Status:',
+    'LBL_SCHEDULING_FORM_TITLE' => 'Scheduling',
+    'LBL_SEARCH_BUTTON'=> 'Search',
+    'LBL_SEARCH_FORM_TITLE' => 'Meeting Search',
+    'LBL_SEND_BUTTON_KEY'=>'I',
+    'LBL_SEND_BUTTON_LABEL'=>'Save & Send Invites',
+    'LBL_SEND_BUTTON_TITLE'=>'Save & Send Invites',
+    'LBL_STATUS' => 'Status:',
     'LBL_TYPE' => 'Meeting Type',
     'LBL_PASSWORD' => 'Meeting Password',
     'LBL_URL' => 'Start/Join Meeting',
@@ -123,25 +123,25 @@ 
     'LBL_DISPLAYED_URL' => 'Display URL',
     'LBL_CREATOR' => 'Meeting Creator',
     'LBL_EXTERNALID' => 'External App ID',
-	'LBL_SUBJECT' => 'Subject:',
-	'LBL_TIME' => 'Start Time:',
-	'LBL_USERS_SUBPANEL_TITLE' => 'Users',
-	'LBL_ACTIVITIES_REPORTS' => 'Activities Report',
+    'LBL_SUBJECT' => 'Subject:',
+    'LBL_TIME' => 'Start Time:',
+    'LBL_USERS_SUBPANEL_TITLE' => 'Users',
+    'LBL_ACTIVITIES_REPORTS' => 'Activities Report',
     'LBL_PARENT_TYPE' => 'Parent Type',
     'LBL_PARENT_ID' => 'Parent ID',
-	'LNK_MEETING_LIST'=>'View Meetings',
-	'LNK_NEW_APPOINTMENT' => 'Create Appointment',
-	'LNK_NEW_MEETING'=>'Schedule Meeting',
-	'LNK_IMPORT_MEETINGS' => 'Import Meetings',
+    'LNK_MEETING_LIST'=>'View Meetings',
+    'LNK_NEW_APPOINTMENT' => 'Create Appointment',
+    'LNK_NEW_MEETING'=>'Schedule Meeting',
+    'LNK_IMPORT_MEETINGS' => 'Import Meetings',
 
-	'NTC_REMOVE_INVITEE' => 'Are you sure you want to remove this invitee from the meeting?',
+    'NTC_REMOVE_INVITEE' => 'Are you sure you want to remove this invitee from the meeting?',
     'LBL_CREATED_USER' => 'Created User',
     'LBL_MODIFIED_USER' => 'Modified User',
     'NOTICE_DURATION_TIME' => 'Duration time must be greater than 0',
     'LBL_MEETING_INFORMATION' => 'Overview',
-	'LBL_LIST_JOIN_MEETING' => 'Join Meeting',
-	'LBL_JOIN_EXT_MEETING' => 'Join Meeting',
-	'LBL_HOST_EXT_MEETING' => 'Start Meeting',
+    'LBL_LIST_JOIN_MEETING' => 'Join Meeting',
+    'LBL_JOIN_EXT_MEETING' => 'Join Meeting',
+    'LBL_HOST_EXT_MEETING' => 'Start Meeting',
     'LBL_ACCEPT_STATUS' => 'Accept Status',
     'LBL_ACCEPT_LINK' => 'Accept Link',
     // You are not invited to the meeting messages
@@ -154,7 +154,7 @@ 
     'LBL_EXTNOSTART_HEADER' => 'Error: Cannot Start Meeting',
     'LBL_EXTNOSTART_MAIN' => 'You cannot start this meeting because you are not an Administrator or the owner of the meeting.',
 
-  //For export labels
+    //For export labels
     'LBL_EXPORT_JOIN_URL' => 'Join Url',
     'LBL_EXPORT_HOST_URL' => 'Host Url',
     'LBL_EXPORT_DISPLAYED_URL' => 'Displayed Url',
@@ -190,14 +190,14 @@ 
     'LBL_SYNCED_RECURRING_MSG' => 'This meeting originated in another system and was synced to SuiteCRM. To make changes, go to the original meeting within the other system. Changes made in the other system can be synced to this record.',
     'LBL_RELATED_TO' => 'Related to:',
 
-	// for reminders
-	'LBL_REMINDERS' => 'Reminders',
-	'LBL_REMINDERS_ACTIONS' => 'Actions:',
-	'LBL_REMINDERS_POPUP' => 'Popup',
-	'LBL_REMINDERS_EMAIL' => 'Email invitees',
-	'LBL_REMINDERS_WHEN' => 'When:',
-	'LBL_REMINDERS_REMOVE_REMINDER' => 'Remove reminder',
-	'LBL_REMINDERS_ADD_ALL_INVITEES' => 'Add All Invitees',
-	'LBL_REMINDERS_ADD_REMINDER' => 'Add reminder',
+    // for reminders
+    'LBL_REMINDERS' => 'Reminders',
+    'LBL_REMINDERS_ACTIONS' => 'Actions:',
+    'LBL_REMINDERS_POPUP' => 'Popup',
+    'LBL_REMINDERS_EMAIL' => 'Email invitees',
+    'LBL_REMINDERS_WHEN' => 'When:',
+    'LBL_REMINDERS_REMOVE_REMINDER' => 'Remove reminder',
+    'LBL_REMINDERS_ADD_ALL_INVITEES' => 'Add All Invitees',
+    'LBL_REMINDERS_ADD_REMINDER' => 'Add reminder',
 );
 ?>

modules/Meetings/MeetingsQuickCreate.php

Indentation +59 added lines, -59 removed lines

@@ -54,9 +54,9 @@ 
         parent::process();
 
         $this->ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['meeting_status_dom'], $app_list_strings['meeting_status_default']));
-		$this->ss->assign("CALENDAR_DATEFORMAT", $timedate->get_cal_date_format());
-		$this->ss->assign("TIME_FORMAT", '('. $timedate->get_user_time_format().')');
-		$this->ss->assign("USER_DATEFORMAT", '('. $timedate->get_user_date_format().')');
+        $this->ss->assign("CALENDAR_DATEFORMAT", $timedate->get_cal_date_format());
+        $this->ss->assign("TIME_FORMAT", '('. $timedate->get_user_time_format().')');
+        $this->ss->assign("USER_DATEFORMAT", '('. $timedate->get_user_date_format().')');
 		
 
 
@@ -75,52 +75,52 @@ 
         $this->javascript->setSugarBean($focus);
         $this->javascript->addAllFields('');
 
-		if (is_null($focus->date_start))
-			$focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
-		if (is_null($focus->time_start))
-			$focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
-		if (!isset ($focus->duration_hours))
-			$focus->duration_hours = "1";
+        if (is_null($focus->date_start))
+            $focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
+        if (is_null($focus->time_start))
+            $focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+        if (!isset ($focus->duration_hours))
+            $focus->duration_hours = "1";
 
         
         $date_start_array=explode(" ",trim($focus->date_start));
         if (count($date_start_array)==2) {
-			$focus->time_start = $timedate->to_db_time($date_start_array[1], false);
-        	//$focus->date_start = $date_start_array[0];
+            $focus->time_start = $timedate->to_db_time($date_start_array[1], false);
+            //$focus->date_start = $date_start_array[0];
         }
 
-		$this->ss->assign("DATE_START", $focus->date_start);
-		$this->ss->assign("TIME_START", substr($focus->time_start,0,5));
-		$time_start_hour = intval(substr($focus->time_start, 0, 2));
-		$time_start_minutes = substr($focus->time_start, 3, 5);
+        $this->ss->assign("DATE_START", $focus->date_start);
+        $this->ss->assign("TIME_START", substr($focus->time_start,0,5));
+        $time_start_hour = intval(substr($focus->time_start, 0, 2));
+        $time_start_minutes = substr($focus->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) {
-						$time_start_hour += 1;
-						$time_start_minutes = "00";
-					}
+        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) {
+                        $time_start_hour += 1;
+                        $time_start_minutes = "00";
+                    }
 		
 		
-		// We default the to assume that the time preference is set to 11:00 (i.e. without meridiem)
-		$hours_arr = array ();
-		$num_of_hours = 24;
-		$start_at = 0;
+        // We default the to assume that the time preference is set to 11:00 (i.e. without meridiem)
+        $hours_arr = array ();
+        $num_of_hours = 24;
+        $start_at = 0;
 
-		$time_pref = $timedate->get_time_format();
-		if(strpos($time_pref, 'a') || strpos($time_pref, 'A')) {
-		   $num_of_hours = 13;
-		   $start_at = 1;	
-		} 
+        $time_pref = $timedate->get_time_format();
+        if(strpos($time_pref, 'a') || strpos($time_pref, 'A')) {
+            $num_of_hours = 13;
+            $start_at = 1;	
+        } 
 		
-		/*
+        /*
 		// Seems to be problematic... $time_meridiem is always empty
 		if (empty ($time_meridiem)) {
 			$num_of_hours = 24;
@@ -128,37 +128,37 @@ 
 		}
 		*/
 		
-		for ($i = $start_at; $i < $num_of_hours; $i ++) {
-			$i = $i."";
-			if (strlen($i) == 1) {
-				$i = "0".$i;
-			}
-			$hours_arr[$i] = $i;
-		}
+        for ($i = $start_at; $i < $num_of_hours; $i ++) {
+            $i = $i."";
+            if (strlen($i) == 1) {
+                $i = "0".$i;
+            }
+            $hours_arr[$i] = $i;
+        }
 
         $this->ss->assign("TIME_START_HOUR_OPTIONS", get_select_options_with_id($hours_arr, $time_start_hour));
-		$this->ss->assign("TIME_START_MINUTE_OPTIONS", get_select_options_with_id($focus->minutes_values, $time_start_minutes));
-		$this->ss->assign("DURATION_HOURS", $focus->duration_hours);
-		$this->ss->assign("DURATION_MINUTES_OPTIONS", get_select_options_with_id($focus->minutes_values, $focus->duration_minutes));
+        $this->ss->assign("TIME_START_MINUTE_OPTIONS", get_select_options_with_id($focus->minutes_values, $time_start_minutes));
+        $this->ss->assign("DURATION_HOURS", $focus->duration_hours);
+        $this->ss->assign("DURATION_MINUTES_OPTIONS", get_select_options_with_id($focus->minutes_values, $focus->duration_minutes));
         // Test to see if time format is 11:00am; otherwise it's 11:00AM 
         if($num_of_hours == 13) {    
         		
-		   if (strpos($time_pref, 'a')) {
+            if (strpos($time_pref, 'a')) {
 		   	   
-               if(!isset($focus->meridiem_am_values)) {
-                  $focus->meridiem_am_values = array('am'=>'am', 'pm'=>'pm');
-               } 		
+                if(!isset($focus->meridiem_am_values)) {
+                    $focus->meridiem_am_values = array('am'=>'am', 'pm'=>'pm');
+                } 		
                
-               $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_am_values, $time_start_hour < 12 ? 'am' : 'pm'));
+                $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_am_values, $time_start_hour < 12 ? 'am' : 'pm'));
                
-		   } else {
-		       if(!isset($focus->meridiem_AM_values)) {
-		          $focus->meridiem_AM_values = array('AM'=>'AM', 'PM'=>'PM');
-		       }
+            } else {
+                if(!isset($focus->meridiem_AM_values)) {
+                    $focus->meridiem_AM_values = array('AM'=>'AM', 'PM'=>'PM');
+                }
 		       
-		       $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_AM_values, $time_start_hour < 12 ? 'AM' : 'PM'));
+                $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_AM_values, $time_start_hour < 12 ? 'AM' : 'PM'));
                
-		   } //if-else
+            } //if-else
            
         }
 

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',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

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',
+    ),
     ),
-  ),
 );
 ?>

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 				
+    );
 ?>

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}',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

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',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>