[Phpgroupware-cvs] addressbook/inc class.uiaddressbook.inc.php, 1.36.2.15.2.26, 1.36.2.15.2.27

[Jonathan Rivera <address@hidden>]

Update of /cvsroot/phpgroupware/addressbook/inc
In directory subversions:/tmp/cvs-serv8979/addressbook/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.uiaddressbook.inc.php 
Log Message:
Add support for referer and fix some problems with delete button


Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.36.2.15.2.26
retrieving revision 1.36.2.15.2.27
diff -C2 -d -r1.36.2.15.2.26 -r1.36.2.15.2.27
*** class.uiaddressbook.inc.php 15 Oct 2003 17:16:29 -0000      1.36.2.15.2.26
--- class.uiaddressbook.inc.php 15 Oct 2003 20:23:47 -0000      1.36.2.15.2.27
***************
*** 546,550 ****
                                Header('Location: '
                                       . $GLOBALS['phpgw']->link('/index.php',
!                                                                
'menuaction=addressbook.uiaddressbook.view_person&ab_id='.$ab_id));
                                $GLOBALS['phpgw']->common->phpgw_exit();
                                break;
--- 546,551 ----
                                Header('Location: '
                                       . $GLOBALS['phpgw']->link('/index.php',
!                                                                
'menuaction=addressbook.uiaddressbook.view_person&ab_id='
!                                                                .$ab_id 
.'&referer='.$this->referer));
                                $GLOBALS['phpgw']->common->phpgw_exit();
                                break;
***************
*** 623,627 ****
                                Header('Location: '
                                       . $GLOBALS['phpgw']->link('/index.php',
!                                               
'menuaction=addressbook.uiaddressbook.view_person&ab_id='.$this->contact_id));
                                $GLOBALS['phpgw']->common->phpgw_exit();
                                break;
--- 624,629 ----
                                Header('Location: '
                                       . $GLOBALS['phpgw']->link('/index.php',
!                                                                
'menuaction=addressbook.uiaddressbook.view_person&ab_id='
!                                                                
.$this->contact_id .'&referer='.$this->referer));
                                $GLOBALS['phpgw']->common->phpgw_exit();
                                break;
***************
*** 936,940 ****
                        //print 'fields:<br>';
                        $js_submit = '';
! 
                        if (($this->bo->so->grants[$fields['owner']] & 
PHPGW_ACL_DELETE) || 
                            $fields['owner'] == 
$GLOBALS['phpgw_info']['user']['account_id'])
--- 938,942 ----
                        //print 'fields:<br>';
                        $js_submit = '';
!                       $fields['owner'] = 
$fields['owner']?$fields['owner']:$this->owner;
                        if (($this->bo->so->grants[$fields['owner']] & 
PHPGW_ACL_DELETE) || 
                            $fields['owner'] == 
$GLOBALS['phpgw_info']['user']['account_id'])
***************
*** 971,974 ****
--- 973,977 ----
                        $this->template->set_var('old_tab_name', 
'entry[old_tab]');
                        $this->template->set_var('old_tab', $fields['old_tab']);
+                       $this->template->set_var('referer', $this->referer);
                        $this->template->set_var('ab_id', $this->contact_id);
                        $this->template->set_var('owner', $this->owner);
***************
*** 1759,1762 ****
--- 1762,1766 ----
                        $this->contact_id = get_var('ab_id', 
array('post','get'));
                        $this->owner = get_var('owner', array('post','get'));
+                       $this->referer = get_var('referer', 
array('post','get'));
                }
  
***************
*** 2531,2535 ****
                                }
                        }
!                       
                        $owner=$contacts['owner'];
                        $cats=$contacts['tab_cats']['my_cats'];
--- 2535,2539 ----
                                }
                        }
! 
                        $owner=$contacts['owner'];
                        $cats=$contacts['tab_cats']['my_cats'];
***************
*** 2538,2542 ****
                        unset($contacts['tab_cats']);
                        unset($contacts['tab_extra']);
-                       
                        if ( 
!$this->bo->so->contacts->check_perms($this->bo->grants[$owner],PHPGW_ACL_READ) 
&& 
                             ($owner != 
$GLOBALS['phpgw_info']['user']['account_id']) )
--- 2542,2545 ----