Home Explore Help
Register Sign In
Omnimaga
/
bugs
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

template expiring.

Nathaniel van Diepen 10 years ago
parent
febecfe969
commit
3b9c2270f3
4 changed files with 17 additions and 9 deletions
Split View Show Diff Stats
  1. 1 1
      config.default.json
  2. 1 1
      install/api.php
  3. 13 5
      js/index.js
  4. 2 2
      php/security.php

+ 1 - 1
config.default.json
View File 

@@ -1 +1 @@
 
-{"host":"localhost","user":"bugs","password":"bugs","database":"bugs","timeout":216000,"email":"[email protected]"}
 
+{"host":"localhost","user":"bugs","password":"bugs","database":"bugs","expire":86400,"email":"[email protected]"}

+ 1 - 1
install/api.php
View File 

@@ -125,7 +125,7 @@
 
 							$sql_query = remove_comments($sql_query);
 
 							$sql_query = remove_remarks($sql_query);
 
 							$sql_query = split_sql_file($sql_query, ';');
 
-							file_put_contents('../config.default.json',"{\"host\":\"{$dbhost}\",\"user\":\"{$dbuser}\",\"password\":\"{$dbpass}\",\"database\":\"{$dbname}\",\"timeout\":216000,\"email\":\"{$email}\"}");
 
+							file_put_contents('../config.default.json',"{\"host\":\"{$dbhost}\",\"user\":\"{$dbuser}\",\"password\":\"{$dbpass}\",\"database\":\"{$dbname}\",\"expire\":86400,\"email\":\"{$email}\"}");
 
 							require_once('../php/database.php');
 
 							foreach($sql_query as $sql){
 
 								query($sql) or die('error in query');

+ 13 - 5
js/index.js
View File 

@@ -28,7 +28,7 @@
 
 				console.log('Key change to '+key);
 
 				Key = key;
 
 				var d = new Date();
 
-				d.setTime(d.getTime()+get('timeout'));
 
+				d.setTime(d.getTime()+get('expire'));
 
 				$.cookie('key',key,{
 
 					expires: d
 
 				});
 
@@ -43,13 +43,21 @@
 
 		},
 
 		template = window.template = function(name,template){
 
 			if(exists(template)){
 
-				templates[name] = template;
 
+				templates[name] = {
 
+						template: template,
 
+						date: get('expire')+new Date
 
+					};
 
 				$.localStorage('templates',templates);
 
 			}else if(exists(templates[name])){
 
-				console.log('Getting template for: '+name);
 
-				return templates[name];
 
+				console.log('Using cached template for: '+name);
 
+				var template = templates[name].template;
 
+				if(templates[name].date < +new Date){
 
+					delete templates[name];
 
+					$.localStorage('templates',templates);
 
+				}
 
+				return template;
 
 			}else{
 
-				console.log('No template stored for: '+name);
 
+				console.log('No cached template stored for: '+name);
 
 				return '';
 
 			}
 
 		},

+ 2 - 2
php/security.php
View File 

@@ -57,8 +57,8 @@
 
 			unset($_SESSION['username']);
 
 		}else{
 
 			$_SESSION['key'] = $key;
 
-			setcookie('username',$_SESSION['username'],time()+get('timeout'));
 
-			setcookie('key',$key,time()+get('timeout'));
 
+			setcookie('username',$_SESSION['username'],time()+get('expire'));
 
+			setcookie('key',$key,time()+get('expire'));
 
 		}
 
 		return $key;
 
 	}