From 1c7e4782aa426dd1a003948756c51cf9d61f2163 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 14 Feb 2021 12:29:08 +0300
Subject: [PATCH] prefs system: load phpinfo using inline method
---
classes/pref/prefs.php | 2 --
classes/pref/system.php | 13 +++++++++----
js/PrefHelpers.js | 6 +-----
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 19f5221eb..6e4deb223 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1032,7 +1032,6 @@ class Pref_Prefs extends Handler_Protected {
if (this.domNode.querySelector('.loading'))
window.setTimeout(() => {
xhrPost("backend.php", {op: 'pref-prefs', method: 'index_auth'}, (transport) => {
- console.log(this);
this.attr('content', transport.responseText);
});
}, 100);
@@ -1047,7 +1046,6 @@ class Pref_Prefs extends Handler_Protected {
if (this.domNode.querySelector('.loading'))
window.setTimeout(() => {
xhrPost("backend.php", {op: 'pref-prefs', method: 'index_plugins'}, (transport) => {
- console.log(this);
this.attr('content', transport.responseText);
});
}, 200);
diff --git a/classes/pref/system.php b/classes/pref/system.php
index 1adddf116..14df6f8d1 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -173,10 +173,15 @@ class Pref_System extends Handler_Protected {
</div>
<div dojoType='dijit.layout.AccordionPane' title='<i class="material-icons">info</i> <?= __('PHP Information') ?>'>
- <script type='dojo/method' event='onSelected' args='evt'>
- Helpers.System.getPHPInfo(this);
- </script>
- <div class='phpinfo'><?= __("Loading, please wait...") ?></div>
+ <script type='dojo/method' event='onSelected' args='evt'>
+ if (this.domNode.querySelector('.loading'))
+ window.setTimeout(() => {
+ xhrPost("backend.php", {op: 'pref-system', method: 'getphpinfo'}, (transport) => {
+ this.attr('content', `<div class='phpinfo'>${transport.responseText}</div>`);
+ });
+ }, 200);
+ </script>
+ <span class='loading'><?= __("Loading, please wait...") ?></span>
</div>
<?php PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, "prefSystem") ?>
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index b09beb995..7a3d38d02 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -54,11 +54,7 @@ const Helpers = {
},
},
System: {
- getPHPInfo: function(widget) {
- xhrPost("backend.php", {op: 'pref-system', method: 'getphpinfo'}, (transport) => {
- widget.attr('content', transport.responseText);
- });
- }
+ //
},
EventLog: {
log_page: 0,
--
GitLab