From 7b4af63a90a726b98a59b83e53f040a7a566a11d Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 10 Nov 2021 17:53:13 +0100 Subject: Update --- Neutron-trunk/resources/private/.htaccess | 0 Neutron-trunk/resources/private/CodeEditor$2.php | 0 Neutron-trunk/resources/private/CodeEditor$3.php | 0 Neutron-trunk/resources/private/CodeEditor.php | 0 Neutron-trunk/resources/private/VisualEditor$2.php | 0 Neutron-trunk/resources/private/VisualEditor.php | 0 Neutron-trunk/resources/private/debug.php | 6 +++++- Neutron-trunk/resources/private/global.js._/index.php | 4 ++-- Neutron-trunk/resources/private/header.php | 0 Neutron-trunk/resources/private/headers/csettings-base.json | 0 Neutron-trunk/resources/private/headers/documentbody.php | 0 Neutron-trunk/resources/private/headers/documenthead.php | 0 Neutron-trunk/resources/private/headers/preprocessor.php | 2 ++ Neutron-trunk/resources/private/license | 0 Neutron-trunk/resources/private/relative.php | 6 +++++- 15 files changed, 14 insertions(+), 4 deletions(-) mode change 100755 => 100644 Neutron-trunk/resources/private/.htaccess mode change 100755 => 100644 Neutron-trunk/resources/private/CodeEditor$2.php mode change 100755 => 100644 Neutron-trunk/resources/private/CodeEditor$3.php mode change 100755 => 100644 Neutron-trunk/resources/private/CodeEditor.php mode change 100755 => 100644 Neutron-trunk/resources/private/VisualEditor$2.php mode change 100755 => 100644 Neutron-trunk/resources/private/VisualEditor.php mode change 100755 => 100644 Neutron-trunk/resources/private/debug.php mode change 100755 => 100644 Neutron-trunk/resources/private/global.js._/index.php mode change 100755 => 100644 Neutron-trunk/resources/private/header.php mode change 100755 => 100644 Neutron-trunk/resources/private/headers/csettings-base.json mode change 100755 => 100644 Neutron-trunk/resources/private/headers/documentbody.php mode change 100755 => 100644 Neutron-trunk/resources/private/headers/documenthead.php mode change 100755 => 100644 Neutron-trunk/resources/private/headers/preprocessor.php mode change 100755 => 100644 Neutron-trunk/resources/private/license mode change 100755 => 100644 Neutron-trunk/resources/private/relative.php (limited to 'Neutron-trunk/resources/private') diff --git a/Neutron-trunk/resources/private/.htaccess b/Neutron-trunk/resources/private/.htaccess old mode 100755 new mode 100644 diff --git a/Neutron-trunk/resources/private/CodeEditor$2.php b/Neutron-trunk/resources/private/CodeEditor$2.php old mode 100755 new mode 100644 diff --git a/Neutron-trunk/resources/private/CodeEditor$3.php b/Neutron-trunk/resources/private/CodeEditor$3.php old mode 100755 new mode 100644 diff --git a/Neutron-trunk/resources/private/CodeEditor.php b/Neutron-trunk/resources/private/CodeEditor.php old mode 100755 new mode 100644 diff --git a/Neutron-trunk/resources/private/VisualEditor$2.php b/Neutron-trunk/resources/private/VisualEditor$2.php old mode 100755 new mode 100644 diff --git a/Neutron-trunk/resources/private/VisualEditor.php b/Neutron-trunk/resources/private/VisualEditor.php old mode 100755 new mode 100644 diff --git a/Neutron-trunk/resources/private/debug.php b/Neutron-trunk/resources/private/debug.php old mode 100755 new mode 100644 index 86a721a..92e7555 --- a/Neutron-trunk/resources/private/debug.php +++ b/Neutron-trunk/resources/private/debug.php @@ -152,7 +152,11 @@ input, textarea { $srv): ?> - + + [hidden for safety] + + + diff --git a/Neutron-trunk/resources/private/global.js._/index.php b/Neutron-trunk/resources/private/global.js._/index.php old mode 100755 new mode 100644 index 2a721a8..fb9dcc3 --- a/Neutron-trunk/resources/private/global.js._/index.php +++ b/Neutron-trunk/resources/private/global.js._/index.php @@ -63,12 +63,12 @@ switchToPage = (url) => { $.ajax({ type: "GET", dataType: 'html', - url: "/cms-special/admin/$resources/admin.js", + url: "/cms-special/admin-v2/$resources/admin.js", success: function (data) { eval(data); }, error: function (error) { - console.error("Unable to load script at " + "/cms-special/admin/$resources/admin.js"); + console.error("Unable to load script at " + "/cms-special/admin-v2/$resources/admin.js"); }, cache: false, contentType: false, diff --git a/Neutron-trunk/resources/private/header.php b/Neutron-trunk/resources/private/header.php old mode 100755 new mode 100644 diff --git a/Neutron-trunk/resources/private/headers/csettings-base.json b/Neutron-trunk/resources/private/headers/csettings-base.json old mode 100755 new mode 100644 diff --git a/Neutron-trunk/resources/private/headers/documentbody.php b/Neutron-trunk/resources/private/headers/documentbody.php old mode 100755 new mode 100644 diff --git a/Neutron-trunk/resources/private/headers/documenthead.php b/Neutron-trunk/resources/private/headers/documenthead.php old mode 100755 new mode 100644 diff --git a/Neutron-trunk/resources/private/headers/preprocessor.php b/Neutron-trunk/resources/private/headers/preprocessor.php old mode 100755 new mode 100644 index 84ff3f0..673a62d --- a/Neutron-trunk/resources/private/headers/preprocessor.php +++ b/Neutron-trunk/resources/private/headers/preprocessor.php @@ -32,6 +32,8 @@ if ($ready) { } } +global $__root; + $_MD_INCLUDES = $GLOBALS["SYSTEM_ROOT"] . "/resources/lib/material"; // Path to Material Design files, can be changed if files are bundled with the code $_MDI_PATH = $GLOBALS["SYSTEM_ROOT"] . "/resources/lib/material/iconfont.css"; // Path to Material Icons font, can be changed if files are bundled with the code diff --git a/Neutron-trunk/resources/private/license b/Neutron-trunk/resources/private/license old mode 100755 new mode 100644 diff --git a/Neutron-trunk/resources/private/relative.php b/Neutron-trunk/resources/private/relative.php old mode 100755 new mode 100644 index d9156e6..a42a87f --- a/Neutron-trunk/resources/private/relative.php +++ b/Neutron-trunk/resources/private/relative.php @@ -3,6 +3,10 @@ function getRelativeDetails($source) { global $__root; + if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { + $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR']; + } + $GLOBALS["ORIGINAL_DOCUMENT_ROOT"] = $_SERVER['DOCUMENT_ROOT']; if (substr($_SERVER['REQUEST_URI'], 0, strlen($source) + 1) === "/" . $source) { @@ -28,4 +32,4 @@ function getRelativeDetails($source) { $_SERVER['DOCUMENT_ROOT'] = $GLOBALS["ORIGINAL_DOCUMENT_ROOT"]; $GLOBALS["SYSTEM_PREFIXED"] = false; } -} \ No newline at end of file +} -- cgit