From 1723f6235ecf8d8e0a8e7407b929c1c03c79a46c Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 1 Jul 2015 18:35:24 +0000 Subject: [PATCH] * Admin: bulk password reset: fixed missing password from email and csv, csv download is working again also changed all et2 actions to not use an iframe with ajax=true --- admin/inc/class.admin_hooks.inc.php | 8 ++++---- admin/inc/class.admin_passwordreset.inc.php | 6 +++--- admin/templates/default/app.css | 7 +++++++ admin/templates/default/passwordreset.xet | 6 +++--- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/admin/inc/class.admin_hooks.inc.php b/admin/inc/class.admin_hooks.inc.php index a5515ca6ee..bbc95bd440 100644 --- a/admin/inc/class.admin_hooks.inc.php +++ b/admin/inc/class.admin_hooks.inc.php @@ -68,7 +68,7 @@ class admin_hooks if (! $GLOBALS['egw']->acl->check('account_access',16,'admin')) { - $file['Bulk password reset'] = egw::link('/index.php','menuaction=admin.admin_passwordreset.index'); + $file['Bulk password reset'] = egw::link('/index.php','menuaction=admin.admin_passwordreset.index&ajax=true'); } if (! $GLOBALS['egw']->acl->check('group_access',1,'admin')) @@ -86,7 +86,7 @@ class admin_hooks } if (! $GLOBALS['egw']->acl->check('global_categories_access',1,'admin')) { - $file['Global Categories'] = egw::link('/index.php','menuaction=admin.admin_categories.index&appname=phpgw'); + $file['Global Categories'] = egw::link('/index.php','menuaction=admin.admin_categories.index&appname=phpgw&ajax=true'); } if (!$GLOBALS['egw']->acl->check('mainscreen_message_access',1,'admin') || !$GLOBALS['egw']->acl->check('mainscreen_message_access',2,'admin')) @@ -96,12 +96,12 @@ class admin_hooks if (! $GLOBALS['egw']->acl->check('current_sessions_access',1,'admin')) { - $file['View Sessions'] = egw::link('/index.php','menuaction=admin.admin_accesslog.sessions'); + $file['View Sessions'] = egw::link('/index.php','menuaction=admin.admin_accesslog.sessions&ajax=true'); } if (! $GLOBALS['egw']->acl->check('access_log_access',1,'admin')) { - $file['View Access Log'] = egw::link('/index.php','menuaction=admin.admin_accesslog.index'); + $file['View Access Log'] = egw::link('/index.php','menuaction=admin.admin_accesslog.index&ajax=true'); } /* disable old EGroupware error_log, as it is not used anymore diff --git a/admin/inc/class.admin_passwordreset.inc.php b/admin/inc/class.admin_passwordreset.inc.php index 67d407a375..12a214c5c9 100644 --- a/admin/inc/class.admin_passwordreset.inc.php +++ b/admin/inc/class.admin_passwordreset.inc.php @@ -73,10 +73,10 @@ class admin_passwordreset if ($content['download_csv'] && $content['changed']) { html::content_header('changed.csv','text/csv'); - //echo "account_lid;account_passwd;account_email;account_firstname;account_lastname\n"; + //echo "account_lid;account_password;account_email;account_firstname;account_lastname\n"; foreach($content['changed'] as $account) { - echo "$account[account_lid];$account[account_passwd];$account[account_email];$account[account_firstname];$account[account_lastname]\n"; + echo "$account[account_lid];$account[account_password];$account[account_email];$account[account_firstname];$account[account_lastname]\n"; } common::egw_exit(); } @@ -150,7 +150,7 @@ class admin_passwordreset $GLOBALS['egw']->acl->delete_repository('preferences','nopasswordchange',$account_id); } } - $account['account_passwd'] = $password; + $account['account_password'] = $password; if ((string)$content['mail']['activate'] !== '' || (string)$content['mail']['quota'] !== '' || strpos($content['mail']['domain'], '.') !== false) diff --git a/admin/templates/default/app.css b/admin/templates/default/app.css index 7e050015e0..94feb9573b 100644 --- a/admin/templates/default/app.css +++ b/admin/templates/default/app.css @@ -87,4 +87,11 @@ td.admin_userAgent span { } #admin-customfield_edit .attributes .et2_label,#admin-customfield_edit .attributes input { margin-right: 1em; +} + +/** + * Bulk password reset + */ +#admin-passwordreset_actions >:nth-child(2) { + display: block; } \ No newline at end of file diff --git a/admin/templates/default/passwordreset.xet b/admin/templates/default/passwordreset.xet index 32dc8edd45..7b2b5a6348 100644 --- a/admin/templates/default/passwordreset.xet +++ b/admin/templates/default/passwordreset.xet @@ -19,11 +19,11 @@ - + - + @@ -69,7 +69,7 @@