From 4f849016ba2322f628efec338f39b9ed4472cdf1 Mon Sep 17 00:00:00 2001
From: shish <shish@7f39781d-f577-437e-ae19-be835c7a54ca>
Date: Fri, 18 May 2007 18:10:32 +0000
Subject: [PATCH] login memory changed to default to a year, and removed from
 visible options

git-svn-id: file:///home/shish/svn/shimmie2/trunk@123 7f39781d-f577-437e-ae19-be835c7a54ca
---
 core/config.class.php |  1 -
 core/ext/user.ext.php | 10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/config.class.php b/core/config.class.php
index 9e7525d2..b9a1aa07 100644
--- a/core/config.class.php
+++ b/core/config.class.php
@@ -29,7 +29,6 @@ class Config {
 			'popular_count' => 15, # popular
 			'info_link' => 'http://tags.shishnet.org/wiki/$tag', # popular
 			'login_signup_enabled' => true, # user
-			'login_memory' => 7, # user
 			'image_ilink' => '$base/image/$id.$ext', # view
 			'image_slink' => '', # view
 			'image_tlink' => '$base/thumb/$id.jpg', # view
diff --git a/core/ext/user.ext.php b/core/ext/user.ext.php
index 009821c9..9bc5b847 100644
--- a/core/ext/user.ext.php
+++ b/core/ext/user.ext.php
@@ -36,7 +36,7 @@ class UserPage extends Extension {
 				}
 			}
 			else if($event->get_arg(0) == "logout") {
-				setcookie("shm_session", "", time()+60*60*24*$config->get_int('login_memory'), "/");
+				setcookie("shm_session", "", time()+60*60*24*$config->get_int('login_memory', 365), "/");
 				$page->set_mode("redirect");
 				$page->set_redirect(make_link("index"));
 			}
@@ -70,13 +70,11 @@ class UserPage extends Extension {
 		
 		if(is_a($event, 'SetupBuildingEvent')) {
 			$sb = new SetupBlock("User Options");
-			$sb->add_int_option("login_memory", "Login memory: "); $sb->add_label(" days");
 			$sb->add_bool_option("login_signup_enabled", "<br>Allow new signups: ");
 			$sb->add_longtext_option("login_tac", "<br>Terms &amp; Conditions:<br>");
 			$event->panel->add_main_block($sb);
 		}
 		if(is_a($event, 'ConfigSaveEvent')) {
-			$event->config->set_int_from_post("login_memory");
 			$event->config->set_bool_from_post("login_signup_enabled");
 			$event->config->set_string_from_post("login_tac");
 		}
@@ -109,7 +107,7 @@ class UserPage extends Extension {
 					);
 			setcookie(
 					"shm_session", md5($hash.$addr),
-					time()+60*60*24*$config->get_int('login_memory'), "/"
+					time()+60*60*24*$config->get_int('login_memory', 365), "/"
 					);
 
 			$page->set_mode("redirect");
@@ -165,7 +163,7 @@ class UserPage extends Extension {
 				setcookie("shm_user", $name,
 						time()+60*60*24*365, '/');
 				setcookie("shm_session", md5($hash.$addr),
-						time()+60*60*24*$config->get_int('login_memory'), '/');
+						time()+60*60*24*$config->get_int('login_memory', 365), '/');
 				$page->set_mode("redirect");
 				$page->set_redirect(make_link("user"));
 			}
@@ -219,7 +217,7 @@ class UserPage extends Extension {
 					setcookie("shm_user", $name,
 							time()+60*60*24*365, '/');
 					setcookie("shm_session", md5($hash.$addr),
-							time()+60*60*24*$config->get_int('login_memory'), '/');
+							time()+60*60*24*$config->get_int('login_memory', 365), '/');
 					$page->set_mode("redirect");
 					$page->set_redirect(make_link("user"));
 				}