diff options
| -rw-r--r-- | conf/dokuwiki.php | 1 | ||||
| -rw-r--r-- | inc/auth.php | 1 | ||||
| -rw-r--r-- | inc/html.php | 4 | ||||
| -rw-r--r-- | lib/plugins/config/lang/en/lang.php | 1 | ||||
| -rw-r--r-- | lib/plugins/config/settings/config.metadata.php | 1 |
5 files changed, 7 insertions, 1 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index ab4d71387..b41d08685 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -126,6 +126,7 @@ $conf['broken_iua'] = 0; //Platform with broken ignore_user_abor $conf['xsendfile'] = 0; //Use X-Sendfile (1 = lighttpd, 2 = standard) $conf['xmlrpc'] = 0; //Enable/disable XML-RPC interface $conf['renderer_xhtml'] = 'xhtml'; //renderer to use for main page generation +$conf['rememberme'] = 1; //Enable/disable remember me on login //Set target to use when creating links - leave empty for same window $conf['target']['wiki'] = ''; diff --git a/inc/auth.php b/inc/auth.php index 1eef0db91..0d267cb27 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -59,6 +59,7 @@ if (!isset($_REQUEST['p'])) $_REQUEST['p'] = ''; if (!isset($_REQUEST['r'])) $_REQUEST['r'] = ''; $_REQUEST['http_credentials'] = false; + if (!$conf['rememberme']) $_REQUEST['r'] = false; // if no credentials were given try to use HTTP auth (for SSO) if(empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){ diff --git a/inc/html.php b/inc/html.php index e714828ee..73e47bf2b 100644 --- a/inc/html.php +++ b/inc/html.php @@ -58,7 +58,9 @@ function html_login(){ $form->addHidden('do', 'login'); $form->addElement(form_makeTextField('u', ((!$_REQUEST['http_credentials']) ? $_REQUEST['u'] : ''), $lang['user'], 'focus__this', 'block')); $form->addElement(form_makePasswordField('p', $lang['pass'], '', 'block')); - $form->addElement(form_makeCheckboxField('r', '1', $lang['remember'], 'remember__me', 'simple')); + if($conf['rememberme']) { + $form->addElement(form_makeCheckboxField('r', '1', $lang['remember'], 'remember__me', 'simple')); + } $form->addElement(form_makeButton('submit', '', $lang['btn_login'])); $form->endFieldset(); html_form('login', $form); diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 6d942c290..f15548f54 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -133,6 +133,7 @@ $lang['xmlrpc'] = 'Enable/disable XML-RPC interface.'; $lang['renderer_xhtml'] = 'Renderer to use for main (xhtml) wiki output'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (plugin)'; +$lang['rememberme'] = 'Enable/disable rememberme on login'; $lang['rss_type'] = 'XML feed type'; $lang['rss_linkto'] = 'XML feed links to'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 56a1c43ff..77b448d8a 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -180,6 +180,7 @@ $meta['broken_iua'] = array('onoff'); $meta['xsendfile'] = array('multichoice','_choices' => array(0,1,2,3)); $meta['xmlrpc'] = array('onoff'); $meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml')); +$meta['rememberme'] = array('onoff'); $meta['_network'] = array('fieldset'); $meta['proxy____host'] = array('string','_pattern' => '#^(|[a-z0-9\-\.+]+)$#i'); |