Update

15 files changed, 14 insertions, 4 deletions

diff --git a/Neutron-trunk/resources/private/.htaccess b/Neutron-trunk/resources/private/.htaccess
index 2c73686..2c73686 100755..100644
--- a/Neutron-trunk/resources/private/.htaccess
+++ b/Neutron-trunk/resources/private/.htaccess
diff --git a/Neutron-trunk/resources/private/CodeEditor$2.php b/Neutron-trunk/resources/private/CodeEditor$2.php
index ec4abe9..ec4abe9 100755..100644
--- a/Neutron-trunk/resources/private/CodeEditor$2.php
+++ b/Neutron-trunk/resources/private/CodeEditor$2.php
diff --git a/Neutron-trunk/resources/private/CodeEditor$3.php b/Neutron-trunk/resources/private/CodeEditor$3.php
index 83b0fa8..83b0fa8 100755..100644
--- a/Neutron-trunk/resources/private/CodeEditor$3.php
+++ b/Neutron-trunk/resources/private/CodeEditor$3.php
diff --git a/Neutron-trunk/resources/private/CodeEditor.php b/Neutron-trunk/resources/private/CodeEditor.php
index 9a915ed..9a915ed 100755..100644
--- a/Neutron-trunk/resources/private/CodeEditor.php
+++ b/Neutron-trunk/resources/private/CodeEditor.php
diff --git a/Neutron-trunk/resources/private/VisualEditor$2.php b/Neutron-trunk/resources/private/VisualEditor$2.php
index e22b9d4..e22b9d4 100755..100644
--- a/Neutron-trunk/resources/private/VisualEditor$2.php
+++ b/Neutron-trunk/resources/private/VisualEditor$2.php
diff --git a/Neutron-trunk/resources/private/VisualEditor.php b/Neutron-trunk/resources/private/VisualEditor.php
index 7d25ef9..7d25ef9 100755..100644
--- a/Neutron-trunk/resources/private/VisualEditor.php
+++ b/Neutron-trunk/resources/private/VisualEditor.php
diff --git a/Neutron-trunk/resources/private/debug.php b/Neutron-trunk/resources/private/debug.php
index 86a721a..92e7555 100755..100644
--- a/Neutron-trunk/resources/private/debug.php
+++ b/Neutron-trunk/resources/private/debug.php
@@ -152,7 +152,11 @@ input, textarea {
                     <?php foreach ($_SERVER as $key => $srv): ?>
                     <tr>
                         <td id="neutron-dump-cell"><?= $key ?></td>
-                        <td colspan="2" id="neutron-dump-cell"><?= $srv ?></td>
+                        <?php if ($key === "HTTP_COOKIE"): ?>
+                            <td colspan="2" id="neutron-dump-cell">[hidden for safety]</td>
+                        <?php else: ?>
+                            <td colspan="2" id="neutron-dump-cell"><?= $srv ?></td>
+                        <?php endif; ?>
                     </tr>
                     <?php endforeach; ?>
                     </tbody>
diff --git a/Neutron-trunk/resources/private/global.js._/index.php b/Neutron-trunk/resources/private/global.js._/index.php
index 2a721a8..fb9dcc3 100755..100644
--- 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: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/admin.js",
+                        url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/admin.js",
                         success: function (data) {
                             eval(data);
                         },
                         error: function (error) {
-                            console.error("Unable to load script at " + "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/admin.js");
+                            console.error("Unable to load script at " + "<?= $GLOBALS["SYSTEM_ROOT"] ?>/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
index 51f7886..51f7886 100755..100644
--- a/Neutron-trunk/resources/private/header.php
+++ b/Neutron-trunk/resources/private/header.php
diff --git a/Neutron-trunk/resources/private/headers/csettings-base.json b/Neutron-trunk/resources/private/headers/csettings-base.json
index 51909c0..51909c0 100755..100644
--- a/Neutron-trunk/resources/private/headers/csettings-base.json
+++ b/Neutron-trunk/resources/private/headers/csettings-base.json
diff --git a/Neutron-trunk/resources/private/headers/documentbody.php b/Neutron-trunk/resources/private/headers/documentbody.php
index 3f8d8c1..3f8d8c1 100755..100644
--- a/Neutron-trunk/resources/private/headers/documentbody.php
+++ b/Neutron-trunk/resources/private/headers/documentbody.php
diff --git a/Neutron-trunk/resources/private/headers/documenthead.php b/Neutron-trunk/resources/private/headers/documenthead.php
index a628016..a628016 100755..100644
--- a/Neutron-trunk/resources/private/headers/documenthead.php
+++ b/Neutron-trunk/resources/private/headers/documenthead.php
diff --git a/Neutron-trunk/resources/private/headers/preprocessor.php b/Neutron-trunk/resources/private/headers/preprocessor.php
index 84ff3f0..673a62d 100755..100644
--- 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
index 6a62c67..6a62c67 100755..100644
--- a/Neutron-trunk/resources/private/license
+++ b/Neutron-trunk/resources/private/license
diff --git a/Neutron-trunk/resources/private/relative.php b/Neutron-trunk/resources/private/relative.php
index d9156e6..a42a87f 100755..100644
--- 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
+}