In-Portal Issue Tracker

Index: admin_templates/js/ajax.js
===================================================================
--- admin_templates/js/ajax.js	(revision 13936)
+++ admin_templates/js/ajax.js	(working copy)
@@ -77,7 +77,7 @@
 }
 
 Request.processRedirect = function($request) {
-	var $match_redirect = new RegExp('^#redirect#(.*)').exec($request.responseText);
+	var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($request.responseText);
 	if ($match_redirect != null) {
 		// redirect to external template requested
 		window.location.href = $match_redirect[1];
@@ -264,7 +264,7 @@
 
 AjaxProgressBar.prototype.successCallback = function($request, $params, $object) {
 	var $responce = $request.responseText;
-	var $match_redirect = new RegExp('^#redirect#(.*)').exec($responce);
+	var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($responce);
 	if ($match_redirect != null) {
 		$object.showProgress(100);
 		// redirect to external template requested
@@ -340,13 +340,6 @@
 
 AjaxPopupManager.prototype.successCallback = function($request, $params, $object) {
 	var $responce = $request.responseText;
-	/*var $match_redirect = new RegExp('^#redirect#(.*)').exec($responce);
-	if ($match_redirect != null) {
-		alert('AJAX REDIRECT!!!')
-		// redirect to external template requested
-		window.location.href = $match_redirect[1];
-		return false;
-	}*/
 
 	switch ($params[0]) {
 		case 'GetSize':
Index: admin_templates/js/frame_resizer.js
===================================================================
--- admin_templates/js/frame_resizer.js	(revision 13936)
+++ admin_templates/js/frame_resizer.js	(working copy)
@@ -36,14 +36,7 @@
 }
 
 FrameResizer.prototype.successCallback = function($request, $params, $object) {
-	/*var $responce = $request.responseText;
-	var $match_redirect = new RegExp('^#redirect#(.*)').exec($responce);
-	if ($match_redirect != null) {
-		$object.showProgress(100);
-		// redirect to external template requested
-		window.location.href = $match_redirect[1];
-		return false;
-	}*/
+
 }
 
 FrameResizer.prototype.errorCallback = function($request, $params, $object) {
Index: admin_templates/js/jquery/thickbox/thickbox.js
===================================================================
--- admin_templates/js/jquery/thickbox/thickbox.js	(revision 13936)
+++ admin_templates/js/jquery/thickbox/thickbox.js	(working copy)
@@ -429,7 +429,7 @@
 }
 
 TB.parseRedirect = function ($data) {
-	var $match_redirect = new RegExp('^#redirect#(.*)').exec($data);
+	var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($data);
 	if ($match_redirect != null) {
 		// redirect to external template requested
 		return $match_redirect[1];

Index: in-auction/admin_templates/inc/ajax.js
===================================================================
--- in-auction/admin_templates/inc/ajax.js	(revision 13956)
+++ in-auction/admin_templates/inc/ajax.js	(working copy)
@@ -62,7 +62,7 @@
 	AjaxLeafCategorySelector.prototype.successCallback = function($request, $params, $object) {
 		var $responce = $request.responseText;
 
-		var $match_redirect = new RegExp('^#redirect#(.*)').exec($responce);
+		var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($responce);
 		if ($match_redirect != null) {
 			// redirect to external template requested
 			window.location.href = $match_redirect[1];
@@ -76,7 +76,7 @@
 	AjaxLeafCategorySelector.prototype.successCallback2 = function($request, $params, $object) {
 		var $responce = $request.responseText;
 
-		var $match_redirect = new RegExp('^#redirect#(.*)').exec($responce);
+		var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($responce);
 		if ($match_redirect != null) {
 			// redirect to external template requested
 			window.location.href = $match_redirect[1];
@@ -93,7 +93,7 @@
 	AjaxLeafCategorySelector.prototype.successCallbackSpecifics = function($request, $params, $object) {
 		var $responce = $request.responseText;
 
-		var $match_redirect = new RegExp('^#redirect#(.*)').exec($responce);
+		var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($responce);
 		if ($match_redirect != null) {
 			// redirect to external template requested
 			window.location.href = $match_redirect[1];

Index: advanced/platform/inc/ajax.js
===================================================================
--- advanced/platform/inc/ajax.js	(revision 13936)
+++ advanced/platform/inc/ajax.js	(working copy)
@@ -76,7 +76,7 @@
 }
 
 Request.processRedirect = function($request) {
-	var $match_redirect = new RegExp('^#redirect#(.*)').exec($request.responseText);
+	var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($request.responseText);
 	if ($match_redirect != null) {
 		// redirect to external template requested
 		window.location.href = $match_redirect[1];
Index: advanced/platform/inc/jquery/thickbox/thickbox.js
===================================================================
--- advanced/platform/inc/jquery/thickbox/thickbox.js	(revision 13936)
+++ advanced/platform/inc/jquery/thickbox/thickbox.js	(working copy)
@@ -349,7 +349,7 @@
 }
 
 TB.parseRedirect = function ($data) {
-	var $match_redirect = new RegExp('^#redirect#(.*)').exec($data);
+	var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($data);
 	if ($match_redirect != null) {
 		// redirect to external template requested
 		return $match_redirect[1];
Index: onlinestore/inc/ajax.js
===================================================================
--- onlinestore/inc/ajax.js	(revision 13936)
+++ onlinestore/inc/ajax.js	(working copy)
@@ -76,7 +76,7 @@
 }
 
 Request.processRedirect = function($request) {
-	var $match_redirect = new RegExp('^#redirect#(.*)').exec($request.responseText);
+	var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($request.responseText);
 	if ($match_redirect != null) {
 		// redirect to external template requested
 		window.location.href = $match_redirect[1];