[Phpgroupware-cvs] CVS: infolog/inc class.uiinfolog.inc.php,1.39,1.40

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv17513

Modified Files:
        class.uiinfolog.inc.php 
Log Message:
corrected bug from savanah patch #419
infolog could not add new entries, that was caused by a halfway change to a new 
edit-form-template

Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** class.uiinfolog.inc.php     1 Jun 2002 13:14:37 -0000       1.39
--- class.uiinfolog.inc.php     6 Aug 2002 07:42:37 -0000       1.40
***************
*** 694,702 ****
                        {
                                Header('Location: ' . 
$this->html->link($referer) );
                        }
                        if(get_var('delete',Array('POST')))
                        {
!                               Header('Location: ' . 
$this->html->link('/index.php',$this->menuaction('delete')+
!                                      array('info_id' => $info_id, 'referer' 
=> $referer)) );
                        }
  
--- 694,703 ----
                        {
                                Header('Location: ' . 
$this->html->link($referer) );
+                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
                        if(get_var('delete',Array('POST')))
                        {
!                               $this->delete($info_id);
!                               return;
                        }
  
***************
*** 870,875 ****
                        
$GLOBALS['phpgw']->template->set_file(array('info_edit_t' => 'form.tpl'));
                        
$GLOBALS['phpgw']->template->set_block('info_edit_t','info_edit');
-                       
$GLOBALS['phpgw']->template->set_block('info_edit_t','add');
-                       
$GLOBALS['phpgw']->template->set_block('info_edit_t','edit');
  
                        if (is_array($error))
--- 871,874 ----
***************
*** 997,1010 ****
                                
$GLOBALS['phpgw']->template->set_var('delete_button',$this->html->submit_button('delete','Delete'));
                        }
-                       $GLOBALS['phpgw']->template->parse('buttons',$is_edit ? 
'edit' : 'add');
                        
$GLOBALS['phpgw']->template->fp('phpgw_body','info_edit');
                }
  
!               function delete( )
                {
                        global $info_id,$confirm,$to_del;
  
                        $referer = $this->get_referer();
  
                        if (!$info_id ||
                            !$this->bo->check_access($info_id,PHPGW_ACL_DELETE))
--- 996,1013 ----
                                
$GLOBALS['phpgw']->template->set_var('delete_button',$this->html->submit_button('delete','Delete'));
                        }
                        
$GLOBALS['phpgw']->template->fp('phpgw_body','info_edit');
                }
  
!               function delete( $id=0 )
                {
                        global $info_id,$confirm,$to_del;
+                       //echo "<p>delete(id=$id): info_id='$info_id', 
confirm='$confirm', to_del='$to_del'</p>\n";
  
                        $referer = $this->get_referer();
  
+                       if ($id)
+                       {
+                               $info_id = $id;
+                       }
                        if (!$info_id ||
                            !$this->bo->check_access($info_id,PHPGW_ACL_DELETE))
***************
*** 1013,1017 ****
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
!                       if ($confirm)
                        {
                                if (!isset($to_del) || $to_del == '.')
--- 1016,1020 ----
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
!                       if ($confirm && !$id)
                        {
                                if (!isset($to_del) || $to_del == '.')
***************
*** 1024,1027 ****
--- 1027,1031 ----
                                }
                                Header('Location: ' . 
$this->html->link($referer,array( 'cd' => 16 )));
+                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
                        else