[Phpgroupware-cvs] admin/inc class.uiaccounts.inc.php, 1.23.2.9.2.18, 1.23.2.9.2.19

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv22617

Modified Files:
      Tag: Version-0_9_16-branch
        class.uiaccounts.inc.php 
Log Message:
attempt to fix problem with 'edit entry' not displaying

Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.23.2.9.2.18
retrieving revision 1.23.2.9.2.19
diff -C2 -d -r1.23.2.9.2.18 -r1.23.2.9.2.19
*** class.uiaccounts.inc.php    19 Sep 2003 05:16:27 -0000      1.23.2.9.2.18
--- class.uiaccounts.inc.php    5 Oct 2003 11:33:58 -0000       1.23.2.9.2.19
***************
*** 794,797 ****
--- 794,800 ----
                        // Maybe we should list this in setup/setup.inc.php and 
put it into the
                        // phpgw_applications table ? (jengo)
+ 
+                       // hooks would be better imho - skwashd
+ 
                        $apps_with_acl = array(
                                'addressbook' => True,
***************
*** 1113,1124 ****
                        $t->set_var($var);
                */
!                       //jarg-SOG S
!                       $edit_entry = $GLOBALS['phpgw']->link('/index.php',
!                                       array(
!                                               'menuaction'    => 
'addressbook.uiaddressbook.edit',
!                                               'ab_id'         => 
$userData['person_id'],
!                                               'referer'       
=>rawurlencode($referer),
!                                            )
!                                       );
                        //End
                        
--- 1116,1150 ----
                        $t->set_var($var);
                */
!                       //jarg-SOG S edited by skwashd
!                       if($_GET['account_id'])
!                       {
!                               if($userData['person_id'])
!                               {
!                                       $edit_entry =   
$GLOBALS['phpgw']->link('/index.php',
!                                                               array
!                                                               (
!                                                                       
'menuaction'    => 'addressbook.uiaddressbook.edit_person',
!                                                                       'ab_id' 
        => $userData['person_id'],
!                                                                       
'referer'       =>rawurlencode($_SERVER['HTTP_REFERER']),
!                                                               )
!                                                       );
!                               }
!                               else
!                               {
!                                       $edit_entry =   
$GLOBALS['phpgw']->link('/index.php',
!                                                               array
!                                                               (
!                                                                       
'menuaction'    => 'addressbook.uiaddressbook.add_person',
!                                                                       
'account_id'    => $userData['account_id'],
!                                                                       
'referer'       =>rawurlencode($_SERVER['HTTP_REFERER']),
!                                                               )
!                                                       );
! 
!                               }
!                       }
!                       else
!                       {
!                               $edit_entry = '';
!                       }
                        //End
                        
***************
*** 1137,1141 ****
                                'account_lastname'      => '<input 
name="account_lastname" value="' . $userData['account_lastname'] . '">',
                                //jarg-SOG S
!                               'add_addbook'   => $userData['person_id'] ? '<a 
href="' . $edit_entry . '">' . lang('edit entry') . '</a>':'',
                                'person_id'     => '<input type="hidden" 
NAME="person_id" VALUE="' . $userData['person_id'] . '">',
                                //End
--- 1163,1167 ----
                                'account_lastname'      => '<input 
name="account_lastname" value="' . $userData['account_lastname'] . '">',
                                //jarg-SOG S
!                               'add_addbook'   => $edit_entry ? '<a href="' . 
$edit_entry . '">' . lang('edit entry') . '</a>':'',
                                'person_id'     => '<input type="hidden" 
NAME="person_id" VALUE="' . $userData['person_id'] . '">',
                                //End