adamjakab / SuiteCRM

modules/Prospects/metadata/quickcreatedefs.php

Indentation +54 added lines, -54 removed lines

@@ -46,121 +46,121 @@
  ********************************************************************************/
 
 $viewdefs = array (
-  'Prospects' => 
-  array (
+    'Prospects' => 
+    array (
     'QuickCreate' => 
     array (
-      'templateMeta' => 
-      array (
+        'templateMeta' => 
+        array (
         'maxColumns' => '2',
         'widths' => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'label' => '10',
             'field' => '30',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'label' => '10',
             'field' => '30',
-          ),
+            ),
         ),
-      ),
-      'panels' => 
-      array (
+        ),
+        'panels' => 
+        array (
         'LBL_PROSPECT_INFORMATION' => 
         array (
-          0 => 
-          array (
             0 => 
             array (
-              'name' => 'first_name',
+            0 => 
+            array (
+                'name' => 'first_name',
             ),
             1 => 
             array (
-              'name' => 'phone_work',
+                'name' => 'phone_work',
             ),
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             0 => 
             array (
-              'name' => 'last_name',
-              'displayParams'=>array('required'=>true)
+                'name' => 'last_name',
+                'displayParams'=>array('required'=>true)
             ),
             1 => 
             array (
-              'name' => 'phone_mobile',
+                'name' => 'phone_mobile',
+            ),
             ),
-          ),
-          2 => 
-          array (
+            2 => 
+            array (
             0 => 
             array (
-              'name' => 'account_name',
+                'name' => 'account_name',
             ),
             1 => 
             array (
-              'name' => 'phone_fax',
+                'name' => 'phone_fax',
+            ),
             ),
-          ),
-          3 => 
-          array (
+            3 => 
+            array (
             0 => 
             array (
-              'name' => 'title',
+                'name' => 'title',
             ),
             1 => 
             array (
-              'name' => 'department',
+                'name' => 'department',
+            ),
             ),
-          ),
-          4 => 
-          array (
+            4 => 
+            array (
             0 => 
             array (
-              'name' => 'team_name',
+                'name' => 'team_name',
             ),
             1 => 
             array (
-              'name' => 'do_not_call',
+                'name' => 'do_not_call',
+            ),
             ),
-          ),
-          5 => 
-          array (
+            5 => 
+            array (
             0 => 
             array (
-              'name' => 'assigned_user_name',
+                'name' => 'assigned_user_name',
+            ),
             ),
-          ),
         ),
         'lbl_email_addresses' => 
         array (
-          0 => 
-          array (
             0 => 
             array (
-              'name' => 'email1',
+            0 => 
+            array (
+                'name' => 'email1',
+            ),
             ),
-          ),
         ),
         'LBL_ADDRESS_INFORMATION' => 
         array (
-          0 => 
-          array (
             0 => 
             array (
-              'name' => 'primary_address_street',
+            0 => 
+            array (
+                'name' => 'primary_address_street',
             ),
             1 => 
             array (
-              'name' => 'alt_address_street',
+                'name' => 'alt_address_street',
+            ),
             ),
-          ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

modules/Prospects/metadata/listviewdefs.php

Indentation +10 added lines, -10 removed lines

@@ -42,10 +42,10 @@ 
 
 
 $listViewDefs['Prospects'] = array(
-	'FULL_NAME' => array(
-		'width' => '20', 
-		'label' => 'LBL_LIST_NAME', 
-		'link' => true,
+    'FULL_NAME' => array(
+        'width' => '20', 
+        'label' => 'LBL_LIST_NAME', 
+        'link' => true,
         'related_fields' => array('first_name', 'last_name'),
         'orderBy' => 'last_name',
         'default' => true),
@@ -65,11 +65,11 @@ 
         'label' => 'LBL_LIST_PHONE', 
         'link' => false,
         'default' => true), 
-	'DATE_ENTERED' => array (
-	    'type' => 'datetime',
-	    'label' => 'LBL_DATE_ENTERED',
-	    'width' => '10',
-	    'default' => true,
-	  ),  
+    'DATE_ENTERED' => array (
+        'type' => 'datetime',
+        'label' => 'LBL_DATE_ENTERED',
+        'width' => '10',
+        'default' => true,
+        ),  
 );
 ?>

modules/Reminders/Reminder.php

Indentation +522 added lines, -522 removed lines

@@ -43,7 +43,7 @@ 
  */
 class Reminder extends Basic {
 
-	const UPGRADE_VERSION = '7.4.3';
+    const UPGRADE_VERSION = '7.4.3';
 
     var $name;
 
@@ -51,19 +51,19 @@ 
     var $module_dir = 'Reminders';
     var $object_name = 'Reminder';
     var $table_name = 'reminders';
-	var $tracker_visibility = false;
+    var $tracker_visibility = false;
     var $importable = false;
     var $disable_row_level_security = true;
 
     var $popup;
     var $email;
     var $email_sent = false;
-	var $timer_popup;
-	var $timer_email;
-	var $related_event_module;
-	var $related_event_module_id;
+    var $timer_popup;
+    var $timer_email;
+    var $related_event_module;
+    var $related_event_module_id;
 
-	private static $remindersData = array();
+    private static $remindersData = array();
 
     public function __construct() {
         parent::Basic();
@@ -76,17 +76,17 @@ 
         return false;
     }
 
-	// ---- save and load remainders on EditViews
+    // ---- save and load remainders on EditViews
 	
-	/**
-	 * Save multiple reminders data from clients Meetings/Calls EditView.
-	 * Call this static function in save action.
-	 * 
-	 * @param string $eventModule Event Bean module name (e.g. Meetings, Calls)
-	 * @param string $eventModuleId Event Bean GUID
-	 * @param string $remindersDataJson Remainders data as Json string from POST data.
-	 * @throws Exception throw an Exception if json format is invalid.
-	 */
+    /**
+     * Save multiple reminders data from clients Meetings/Calls EditView.
+     * Call this static function in save action.
+     * 
+     * @param string $eventModule Event Bean module name (e.g. Meetings, Calls)
+     * @param string $eventModuleId Event Bean GUID
+     * @param string $remindersDataJson Remainders data as Json string from POST data.
+     * @throws Exception throw an Exception if json format is invalid.
+     */
     public static function saveRemindersDataJson($eventModule, $eventModuleId, $remindersDataJson) {
         $reminderData = json_decode($remindersDataJson);
         if(!json_last_error()) {
@@ -100,7 +100,7 @@ 
     private static function saveRemindersData($eventModule, $eventModuleId, $remindersData) {
         $savedReminderIds = array();
         foreach($remindersData as $reminderData) {
-			if(isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $reminderData->id = '';
+            if(isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $reminderData->id = '';
             $reminderBean = BeanFactory::getBean('Reminders', $reminderData->id);
             $reminderBean->popup = $reminderData->popup;
             $reminderBean->email = $reminderData->email;
@@ -123,18 +123,18 @@ 
                 }
             }
         }
-		unset(self::$remindersData[$eventModule][$eventModuleId]);
+        unset(self::$remindersData[$eventModule][$eventModuleId]);
     }
 
-	/**
-	 * Load multiple reminders JSON data for related Event module EditViews.
-	 * Call this function in module display function.
-	 * 
-	 * @param string $eventModule Related event module name (Meetings/Calls)
-	 * @param string $eventModuleId Related event GUID
-	 * @return string JSON string contains the remainders
-	 * @throws Exception
-	 */
+    /**
+     * Load multiple reminders JSON data for related Event module EditViews.
+     * Call this function in module display function.
+     * 
+     * @param string $eventModule Related event module name (Meetings/Calls)
+     * @param string $eventModuleId Related event GUID
+     * @return string JSON string contains the remainders
+     * @throws Exception
+     */
     public static function loadRemindersDataJson($eventModule, $eventModuleId, $isDuplicate = false) {
         $remindersData = self::loadRemindersData($eventModule, $eventModuleId, $isDuplicate);
         $remindersDataJson = json_encode($remindersData);
@@ -144,551 +144,551 @@ 
         return $remindersDataJson;
     }
 
-	/**
-	 * Load multiple reminders data for related Event module EditViews.
-	 * Call this function in module display function.
-	 *
-	 * @param string $eventModule Related event module name (Meetings/Calls)
-	 * @param string $eventModuleId Related event GUID
-	 * @return array contains the remainders
-	 * @throws Exception
-	 */
-	public static function loadRemindersData($eventModule, $eventModuleId, $isDuplicate = false) {
-		if(!isset(self::$remindersData[$eventModule][$eventModuleId]) || !$eventModuleId || $isDuplicate) {
-			$ret = array();
-			$reminders = BeanFactory::getBean('Reminders')->get_full_list("reminders.date_entered", "reminders.related_event_module = '$eventModule' AND reminders.related_event_module_id = '$eventModuleId'");
-			if ($reminders) {
-				foreach ($reminders as $reminder) {
-					$ret[] = array(
-							'id' => $isDuplicate ? null : $reminder->id,
-							'popup' => $reminder->popup,
-							'email' => $reminder->email,
-							'timer_popup' => $reminder->timer_popup,
-							'timer_email' => $reminder->timer_email,
-							'invitees' => Reminder_Invitee::loadRemindersInviteesData($reminder->id, $isDuplicate),
-					);
-				}
-			}
-			self::$remindersData[$eventModule][$eventModuleId] = $ret;
-		}
-		return self::$remindersData[$eventModule][$eventModuleId];
-	}
+    /**
+     * Load multiple reminders data for related Event module EditViews.
+     * Call this function in module display function.
+     *
+     * @param string $eventModule Related event module name (Meetings/Calls)
+     * @param string $eventModuleId Related event GUID
+     * @return array contains the remainders
+     * @throws Exception
+     */
+    public static function loadRemindersData($eventModule, $eventModuleId, $isDuplicate = false) {
+        if(!isset(self::$remindersData[$eventModule][$eventModuleId]) || !$eventModuleId || $isDuplicate) {
+            $ret = array();
+            $reminders = BeanFactory::getBean('Reminders')->get_full_list("reminders.date_entered", "reminders.related_event_module = '$eventModule' AND reminders.related_event_module_id = '$eventModuleId'");
+            if ($reminders) {
+                foreach ($reminders as $reminder) {
+                    $ret[] = array(
+                            'id' => $isDuplicate ? null : $reminder->id,
+                            'popup' => $reminder->popup,
+                            'email' => $reminder->email,
+                            'timer_popup' => $reminder->timer_popup,
+                            'timer_email' => $reminder->timer_email,
+                            'invitees' => Reminder_Invitee::loadRemindersInviteesData($reminder->id, $isDuplicate),
+                    );
+                }
+            }
+            self::$remindersData[$eventModule][$eventModuleId] = $ret;
+        }
+        return self::$remindersData[$eventModule][$eventModuleId];
+    }
 	
-	// ---- sending email reminders
+    // ---- sending email reminders
 	
-	/**
-	 * Sending multiple email reminders. 
-	 * Call in EmainReminder and use original EmailRemainder class for sending.
-	 * 
-	 * @param EmailReminder $emailReminder Caller EmailReminder
-	 * @param Administration $admin Administration module for EmailRemainder->sendReminders() function
-	 * @param boolean $checkDecline (optional) Send email if user accept status is not decline. Default is TRUE.
-	 */
-	public static function sendEmailReminders(EmailReminder $emailReminder, Administration $admin, $checkDecline = true) {
+    /**
+     * Sending multiple email reminders. 
+     * Call in EmainReminder and use original EmailRemainder class for sending.
+     * 
+     * @param EmailReminder $emailReminder Caller EmailReminder
+     * @param Administration $admin Administration module for EmailRemainder->sendReminders() function
+     * @param boolean $checkDecline (optional) Send email if user accept status is not decline. Default is TRUE.
+     */
+    public static function sendEmailReminders(EmailReminder $emailReminder, Administration $admin, $checkDecline = true) {
         if($reminders = self::getUnsentEmailReminders()) {
             foreach($reminders as $reminderId => $reminder) {
-				$recipients = self::getEmailReminderInviteesRecipients($reminderId, $checkDecline);
-				$eventBean = BeanFactory::getBean($reminder->related_event_module, $reminder->related_event_module_id);
-				if ( $emailReminder->sendReminders($eventBean, $admin, $recipients) ) {
-					$reminder->email_sent = 1;
-					$reminder->save();
-				}
+                $recipients = self::getEmailReminderInviteesRecipients($reminderId, $checkDecline);
+                $eventBean = BeanFactory::getBean($reminder->related_event_module, $reminder->related_event_module_id);
+                if ( $emailReminder->sendReminders($eventBean, $admin, $recipients) ) {
+                    $reminder->email_sent = 1;
+                    $reminder->save();
+                }
             }
         }
     }
 	
-	private static function getEmailReminderInviteesRecipients($reminderId, $checkDecline = true) {
-		$emails = array();
-		$reminder = BeanFactory::getBean('Reminders', $reminderId);
-		$eventModule = $reminder->related_event_module;
-		$eventModuleId = $reminder->related_event_module_id;		
-		$event = BeanFactory::getBean($eventModule, $eventModuleId);
-		if(!isset($event->status) || $event->status != 'Held') {
-			$invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', "reminders_invitees.reminder_id = '$reminderId'");
-			foreach($invitees as $invitee) {
-				$inviteeModule = $invitee->related_invitee_module;
-				$inviteeModuleId = $invitee->related_invitee_module_id;
-				$personBean = BeanFactory::getBean($inviteeModule, $inviteeModuleId);
-				// The original email reminders check the accept_status field in related users/leads/contacts etc. and filtered these users who not decline this event.
-				if($checkDecline && !self::isDecline($event, $personBean)) {
-					if ( !empty($personBean->email1) ) {
-						$arr = array(
-							'type' => $inviteeModule,
-							'name' => $personBean->full_name,
-							'email' => $personBean->email1,
-						);
-						$emails[] = $arr;
-					}
-				}
-			}
-		}
-		return $emails;
-	}	
+    private static function getEmailReminderInviteesRecipients($reminderId, $checkDecline = true) {
+        $emails = array();
+        $reminder = BeanFactory::getBean('Reminders', $reminderId);
+        $eventModule = $reminder->related_event_module;
+        $eventModuleId = $reminder->related_event_module_id;		
+        $event = BeanFactory::getBean($eventModule, $eventModuleId);
+        if(!isset($event->status) || $event->status != 'Held') {
+            $invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', "reminders_invitees.reminder_id = '$reminderId'");
+            foreach($invitees as $invitee) {
+                $inviteeModule = $invitee->related_invitee_module;
+                $inviteeModuleId = $invitee->related_invitee_module_id;
+                $personBean = BeanFactory::getBean($inviteeModule, $inviteeModuleId);
+                // The original email reminders check the accept_status field in related users/leads/contacts etc. and filtered these users who not decline this event.
+                if($checkDecline && !self::isDecline($event, $personBean)) {
+                    if ( !empty($personBean->email1) ) {
+                        $arr = array(
+                            'type' => $inviteeModule,
+                            'name' => $personBean->full_name,
+                            'email' => $personBean->email1,
+                        );
+                        $emails[] = $arr;
+                    }
+                }
+            }
+        }
+        return $emails;
+    }	
 
     private static function getUnsentEmailReminders() {
         global $db;
-		$reminders = array();
-		$reminderBeans = BeanFactory::getBean('Reminders')->get_full_list('', "reminders.email = 1 AND reminders.email_sent = 0");
-		foreach($reminderBeans as $reminderBean) {
-			$eventBean = BeanFactory::getBean($reminderBean->related_event_module, $reminderBean->related_event_module_id);
-			$dateStart = $eventBean->date_start;
-			$time = strtotime($db->fromConvert($dateStart,'datetime'));
-			$dateStart = date(TimeDate::DB_DATETIME_FORMAT, $time);
-			$remind_ts = $GLOBALS['timedate']->fromDb($db->fromConvert($dateStart,'datetime'))->modify("-{$reminderBean->timer_email} seconds")->ts;
+        $reminders = array();
+        $reminderBeans = BeanFactory::getBean('Reminders')->get_full_list('', "reminders.email = 1 AND reminders.email_sent = 0");
+        foreach($reminderBeans as $reminderBean) {
+            $eventBean = BeanFactory::getBean($reminderBean->related_event_module, $reminderBean->related_event_module_id);
+            $dateStart = $eventBean->date_start;
+            $time = strtotime($db->fromConvert($dateStart,'datetime'));
+            $dateStart = date(TimeDate::DB_DATETIME_FORMAT, $time);
+            $remind_ts = $GLOBALS['timedate']->fromDb($db->fromConvert($dateStart,'datetime'))->modify("-{$reminderBean->timer_email} seconds")->ts;
             $now_ts = $GLOBALS['timedate']->getNow()->ts;
             if ( $now_ts >= $remind_ts ) {
                 $reminders[$reminderBean->id] = $reminderBean;
             }
-		}
+        }
         return $reminders;
     }
 	
-	// ---- popup and alert reminders
+    // ---- popup and alert reminders
 	
-	/**
-	 * Show a popup and/or desktop notification alert for related users with related Event information.
-	 * Call in jsAlerts class and use original jsAlerts for show notifications.
-	 * 
-	 * @global ??? $current_user
-	 * @global ??? $timedate
-	 * @global ??? $app_list_strings
-	 * @global ??? $db
-	 * @global ??? $sugar_config
-	 * @global ??? $app_strings
-	 * @param jsAlerts $alert caller jsAlerts object
-	 * @param boolean $checkDecline (optional) Send email if user accept status is not decline. Default is TRUE.
-	 * @return ???
-	 */
-	public static function addNotifications(jsAlerts $alert, $checkDecline = true) {
-		global $current_user, $timedate, $app_list_strings, $db, $sugar_config, $app_strings;
-
-		if (empty($current_user->id)) {
+    /**
+     * Show a popup and/or desktop notification alert for related users with related Event information.
+     * Call in jsAlerts class and use original jsAlerts for show notifications.
+     * 
+     * @global ??? $current_user
+     * @global ??? $timedate
+     * @global ??? $app_list_strings
+     * @global ??? $db
+     * @global ??? $sugar_config
+     * @global ??? $app_strings
+     * @param jsAlerts $alert caller jsAlerts object
+     * @param boolean $checkDecline (optional) Send email if user accept status is not decline. Default is TRUE.
+     * @return ???
+     */
+    public static function addNotifications(jsAlerts $alert, $checkDecline = true) {
+        global $current_user, $timedate, $app_list_strings, $db, $sugar_config, $app_strings;
+
+        if (empty($current_user->id)) {
             return;
-		}
+        }
 		
-		//Create separate variable to hold timedate value
+        //Create separate variable to hold timedate value
         $alertDateTimeNow = $timedate->nowDb();
 
-		// cn: get a boundary limiter
-		$dateTimeMax = $timedate->getNow()->modify("+{$app_list_strings['reminder_max_time']} seconds")->asDb();
-		$dateTimeNow = $timedate->nowDb();
+        // cn: get a boundary limiter
+        $dateTimeMax = $timedate->getNow()->modify("+{$app_list_strings['reminder_max_time']} seconds")->asDb();
+        $dateTimeNow = $timedate->nowDb();
 
-		$dateTimeNow = $db->convert($db->quoted($dateTimeNow), 'datetime');
-		$dateTimeMax = $db->convert($db->quoted($dateTimeMax), 'datetime');
+        $dateTimeNow = $db->convert($db->quoted($dateTimeNow), 'datetime');
+        $dateTimeMax = $db->convert($db->quoted($dateTimeMax), 'datetime');
 		
-		// Original jsAlert used to a meeting integration.
+        // Original jsAlert used to a meeting integration.
 		
-		///////////////////////////////////////////////////////////////////////
-		////	MEETING INTEGRATION
-		$meetingIntegration = null;
-		if(isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
-			if(!class_exists($sugar_config['meeting_integration'])) {
-				require_once("modules/{$sugar_config['meeting_integration']}/{$sugar_config['meeting_integration']}.php");
-			}
-			$meetingIntegration = new $sugar_config['meeting_integration']();
-		}
-		////	END MEETING INTEGRATION
-		///////////////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////////////////////////////////
+        ////	MEETING INTEGRATION
+        $meetingIntegration = null;
+        if(isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
+            if(!class_exists($sugar_config['meeting_integration'])) {
+                require_once("modules/{$sugar_config['meeting_integration']}/{$sugar_config['meeting_integration']}.php");
+            }
+            $meetingIntegration = new $sugar_config['meeting_integration']();
+        }
+        ////	END MEETING INTEGRATION
+        ///////////////////////////////////////////////////////////////////////
 		
-		$popupReminders = BeanFactory::getBean('Reminders')->get_full_list('', "reminders.popup = 1");
-
-		if($popupReminders) {
-			foreach($popupReminders as $popupReminder) {
-				$relatedEvent = BeanFactory::getBean($popupReminder->related_event_module, $popupReminder->related_event_module_id);
-				if( $relatedEvent &&
-					(!isset($relatedEvent->status) || $relatedEvent->status == 'Planned') &&
-					(!isset($relatedEvent->date_start) || (strtotime($relatedEvent->date_start) >= strtotime(self::unQuoteTime($dateTimeNow)) && strtotime($relatedEvent->date_start) <= strtotime(self::unQuoteTime($dateTimeMax))) ) &&
-					(!$checkDecline || ($checkDecline && !self::isDecline($relatedEvent, BeanFactory::getBean('Users', $current_user->id))))
-				) {
-					// The original popup/alert reminders check the accept_status field in related users/leads/contacts etc. and filtered these users who not decline this event.
-					$invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', "reminders_invitees.reminder_id = '{$popupReminder->id}' AND reminders_invitees.related_invitee_module_id = '{$current_user->id}'");
-					if($invitees) {
-						foreach($invitees as $invitee) {
-							// need to concatenate since GMT times can bridge two local days
-							$timeStart = strtotime($db->fromConvert(isset($relatedEvent->date_start) ? $relatedEvent->date_start : date(TimeDate::DB_DATETIME_FORMAT), 'datetime'));
-							$timeRemind = $popupReminder->timer_popup;
-							$timeStart -= $timeRemind;
-
-							$url = 'index.php?action=DetailView&module=' . $popupReminder->related_event_module . '&record=' . $popupReminder->related_event_module_id;
-							$instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
-
-							if($popupReminder->related_event_module == 'Meetings') {
-								///////////////////////////////////////////////////////////////////
-								////	MEETING INTEGRATION
-								if(!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($popupReminder->related_event_module_id)) {
-									$url = $meetingIntegration->miUrlGetJsAlert((array) $popupReminder);
-									$instructions = $meetingIntegration->miGetJsAlertInstructions();
-								}
-								////	END MEETING INTEGRATION
-								///////////////////////////////////////////////////////////////////								
-							}
+        $popupReminders = BeanFactory::getBean('Reminders')->get_full_list('', "reminders.popup = 1");
+
+        if($popupReminders) {
+            foreach($popupReminders as $popupReminder) {
+                $relatedEvent = BeanFactory::getBean($popupReminder->related_event_module, $popupReminder->related_event_module_id);
+                if( $relatedEvent &&
+                    (!isset($relatedEvent->status) || $relatedEvent->status == 'Planned') &&
+                    (!isset($relatedEvent->date_start) || (strtotime($relatedEvent->date_start) >= strtotime(self::unQuoteTime($dateTimeNow)) && strtotime($relatedEvent->date_start) <= strtotime(self::unQuoteTime($dateTimeMax))) ) &&
+                    (!$checkDecline || ($checkDecline && !self::isDecline($relatedEvent, BeanFactory::getBean('Users', $current_user->id))))
+                ) {
+                    // The original popup/alert reminders check the accept_status field in related users/leads/contacts etc. and filtered these users who not decline this event.
+                    $invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', "reminders_invitees.reminder_id = '{$popupReminder->id}' AND reminders_invitees.related_invitee_module_id = '{$current_user->id}'");
+                    if($invitees) {
+                        foreach($invitees as $invitee) {
+                            // need to concatenate since GMT times can bridge two local days
+                            $timeStart = strtotime($db->fromConvert(isset($relatedEvent->date_start) ? $relatedEvent->date_start : date(TimeDate::DB_DATETIME_FORMAT), 'datetime'));
+                            $timeRemind = $popupReminder->timer_popup;
+                            $timeStart -= $timeRemind;
+
+                            $url = 'index.php?action=DetailView&module=' . $popupReminder->related_event_module . '&record=' . $popupReminder->related_event_module_id;
+                            $instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
+
+                            if($popupReminder->related_event_module == 'Meetings') {
+                                ///////////////////////////////////////////////////////////////////
+                                ////	MEETING INTEGRATION
+                                if(!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($popupReminder->related_event_module_id)) {
+                                    $url = $meetingIntegration->miUrlGetJsAlert((array) $popupReminder);
+                                    $instructions = $meetingIntegration->miGetJsAlertInstructions();
+                                }
+                                ////	END MEETING INTEGRATION
+                                ///////////////////////////////////////////////////////////////////								
+                            }
 							
-							$meetingName = from_html(isset($relatedEvent->name) ? $relatedEvent->name : $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_EVENT_NAME']);
-							$desc1 = from_html(isset($relatedEvent->description) ? $relatedEvent->description : $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_DESCRIPTION']);
-							$location = from_html(isset($relatedEvent->location) ? $relatedEvent->location : $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_LOCATION']);
+                            $meetingName = from_html(isset($relatedEvent->name) ? $relatedEvent->name : $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_EVENT_NAME']);
+                            $desc1 = from_html(isset($relatedEvent->description) ? $relatedEvent->description : $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_DESCRIPTION']);
+                            $location = from_html(isset($relatedEvent->location) ? $relatedEvent->location : $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_LOCATION']);
 							
-							$relatedToMeeting = $alert->getRelatedName($popupReminder->related_event_module, $popupReminder->related_event_module_id);
+                            $relatedToMeeting = $alert->getRelatedName($popupReminder->related_event_module, $popupReminder->related_event_module_id);
 							
-							$description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
-							$description = $description  ."\n" .$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . (isset($relatedEvent->status) ? $relatedEvent->status : '') ."\n". $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO']. $relatedToMeeting;
-
-
-							if(isset($relatedEvent->date_start)) {
-								$time_dbFromConvert = $db->fromConvert($relatedEvent->date_start, 'datetime');
-								$time = $timedate->to_display_date_time($time_dbFromConvert);
-								if(!$time) {
-									$time = $relatedEvent->date_start;
-								}
-								if(!$time) {
-									$time = $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE'];
-								}
-							}
-							else {
-								$time = $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE'];
-							}
-
-							// standard functionality
-							$alert->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING'], $meetingName,
-								$app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$time,
-								$app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'].$location.
-								$description.
-								$instructions,
-								$timeStart - strtotime($alertDateTimeNow),
-								$url
-							);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private static function unQuoteTime($timestr) {
-		$ret = '';
-		for($i=0; $i<strlen($timestr); $i++) {
-			if($timestr[$i]!="'") $ret .= $timestr[$i];
-		}
-		return $ret;
-	}
+                            $description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
+                            $description = $description  ."\n" .$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . (isset($relatedEvent->status) ? $relatedEvent->status : '') ."\n". $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO']. $relatedToMeeting;
+
+
+                            if(isset($relatedEvent->date_start)) {
+                                $time_dbFromConvert = $db->fromConvert($relatedEvent->date_start, 'datetime');
+                                $time = $timedate->to_display_date_time($time_dbFromConvert);
+                                if(!$time) {
+                                    $time = $relatedEvent->date_start;
+                                }
+                                if(!$time) {
+                                    $time = $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE'];
+                                }
+                            }
+                            else {
+                                $time = $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE'];
+                            }
+
+                            // standard functionality
+                            $alert->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING'], $meetingName,
+                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$time,
+                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'].$location.
+                                $description.
+                                $instructions,
+                                $timeStart - strtotime($alertDateTimeNow),
+                                $url
+                            );
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private static function unQuoteTime($timestr) {
+        $ret = '';
+        for($i=0; $i<strlen($timestr); $i++) {
+            if($timestr[$i]!="'") $ret .= $timestr[$i];
+        }
+        return $ret;
+    }
 	
-	// --- test for accept status decline is?
+    // --- test for accept status decline is?
 	
-	private static function isDecline(SugarBean $event, SugarBean $person) {
-		return self::testEventPersonAcceptStatus($event, $person, 'decline');
-	}
+    private static function isDecline(SugarBean $event, SugarBean $person) {
+        return self::testEventPersonAcceptStatus($event, $person, 'decline');
+    }
 	
-	private static function testEventPersonAcceptStatus(SugarBean $event, SugarBean $person, $acceptStatus = 'decline') {
-		if($acceptStats = self::getEventPersonAcceptStatus($event, $person)) {
-			$acceptStatusLower = strtolower($acceptStatus);
-			foreach((array) $acceptStats as $acceptStat) {
-				if(strtolower($acceptStat) == $acceptStatusLower) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
+    private static function testEventPersonAcceptStatus(SugarBean $event, SugarBean $person, $acceptStatus = 'decline') {
+        if($acceptStats = self::getEventPersonAcceptStatus($event, $person)) {
+            $acceptStatusLower = strtolower($acceptStatus);
+            foreach((array) $acceptStats as $acceptStat) {
+                if(strtolower($acceptStat) == $acceptStatusLower) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 	
-	private static function getEventPersonAcceptStatus(SugarBean $event, SugarBean $person) {
-		global $db;
-		$rel_person_table_Key = "rel_{$person->table_name}_table";
-		$rel_person_table_Value = "{$event->table_name}_{$person->table_name}";
-		if(isset($event->$rel_person_table_Key) && $event->$rel_person_table_Key == $rel_person_table_Value) {
-			$query = self::getEventPersonQuery($event, $person);
-			$re = $db->query($query);
-			$ret = array();
-			while($row = $db->fetchByAssoc($re) ) {
-				if(!isset($row['accept_status'])) {
-					return null;
-				}
-				$ret[] = $row['accept_status'];
-			}
-			return $ret;
-		}
-		return null;
-	}
-
-	private function upgradeEventPersonQuery(SugarBean $event, $person_table) {
-		$eventIdField = strtolower($event->object_name).'_id';
-		$query = "
+    private static function getEventPersonAcceptStatus(SugarBean $event, SugarBean $person) {
+        global $db;
+        $rel_person_table_Key = "rel_{$person->table_name}_table";
+        $rel_person_table_Value = "{$event->table_name}_{$person->table_name}";
+        if(isset($event->$rel_person_table_Key) && $event->$rel_person_table_Key == $rel_person_table_Value) {
+            $query = self::getEventPersonQuery($event, $person);
+            $re = $db->query($query);
+            $ret = array();
+            while($row = $db->fetchByAssoc($re) ) {
+                if(!isset($row['accept_status'])) {
+                    return null;
+                }
+                $ret[] = $row['accept_status'];
+            }
+            return $ret;
+        }
+        return null;
+    }
+
+    private function upgradeEventPersonQuery(SugarBean $event, $person_table) {
+        $eventIdField = strtolower($event->object_name).'_id';
+        $query = "
 			SELECT * FROM {$event->table_name}_{$person_table}
 			WHERE
 				{$eventIdField} = '{$event->id}' AND
 				deleted = 0
 		";
-		return $query;
-	}
-
-	private static function getEventPersonQuery(SugarBean $event, SugarBean $person) {
-		$eventIdField = array_search($event->table_name, $event->relationship_fields);
-		if(!$eventIdField) {
-			$eventIdField = strtolower($event->object_name . '_id');
-		}
-		$personIdField = strtolower($person->object_name) . '_id';
-		$query = "
+        return $query;
+    }
+
+    private static function getEventPersonQuery(SugarBean $event, SugarBean $person) {
+        $eventIdField = array_search($event->table_name, $event->relationship_fields);
+        if(!$eventIdField) {
+            $eventIdField = strtolower($event->object_name . '_id');
+        }
+        $personIdField = strtolower($person->object_name) . '_id';
+        $query = "
 			SELECT * FROM {$event->table_name}_{$person->table_name}
 			WHERE
 				{$eventIdField} = '{$event->id}' AND
 				{$personIdField} = '{$person->id}' AND
 				deleted = 0
 		";
-		return $query;
-	}
+        return $query;
+    }
 	
-	// --- user preferences as default values in reminders
-
-	/**
-	 * Default values for Reminders from User Preferences
-	 * @return string JSON encoded default values
-	 * @throws Exception on json_encode error
-	 */
-	public static function loadRemindersDefaultValuesDataJson() {
-		$ret = json_encode(self::loadRemindersDefaultValuesData());
-		if(!$ret && json_last_error()) {
+    // --- user preferences as default values in reminders
+
+    /**
+     * Default values for Reminders from User Preferences
+     * @return string JSON encoded default values
+     * @throws Exception on json_encode error
+     */
+    public static function loadRemindersDefaultValuesDataJson() {
+        $ret = json_encode(self::loadRemindersDefaultValuesData());
+        if(!$ret && json_last_error()) {
             throw new Exception(json_last_error_msg());
         }
-		return $ret;
-	}
+        return $ret;
+    }
 
-	/**
-	 * Default values for Reminders from User Preferences
-	 * @return array default values
-	 */
-	public static function loadRemindersDefaultValuesData() {
-		global $current_user;
-
-		$preferencePopupReminderTime = $current_user->getPreference('reminder_time');
-		$preferenceEmailReminderTime = $current_user->getPreference('email_reminder_time');
-		$preferencePopupReminderChecked = $current_user->getPreference('reminder_checked');
-		$preferenceEmailReminderChecked = $current_user->getPreference('email_reminder_checked');
-
-		return array(
-			'popup' => $preferencePopupReminderChecked,
-			'email' => $preferenceEmailReminderChecked,
-			'timer_popup' => $preferencePopupReminderTime,
-			'timer_email' => $preferenceEmailReminderTime,
-		);
-	}
-
-	// --- upgrade
-
-	/**
-	 * Reminders upgrade, old reminders migrate to multiple-reminders.
-	 * @throws Exception unknown event type or any error
-	 */
-	public static function upgrade() {
-		self::upgradeUserPreferences();
-		self::upgradeEventReminders('Calls');
-		self::upgradeEventReminders('Meetings');
-		self::upgradeRestoreReminders();
-	}
-
-	private static function upgradeRestoreReminders() {
-		if($reminders = BeanFactory::getBean('Reminders')->get_full_list('', 'reminders.deleted = 1')) {
-			foreach($reminders as $reminder) {
-				$reminder->deleted = 0;
-				$reminder->save();
-			}
-		}
-		if($reminderInvitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', 'reminders_invitees.deleted = 1')) {
-			foreach($reminderInvitees as $invitee) {
-				$invitee->deleted = 0;
-				$invitee->save();
-			}
-		}
-		global $db;
-		$q = "UPDATE reminders SET deleted = 0";
-		$db->query($q);
-		$q = "UPDATE reminders_invitees SET deleted = 0";
-		$db->query($q);
-	}
-
-	private static function upgradeUserPreferences() {
-		$users = User::getActiveUsers();
-		foreach($users as $user_id => $user_name) {
-			$user = new User();
-			$user->retrieve($user_id);
-
-			$preferencePopupReminderTime = $user->getPreference('reminder_time');
-			$preferenceEmailReminderTime = $user->getPreference('email_reminder_time');
-
-			$preferencePopupReminderChecked = $preferencePopupReminderTime > -1;
-			$preferenceEmailReminderChecked = $preferenceEmailReminderTime > -1;
-			$user->setPreference('reminder_checked', $preferencePopupReminderChecked);
-			$user->setPreference('email_reminder_checked', $preferenceEmailReminderChecked);
-
-		}
-	}
-
-	/**
-	 * @param string $eventModule 'Calls' or 'Meetings'
-	 */
-	private static function upgradeEventReminders($eventModule) {
-
-		$eventBean = BeanFactory::getBean($eventModule);
-		$events = BeanFactory::getBean($eventModule)->get_full_list('', "{$eventBean->table_name}.date_start >  '2015-11-01 00:00:00' AND ({$eventBean->table_name}.reminder_time != -1 OR ({$eventBean->table_name}.email_reminder_time != -1 AND {$eventBean->table_name}.email_reminder_sent != 1))");
-		if ($events) {
-			foreach ($events as $event) {
-
-				$oldReminderPopupChecked = false;
-				$oldReminderPopupTimer = null;
-				if ($event->reminder_time != -1) {
-					$oldReminderPopupChecked = true;
-					$oldReminderPopupTimer = $event->reminder_time;
-				}
-
-				$oldReminderEmailChecked = false;
-				$oldReminderEmailTimer = null;
-				if ($event->email_reminder_time != -1) {
-					$oldReminderEmailChecked = true;
-					$oldReminderEmailTimer = $event->email_reminder_time;
-				}
-
-				$oldReminderEmailSent = $event->email_reminder_sent;
-
-				if( ($oldInvitees = self::getOldEventInvitees($event)) && ($event->reminder_time != -1 || ($event->email_reminder_time != -1 && $event->email_reminder_sent != 1)) ) {
-
-					self::migrateReminder(
-							$eventModule,
-							$event->id,
-							$oldReminderPopupChecked,
-							$oldReminderPopupTimer,
-							$oldReminderEmailChecked,
-							$oldReminderEmailTimer,
-							$oldReminderEmailSent,
-							$oldInvitees
-					);
-
-				}
-			}
-		}
-
-	}
-
-
-	private static function getOldEventInvitees(SugarBean $event) {
-		global $db;
-		$ret = array();
-		$persons = array('users','contacts','leads');
-		foreach($persons as $person){
-			$query = self::upgradeEventPersonQuery($event, $person);
-			$re = $db->query($query);
-			while($row = $db->fetchByAssoc($re) ) {
-				$ret[] = $row;
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * @param string	$eventModule 'Calls' or 'Meetings'
-	 * @param string	$eventModuleId
-	 * @param bool		$oldReminderPopupChecked
-	 * @param int		$oldReminderPopupTimer
-	 * @param bool		$oldReminderEmailChecked
-	 * @param int		$oldReminderEmailTimer
-	 * @param array		$oldInvitees
-	 */
-	private static function migrateReminder($eventModule, $eventModuleId, $oldReminderPopupChecked, $oldReminderPopupTimer, $oldReminderEmailChecked, $oldReminderEmailTimer, $oldReminderEmailSent, $oldInvitees) {
-
-		$reminder = BeanFactory::getBean('Reminders');
-		$reminder->popup = $oldReminderPopupChecked;
-		$reminder->email = $oldReminderEmailChecked;
-		$reminder->email_sent = $oldReminderEmailSent;
-		$reminder->timer_popup = $oldReminderPopupTimer;
-		$reminder->timer_email = $oldReminderEmailTimer;
-		$reminder->related_event_module = $eventModule;
-		$reminder->related_event_module_id = $eventModuleId;
-		$reminder->save();
-		$reminderId = $reminder->id;
-		self::migrateReminderInvitees($reminderId, $oldInvitees);
-
-		self::removeOldReminder($eventModule, $eventModuleId);
-	}
-
-	private static function migrateReminderInvitees($reminderId, $invitees) {
-		$ret = array();
-		foreach((array) $invitees as $invitee) {
-			$newInvitee = BeanFactory::getBean('Reminders_Invitees');
-			$newInvitee->reminder_id = $reminderId;
-			$newInvitee->related_invitee_module = self::getRelatedInviteeModuleFromInviteeArray($invitee);
-			$newInvitee->related_invitee_module_id = self::getRelatedInviteeModuleIdFromInviteeArray($invitee);
-			$newInvitee->save();
-		}
-		return $ret;
-	}
-
-	private static function getRelatedInviteeModuleFromInviteeArray($invitee) {
-		if(array_key_exists('user_id', $invitee)) {
-			return 'Users';
-		}
-		if(array_key_exists('lead_id', $invitee)) {
-			return 'Leads';
-		}
-		if(array_key_exists('contact_id', $invitee)) {
-			return 'Contacts';
-		}
-		// TODO:!!!!
-		throw new Exception('Unknown invitee module type');
-		//return null;
-	}
-
-	private static function getRelatedInviteeModuleIdFromInviteeArray($invitee) {
-		if(array_key_exists('user_id', $invitee)) {
-			return $invitee['user_id'];
-		}
-		if(array_key_exists('lead_id', $invitee)) {
-			return $invitee['lead_id'];
-		}
-		if(array_key_exists('contact_id', $invitee)) {
-			return $invitee['contact_id'];
-		}
-		// TODO:!!!!
-		throw new Exception('Unknown invitee type');
-		//return null;
-	}
-
-	/**
-	 * @param string	$eventModule 'Calls' or 'Meetings'
-	 * @param string	$eventModuleId
-	 */
-	private static function removeOldReminder($eventModule, $eventModuleId) {
-		$event = BeanFactory::getBean($eventModule, $eventModuleId);
-		$event->reminder_time = -1;
-		$event->email_reminder_time = -1;
-		$event->email_reminder_sent = 0;
-		$event->save();
-	}
-
-	// --- reminders list on detail views
-
-	/**
-	 * Return a list of related reminders for specified event (Calls/Meetings). Call it from DetailViews.
-	 * @param SugarBean $event a Call or Meeting Bean
-	 * @return mixed|string|void output of list (html)
-	 * @throws Exception on json error in Remainders
-	 */
-	public static function getRemindersListView(SugarBean $event) {
-		global $mod_strings, $app_list_strings;
-		$tpl = new Sugar_Smarty();
-		$tpl->assign('MOD', $mod_strings);
-		$tpl->assign('reminder_time_options', $app_list_strings['reminder_time_options']);
-		$tpl->assign('remindersData', Reminder::loadRemindersData($event->module_name, $event->id));
-		$tpl->assign('remindersDataJson', Reminder::loadRemindersDataJson($event->module_name, $event->id));
-		$tpl->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
-		$tpl->assign('remindersDisabled', json_encode(true));
-		return $tpl->fetch('modules/Reminders/tpls/reminders.tpl');
-	}
-
-	/*
+    /**
+     * Default values for Reminders from User Preferences
+     * @return array default values
+     */
+    public static function loadRemindersDefaultValuesData() {
+        global $current_user;
+
+        $preferencePopupReminderTime = $current_user->getPreference('reminder_time');
+        $preferenceEmailReminderTime = $current_user->getPreference('email_reminder_time');
+        $preferencePopupReminderChecked = $current_user->getPreference('reminder_checked');
+        $preferenceEmailReminderChecked = $current_user->getPreference('email_reminder_checked');
+
+        return array(
+            'popup' => $preferencePopupReminderChecked,
+            'email' => $preferenceEmailReminderChecked,
+            'timer_popup' => $preferencePopupReminderTime,
+            'timer_email' => $preferenceEmailReminderTime,
+        );
+    }
+
+    // --- upgrade
+
+    /**
+     * Reminders upgrade, old reminders migrate to multiple-reminders.
+     * @throws Exception unknown event type or any error
+     */
+    public static function upgrade() {
+        self::upgradeUserPreferences();
+        self::upgradeEventReminders('Calls');
+        self::upgradeEventReminders('Meetings');
+        self::upgradeRestoreReminders();
+    }
+
+    private static function upgradeRestoreReminders() {
+        if($reminders = BeanFactory::getBean('Reminders')->get_full_list('', 'reminders.deleted = 1')) {
+            foreach($reminders as $reminder) {
+                $reminder->deleted = 0;
+                $reminder->save();
+            }
+        }
+        if($reminderInvitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', 'reminders_invitees.deleted = 1')) {
+            foreach($reminderInvitees as $invitee) {
+                $invitee->deleted = 0;
+                $invitee->save();
+            }
+        }
+        global $db;
+        $q = "UPDATE reminders SET deleted = 0";
+        $db->query($q);
+        $q = "UPDATE reminders_invitees SET deleted = 0";
+        $db->query($q);
+    }
+
+    private static function upgradeUserPreferences() {
+        $users = User::getActiveUsers();
+        foreach($users as $user_id => $user_name) {
+            $user = new User();
+            $user->retrieve($user_id);
+
+            $preferencePopupReminderTime = $user->getPreference('reminder_time');
+            $preferenceEmailReminderTime = $user->getPreference('email_reminder_time');
+
+            $preferencePopupReminderChecked = $preferencePopupReminderTime > -1;
+            $preferenceEmailReminderChecked = $preferenceEmailReminderTime > -1;
+            $user->setPreference('reminder_checked', $preferencePopupReminderChecked);
+            $user->setPreference('email_reminder_checked', $preferenceEmailReminderChecked);
+
+        }
+    }
+
+    /**
+     * @param string $eventModule 'Calls' or 'Meetings'
+     */
+    private static function upgradeEventReminders($eventModule) {
+
+        $eventBean = BeanFactory::getBean($eventModule);
+        $events = BeanFactory::getBean($eventModule)->get_full_list('', "{$eventBean->table_name}.date_start >  '2015-11-01 00:00:00' AND ({$eventBean->table_name}.reminder_time != -1 OR ({$eventBean->table_name}.email_reminder_time != -1 AND {$eventBean->table_name}.email_reminder_sent != 1))");
+        if ($events) {
+            foreach ($events as $event) {
+
+                $oldReminderPopupChecked = false;
+                $oldReminderPopupTimer = null;
+                if ($event->reminder_time != -1) {
+                    $oldReminderPopupChecked = true;
+                    $oldReminderPopupTimer = $event->reminder_time;
+                }
+
+                $oldReminderEmailChecked = false;
+                $oldReminderEmailTimer = null;
+                if ($event->email_reminder_time != -1) {
+                    $oldReminderEmailChecked = true;
+                    $oldReminderEmailTimer = $event->email_reminder_time;
+                }
+
+                $oldReminderEmailSent = $event->email_reminder_sent;
+
+                if( ($oldInvitees = self::getOldEventInvitees($event)) && ($event->reminder_time != -1 || ($event->email_reminder_time != -1 && $event->email_reminder_sent != 1)) ) {
+
+                    self::migrateReminder(
+                            $eventModule,
+                            $event->id,
+                            $oldReminderPopupChecked,
+                            $oldReminderPopupTimer,
+                            $oldReminderEmailChecked,
+                            $oldReminderEmailTimer,
+                            $oldReminderEmailSent,
+                            $oldInvitees
+                    );
+
+                }
+            }
+        }
+
+    }
+
+
+    private static function getOldEventInvitees(SugarBean $event) {
+        global $db;
+        $ret = array();
+        $persons = array('users','contacts','leads');
+        foreach($persons as $person){
+            $query = self::upgradeEventPersonQuery($event, $person);
+            $re = $db->query($query);
+            while($row = $db->fetchByAssoc($re) ) {
+                $ret[] = $row;
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * @param string	$eventModule 'Calls' or 'Meetings'
+     * @param string	$eventModuleId
+     * @param bool		$oldReminderPopupChecked
+     * @param int		$oldReminderPopupTimer
+     * @param bool		$oldReminderEmailChecked
+     * @param int		$oldReminderEmailTimer
+     * @param array		$oldInvitees
+     */
+    private static function migrateReminder($eventModule, $eventModuleId, $oldReminderPopupChecked, $oldReminderPopupTimer, $oldReminderEmailChecked, $oldReminderEmailTimer, $oldReminderEmailSent, $oldInvitees) {
+
+        $reminder = BeanFactory::getBean('Reminders');
+        $reminder->popup = $oldReminderPopupChecked;
+        $reminder->email = $oldReminderEmailChecked;
+        $reminder->email_sent = $oldReminderEmailSent;
+        $reminder->timer_popup = $oldReminderPopupTimer;
+        $reminder->timer_email = $oldReminderEmailTimer;
+        $reminder->related_event_module = $eventModule;
+        $reminder->related_event_module_id = $eventModuleId;
+        $reminder->save();
+        $reminderId = $reminder->id;
+        self::migrateReminderInvitees($reminderId, $oldInvitees);
+
+        self::removeOldReminder($eventModule, $eventModuleId);
+    }
+
+    private static function migrateReminderInvitees($reminderId, $invitees) {
+        $ret = array();
+        foreach((array) $invitees as $invitee) {
+            $newInvitee = BeanFactory::getBean('Reminders_Invitees');
+            $newInvitee->reminder_id = $reminderId;
+            $newInvitee->related_invitee_module = self::getRelatedInviteeModuleFromInviteeArray($invitee);
+            $newInvitee->related_invitee_module_id = self::getRelatedInviteeModuleIdFromInviteeArray($invitee);
+            $newInvitee->save();
+        }
+        return $ret;
+    }
+
+    private static function getRelatedInviteeModuleFromInviteeArray($invitee) {
+        if(array_key_exists('user_id', $invitee)) {
+            return 'Users';
+        }
+        if(array_key_exists('lead_id', $invitee)) {
+            return 'Leads';
+        }
+        if(array_key_exists('contact_id', $invitee)) {
+            return 'Contacts';
+        }
+        // TODO:!!!!
+        throw new Exception('Unknown invitee module type');
+        //return null;
+    }
+
+    private static function getRelatedInviteeModuleIdFromInviteeArray($invitee) {
+        if(array_key_exists('user_id', $invitee)) {
+            return $invitee['user_id'];
+        }
+        if(array_key_exists('lead_id', $invitee)) {
+            return $invitee['lead_id'];
+        }
+        if(array_key_exists('contact_id', $invitee)) {
+            return $invitee['contact_id'];
+        }
+        // TODO:!!!!
+        throw new Exception('Unknown invitee type');
+        //return null;
+    }
+
+    /**
+     * @param string	$eventModule 'Calls' or 'Meetings'
+     * @param string	$eventModuleId
+     */
+    private static function removeOldReminder($eventModule, $eventModuleId) {
+        $event = BeanFactory::getBean($eventModule, $eventModuleId);
+        $event->reminder_time = -1;
+        $event->email_reminder_time = -1;
+        $event->email_reminder_sent = 0;
+        $event->save();
+    }
+
+    // --- reminders list on detail views
+
+    /**
+     * Return a list of related reminders for specified event (Calls/Meetings). Call it from DetailViews.
+     * @param SugarBean $event a Call or Meeting Bean
+     * @return mixed|string|void output of list (html)
+     * @throws Exception on json error in Remainders
+     */
+    public static function getRemindersListView(SugarBean $event) {
+        global $mod_strings, $app_list_strings;
+        $tpl = new Sugar_Smarty();
+        $tpl->assign('MOD', $mod_strings);
+        $tpl->assign('reminder_time_options', $app_list_strings['reminder_time_options']);
+        $tpl->assign('remindersData', Reminder::loadRemindersData($event->module_name, $event->id));
+        $tpl->assign('remindersDataJson', Reminder::loadRemindersDataJson($event->module_name, $event->id));
+        $tpl->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
+        $tpl->assign('remindersDisabled', json_encode(true));
+        return $tpl->fetch('modules/Reminders/tpls/reminders.tpl');
+    }
+
+    /*
 	 * @todo implenent it
 	 */
-	public static function getRemindersListInlineEditView(SugarBean $event) {
-		// TODO: getEditFieldHTML() function in InlineEditing.php:218 doesn't pass the Bean ID to this custom inline edit view function but we have to know which Bean are in the focus to editing.
-		if(!$event->id) {
-			throw new Exception("No GUID for edit.");
-		}
-	}
+    public static function getRemindersListInlineEditView(SugarBean $event) {
+        // TODO: getEditFieldHTML() function in InlineEditing.php:218 doesn't pass the Bean ID to this custom inline edit view function but we have to know which Bean are in the focus to editing.
+        if(!$event->id) {
+            throw new Exception("No GUID for edit.");
+        }
+    }
 
 }
 ?>
\ No newline at end of file

modules/Documents/GetLatestRevision.php

Indentation +6 added lines, -6 removed lines

@@ -45,12 +45,12 @@
 require_once('include/formbase.php');
 if (!empty($_REQUEST['record'])) {
 
-	$document = new Document();
-	$document->retrieve($_REQUEST['record']);
-	if (!empty($document->document_revision_id) && !empty($_REQUEST['get_latest_for_id']))  {
-		$query="update linked_documents set document_revision_id='{$document->document_revision_id}', date_modified='".TimeDate::getInstance()->nowDb()."' where id ='{$_REQUEST['get_latest_for_id']}' ";
-		$document->db->query($query);
-	}	
+    $document = new Document();
+    $document->retrieve($_REQUEST['record']);
+    if (!empty($document->document_revision_id) && !empty($_REQUEST['get_latest_for_id']))  {
+        $query="update linked_documents set document_revision_id='{$document->document_revision_id}', date_modified='".TimeDate::getInstance()->nowDb()."' where id ='{$_REQUEST['get_latest_for_id']}' ";
+        $document->db->query($query);
+    }	
 }
 handleRedirect();
 ?>

modules/Documents/DocumentExternalApiDropDown.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 if(!defined('sugarEntry') || !sugarEntry)
-	die('Not A Valid Entry Point');
+    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/Documents/Document.php

Indentation +176 added lines, -176 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if(!defined('sugarEntry') || !sugarEntry)
-	die('Not A Valid Entry Point');
+    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.
@@ -45,71 +45,71 @@ 
 // User is used to store Forecast information.
 class Document extends File {
 
-	var $id;
-	var $document_name;
-	var $description;
-	var $category_id;
-	var $subcategory_id;
-	var $status_id;
-	var $status;
-	var $created_by;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
+    var $id;
+    var $document_name;
+    var $description;
+    var $category_id;
+    var $subcategory_id;
+    var $status_id;
+    var $status;
+    var $created_by;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
     var $assigned_user_id;
-	var $active_date;
-	var $exp_date;
-	var $document_revision_id;
-	var $filename;
-	var $doc_type;
-
-	var $img_name;
-	var $img_name_bare;
-	var $related_doc_id;
-	var $related_doc_name;
-	var $related_doc_rev_id;
-	var $related_doc_rev_number;
-	var $is_template;
-	var $template_type;
-
-	//additional fields.
-	var $revision;
-	var $last_rev_create_date;
-	var $last_rev_created_by;
-	var $last_rev_created_name;
-	var $file_url;
-	var $file_url_noimage;
-
-	var $table_name = "documents";
-	var $object_name = "Document";
-	var $user_preferences;
-
-	var $encodeFields = Array ();
-
-	// This is used to retrieve related fields from form posts.
-	var $additional_column_fields = Array ('revision');
-
-	var $new_schema = true;
-	var $module_dir = 'Documents';
-
-	var $relationship_fields = Array(
-		'contract_id'=>'contracts',
-	 );
-
-
-	function Document() {
-		parent :: File();
-		$this->setupCustomFields('Documents'); //parameter is module name
-		$this->disable_row_level_security = false;
-	}
-
-	function save($check_notify = false) {
+    var $active_date;
+    var $exp_date;
+    var $document_revision_id;
+    var $filename;
+    var $doc_type;
+
+    var $img_name;
+    var $img_name_bare;
+    var $related_doc_id;
+    var $related_doc_name;
+    var $related_doc_rev_id;
+    var $related_doc_rev_number;
+    var $is_template;
+    var $template_type;
+
+    //additional fields.
+    var $revision;
+    var $last_rev_create_date;
+    var $last_rev_created_by;
+    var $last_rev_created_name;
+    var $file_url;
+    var $file_url_noimage;
+
+    var $table_name = "documents";
+    var $object_name = "Document";
+    var $user_preferences;
+
+    var $encodeFields = Array ();
+
+    // This is used to retrieve related fields from form posts.
+    var $additional_column_fields = Array ('revision');
+
+    var $new_schema = true;
+    var $module_dir = 'Documents';
+
+    var $relationship_fields = Array(
+        'contract_id'=>'contracts',
+        );
+
+
+    function Document() {
+        parent :: File();
+        $this->setupCustomFields('Documents'); //parameter is module name
+        $this->disable_row_level_security = false;
+    }
+
+    function save($check_notify = false) {
 
         if (empty($this->doc_type)) {
-			$this->doc_type = 'Sugar';
-		}
+            $this->doc_type = 'Sugar';
+        }
         if (empty($this->id) || $this->new_with_id)
-		{
+        {
             if (empty($this->id)) {
                 $this->id = create_guid();
                 $this->new_with_id = true;
@@ -135,12 +135,12 @@ 
 
             if(isset($this->file_ext))
             {
-            	$Revision->file_ext = $this->file_ext;
+                $Revision->file_ext = $this->file_ext;
             }
 
             if(isset($this->file_mime_type))
             {
-            	$Revision->file_mime_type = $this->file_mime_type;
+                $Revision->file_mime_type = $this->file_mime_type;
             }
 
             $Revision->doc_type = $this->doc_type;
@@ -196,29 +196,29 @@ 
             }
         }
 
-		return parent :: save($check_notify);
-	}
-	function get_summary_text() {
-		return "$this->document_name";
-	}
+        return parent :: save($check_notify);
+    }
+    function get_summary_text() {
+        return "$this->document_name";
+    }
 
-	function is_authenticated() {
-		return $this->authenticated;
-	}
+    function is_authenticated() {
+        return $this->authenticated;
+    }
 
-	function fill_in_additional_list_fields() {
-		$this->fill_in_additional_detail_fields();
-	}
+    function fill_in_additional_list_fields() {
+        $this->fill_in_additional_detail_fields();
+    }
 
-	function fill_in_additional_detail_fields() {
-		global $theme;
-		global $current_language;
-		global $timedate;
-		global $locale;
+    function fill_in_additional_detail_fields() {
+        global $theme;
+        global $current_language;
+        global $timedate;
+        global $locale;
 
-		parent::fill_in_additional_detail_fields();
+        parent::fill_in_additional_detail_fields();
 
-		$mod_strings = return_module_language($current_language, 'Documents');
+        $mod_strings = return_module_language($current_language, 'Documents');
 
         if (!empty($this->document_revision_id)) {
 
@@ -234,7 +234,7 @@ 
             //populate name
             if(isset($this->document_name))
             {
-            	$this->name = $this->document_name;
+                $this->name = $this->document_name;
             }
 
             if(isset($row['filename']))$this->filename = $row['filename'];
@@ -251,93 +251,93 @@ 
             }
         }
 
-		//set default file name.
-		if (!empty ($img_name) && file_exists($img_name)) {
-			$img_name = $img_name_bare;
-		} else {
-			$img_name = "def_image_inline"; //todo change the default image.
-		}
-		if($this->ACLAccess('DetailView')) {
-			if(!empty($this->doc_type) && $this->doc_type != 'Sugar' && !empty($this->doc_url)) {
+        //set default file name.
+        if (!empty ($img_name) && file_exists($img_name)) {
+            $img_name = $img_name_bare;
+        } else {
+            $img_name = "def_image_inline"; //todo change the default image.
+        }
+        if($this->ACLAccess('DetailView')) {
+            if(!empty($this->doc_type) && $this->doc_type != 'Sugar' && !empty($this->doc_url)) {
                 $file_url= "<a href='".$this->doc_url."' target='_blank'>".SugarThemeRegistry::current()->getImage($this->doc_type.'_image_inline', 'border="0"',null,null,'.png',$mod_strings['LBL_LIST_VIEW_DOCUMENT'])."</a>";
-			} else {
-			    $file_url = "<a href='index.php?entryPoint=download&id={$this->document_revision_id}&type=Documents' target='_blank'>".SugarThemeRegistry::current()->getImage($img_name, 'border="0"', null,null,'.gif',$mod_strings['LBL_LIST_VIEW_DOCUMENT'])."</a>";
-			}
+            } else {
+                $file_url = "<a href='index.php?entryPoint=download&id={$this->document_revision_id}&type=Documents' target='_blank'>".SugarThemeRegistry::current()->getImage($img_name, 'border="0"', null,null,'.gif',$mod_strings['LBL_LIST_VIEW_DOCUMENT'])."</a>";
+            }
 
-    		$this->file_url = $file_url;
-    		$this->file_url_noimage = "index.php?entryPoint=download&type=Documents&id={$this->document_revision_id}";
-		}else{
+            $this->file_url = $file_url;
+            $this->file_url_noimage = "index.php?entryPoint=download&type=Documents&id={$this->document_revision_id}";
+        }else{
             $this->file_url = "";
             $this->file_url_noimage = "";
-		}
+        }
 
-		//get last_rev_by user name.
-		if (!empty ($row)) {
-			$this->last_rev_created_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
+        //get last_rev_by user name.
+        if (!empty ($row)) {
+            $this->last_rev_created_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
 
-			$this->last_rev_create_date = $timedate->to_display_date_time($this->db->fromConvert($row['rev_date'], 'datetime'));
-			$this->last_rev_mime_type = $row['file_mime_type'];
-		}
+            $this->last_rev_create_date = $timedate->to_display_date_time($this->db->fromConvert($row['rev_date'], 'datetime'));
+            $this->last_rev_mime_type = $row['file_mime_type'];
+        }
 
-		global $app_list_strings;
-	    if(!empty($this->status_id)) {
-	       //_pp($this->status_id);
-	       $this->status = $app_list_strings['document_status_dom'][$this->status_id];
-	    }
+        global $app_list_strings;
+        if(!empty($this->status_id)) {
+            //_pp($this->status_id);
+            $this->status = $app_list_strings['document_status_dom'][$this->status_id];
+        }
         if (!empty($this->related_doc_id)) {
             $this->related_doc_name = Document::get_document_name($this->related_doc_id);
             $this->related_doc_rev_number = DocumentRevision::get_document_revision_name($this->related_doc_rev_id);
         }
-	}
+    }
 
-	function list_view_parse_additional_sections(&$list_form/*, $xTemplateSection*/) {
-		return $list_form;
-	}
+    function list_view_parse_additional_sections(&$list_form/*, $xTemplateSection*/) {
+        return $list_form;
+    }
 
     function create_export_query($order_by, $where, $relate_link_join='')
     {
         $custom_join = $this->getCustomJoin(true, true, $where);
         $custom_join['join'] .= $relate_link_join;
-		$query = "SELECT
+        $query = "SELECT
 						documents.*";
         $query .=  $custom_join['select'];
-		$query .= " FROM documents ";
+        $query .= " FROM documents ";
         $query .=  $custom_join['join'];
 
-		$where_auto = " documents.deleted = 0";
+        $where_auto = " documents.deleted = 0";
 
-		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;
 
-		if ($order_by != "")
-			$query .= " ORDER BY $order_by";
-		else
-			$query .= " ORDER BY documents.document_name";
+        if ($order_by != "")
+            $query .= " ORDER BY $order_by";
+        else
+            $query .= " ORDER BY documents.document_name";
 
-		return $query;
-	}
+        return $query;
+    }
 
-	function get_list_view_data() {
-		global $current_language;
-		$app_list_strings = return_app_list_strings_language($current_language);
+    function get_list_view_data() {
+        global $current_language;
+        $app_list_strings = return_app_list_strings_language($current_language);
 
-		$document_fields = $this->get_list_view_array();
+        $document_fields = $this->get_list_view_array();
 
         $this->fill_in_additional_list_fields();
 
 
-		$document_fields['FILENAME'] = $this->filename;
-		$document_fields['FILE_URL'] = $this->file_url;
-		$document_fields['FILE_URL_NOIMAGE'] = $this->file_url_noimage;
-		$document_fields['LAST_REV_CREATED_BY'] = $this->last_rev_created_name;
-		$document_fields['CATEGORY_ID'] = empty ($this->category_id) ? "" : $app_list_strings['document_category_dom'][$this->category_id];
-		$document_fields['SUBCATEGORY_ID'] = empty ($this->subcategory_id) ? "" : $app_list_strings['document_subcategory_dom'][$this->subcategory_id];
+        $document_fields['FILENAME'] = $this->filename;
+        $document_fields['FILE_URL'] = $this->file_url;
+        $document_fields['FILE_URL_NOIMAGE'] = $this->file_url_noimage;
+        $document_fields['LAST_REV_CREATED_BY'] = $this->last_rev_created_name;
+        $document_fields['CATEGORY_ID'] = empty ($this->category_id) ? "" : $app_list_strings['document_category_dom'][$this->category_id];
+        $document_fields['SUBCATEGORY_ID'] = empty ($this->subcategory_id) ? "" : $app_list_strings['document_subcategory_dom'][$this->subcategory_id];
         $document_fields['NAME'] = $this->document_name;
-		$document_fields['DOCUMENT_NAME_JAVASCRIPT'] = $GLOBALS['db']->quote($document_fields['DOCUMENT_NAME']);
-		return $document_fields;
-	}
+        $document_fields['DOCUMENT_NAME_JAVASCRIPT'] = $GLOBALS['db']->quote($document_fields['DOCUMENT_NAME']);
+        return $document_fields;
+    }
 
 
     /**
@@ -348,45 +348,45 @@ 
      *
      * @param $id String The record id of the Document instance
      */
-	function mark_relationships_deleted($id)
+    function mark_relationships_deleted($id)
     {
         $this->load_relationships('revisions');
-       	$revisions= $this->get_linked_beans('revisions','DocumentRevision');
-
-       	if (!empty($revisions) && is_array($revisions)) {
-       		foreach($revisions as $key=>$version) {
-       			UploadFile::unlink_file($version->id,$version->filename);
-       			//mark the version deleted.
-       			$version->mark_deleted($version->id);
-       		}
-       	}
-
-	}
-
-
-	function bean_implements($interface) {
-		switch ($interface) {
-			case 'ACL' :
-				return true;
-		}
-		return false;
-	}
-
-	//static function.
-	function get_document_name($doc_id){
-		if (empty($doc_id)) return null;
-
-		$db = DBManagerFactory::getInstance();
-		$query="select document_name from documents where id='$doc_id'  and deleted=0";
-		$result=$db->query($query);
-		if (!empty($result)) {
-			$row=$db->fetchByAssoc($result);
-			if (!empty($row)) {
-				return $row['document_name'];
-			}
-		}
-		return null;
-	}
+            $revisions= $this->get_linked_beans('revisions','DocumentRevision');
+
+            if (!empty($revisions) && is_array($revisions)) {
+                foreach($revisions as $key=>$version) {
+                    UploadFile::unlink_file($version->id,$version->filename);
+                    //mark the version deleted.
+                    $version->mark_deleted($version->id);
+                }
+            }
+
+    }
+
+
+    function bean_implements($interface) {
+        switch ($interface) {
+            case 'ACL' :
+                return true;
+        }
+        return false;
+    }
+
+    //static function.
+    function get_document_name($doc_id){
+        if (empty($doc_id)) return null;
+
+        $db = DBManagerFactory::getInstance();
+        $query="select document_name from documents where id='$doc_id'  and deleted=0";
+        $result=$db->query($query);
+        if (!empty($result)) {
+            $row=$db->fetchByAssoc($result);
+            if (!empty($row)) {
+                return $row['document_name'];
+            }
+        }
+        return null;
+    }
 }
 
 require_once('modules/Documents/DocumentExternalApiDropDown.php');

modules/Documents/metadata/editviewdefs.php

Indentation +61 added lines, -61 removed lines

@@ -1,131 +1,131 @@
 <?php
 $viewdefs ['Documents'] = 
 array (
-  'EditView' => 
-  array (
+    'EditView' => 
+    array (
     'templateMeta' => 
     array (
-      'form' => 
-      array (
+        'form' => 
+        array (
         'enctype' => 'multipart/form-data',
         'hidden' => 
         array (
-          0 => '<input type="hidden" name="old_id" value="{$fields.document_revision_id.value}">',
-          1 => '<input type="hidden" name="contract_id" value="{$smarty.request.contract_id}">',
+            0 => '<input type="hidden" name="old_id" value="{$fields.document_revision_id.value}">',
+            1 => '<input type="hidden" name="contract_id" value="{$smarty.request.contract_id}">',
         ),
-      ),
-      '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',
         ),
-      ),
-      'javascript' => '{sugar_getscript file="include/javascript/popup_parent_helper.js"}
+        ),
+        'javascript' => '{sugar_getscript file="include/javascript/popup_parent_helper.js"}
 {sugar_getscript file="cache/include/javascript/sugar_grp_jsolait.js"}
 {sugar_getscript file="modules/Documents/documents.js"}',
-      'useTabs' => false,
-      'tabDefs' => 
-      array (
+        'useTabs' => false,
+        'tabDefs' => 
+        array (
         'LBL_DOCUMENT_INFORMATION' => 
         array (
-          'newTab' => false,
-          'panelDefault' => 'expanded',
+            'newTab' => false,
+            'panelDefault' => 'expanded',
+        ),
         ),
-      ),
     ),
     'panels' => 
     array (
-      'lbl_document_information' => 
-      array (
+        'lbl_document_information' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'filename',
             'displayParams' => 
             array (
-              'onchangeSetFileNameTo' => 'document_name',
+                'onchangeSetFileNameTo' => 'document_name',
+            ),
             ),
-          ),
-          1 => 
-          array (
+            1 => 
+            array (
             'name' => 'status_id',
             'label' => 'LBL_DOC_STATUS',
-          ),
+            ),
         ),
         1 => 
         array (
-          0 => 'document_name',
-          1 => 
-          array (
+            0 => 'document_name',
+            1 => 
+            array (
             'name' => 'revision',
             'customCode' => '<input name="revision" type="text" value="{$fields.revision.value}" {$DISABLED}>',
-          ),
+            ),
         ),
         2 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'template_type',
             'label' => 'LBL_DET_TEMPLATE_TYPE',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'is_template',
             'label' => 'LBL_DET_IS_TEMPLATE',
-          ),
+            ),
         ),
         3 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'active_date',
-          ),
-          1 => 'exp_date',
+            ),
+            1 => 'exp_date',
         ),
         4 => 
         array (
-          0 => 'category_id',
-          1 => 'subcategory_id',
+            0 => 'category_id',
+            1 => 'subcategory_id',
         ),
         5 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'description',
-          ),
+            ),
         ),
         6 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'related_doc_name',
             'customCode' => '<input name="related_document_name" type="text" size="30" maxlength="255" value="{$RELATED_DOCUMENT_NAME}" readonly><input name="related_doc_id" type="hidden" value="{$fields.related_doc_id.value}"/>&nbsp;<input title="{$APP.LBL_SELECT_BUTTON_TITLE}" type="{$RELATED_DOCUMENT_BUTTON_AVAILABILITY}" class="button" value="{$APP.LBL_SELECT_BUTTON_LABEL}" name="btn2" onclick=\'open_popup("Documents", 600, 400, "", true, false, {$encoded_document_popup_request_data}, "single", true);\'/>',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'related_doc_rev_number',
             'customCode' => '<select name="related_doc_rev_id" id="related_doc_rev_id" {$RELATED_DOCUMENT_REVISION_DISABLED}>{$RELATED_DOCUMENT_REVISION_OPTIONS}</select>',
-          ),
+            ),
         ),
         7 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO_NAME',
-          ),
+            ),
+        ),
         ),
-      ),
     ),
-  ),
+    ),
 );
 ?>

modules/Documents/metadata/searchdefs.php

Indentation +38 added lines, -38 removed lines

@@ -1,88 +1,88 @@
 <?php
 $searchdefs ['Documents'] = 
 array (
-  'layout' => 
-  array (
+    'layout' => 
+    array (
     'basic_search' => 
     array (
-      0 => 'document_name',
-      1 => array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
+        0 => 'document_name',
+        1 => array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
     ),
     'advanced_search' => 
     array (
-      'document_name' => 
-      array (
+        'document_name' => 
+        array (
         'name' => 'document_name',
         'default' => true,
         'width' => '10%',
-      ),
-      'status' => 
-      array (
+        ),
+        'status' => 
+        array (
         'type' => 'varchar',
         'label' => 'LBL_DOC_STATUS',
         'width' => '10%',
         'default' => true,
         'name' => 'status',
-      ),
-      'template_type' => 
-      array (
+        ),
+        'template_type' => 
+        array (
         'type' => 'enum',
         'label' => 'LBL_TEMPLATE_TYPE',
         'width' => '10%',
         'default' => true,
         'name' => 'template_type',
-      ),
-      'category_id' => 
-      array (
+        ),
+        'category_id' => 
+        array (
         'name' => 'category_id',
         'default' => true,
         'width' => '10%',
-      ),
-      'subcategory_id' => 
-      array (
+        ),
+        'subcategory_id' => 
+        array (
         'name' => 'subcategory_id',
         '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%',
-      ),
-      'active_date' => 
-      array (
+        ),
+        'active_date' => 
+        array (
         'name' => 'active_date',
         'default' => true,
         'width' => '10%',
-      ),
-      'exp_date' => 
-      array (
+        ),
+        'exp_date' => 
+        array (
         'name' => 'exp_date',
         'default' => true,
         'width' => '10%',
-      ),
+        ),
+    ),
     ),
-  ),
-  'templateMeta' => 
-  array (
+    'templateMeta' => 
+    array (
     'maxColumns' => '3',
     'maxColumnsBasic' => '4',
     'widths' => 
     array (
-      'label' => '10',
-      'field' => '30',
+        'label' => '10',
+        'field' => '30',
+    ),
     ),
-  ),
 );
 ?>

modules/Documents/metadata/SearchFields.php

Indentation +40 added lines, -40 removed lines

@@ -3,36 +3,36 @@ 
 global $current_user;
 $module_name = "Documents";
 $searchFields['Documents'] = array (
-  'document_name' => 
-  array (
+    'document_name' => 
+    array (
     'query_type' => 'default',
-  ),
-  'category_id' => 
-  array (
+    ),
+    'category_id' => 
+    array (
     'query_type' => 'default',
     'options' => 'document_category_dom',
     'template_var' => 'CATEGORY_OPTIONS',
-  ),
-  'subcategory_id' => 
-  array (
+    ),
+    'subcategory_id' => 
+    array (
     'query_type' => 'default',
     'options' => 'document_subcategory_dom',
     'template_var' => 'SUBCATEGORY_OPTIONS',
-  ),
-  'active_date' => 
-  array (
+    ),
+    'active_date' => 
+    array (
     'query_type' => 'default',
-  ),
-  'exp_date' => 
-  array (
+    ),
+    'exp_date' => 
+    array (
     'query_type' => 'default',
-  ),
-  'assigned_user_id' => 
-  array (
+    ),
+    'assigned_user_id' => 
+    array (
     'query_type' => 'default',
-  ),
-  'filename' => 
-  array (
+    ),
+    'filename' => 
+    array (
     'query_type' => 'format',
     'operator' => 'subquery',
     'subquery' => 'SELECT document_revisions.id FROM document_revisions
@@ -40,45 +40,45 @@ 
 				   AND document_revisions.filename LIKE \'{0}\'',
     'db_field' => 
     array (
-      0 => 'document_revision_id',
+        0 => 'document_revision_id',
     ),
-  ),
-  'range_date_entered' => 
-  array (
+    ),
+    'range_date_entered' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'start_range_date_entered' => 
-  array (
+    ),
+    'start_range_date_entered' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'end_range_date_entered' => 
-  array (
+    ),
+    'end_range_date_entered' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'range_date_modified' => 
-  array (
+    ),
+    'range_date_modified' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'start_range_date_modified' => 
-  array (
+    ),
+    'start_range_date_modified' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'end_range_date_modified' => 
-  array (
+    ),
+    'end_range_date_modified' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
+    ),
     'favorites_only' => array(
         'query_type'=>'format',
         'operator' => 'subquery',