[Phpgroupware-cvs] CVS: notes/inc class.bo.inc.php,1.14,1.15 class.ui.inc.php,1.51,1.52

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/notes/inc
In directory subversions:/tmp/cvs-serv6723/inc

Modified Files:
        class.bo.inc.php class.ui.inc.php 
Log Message:
update

Index: class.bo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.bo.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.bo.inc.php    27 Apr 2003 11:49:34 -0000      1.14
--- class.bo.inc.php    27 Apr 2003 19:27:58 -0000      1.15
***************
*** 89,92 ****
--- 89,96 ----
                                $this->cat_id = $cat_id;
                        }
+                       else
+                       {
+                               unset($this->cat_id);
+                       }
                }
  

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.ui.inc.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** class.ui.inc.php    27 Apr 2003 13:14:38 -0000      1.51
--- class.ui.inc.php    27 Apr 2003 19:27:58 -0000      1.52
***************
*** 241,247 ****
                {
                        $note_id        = 
get_var('note_id',array('POST','GET'));
!                       $confirm        = get_var('confirm',array('POST'));
! 
!                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . lang('delete note');
  
                        $link_data = array
--- 241,246 ----
                {
                        $note_id        = 
get_var('note_id',array('POST','GET'));
!                       $delete         = get_var('delete',array('POST'));
!                       $cancel         = get_var('cancel',array('POST'));
  
                        $link_data = array
***************
*** 250,270 ****
                        );
  
!                       if (get_var('confirm',array('POST')))
                        {
                                $this->bo->delete($note_id);
!                               Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',$link_data));
                        }
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
                        (
!                               'done_url'                              => 
$GLOBALS['phpgw']->link('/index.php',$link_data),
!                               'delete_url'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=notes.ui.delete&note_id=' . 
$note_id),
!                               'lang_confirm_msg'              => lang('do you 
really want to delete this entry'),
!                               'lang_yes'                              => 
lang('yes'),
!                               'lang_yes_statustext'   => lang('Delete the 
entry'),
!                               'lang_no_statustext'    => lang('Back to the 
list'),
!                               'lang_no'                               => 
lang('no')
                        );
  
--- 249,275 ----
                        );
  
!                       if ($_POST['delete'])
                        {
                                $this->bo->delete($note_id);
!                               
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
!                       }
! 
!                       if ($_POST['cancel'])
!                       {
!                               
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
                        }
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
+                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . lang('delete note');
+ 
                        $data = array
                        (
!                               'delete_url'                            => 
$GLOBALS['phpgw']->link('/index.php','menuaction=notes.ui.delete&note_id=' . 
$note_id),
!                               'lang_delete_msg'                       => 
lang('do you really want to delete this note ?'),
!                               'lang_delete'                           => 
lang('delete'),
!                               'lang_delete_statustext'        => lang('Delete 
the note'),
!                               'lang_cancel_statustext'        => lang('Leave 
the note untouched and return back to the list'),
!                               'lang_cancel'                           => 
lang('cancel')
                        );