[eGroupWare-svn] r46437 - in /trunk/admin: inc/class.admin_hooks.inc.php setup/setup.inc.php

[<ral...@us...>]

Author: ralfbecker
Date: Fri Mar 28 19:54:40 2014
New Revision: 46437

URL: http://svn.stylite.de/viewvc/egroupware?rev=46437&view=rev
Log:
missing "edit_user" hook from admin

Modified:
    trunk/admin/inc/class.admin_hooks.inc.php
    trunk/admin/setup/setup.inc.php

Modified: trunk/admin/inc/class.admin_hooks.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/admin/inc/class.admin_hooks.inc.php?rev=46437&r1=46436&r2=46437&view=diff
==============================================================================
--- trunk/admin/inc/class.admin_hooks.inc.php (original)
+++ trunk/admin/inc/class.admin_hooks.inc.php Fri Mar 28 19:54:40 2014
@@ -176,4 +176,33 @@
 
 		$GLOBALS['egw']->redirect_link('/admin/index.php');
 	}
+
+	/**
+	 * Actions for context menu of users
+	 *
+	 * @return array of actions
+	 */
+	public static function edit_user()
+	{
+		$actions = array();
+
+		if (!$GLOBALS['egw']->acl->check('current_sessions_access',1,'admin'))	// no rights to view
+		{
+			$actions[] = array(
+				'description' => 'Login History',
+				'url'         => '/index.php',
+				'extradata'   => 'menuaction=admin.admin_accesslog.index'
+			);
+		}
+
+		if (!$GLOBALS['egw']->acl->check('account_access',64,'admin'))	// no rights to set ACL-rights
+		{
+			$actions[] = array(
+				'description' => 'Deny access',
+				'url'         => '/index.php',
+				'extradata'   => 'menuaction=admin.uiaclmanager.list_apps'
+			);
+		}
+		return $actions;
+	}
 }

Modified: trunk/admin/setup/setup.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/admin/setup/setup.inc.php?rev=46437&r1=46436&r2=46437&view=diff
==============================================================================
--- trunk/admin/setup/setup.inc.php (original)
+++ trunk/admin/setup/setup.inc.php Fri Mar 28 19:54:40 2014
@@ -39,8 +39,9 @@
 	'deleteaccount',
 	'topmenu_info'
 );
-$setup_info['admin']['hooks']['admin'] = 'admin.admin_hooks.all_hooks';
-$setup_info['admin']['hooks']['sidebox_menu'] = 'admin.admin_hooks.all_hooks';
+$setup_info['admin']['hooks']['admin'] = 'admin_hooks::all_hooks';
+$setup_info['admin']['hooks']['sidebox_menu'] = 'admin_hooks::all_hooks';
+$setup_info['admin']['hooks']['edit_user'] = 'admin_hooks::edit_user';
 
 // add account tab to addressbook.edit
 $setup_info['admin']['hooks']['addressbook_edit'] = 'admin.admin_account.addressbook_edit';