From 2365d73d76c039bedafc4a250fa0d584296f87d3 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 16 Jan 2009 22:47:02 +0100
Subject: [PATCH] made 'edit user' in user manager more usable
darcs-hash:20090116214702-f7d6d-89ecae0e072bbd8ae42646733bf7ceff10b59540.gz
---
lib/plugins/usermanager/admin.php | 30 ++++++++----------
.../usermanager/images/no_user_edit.png | Bin 431 -> 0 bytes
lib/plugins/usermanager/images/user_edit.png | Bin 1058 -> 0 bytes
3 files changed, 14 insertions(+), 16 deletions(-)
delete mode 100644 lib/plugins/usermanager/images/no_user_edit.png
delete mode 100644 lib/plugins/usermanager/images/user_edit.png
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 67af14519..cb34d1f2c 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -150,13 +150,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
$page_buttons = $this->_pagination();
$delete_disable = $this->_auth->canDo('delUser') ? '' : 'disabled="disabled"';
- if ($this->_auth->canDo('UserMod')) {
- $edit_disable = '';
- $img_useredit = 'user_edit.png';
- } else {
- $edit_disable = 'disabled="disabled"';
- $img_useredit = 'no_user_edit.png';
- }
+ $editable = ($this->_auth->canDo('UserMod')) ? 1 : 0;
print $this->locale_xhtml('intro');
print $this->locale_xhtml('list');
@@ -174,11 +168,11 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
ptln(" <table class=\"inline\">");
ptln(" <thead>");
ptln(" <tr>");
- ptln(" <th colspan=\"2\"> </th><th>".$this->lang["user_id"]."</th><th>".$this->lang["user_name"]."</th><th>".$this->lang["user_mail"]."</th><th>".$this->lang["user_groups"]."</th>");
+ ptln(" <th> </th><th>".$this->lang["user_id"]."</th><th>".$this->lang["user_name"]."</th><th>".$this->lang["user_mail"]."</th><th>".$this->lang["user_groups"]."</th>");
ptln(" </tr>");
ptln(" <tr>");
- ptln(" <td colspan=\"2\" class=\"rightalign\"><input type=\"image\" src=\"".DOKU_PLUGIN_IMAGES."search.png\" name=\"fn[search][new]\" title=\"".$this->lang['search_prompt']."\" alt=\"".$this->lang['search']."\" /></td>");
+ ptln(" <td class=\"rightalign\"><input type=\"image\" src=\"".DOKU_PLUGIN_IMAGES."search.png\" name=\"fn[search][new]\" title=\"".$this->lang['search_prompt']."\" alt=\"".$this->lang['search']."\" class=\"button\" /></td>");
ptln(" <td><input type=\"text\" name=\"userid\" class=\"edit\" value=\"".$this->_htmlFilter('user')."\" /></td>");
ptln(" <td><input type=\"text\" name=\"username\" class=\"edit\" value=\"".$this->_htmlFilter('name')."\" /></td>");
ptln(" <td><input type=\"text\" name=\"usermail\" class=\"edit\" value=\"".$this->_htmlFilter('mail')."\" /></td>");
@@ -193,15 +187,19 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
$groups = join(', ',$grps);
ptln(" <tr class=\"user_info\">");
ptln(" <td class=\"centeralign\"><input type=\"checkbox\" name=\"delete[".$user."]\" ".$delete_disable." /></td>");
- ptln(" <td class=\"centeralign\"><input type=\"image\" name=\"fn[edit][".$user."]\" ".$edit_disable." src=\"".DOKU_PLUGIN_IMAGES.$img_useredit."\" title=\"".$this->lang['edit_prompt']."\" alt=\"".$this->lang['edit']."\"/></td>");
- ptln(" <td>".hsc($user)."</td><td>".hsc($name)."</td><td>".hsc($mail)."</td><td>".hsc($groups)."</td>");
+ if ($editable) {
+ ptln(" <td><a href=\"".wl($ID,'fn[edit]['.$user.']=1&do=admin&page=usermanager&start='.$this->_start.'&sectok='.getSecurityToken())."\" title=\"".$this->lang['edit_prompt']."\">".hsc($user)."</a></td>");
+ } else {
+ ptln(" <td>".hsc($user)."</td>");
+ }
+ ptln(" <td>".hsc($name)."</td><td>".hsc($mail)."</td><td>".hsc($groups)."</td>");
ptln(" </tr>");
}
ptln(" </tbody>");
}
ptln(" <tbody>");
- ptln(" <tr><td colspan=\"6\" class=\"centeralign\">");
+ ptln(" <tr><td colspan=\"5\" class=\"centeralign\">");
ptln(" <span class=\"medialeft\">");
ptln(" <input type=\"submit\" name=\"fn[delete]\" ".$delete_disable." class=\"button\" value=\"".$this->lang['delete_selected']."\" id=\"usrmgr__del\" />");
ptln(" </span>");
@@ -393,10 +391,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
if (!is_array($selected) || empty($selected)) return false;
$selected = array_keys($selected);
- if(in_array($_SERVER['REMOTE_USER'], $selected)) {
- msg("You can't delete yourself!", -1);
- return false;
- }
+ if(in_array($_SERVER['REMOTE_USER'], $selected)) {
+ msg("You can't delete yourself!", -1);
+ return false;
+ }
$count = $this->_auth->triggerUserMod('delete', array($selected));
if ($count == count($selected)) {
diff --git a/lib/plugins/usermanager/images/no_user_edit.png b/lib/plugins/usermanager/images/no_user_edit.png
deleted file mode 100644
index 3a1d42996954632f59eadb3173a7321712280264..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 431
zcmV;g0Z{&lP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00002VoOIv0RM-N
z%)bBt010qNS#tmY3h)2`3h)6!tTdPa000McNliru)&c<%6cLeg;Vu9G0YFJaK~yNu
zh0#k(RB;%`@z4L9ql|eWV%h|zjwprgMOs<RBCxkny@H^3VlE^kY13tw1PX2(yoAEE
zX%Q~Q3pk)KU8v5We-}s7XwkFzJ&P|755F(}nQ*?$#YJt$qN+#X0!WIOkBd5W>k_;(
z9WQ{ai1)g+&Q2!Y`Um*tzKUJ*GKruaJHlVUsD~N`Jl1Q(a|d3>UQOfYz;*jFWo5aR
ze%tQo*RWDN*^a-xl1imIESXSoWLKXa8F^e#GwmhlbI*`HnNOms>?D3LW5!qGe#(ug
zXh>bbq^luWH|v=l+gh4#8rG1?ttlx7vK3E!R>F6KZrPLhWy^q#qRF7sh93I{CF)N6
zu&Ji&%tG?Os^|^wYFbvaY(dFKQ$<m?Lp$bPsQY5fp}GU3o+>H2{Nt?}hmE;m(zS3|
Z_bEd-UXU@E;5GmN002ovPDHLkV1jt>zEuDK
diff --git a/lib/plugins/usermanager/images/user_edit.png b/lib/plugins/usermanager/images/user_edit.png
deleted file mode 100644
index 8ca490eaf4df5f93debd4270c1c844ad67be326a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1058
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vk7#JA;1^9%x
z{{R2~-@pHVe*gOW`}?ooe}De^`}OO$zu%Al|NQjtw?qFwJ^1_W$mdUAzQ2F^_3h(t
zukL(*ar5WnO`o6a`t#t(wI|=MJo@tP{@EXoV!uC%{{ArP`~Bpv_oKhv&3SiY<JUWJ
zU+=^(dGi1JmG$2)uX}ZQ*N016-d|et=~~sd3oE`|SpMz&(vMfF-(9KwaJlmJ<@y)r
zx4gSt`Qyx-cW0NsI<xxSsbz03RQx<S@#pa=ACFFddn)(&>GByD|L-~Z@X5*0)hGTu
zKhXVtPjk_g|L=A+J>OUUba&sA?Om@nSKQy)d2#!MSDQ*RPyWBWqwMOos@&uMmh8NL
zdt+<M?yoyGZJxK~R>uB+ZM*khTv>l+Wx<W55y{*BUtgS@u>Jp|MS)iqWnW#CxnseE
z6LSi0%nG?M*KOOJo`&TcZcKH*G%aw-yv=8(Mb<9fykmOJ(HWjsCc3Sf+O}kB$AKv>
zRnsr+>T%lF<+Hy_?_{fE$)x4mJ3P-fnXKw`zF4PqzD|2}WAwRdjZ+ocrOgXYl<V%R
zl3H2qx1!oNzW(@{0{!K=CW|uli?iyNBq>Lv&2LQ6?M%{+O_`RQ+%Z2wXm*6q%m^XV
zg#D9)1t$f_O!F6-?#=HNI?*X)&IE6PRv%H9kgj%b!7eZUc5nW6Fa9nM{w7Z;d7mRi
zE|S@<O6_($rH(=}9(#)H`STn^GwsEqoF!82WY*hH?F1%_RV6`w!3@BpFf_nr<qtQ2
zuI4Q8h%9Dc;Q9c<j81DzW&i~hN?apKg7ec#$`gxH8GI9yi}G_*Q!*13+%k(&%kzt}
zixqq$c2Cq&0jj;}>EaktF(*0U0Gp7y-)w7r>4W`quiUmyJa<WE$AKsFA~&b`#_ti*
z+n{k+HScCq>*<*ZOu9_Z&MD?4`8p-mac)v*^h#Fd<yAf$qb|yK)kI<b(q%Ut0s}V(
zgkSLUw3yY{Xj;&jQCnNP&un{-s|$}l^Wyh4f~@T46KcyUIk#%mv9Z0D+!ki%=sE38
z(WIzIMh9W7m|$h)%X=-B9x0t<o7KqlwD0Y|qxasKT~gDG{dU!X@#(5}|BTlC*mY*o
z%C$?Y6v7QQKP{axQ*^6u=99!W%Tm{LM-BNYybODmTKsv)(BcU6B!j1`pUXO@geCy?
C3UsUh
--
GitLab