From 8b5ccd302bd1497de721a25e4ce086bebf95173f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 08 Jun 2008 15:32:42 -0400
Subject: [PATCH] Fixed a problem with the logout when the php session has ended.
---
interface/web/js/scrigo.js | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/interface/web/js/scrigo.js b/interface/web/js/scrigo.js
index 26d270a..3fde066 100644
--- a/interface/web/js/scrigo.js
+++ b/interface/web/js/scrigo.js
@@ -46,6 +46,9 @@
loadContent(parts[1]);
//redirect = parts[1];
//window.setTimeout('loadContent(redirect)', 1000);
+ } else if (o.responseText.indexOf('LOGIN_REDIRECT:') > -1) {
+ // Go to the login page
+ document.location.href = 'index.php';
} else {
document.getElementById('pageContent').innerHTML = o.responseText;
}
@@ -61,7 +64,7 @@
var userNameObj = frm.username;
if(userNameObj.value == ''){
userNameObj.focus();
- return;q
+ return;
}
var passwordObj = frm.passwort;
if(passwordObj.value == ''){
@@ -98,6 +101,46 @@
}
YAHOO.util.Connect.setForm(formname);
+ var submitFormObj = YAHOO.util.Connect.asyncRequest('POST', target, submitFormCallback);
+ /*
+ if(redirect != '') {
+ loadContent(redirect);
+ redirect = '';
+ }
+ */
+}
+
+function submitUploadForm(formname,target) {
+
+ var submitFormCallback = {
+ success: function(o) {
+ if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
+ var parts = o.responseText.split(':');
+ //alert(parts[1]);
+ loadContent(parts[1]);
+ //redirect = parts[1];
+ //window.setTimeout('loadContent(redirect)', 1000);
+ } else {
+ document.getElementById('pageContent').innerHTML = o.responseText;
+ }
+ },
+ upload: function(o) {
+ if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
+ var parts = o.responseText.split(':');
+ //alert(parts[1]);
+ loadContent(parts[1]);
+ //redirect = parts[1];
+ //window.setTimeout('loadContent(redirect)', 1000);
+ } else {
+ document.getElementById('pageContent').innerHTML = o.responseText;
+ }
+ },
+ failure: function(o) {
+ alert('Ajax Request was not successful. 1');
+ }
+ }
+
+ YAHOO.util.Connect.setForm(formname,true);
var submitFormObj = YAHOO.util.Connect.asyncRequest('POST', target, submitFormCallback);
/*
if(redirect != '') {
@@ -201,8 +244,8 @@
alert('Sorry. There was an error.');
}
- function del_record(link) {
- if(window.confirm("<tmpl_var name='delete_confirmation'>")) {
+function del_record(link,confirmation) {
+ if(window.confirm(confirmation)) {
loadContent(link);
}
}
--
Gitblit v1.9.1