diff options
| author | Andy Webber <dokuwiki@andywebber.com> | 2008-10-01 17:29:14 +0200 |
|---|---|---|
| committer | Andy Webber <dokuwiki@andywebber.com> | 2008-10-01 17:29:14 +0200 |
| commit | dc58b6f4952c9a966ba23101144f00d378746a17 (patch) | |
| tree | 8cb135a4c3ad2979c2e90169932cdb8dab9fcc99 /lib/plugins | |
| parent | 5babd79b8d25882c3af5dccc15157e728e5bda9e (diff) | |
| download | rpg-dc58b6f4952c9a966ba23101144f00d378746a17.tar.gz rpg-dc58b6f4952c9a966ba23101144f00d378746a17.tar.bz2 | |
editor_info_patch
At present, DW shows the username on the bottom left under "logged in as", and the login name for "last modified", "locked by" and under
revisions/recent changes. In a corporate environment, particularly when integrated with a Single Sign-On system, the login name may be somewhat
unfriendly. This patch makes the "logged in as" the same as the value used elsewhere and also allows an admin to decide whether it should be the
login name, username or e-mail address that is displayed. The e-mail address may also, optionally, be a mailto: link. E-mail addresses are
obfuscated according to the 'mailguard' setting. The default behaviour is to show the login name which is no change from previous behaviour for the
"last modified"/"locked by"/revisions/"recent changes", but is a change for the "logged in as".
darcs-hash:20081001152914-6ad63-9cd7174068ac55de381f1318a4401f8c51de5b0c.gz
Diffstat (limited to 'lib/plugins')
| -rw-r--r-- | lib/plugins/config/lang/en/lang.php | 7 | ||||
| -rw-r--r-- | lib/plugins/config/settings/config.metadata.php | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 864e79ee1..3de0bbd7d 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -81,6 +81,7 @@ $lang['indexdelay'] = 'Time delay before indexing (sec)'; $lang['relnofollow'] = 'Use rel="nofollow" on external links'; $lang['mailguard'] = 'Obfuscate email addresses'; $lang['iexssprotect']= 'Check uploaded files for possibly malicious JavaScript or HTML code'; +$lang['showuseras'] = 'What to display when showing the user that last edited a page'; /* Authentication Options */ $lang['useacl'] = 'Use access control lists'; @@ -210,3 +211,9 @@ $lang['xsendfile_o_0'] = "don't use"; $lang['xsendfile_o_1'] = 'Proprietary lighttpd header (before release 1.5)'; $lang['xsendfile_o_2'] = 'Standard X-Sendfile header'; $lang['xsendfile_o_3'] = 'Proprietary Nginx X-Accel-Redirect header'; + +/* Display user info */ +$lang['showuseras_o_loginname'] = 'Login name'; +$lang['showuseras_o_username'] = "User's full name"; +$lang['showuseras_o_email'] = "User's e-mail addresss (obfuscated according to mailguard setting)"; +$lang['showuseras_o_email_link'] = "User's e-mail addresss as a mailto: link"; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 4c86c2370..ee558b767 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -99,6 +99,7 @@ $meta['fullpath'] = array('onoff'); $meta['typography'] = array('multichoice','_choices' => array(0,1,2)); $meta['dformat'] = array('string'); $meta['signature'] = array('string'); +$meta['showuseras'] = array('multichoice','_choices' => array('loginname','username','email','email_link')); $meta['toptoclevel'] = array('multichoice','_choices' => array(1,2,3,4,5)); // 5 toc levels $meta['maxtoclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5)); $meta['maxseclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5)); // 0 for no sec edit buttons |