Fix issue with AJAX calls to site in subfolder. ACE updates.

adrianbj · Jul 31, 2024 · 63eae91 · 63eae91
1 parent 1fb3b01
commit 63eae91
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 9 deletions.
diff --git a/TracyDebugger.module.php b/TracyDebugger.module.php
@@ -27,7 +27,7 @@ public static function getModuleInfo() {
             'summary' => __('Tracy debugger from Nette with many PW specific custom tools.', __FILE__),
             'author' => 'Adrian Jones',
             'href' => 'https://processwire.com/talk/forum/58-tracy-debugger/',
-            'version' => '4.26.34',
+            'version' => '4.26.35',
             'autoload' => 100000, // in PW 3.0.114+ higher numbers are loaded first - we want Tracy first
             'singular' => true,
             'requires'  => 'ProcessWire>=2.7.2, PHP>=5.4.4',

diff --git a/panels/ConsolePanel.php b/panels/ConsolePanel.php
@@ -39,6 +39,7 @@ public function getTab() {
     public function getPanel() {
 
         $rootPath = $this->wire('config')->paths->root;
+        $rootUrl = $this->wire('config')->urls->root;
         $tracyModuleUrl = $this->wire('config')->urls->TracyDebugger;
         $inAdmin = \TracyDebugger::$inAdmin;
 
@@ -402,7 +403,7 @@ public function getPanel() {
                     var backupFilename = document.getElementById("backupFilename").value;
                     var accessTemplateVars = !this.inAdmin ? document.getElementById("accessTemplateVars").checked : "false";
 
-                    xmlhttp.open("POST", "/", true);
+                    xmlhttp.open("POST", "$rootUrl", true);
                     xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
                     xmlhttp.setRequestHeader("X-Requested-With", "XMLHttpRequest");
                     xmlhttp.send("tracyConsole=1&codeReturn=codeReturn&allowBluescreen="+allowBluescreen+"&dbBackup="+dbBackup+"&backupFilename="+backupFilename+"&accessTemplateVars="+accessTemplateVars+"&pid={$pid}&fid={$fid}&tid={$tid}&mid={$mid}&code="+encodeURIComponent(code));
@@ -444,7 +445,7 @@ public function getPanel() {
                             xmlhttp.getAllResponseHeaders();
                         }
                     };
-                    xmlhttp.open("POST", "/", true);
+                    xmlhttp.open("POST", "$rootUrl", true);
                     xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
                     xmlhttp.setRequestHeader("X-Requested-With", "XMLHttpRequest");
                     xmlhttp.send("tracysnippets=1&snippetname=" + name);
@@ -501,7 +502,7 @@ public function getPanel() {
                             xmlhttp.getAllResponseHeaders();
                         }
                     };
-                    xmlhttp.open("POST", "/", true);
+                    xmlhttp.open("POST", "$rootUrl", true);
                     xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
                     xmlhttp.setRequestHeader("X-Requested-With", "XMLHttpRequest");
                     if(deleteSnippet) {

diff --git a/panels/FileEditorPanel.php b/panels/FileEditorPanel.php
@@ -58,6 +58,7 @@ public function getTab() {
     public function getPanel() {
 
         $tracyModuleUrl = $this->wire('config')->urls->TracyDebugger;
+        $rootUrl = $this->wire('config')->urls->root;
 
         $filePath = $this->wire('config')->paths->root . $this->tracyFileEditorFilePath;
 
@@ -140,6 +141,7 @@ public function getPanel() {
 
                 tfe: {},
                 tracyModuleUrl: "$tracyModuleUrl",
+                rootUrl: "$rootUrl",
                 tracyFileEditorFilePath: "{$this->tracyFileEditorFilePath}",
                 errorMessage: "{$this->errorMessage}",
                 customSnippetsUrl: "$customSnippetsUrl",

diff --git a/panels/ProcesswireInfoPanel.php b/panels/ProcesswireInfoPanel.php
@@ -86,6 +86,7 @@ public function getPanel() {
 
         $out = '';
         $panelSections = \TracyDebugger::getDataValue('processwireInfoPanelSections');
+        $rootUrl = $this->wire('config')->urls->root;
 
         if(in_array('gotoId', $panelSections)) {
             $out .= <<< HTML
@@ -123,7 +124,7 @@ function tracyClearGoToPageID(matchStatus) {
                                 }
                             }
 
-                            xmlhttp.open("POST", "/", true);
+                            xmlhttp.open("POST", "$rootUrl", true);
                             xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
                             xmlhttp.setRequestHeader("X-Requested-With", "XMLHttpRequest");
                             xmlhttp.send("goToPage="+pid);

diff --git a/panels/TracyExceptionsPanel.php b/panels/TracyExceptionsPanel.php
@@ -52,6 +52,7 @@ public function getTab() {
     public function getPanel() {
 
         $tracyModuleUrl = $this->wire('config')->urls->TracyDebugger;
+        $rootUrl = $this->wire('config')->urls->root;
 
         $filePath = $this->wire('config')->paths->root . $this->tracyExceptionFile;
 
@@ -62,6 +63,7 @@ public function getPanel() {
 
             var tracyExceptionsViewer = {
                 tracyModuleUrl: "$tracyModuleUrl",
+                rootURL: "$rootUrl",
             };
 
             function clearTracyExceptionsViewer() {

diff --git a/scripts/ace-editor/ace.js b/scripts/ace-editor/ace.js
diff --git a/scripts/ace-editor/keybinding-emacs.js b/scripts/ace-editor/keybinding-emacs.js
diff --git a/scripts/exception-loader.js b/scripts/exception-loader.js
@@ -43,7 +43,7 @@ if(!tracyExceptionLoader) {
                         xmlhttp.getAllResponseHeaders();
                     }
                 };
-                xmlhttp.open("POST", "/", true);
+                xmlhttp.open("POST", tracyExceptionsViewer.rootUrl, true);
                 xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
                 xmlhttp.setRequestHeader("X-Requested-With", "XMLHttpRequest");
                 xmlhttp.send("filePath=" + filePath);

diff --git a/scripts/file-editor.js b/scripts/file-editor.js
@@ -124,7 +124,7 @@ if(!tracyFileEditorLoader) {
                         xmlhttp.getAllResponseHeaders();
                     }
                 };
-                xmlhttp.open("POST", "/", true);
+                xmlhttp.open("POST", tracyFileEditor.rootUrl, true);
                 xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
                 xmlhttp.setRequestHeader("X-Requested-With", "XMLHttpRequest");
                 xmlhttp.send("filePath=" + filePath);