Changeset 5132 for trunk/calendar/inc/class.uiicalendar.inc.php

Timestamp:

11/03/11 13:21:19 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo calendar.

File:

• trunk/calendar/inc/class.uiicalendar.inc.php (modified) (5 diffs)

trunk/calendar/inc/class.uiicalendar.inc.php

@@ -17 +17 @@
         {
                 var $bo;
+//              var $ui;
                 var $template;
 
@@ -30 +31 @@
                 {
                         $this->bo = CreateObject('calendar.boicalendar');
+//                      $this->ui = CreateObject('calendar.uicalendar');
+
                         $this->template = $GLOBALS['phpgw']->template;
                         $GLOBALS['phpgw_info']['flags']['app_header'] = lang('Calendar - [iv]Cal Importer');
@@ -77 +80 @@
                 }
 
-                function import_from_mail($calendar) {
-                        return $this->bo->import(explode("\n",$calendar),true);
+                function import_from_mail($calendar, $from_ajax, $importAccount = false) {
+                        return $this->bo->import(explode("\n",$calendar),$from_ajax,$importAccount);
                 }
                 
-                function get_error_message($error_number) {
-                        switch ($error_number) {
-                                case 1:
-                                        return lang('event already exists');
-                        }
-                }
 
                 function import()
@@ -108 +105 @@
                         }
 
-                        $this->template->set_file(array('vcalimport' => 'vcal_import.tpl'));
-                        $this->template->set_block('vcalimport','page_block');
-                        $this->template->set_block('vcalimport','error_block');
-                        
-                        if($GLOBALS['HTTP_GET_VARS']['error_number']) {
-                                $this->template->set_var('error_message',$this->get_error_message( $GLOBALS['HTTP_GET_VARS']['error_number'] ) );
-                                $this->template->parse('error_box','error_block',true);
-                        }
+                        $this->template->set_file(
+                                Array(
+                                        'vcalimport' => 'vcal_import.tpl'
+                                )
+                        );
                         
                         $var = Array(
                                 'vcal_header'   => '<p>',
                                 'ical_lang'             => lang('(i/v)Cal'),
-                                'action_url'    => $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.boicalendar.import'),
+                                'action_url'    => $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.boicalendar.import&calendarImport=1'),
                                 'lang_access'   => lang('Access'),
                                 'lang_groups'   => lang('Which groups'),
@@ -128 +122 @@
                         );
                         $this->template->set_var($var);
-                        $this->template->pfp('out', 'page_block');
-                        // $this->template->pparse('out','page_block');
+                        $this->template->pparse('out','vcalimport');
                 }
         }