Changeset 3736

Timestamp:

02/07/11 17:15:46 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1532 - Adicionada mensagem de erro ao tentar importar o evento 2 vezes

Location:

branches/2.2/calendar

Files:

• inc/class.boicalendar.inc.php (modified) (2 diffs)
• inc/class.uiicalendar.inc.php (modified) (3 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)
• templates/default/vcal_import.tpl (modified) (2 diffs)

branches/2.2/calendar/inc/class.boicalendar.inc.php

@@ -3050 +3050 @@
                                 if($uid_exists)
                                 {
-                                        $event = $so_event->read_entry($uid_exists);
-                                        $this->check_owner($event,$ical['event'][$i],$so_event);
-                                        $event = $so_event->get_cached_event();
-                                        $so_event->add_entry($event);
-//                                      $event = $so_event->get_cached_event();
+                                        // $event = $so_event->read_entry($uid_exists);
+                                        // $this->check_owner($event,$ical['event'][$i],$so_event);
+                                        // $event = $so_event->get_cached_event();
+                                        // $so_event->add_entry($event);
+                                        Header('Location: ' . $GLOBALS['phpgw']->link('/index.php',
+                                                        Array(
+                                                                'menuaction'    => 'calendar.uiicalendar.import',
+                                                                'error_number'  => 1
+                                                        )
+                                                )
+                                        );
+                                        $GLOBALS['phpwg']->common->phpgw_exit();
+
                                 }
                                 else
@@ -3369 +3377 @@
                                         )
                                 );
-                                $GLOBALS['phpgw']->common->phpgw_exit();                                
+                                $GLOBALS['phpgw']->common->phpgw_exit();
                         }
                         else 

branches/2.2/calendar/inc/class.uiicalendar.inc.php

@@ -80 +80 @@
                         return $this->bo->import(explode("\n",$calendar),true);
                 }
-
+                
+                function get_error_message($error_number) {
+                        switch ($error_number) {
+                                case 1:
+                                        return lang('event already exists');
+                        }
+                }
 
                 function import()
@@ -102 +108 @@
                         }
 
-                        $this->template->set_file(
-                                Array(
-                                        'vcalimport' => 'vcal_import.tpl'
-                                )
-                        );
-
+                        $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);
+                        }
+                        
                         $var = Array(
                                 'vcal_header'   => '<p>',
@@ -119 +128 @@
                         );
                         $this->template->set_var($var);
-                        $this->template->pparse('out','vcalimport');
+                        $this->template->pfp('out', 'page_block');
+                        // $this->template->pparse('out','page_block');
                 }
         }

branches/2.2/calendar/templates/default/vcal_import.tpl

@@ +1 @@
+<!-- BEGIN page_block -->
 <!-- vcardin form -->
 {vcal_header}
+                {error_box}
     <form ENCTYPE="multipart/form-data" method="POST" action="{action_url}">
       <table border=0>
@@ -9 +11 @@
       </table>
      </form>
+<!-- END page_block -->
+<!-- BEGIN error_block -->
+<b><center>{error_message}</b></center><br><br>
+<!-- END error_block -->