From 412715c34ac22c0e6a942f685cde9a5ab09942f9 Mon Sep 17 00:00:00 2001 From: Webslice Date: Fri, 21 Feb 2020 13:13:54 +0100 Subject: [PATCH] Use relative paths for login_as functionality --- interface/web/login/login_as.php | 2 +- interface/web/login/logout.php | 2 +- interface/web/themes/default/assets/javascripts/ispconfig.js | 2 +- .../web/themes/default/assets/javascripts/ispconfig.min.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/web/login/login_as.php b/interface/web/login/login_as.php index 4c2fb33393..67d5858ff6 100644 --- a/interface/web/login/login_as.php +++ b/interface/web/login/login_as.php @@ -96,7 +96,7 @@ echo '
- +
'; diff --git a/interface/web/login/logout.php b/interface/web/login/logout.php index dadd871bab..fa60fba632 100644 --- a/interface/web/login/logout.php +++ b/interface/web/login/logout.php @@ -54,7 +54,7 @@ if ((isset($_SESSION['s_old']) && ($_SESSION['s_old']['user']['typ'] == 'admin'
- +
'; diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js index 5f797af328..70e3a903a6 100644 --- a/interface/web/themes/default/assets/javascripts/ispconfig.js +++ b/interface/web/themes/default/assets/javascripts/ispconfig.js @@ -172,7 +172,7 @@ var ISPConfig = { ISPConfig.loadContent(parts[1]); } else if (jqXHR.responseText.indexOf('LOGIN_REDIRECT:') > -1) { // Go to the login page - document.location.href = '/index.php'; + document.location.href = './index.php'; } else { $('#pageContent').html(jqXHR.responseText); ISPConfig.onAfterContentLoad(target, $('#'+formname).serialize()); diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.min.js b/interface/web/themes/default/assets/javascripts/ispconfig.min.js index 76af49d1dc..e118b994b0 100644 --- a/interface/web/themes/default/assets/javascripts/ispconfig.min.js +++ b/interface/web/themes/default/assets/javascripts/ispconfig.min.js @@ -1 +1 @@ -var ISPConfig={pageFormChanged:!1,tabChangeWarningTxt:"",tabChangeDiscardTxt:"",tabChangeWarning:!1,tabChangeDiscard:!1,requestsRunning:0,indicatorCompleted:!1,registeredHooks:new Array,new_tpl_add_id:0,dataLogTimer:0,options:{useLoadIndicator:!1,useComboBox:!1},setOption:function(a,b){ISPConfig.options[a]=b},setOptions:function(a){$.extend(ISPConfig.options,a)},reportError:function(){},registerHook:function(a,b){ISPConfig.registeredHooks[a]||(ISPConfig.registeredHooks[a]=new Array);var c=ISPConfig.registeredHooks[a].length;ISPConfig.registeredHooks[a][c]=b},callHook:function(a,b){if(ISPConfig.registeredHooks[a])for(var c=0;c