From af0483c32ba34fbe193cdc0caed56e956b171b83 Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Tue, 17 Jul 2007 20:28:20 +0000
Subject: [PATCH] Bugtracker #3575, #3891 - reduce JS warnings, reduce no of
 cookies generated, recalc tzOffset cookie every time

---
 e107_files/e107.js               | 29 ++++++++++++++---------------
 e107_plugins/clock_menu/clock.js |  3 ++-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/e107_files/e107.js b/e107_files/e107.js
index 2ad4104e4..3bebc4423 100644
--- a/e107_files/e107.js
+++ b/e107_files/e107.js
@@ -5,8 +5,8 @@
 |	e107 website system - Javascript File.
 |
 |	$Source: /cvs_backup/e107_0.8/e107_files/e107.js,v $
-|	$Revision: 1.5 $
-|	$Date: 2007-05-28 18:49:08 $
+|	$Revision: 1.6 $
+|	$Date: 2007-07-17 20:28:14 $
 |	$Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -34,24 +34,23 @@ var localTime = Math.floor(nowLocal.getTime()/1000);	/* time, in ms -- recorded
  */
 function SyncWithServerTime(serverTime)
 {
-	if (serverTime) {
+	if (serverTime) 
+	{
 	  	/* update time difference cookie */
-		tdCookie='e107_tdOffset=';
-		tdSetTimeCookie='e107_tdSetTime=';
-		serverDelta=Math.floor(localTime-serverTime);
-	  	document.cookie = tdCookie+serverDelta;
-	  	document.cookie = tdSetTimeCookie+(localTime-serverDelta); /* server time when set */
+		var serverDelta=Math.floor(localTime-serverTime);
+	  	document.cookie = 'e107_tdOffset='+serverDelta+'; path=/';
+	  	document.cookie = 'e107_tdSetTime='+(localTime-serverDelta)+'; path=/'; /* server time when set */
 	}
 
-	tzCookie = 'e107_tzOffset=';
-	if (document.cookie.indexOf(tzCookie) < 0) {
+	var tzCookie = 'e107_tzOffset=';
+//	if (document.cookie.indexOf(tzCookie) < 0) {
 		/* set if not already set */
-		timezoneOffset = nowLocal.getTimezoneOffset(); /* client-to-GMT in minutes */
-		document.cookie = tzCookie + timezoneOffset;
-	}
+		var timezoneOffset = nowLocal.getTimezoneOffset(); /* client-to-GMT in minutes */
+		document.cookie = tzCookie + timezoneOffset+'; path=/';
+//	}
 }
-
-if(document.getElementById&&!document.all){ns6=1;}else{ns6=0;}
+var ns6=0;
+if(document.getElementById&&!document.all){ns6=1;}
 var agtbrw=navigator.userAgent.toLowerCase();
 var operaaa=(agtbrw.indexOf('opera')!=-1);
 var head="display:''";
diff --git a/e107_plugins/clock_menu/clock.js b/e107_plugins/clock_menu/clock.js
index 89ae48d64..843114455 100644
--- a/e107_plugins/clock_menu/clock.js
+++ b/e107_plugins/clock_menu/clock.js
@@ -3,7 +3,8 @@
 function tick(e107_datepref,e107_dateformat,e107_datesuff1,e107_datesuff2,e107_datesuff3,e107_datesuff4) {
   if(e107_datepref=='undefined'){e107_datepref = '';}
   var hours, minutes, seconds, ap;
-  var intHours, intMinutes, intSeconds;  var today;
+  var intHours, intMinutes, intSeconds, today;
+  var intDay, intDate, intMonth, intYear, timeString;
   today = new Date();
   intDay = today.getDay();
   intDate = today.getDate();