From 9fcf88d06d20076f1b228979e9ed4e8a56f39ef8 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 26 Oct 2010 10:28:10 -0400
Subject: [PATCH] Fixed: FS#1388 - Namevirtualhost directive is missing after update. 2nd try ;)

---
 interface/web/js/scrigo.js.php |   42 ++++++++++++++++++++++--------------------
 1 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index ba73aa7..4316af7 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -1,10 +1,19 @@
 <?php
 	session_start();
 	include('../../lib/config.inc.php');
-	include_once(ISPC_ROOT_PATH.'/web/strengthmeter/lib/lang/'.$_SESSION['s']['language'].'_strengthmeter.lng');
+	$lang = (isset($_SESSION['s']['language']) && $_SESSION['s']['language'] != '')?$_SESSION['s']['language']:'en';
+	include_once(ISPC_ROOT_PATH.'/web/strengthmeter/lib/lang/'.$lang.'_strengthmeter.lng');
 ?>
 
 redirect = '';
+
+function reportError(request) {
+	/* Error reporting is disabled by default as some browsers like safari 
+	   sometimes throw errors when a ajax request is delayed even if the 
+	   ajax request worked. */
+	   
+	/*alert(request);*/
+}
 
 function loadContentRefresh(pagename) {
 	var pageContentCallbackRefresh = {
@@ -12,7 +21,7 @@
 			document.getElementById('pageContent').innerHTML = o.responseText;
 		},
 		failure: function(o) {
-			alert('Ajax Request was not successful.'+pagename);
+			reportError('Ajax Request was not successful.'+pagename);
 		}
 	}
 	
@@ -36,7 +45,7 @@
 			loadMenus();
 		},
 		failure: function(o) {
-			alert('Ajax Request was not successful.');
+			reportError('Ajax Request was not successful.'+module);
 		}
 	}
 	var submitFormObj = YAHOO.util.Connect.asyncRequest('GET', 'capp.php?mod='+module, cappCallback);
@@ -61,7 +70,7 @@
 			loadMenus();
 		},
 		failure: function(o) {
-			alert('Ajax Request was not successful.');
+			reportError('Ajax Request was not successful.110');
 		}
 	}
 	
@@ -105,7 +114,7 @@
 		},
 		failure: function(o) {
 			var parts = o.responseText.split(':');
-			alert('Ajax Request was not successful. '+parts[1]);
+			reportError('Ajax Request was not successful. 111');
 		}
 	}
 	
@@ -145,7 +154,7 @@
 			}
         },
 		failure: function(o) {
-			alert('Ajax Request was not successful. 1');
+			reportError('Ajax Request was not successful. 112');
 		}
 	}
 	
@@ -173,7 +182,7 @@
 			}
 		},
 		failure: function(o) {
-			alert('Ajax Request was not successful.');
+			reportError('Ajax Request was not successful. 113');
 		}
 	}
 	
@@ -207,7 +216,7 @@
 			*/
 		},
 		failure: function(o) {
-			alert('Ajax Request was not successful.');
+			reportError('Ajax Request was not successful. 114');
 		}
 	}
 	
@@ -252,7 +261,7 @@
 			document.getElementById('sideNav').innerHTML = o.responseText;
 		},
 		failure: function(o) {
-			alert('Ajax Request was not successful.');
+			reportError('Ajax Request was not successful. 115');
 		}
 	}
 	
@@ -263,7 +272,7 @@
 			document.getElementById('topNav').innerHTML = o.responseText;
 		},
 		failure: function(o) {
-			alert('Ajax Request was not successful.');
+			reportError('Ajax Request was not successful. 116');
 		}
 	}
 	
@@ -276,13 +285,6 @@
 	document.pageForm.next_tab.value = tab;
 	submitForm('pageForm',target);
 }
-
-
-
-function reportError(request)
-	{
-		alert('Sorry. There was an error.');
-	}
 	
 function del_record(link,confirmation) {
   if(window.confirm(confirmation)) {
@@ -296,7 +298,7 @@
 			document.getElementById(elementid).innerHTML = o.responseText;
 		},
 		failure: function(o) {
-			alert('Ajax Request was not successful.');
+			reportError('Ajax Request was not successful. 118');
 		}
 	}
 	
@@ -320,7 +322,7 @@
 			}
 		},
 		failure: function(o) {
-		alert('Ajax Request was not successful.');
+		reportError('Ajax Request was not successful. 119');
 		}
 	}
 	var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, itemContentCallback);
@@ -332,7 +334,7 @@
 			setTimeout( keepalive, 1000000 );
 		},
 		failure: function(o) {
-			alert('Sorry. There was an error.');
+			reportError('Session expired. Please login again.');
 		}
 	}
 	

--
Gitblit v1.9.1