some session length issues and minor formating/ui tweaks

3 files changed, 26 insertions, 18 deletions

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 5f01b4b5..6865d4fe 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,10 @@
 
 --------------------------------------------------------------------------
   v.3.3.3-Alpha2
+	- Fixed override of local_length to 9000 regardless of config file
+	- Tweaked Remeber Me Checkbox to be disabled if remember_length
+		is <= local_length
+	- Fixed issues with date not being set on insert of stats
 	- Fixed style issue on Single Album view when ratings are off
 	- Added Democratic Play ability, UI incomplete and 'clunky'
 	- Added some extra error checking to the install process
diff --git a/lib/init.php b/lib/init.php
index c5efb98a..47c55ad3 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -67,7 +67,7 @@ if (!$results = read_config($configfile,0)) {
 } 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.3.3-Alpha2 Build (003)';
+$results['version']		= '3.3.3-Alpha2 Build (004)';
 
 $results['raw_web_path']	= $results['web_path'];
 $results['web_path']		= $http_type . $_SERVER['HTTP_HOST'] . $results['web_path'];
@@ -109,6 +109,9 @@ if (!is_array($results['auth_methods'])) {
 if (!$results['user_ip_cardinality']) { 
 	$results['user_ip_cardinality'] = 42;
 }
+if (!$results['local_length']) { 
+	$results['local_length'] = '9000';
+}
 
 
 /* Variables needed for vauth Module */
@@ -116,8 +119,8 @@ $results['cookie_path'] 	= $results['raw_web_path'];
 $results['cookie_domain']	= $_SERVER['SERVER_NAME'];
 $results['cookie_life']		= $results['sess_cookielife'];
 $results['session_name']	= $results['sess_name'];
-$results['cookie_secure']	= '0';
-$results['session_length']	= '9000';
+$results['cookie_secure']	= $results['sess_cookiesecure'];
+$results['session_length']	= $results['local_length'];
 $results['mysql_password']	= $results['local_pass'];
 $results['mysql_username']	= $results['local_username'];
 $results['mysql_hostname']	= $results['local_host'];
diff --git a/templates/show_login_form.inc b/templates/show_login_form.inc
index 8102aadf..453a665a 100644
--- a/templates/show_login_form.inc
+++ b/templates/show_login_form.inc
@@ -4,9 +4,8 @@
  All Rights Reserved
 
  This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,6 +17,14 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
+
+/* Check and see if their remember me is the same or lower then local
+ * if so disable the checkbox 
+ */
+if (conf('local_length') >= conf('remember_length')) { 
+	$remember_disabled = 'disabled="disabled"';
+}
+
 ?>
 
 <div id="container">
@@ -29,23 +36,17 @@
 			<input class="text_input" type="text" name="username" value="<?php echo  $_REQUEST['username']; ; ?>" /></p>
 			<p class="loginp_1"><span><?php echo  _('Password'); ; ?>:</span> 
 			<input class="text_input" type="password" name="password" value="" /></p>
-			<p class="loginp_1"><?php echo _('Remember Me'); ?><input class="check_input" type="checkbox" name="rememberme" /></p>
+			<p class="loginp_1"><?php echo _('Remember Me'); ?><input class="check_input" type="checkbox" name="rememberme" <?php echo $remember_disabled; ?> /></p>
 			<?php echo  conf('login_message'); ; ?>
 			<?php $GLOBALS['error']->print_error('general'); ?>
 			<p><input class="button" type="submit" value="<?php echo _('Login'); ?>" /></p>
 			<input type="hidden" name="referrer" value="<?php echo $referrer; ?>" />
 			<input type="hidden" name="action" value="login" />
 		</form>
+		<?php if (conf('allow_public_registration')) { ?>
+		<span class="text-action">
+			<a href="<?php echo conf('web_path'); ?>/register.php"><?php echo _('Register'); ?></a>
+		</span>
+		<?php } // end if (conf('allow_public_registration')) ?>
 	</div>
 </div>
-
-<?php
-if (conf('allow_public_registration')) { ?>
-<div align="center">
-	<?php show_box_top(); ?>
-	<span class="text-action">
-		<a href="<?php echo conf('web_path'); ?>/register.php"><?php echo _('Register'); ?></a>
-	</span>
-	<?php show_box_bottom(); ?>
-</div>
-<?php } // end if (conf('allow_public_registration')) ?>