Changeset 61 for trunk/Sillaj-widget

Timestamp:

05/16/07 20:33:25 (3 years ago)

Author:

johan

Message:

Selected date is same as before only 6 hours into new day, after 6 hours the current date is set..
Fixes and changes in login timeout. PHP by default times session out after 1440 secs, but this is configurable (altough not from gui..) now..

Files:

• trunk/Sillaj-widget/Sillaj.wdgt/sillaj.js (modified) (5 diffs)

trunk/Sillaj-widget/Sillaj.wdgt/sillaj.js

@@ -1 +1 @@
 var flipper;
 
-var conf = {'baseURL':'', 'username':'', 'password':'', 'round':1};
+var conf = {'baseURL':'', 'username':'', 'password':'', 'round':1,
+                                'php_session_timeout':1440}; // the php_session_timeout var should be same as session.gc_maxlifetime in php.ini. Defaults to 1440 seconds
 
 var loggedIn = null;
@@ -51 +52 @@
 }
 
-function postEvent(data, cb, recursive)
-{
-        login();
-        doRequest("POST", "index.php", data, function(c)
-                {
-                        var r=c.responseText;
-                        if(r.match(/login/))
-                        {
-                                // not logged in...
-                                if(recursive == true)
-                                {
-                                        // Failed to post event due to login failure...
-                                        document.getElementById('status').innerHTML+="Failed to post event!";
-                                }
-                                else
-                                {
-                                        login(true, function(){
-                                                postEvent(data, cb, true);      // try again
-                                                });
-                                }
-                        }else
-                        {
-                                // assume OK
-                                if(cb)
-                                        cb();
-                        }
-                }
-        );
-}
-
 function login(force, cb)
 {
-        if(force == false && (loggedIn != null && (new Date()).getTime()/1000 < loggedIn.getTime()/100 + 3600))
+        if(force == false && (loggedIn != null && (new Date()).getTime()/1000 < loggedIn.getTime()/1000 + conf['php_session_timeout']))
         {
                 if(cb)
@@ -106 +77 @@
 }
 
+function postEvent(data, cb, recursive)
+{
+        login(false, function()
+                {
+                        doRequest("POST", "index.php", data, function(c)
+                                {
+                                        var r=c.responseText;
+                                        if(r.match(/login/))
+                                        {
+                                                // not logged in...
+                                                if(recursive == true)
+                                                {
+                                                        // Failed to post event due to login failure...
+                                                        document.getElementById('status').innerHTML+="Failed to post event!";
+                                                }
+                                                else
+                                                {
+                                                        login(true, function(){
+                                                                postEvent(data, cb, true);      // try again
+                                                                });
+                                                }
+                                        }else
+                                        {
+                                                // assume OK
+                                                if(cb)
+                                                        cb();
+                                        }
+                                }
+                        );
+                }
+        );
+}
+
 function updateProjects()
 {
@@ -191 +195 @@
                 if(n == lastSel) 
                         newSel = index-1;
+        }
+
+        if(lastSel != null && newSel != 0)
+        {
+                // Get date of lastSel and compare it to current. if more than 6 hours diff, ignore lastSel
+                var dd = sd.options[lastSel].value;
+                var d = Date.parse(d)
+                if(d.getTime() + 3600*6*1000 < (new Date()).getTime())
+                        newSel = 0; // set current date
         }
         sd.selectedIndex = newSel;
@@ -245 +258 @@
 
         var m = d.getMinutes().toString(); 
-        m = Math.round(m / conf.round) * conf.round;
+        m = ""+(Math.round(m / conf.round) * conf.round);
         if (m.length == 1)
                 m = "0" + m;