[Phpgroupware-cvs] admin/inc class.uiaccounts.inc.php, 1.23.2.9.2.23, 1.23.2.9.2.24

[Jonathan Rivera <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.uiaccounts.inc.php 
Log Message:
link to Set addressmaster when you have not this.


Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.23.2.9.2.23
retrieving revision 1.23.2.9.2.24
diff -C2 -d -r1.23.2.9.2.23 -r1.23.2.9.2.24
*** class.uiaccounts.inc.php    26 Oct 2003 03:24:41 -0000      1.23.2.9.2.23
--- class.uiaccounts.inc.php    28 Oct 2003 16:31:24 -0000      1.23.2.9.2.24
***************
*** 1129,1159 ****
                        if($_account_id)
                        {
                                $owner = 
$GLOBALS['phpgw_info']['server']['addressmaster'];
                                $grants = 
$GLOBALS['phpgw']->acl->get_grants('addressbook');
                                if (!!($grants[$owner] & PHPGW_ACL_EDIT))
                                {
-                                       $referer = 
$GLOBALS['phpgw']->link('/index.php', 
-                                                                          
'menuaction=admin.uiaccounts.edit_user&account_id='.$_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($referer)
!                                                                               
                )
!                                                       );
                                        }
                                        else
                                        {
- //                                            $edit_entry =   
$GLOBALS['phpgw']->link('/index.php',
- //                                                                            
        array
- //                                                                            
        (
- //                                                                            
                'menuaction'    => 'addressbook.uiaddressbook.add_person',
- //                                                                            
                'account_id'    => $userData['account_id'],
- //                                                                            
                'referer'       =>rawurlencode($referer),
- //                                                                            
                )
- //                                                    );
                                                $edit_entry = '';
                                                $addressbook_message = 
lang('This account has no contact entry yet');
--- 1129,1148 ----
                        if($_account_id)
                        {
+                               $referer = 
$GLOBALS['phpgw']->link('/index.php', 
+                                                                  
'menuaction=admin.uiaccounts.edit_user&account_id='.$_account_id);
                                $owner = 
$GLOBALS['phpgw_info']['server']['addressmaster'];
                                $grants = 
$GLOBALS['phpgw']->acl->get_grants('addressbook');
                                if (!!($grants[$owner] & PHPGW_ACL_EDIT))
                                {
                                        if($userData['person_id'])
                                        {
!                                               $addressbook_label = 'Edit 
entry';
!                                               $edit_entry =   
$GLOBALS['phpgw']->link('/index.php', array(
                                                                                
                'menuaction'    => 'addressbook.uiaddressbook.edit_person',
                                                                                
                'ab_id'         => $userData['person_id'],
!                                                                               
                'referer'       =>rawurlencode($referer)));
                                        }
                                        else
                                        {
                                                $edit_entry = '';
                                                $addressbook_message = 
lang('This account has no contact entry yet');
***************
*** 1162,1171 ****
                                else
                                {
!                                       $edit_entry = '';
!                                       $addressbook_message = lang('You do not 
have edit access to addressmaster records');
                                }
                        }
                        else
                        {
                                $edit_entry = '';
                                $addressbook_message = '';
--- 1151,1164 ----
                                else
                                {
!                                       $addressbook_label = 'You do not have 
edit access to addressmaster contacts';
!                                       $edit_entry =   
$GLOBALS['phpgw']->link('/index.php', array(
!                                                                               
        'menuaction'    => 'admin.uiaclmanager.edit_accountmasters',
!                                                                               
        'account_id'    => $GLOBALS['phpgw_info']['user']['account_id'],
!                                                                               
        'referer'       => rawurlencode($referer)));
                                }
                        }
                        else
                        {
+                               $addressbook_label = '';
                                $edit_entry = '';
                                $addressbook_message = '';
***************
*** 1187,1191 ****
                                '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>':$addressbook_message,
                                'person_id'     => '<input type="hidden" 
NAME="person_id" VALUE="' . $userData['person_id'] . '">',
                                //End
--- 1180,1184 ----
                                'account_lastname'      => '<input 
name="account_lastname" value="' . $userData['account_lastname'] . '">',
                                //jarg-SOG S
!                               'add_addbook'   => $edit_entry ? '<a href="' . 
$edit_entry . '">' . lang($addressbook_label) . '</a>':$addressbook_message,
                                'person_id'     => '<input type="hidden" 
NAME="person_id" VALUE="' . $userData['person_id'] . '">',
                                //End