mikuli.cz

commit c530f3b89f865c0cb543beeff855f59fe17ebf5d
parent bfbddf87b45da3b9fd2a531af8f7dfb2ca46bdf5
Author: markseu <mark2011@mayberg.se>
Date:   Fri,  6 Oct 2017 12:03:30 +0200

System update (login with configurable timeout)

Diffstat:
M
system/config/config.ini
 | 
1
+
M
system/plugins/edit.php
 | 
6
++++--

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/system/config/config.ini b/system/config/config.ini
@@ -61,6 +61,7 @@ EditUserHome: /
 EditLoginEmail:
 EditLoginPassword:
 EditLoginRestrictions: 0
+EditLoginSessionTimeout: 31536000
 EditBruteForceProtection: 25
 ImageThumbnailLocation: /media/thumbnails/
 ImageThumbnailDir: media/thumbnails/
diff --git a/system/plugins/edit.php b/system/plugins/edit.php
@@ -5,7 +5,7 @@
 
 class YellowEdit
 {
-	const VERSION = "0.7.3";
+	const VERSION = "0.7.4";
 	var $yellow;			//access to API
 	var $response;			//web response
 	var $users;				//user accounts
@@ -29,6 +29,7 @@ class YellowEdit
 		$this->yellow->config->setDefault("editLoginEmail", "");
 		$this->yellow->config->setDefault("editLoginPassword", "");
 		$this->yellow->config->setDefault("editLoginRestrictions", "0");
+		$this->yellow->config->setDefault("editLoginSessionTimeout", "31536000");
 		$this->yellow->config->setDefault("editBruteForceProtection", "25");
 		$this->users->load($this->yellow->config->get("configDir").$this->yellow->config->get("editUserFile"));
 	}
@@ -1074,7 +1075,8 @@ class YellowResponse
 	function createCookie($scheme, $address, $base, $email)
 	{
 		$session = $this->plugin->users->createSession($email);
-		setcookie("login", "$email,$session", time()+60*60*24*365, "$base/", "", $scheme=="https");
+		$timeout = $this->yellow->config->get("editLoginSessionTimeout");
+		setcookie("login", "$email,$session", $timeout ? time()+$timeout : 0, "$base/", "", $scheme=="https");
 	}
 	
 	// Destroy browser cookie