[Phpgroupware-cvs] admin/inc class.uiaccounts.inc.php, 1.23.2.9.2.24, 1.23.2.9.2.25 hook_admin.inc.php, 1.26.2.1.2.7, 1.26.2.1.2.8

[Alejandro Borges (lex) <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.uiaccounts.inc.php hook_admin.inc.php 
Log Message:
Further work to make contacts <-> ldap work with all  upgrade paths


Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/hook_admin.inc.php,v
retrieving revision 1.26.2.1.2.7
retrieving revision 1.26.2.1.2.8
diff -C2 -d -r1.26.2.1.2.7 -r1.26.2.1.2.8
*** hook_admin.inc.php  28 Oct 2003 13:44:20 -0000      1.26.2.1.2.7
--- hook_admin.inc.php  31 Oct 2003 01:23:27 -0000      1.26.2.1.2.8
***************
*** 37,40 ****
--- 37,45 ----
        }
  
+       if (! $GLOBALS['phpgw']->acl->check('sync_account_contact',1,'admin'))
+       {
+               $file['Sync Account-Contact']       = 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.sync_accounts_contacts');
+       }
+ 
        if (! $GLOBALS['phpgw']->acl->check('applications_access',1,'admin'))
        {

Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.23.2.9.2.24
retrieving revision 1.23.2.9.2.25
diff -C2 -d -r1.23.2.9.2.24 -r1.23.2.9.2.25
*** class.uiaccounts.inc.php    28 Oct 2003 16:31:24 -0000      1.23.2.9.2.24
--- class.uiaccounts.inc.php    31 Oct 2003 01:23:27 -0000      1.23.2.9.2.25
***************
*** 26,30 ****
                        'view_user_hook'        => True,
                        'group_manager'         => True,
!                       'accounts_popup'        => True
                );
  
--- 26,31 ----
                        'view_user_hook'        => True,
                        'group_manager'         => True,
!                       'accounts_popup'        => True,
!                       'sync_accounts_contacts'=> True
                );
  
***************
*** 1332,1335 ****
--- 1333,1341 ----
                }
  
+               function sync_accounts_contacts()
+               {
+                       $GLOBALS['phpgw']->accounts->sync_accounts_contacts();
+                       $GLOBALS['phpgw']->redirect_link('/admin/index.php');
+               }
        }
  ?>