Changeset 588 for trunk/calendar

Timestamp:

01/12/09 11:28:22 (15 years ago)

Author:

eduardoalex

Message:

Ticket #386

File:

• trunk/calendar/inc/class.bocalendar.inc.php (modified) (10 diffs)

trunk/calendar/inc/class.bocalendar.inc.php

@@ -758 +758 @@
                 function update($params='')
                 {
+                        
+                        if($params['from_mobile']) {
+                                $ui_return = "mobile.ui_mobilecalendar.edit";
+                                $ui_index = "mobile.ui_mobilecalendar.index";
+                                $ui_overlap = "mobile.ui_mobilecalendar.overlap";
+                        }
+                        else {
+                                $ui_return = "calendar.uicalendar.edit";
+                                $ui_index = "calendar.uicalendar.index";                
+                                $ui_overlap = "calendar.uicalendar.overlap";
+                        }
+                        
                         if(!is_object($GLOBALS['phpgw']->datetime))
                         {
@@ -769 +781 @@
                         $l_end = (@isset($params['end']) && $params['end']?$params['end']:$_POST['end']);
                         $l_recur_enddate = (@isset($params['recur_enddate']) && $params['recur_enddate']?$params['recur_enddate']:$_POST['recur_enddate']);
+
                         
                         $send_to_ui = True;
@@ -837 +850 @@
                                 if($datetime_check)
                                 {
-                                        ExecMethod('calendar.uicalendar.edit',
+                                        ExecMethod($ui_return,
                                                 Array(
                                                         'cd'            => $datetime_check,
@@ -843 +856 @@
                                                 )
                                         );
-                                        $GLOBALS['phpgw']->common->phpgw_exit(True);
+                                        if(!$params['from_mobile'])
+                                                $GLOBALS['phpgw']->common->phpgw_exit(True);
+                                        else
+                                                return;
                                 }
                                 $overlapping_events = False;
@@ -860 +876 @@
                                                 return array(($l_cal['id']?1:2) => 'permission denied');
                                         }
-                                        ExecMethod('calendar.uicalendar.index');
-                                        $GLOBALS['phpgw']->common->phpgw_exit();
+                                        ExecMethod($ui_index);
+                                        if(!$params['from_mobile'])
+                                                $GLOBALS['phpgw']->common->phpgw_exit();
+                                        else
+                                                return;
                                 }
 
@@ -1141 +1160 @@
                                                 return array($datetime_check => 'invalid input data');
                                         }
-                                        ExecMethod('calendar.uicalendar.edit',
+                                        ExecMethod($ui_return,
                                                 Array(
                                                         'cd'            => $datetime_check,
@@ -1147 +1166 @@
                                                 )
                                         );
-                                        $GLOBALS['phpgw']->common->phpgw_exit(True);
+                                        if(!$params['from_mobile'])
+                                                $GLOBALS['phpgw']->common->phpgw_exit(True);
+                                        else
+                                                return;
                                 }
 
@@ -1176 +1198 @@
                                         unset($GLOBALS['phpgw_info']['flags']['noheader']);
                                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-                                        ExecMethod('calendar.uicalendar.overlap',
+                                        ExecMethod($ui_overlap,
                                                 Array(
                                                         'o_events'      => $overlapping_events,
@@ -1182 +1204 @@
                                                 )
                                         );
-                                        $GLOBALS['phpgw']->common->phpgw_exit(True);
+                                        if(!$params['from_mobile'])
+                                                $GLOBALS['phpgw']->common->phpgw_exit(True);
+                                        else
+                                                return;
                                 }
                                 else
@@ -1229 +1254 @@
                                                 $GLOBALS['phpgw']->common->phpgw_exit();
                                         }
-                                        Execmethod('calendar.uicalendar.index');
+                                        Execmethod($ui_index);
                                 }
                                 else