Changeset 678 for trunk/calendar/inc/class.boicalendar.inc.php

Timestamp:

02/06/09 17:13:58 (15 years ago)

Author:

niltonneto

Message:

IMportação de compromisso pelo Expressomail.

File:

• trunk/calendar/inc/class.boicalendar.inc.php (modified) (2 diffs)

trunk/calendar/inc/class.boicalendar.inc.php

@@ -2946 +2946 @@
                 }
 
-                function import($mime_msg='')
+                function import($mime_msg='', $from_ajax = false)
                 {
                         if($_FILES['uploadedfile']['tmp_name'] != 'none' && $_FILES['uploadedfile']['tmp_name'] != '')
@@ -3304 +3304 @@
                                 }
                         }
-                        Header('Location: '.$GLOBALS['phpgw']->link('/index.php',
+                        if(!$from_ajax) {
+                                Header('Location: '.$GLOBALS['phpgw']->link('/index.php',
                                         Array(
                                                 'menuaction'    => 'calendar.uicalendar.view',
                                                 'cal_id'        => $event['id']
-                                        )
-                                )
-                        );
-                        $GLOBALS['phpgw']->common->phpgw_exit();
+                                                )
+                                        )
+                                );
+                                $GLOBALS['phpgw']->common->phpgw_exit();                                
+                        }
+                        else 
+                                return true;
                 }