aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--application/config/ConfigManager.php2
-rw-r--r--doc/md/Shaarli-configuration.md5
-rw-r--r--index.php2
-rw-r--r--tpl/default/loginform.html3
-rw-r--r--tpl/vintage/loginform.html4
5 files changed, 13 insertions, 3 deletions
diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php
index 0fc5a5c7..fdd5b3d7 100644
--- a/application/config/ConfigManager.php
+++ b/application/config/ConfigManager.php
@@ -328,6 +328,8 @@ class ConfigManager
328 $this->setEmpty('privacy.default_private_links', false); 328 $this->setEmpty('privacy.default_private_links', false);
329 $this->setEmpty('privacy.hide_public_links', false); 329 $this->setEmpty('privacy.hide_public_links', false);
330 $this->setEmpty('privacy.hide_timestamps', false); 330 $this->setEmpty('privacy.hide_timestamps', false);
331 // default state of the 'remember me' checkbox of the login form
332 $this->setEmpty('privacy.remember_user_default', true);
331 333
332 $this->setEmpty('thumbnail.enable_thumbnails', true); 334 $this->setEmpty('thumbnail.enable_thumbnails', true);
333 $this->setEmpty('thumbnail.enable_localcache', true); 335 $this->setEmpty('thumbnail.enable_localcache', true);
diff --git a/doc/md/Shaarli-configuration.md b/doc/md/Shaarli-configuration.md
index 188a3c09..d90e95eb 100644
--- a/doc/md/Shaarli-configuration.md
+++ b/doc/md/Shaarli-configuration.md
@@ -91,6 +91,8 @@ _These settings should not be edited_
91- **default_private_links**: Check the private checkbox by default for every new link. 91- **default_private_links**: Check the private checkbox by default for every new link.
92- **hide_public_links**: All links are hidden while logged out. 92- **hide_public_links**: All links are hidden while logged out.
93- **hide_timestamps**: Timestamps are hidden. 93- **hide_timestamps**: Timestamps are hidden.
94- **remember_user_default**: Default state of the login page's *remember me* checkbox
95 - `true`: checked by default, `false`: unchecked by default
94 96
95### Feed 97### Feed
96 98
@@ -192,7 +194,8 @@ _These settings should not be edited_
192 "privacy": { 194 "privacy": {
193 "default_private_links": true, 195 "default_private_links": true,
194 "hide_public_links": false, 196 "hide_public_links": false,
195 "hide_timestamps": false 197 "hide_timestamps": false,
198 "remember_user_default": true
196 }, 199 },
197 "thumbnail": { 200 "thumbnail": {
198 "enable_thumbnails": true, 201 "enable_thumbnails": true,
diff --git a/index.php b/index.php
index 7df6d819..e0a7b416 100644
--- a/index.php
+++ b/index.php
@@ -737,6 +737,8 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history)
737 $PAGE->assign('username', escape($_GET['username'])); 737 $PAGE->assign('username', escape($_GET['username']));
738 } 738 }
739 $PAGE->assign('returnurl',(isset($_SERVER['HTTP_REFERER']) ? escape($_SERVER['HTTP_REFERER']):'')); 739 $PAGE->assign('returnurl',(isset($_SERVER['HTTP_REFERER']) ? escape($_SERVER['HTTP_REFERER']):''));
740 // add default state of the 'remember me' checkbox
741 $PAGE->assign('remember_user_default', $conf->get('privacy.remember_user_default'));
740 $PAGE->renderPage('loginform'); 742 $PAGE->renderPage('loginform');
741 exit; 743 exit;
742 } 744 }
diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html
index eb6d8378..5777a218 100644
--- a/tpl/default/loginform.html
+++ b/tpl/default/loginform.html
@@ -30,7 +30,8 @@
30 </div> 30 </div>
31 <div class="remember-me"> 31 <div class="remember-me">
32 <input type="checkbox" name="longlastingsession" id="longlastingsessionform" 32 <input type="checkbox" name="longlastingsession" id="longlastingsessionform"
33 checked="checked" tabindex="22"> 33 {if="$remember_user_default"}checked="checked"{/if}
34 tabindex="22">
34 <label for="longlastingsessionform">{'Remember me'|t}</label> 35 <label for="longlastingsessionform">{'Remember me'|t}</label>
35 </div> 36 </div>
36 <div> 37 <div>
diff --git a/tpl/vintage/loginform.html b/tpl/vintage/loginform.html
index 84176385..1becd44f 100644
--- a/tpl/vintage/loginform.html
+++ b/tpl/vintage/loginform.html
@@ -24,7 +24,9 @@
24 </label> 24 </label>
25 <input type="submit" value="Login" class="bigbutton" tabindex="4"> 25 <input type="submit" value="Login" class="bigbutton" tabindex="4">
26 <label for="longlastingsession"> 26 <label for="longlastingsession">
27 <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3"> 27 <input type="checkbox" name="longlastingsession"
28 id="longlastingsession" tabindex="3"
29 {if="$remember_user_default"}checked="checked"{/if}>
28 Stay signed in (Do not check on public computers)</label> 30 Stay signed in (Do not check on public computers)</label>
29 <input type="hidden" name="token" value="{$token}"> 31 <input type="hidden" name="token" value="{$token}">
30 {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if} 32 {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if}