Update

1 files changed, 58 insertions, 76 deletions

diff --git a/Neutron-trunk/cms-special/admin-v2/about/index.php b/Neutron-trunk/cms-special/admin-v2/about/index.php
index 1551ff0..c9791a0 100755..100644
--- a/Neutron-trunk/cms-special/admin-v2/about/index.php
+++ b/Neutron-trunk/cms-special/admin-v2/about/index.php
@@ -1,12 +1,12 @@
 <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?>
-<?php $pageConfig = [ "domName" => "Mise à jour et sécurité", "headerName" => "Mise à jour et sécurité" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?>
+<?php $pageConfig = [ "domName" => "Mise à jour et sécurité", "headerName" => "Mise à jour et sécurité" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?>
         <?php
 
         $currentVersionP = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/api/version");
         $currentVersion = $currentVersionP;
 
         ?>
-    <h3><?= $lang["admin-about"]["info"] ?></h3>
+    <h3><?= $lang["admin-about"]["new"]["overview"] ?></h3>
     <ul><li>
     <?php
 
@@ -30,87 +30,69 @@
         $sizestr = $size . " " . $lang["sizes"]["bytes"] . "";
     }
 
-    echo("<li>" . $lang["admin-about"]["diskspace"][0] . " <b>" . $sizestr . "</b> " . $lang["admin-about"]["diskspace"][1] . "</li>");
+    if (!file_exists($GLOBALS["ORIGINAL_DOCUMENT_ROOT"] . "/NeutronCloud")) {
+        echo("<li>" . $lang["admin-about"]["diskspace"][0] . " <b>" . $sizestr . "</b> " . $lang["admin-about"]["diskspace"][1] . "</li>");
+    } else {
+        $sizep = $size;
+        switch (file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/Tier")) {
+            case "3":
+                $size = 104857600;
+                break;
+
+            case "5":
+                $size = 262144000;
+                break;
+
+            case "7":
+                $size = 524288000;
+                break;
+        }
+        $sizestr2 = $size . " " . $lang["sizes"]["bytes"] . "";
+        if ($size > 1024) {
+            if ($size > 1048576) {
+                if ($size > 1073741824) {
+                    $sizestr2 = round($size / 1073741824, 3) . " " . $lang["sizes"]["gibibytes"] . "";
+                } else {
+                    $sizestr2 = round($size / 1048576, 3) . " " . $lang["sizes"]["mebibytes"] . "";
+                }
+            } else {
+                $sizestr2 = round($size / 1024, 3) . " " . $lang["sizes"]["kibibytes"] . "";
+            }
+        } else {
+            $sizestr2 = $size . " " . $lang["sizes"]["bytes"] . "";
+        }
+
+        echo("<li>" . $lang["admin-about"]["diskspace"][0] . " <b>" . $sizestr . "/" . $sizestr2 . "</b> " . $lang["admin-about"]["diskspace"][1]);
+        if (file_exists($GLOBALS["ORIGINAL_DOCUMENT_ROOT"] . "/NeutronCloud")) {
+            echo(" (" . round(($sizep / $size) * 100, 2) . "%)");
+        }
+        echo("</li>");
+    }
 
     ?>
     </ul>
-    <h3><?= $lang["admin-about"]["disk"] ?></h3>
-    <div id="storagebar" value="0" max="1"></div>
-    <span style="margin-left: 10px;"></span>
-    <?php
 
-    $globalSize = $size;
+<h3><?= $lang["admin-about"]["new"]["version"] ?></h3>
 
-    $size = 0;
-    getData($_SERVER['DOCUMENT_ROOT'] . "/api");
-    $mpcmsSize = $size;
-    getData($_SERVER['DOCUMENT_ROOT'] . "/cms-special");
-    $mpcmsSize = $mpcmsSize + $size;
-    getData($_SERVER['DOCUMENT_ROOT'] . "/widgets");
-    $mpcmsSize = $mpcmsSize + $size;
-
-    getData($_SERVER['DOCUMENT_ROOT'] . "/resources/css");
-    $mpcmsSize = $mpcmsSize + $size;
-    getData($_SERVER['DOCUMENT_ROOT'] . "/resources/fonts");
-    $mpcmsSize = $mpcmsSize + $size;
-    getData($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n");
-    $mpcmsSize = $mpcmsSize + $size;
-    getData($_SERVER['DOCUMENT_ROOT'] . "/resources/image");
-    $mpcmsSize = $mpcmsSize + $size;
-    getData($_SERVER['DOCUMENT_ROOT'] . "/resources/js");
-    $mpcmsSize = $mpcmsSize + $size;
-    getData($_SERVER['DOCUMENT_ROOT'] . "/resources/lib");
-    $mpcmsSize = $mpcmsSize + $size;
-    getData($_SERVER['DOCUMENT_ROOT'] . "/resources/private");
-    $mpcmsSize = $mpcmsSize + $size;
+<ul>
+    <li><b>Neutron <?= trim(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/api/prettyver")) ?> « <?= trim(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/api/codename")) ?> »</b> (build <?= substr(trim(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/api/version")), 5) ?>)</li>
 
-    $size = 0;
-    getData($_SERVER['DOCUMENT_ROOT'] . "/data");
-    $dataSize = $size;
+    <?php if (file_exists($GLOBALS["ORIGINAL_DOCUMENT_ROOT"] . "/NeutronCloud")): ?><li><?= $lang["admin-about"]["new"]["types"][0] ?></li><?php else: ?><li><?= $lang["admin-about"]["new"]["types"][1] ?></li><?php endif; ?>
 
-    $calSize = filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/caldb.json");
-    $confSize = filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/sitename") + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/system.log") + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widgets.json") + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/password") + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/footer");
-    if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widget-notes-data")) {
-        $confSize = $confSize + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widget-notes-data");
-    }
-    if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widget-contact-data")) {
-        $confSize = $confSize + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widget-contact-data");
-    }
+    <li><b><?= $lang["admin-about"]["new"]["renderer"][0] ?></b> <?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/api/cyclic_version") ?></li>
+    <li><b><?= $lang["admin-about"]["new"]["renderer"][1] ?></b>  <?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/api/jaw_version") ?></li>
+</ul>
 
-    $size = 0;
-    getData($_SERVER['DOCUMENT_ROOT'] . "/resources/upload");
-    $resSize = $size;
+<h3><?= $lang["admin-about"]["new"]["system"] ?></h3>
 
-    $globalSize = $resSize + $mpcmsSize + $confSize + $dataSize + $calSize;
+<ul>
+    <?php if (isset($__electrode) && isset($__electrode_version) && isset($__electrode_node_version)): ?>
+        <li><?= "Electrode " . $__electrode_version . "</li><li>NodeJS " . $__electrode_node_version ?></li>
+    <?php endif; ?>
 
-    ?>
-    <div style="display:grid;grid-template-columns:1fr 1fr 1fr 1fr;">
-    <span><span style="margin-right:5px;border-radius:999px;vertical-align:middle;background-color:#8bcf69;position:relative;width:15px;height:15px;display:inline-block;"></span><span style="margin-right:30px;"><?= $lang["admin-about"]["categories"]['system'] ?> (<?= round(($mpcmsSize*100)/$globalSize, 2) ?>%)</span></span>
-    <span><span style="margin-right:5px;border-radius:999px;vertical-align:middle;background-color:#e6d450;position:relative;width:15px;height:15px;display:inline-block;"></span><span style="margin-right:30px;"><?= $lang["admin-about"]["categories"]['config'] ?> (<?= round(($dataSize*100)/$globalSize, 2) ?>%)</span></span>
-    <span><span style="margin-right:5px;border-radius:999px;vertical-align:middle;background-color:#cf82bf;position:relative;width:15px;height:15px;display:inline-block;"></span><span style="margin-right:30px;"><?= $lang["admin-about"]["categories"]['resources'] ?> (<?= round(($resSize*100)/$globalSize, 2) ?>%)</span></span>
-    <span><span style="margin-right:5px;border-radius:999px;vertical-align:middle;background-color:gray;position:relative;width:15px;height:15px;display:inline-block;"></span><span style="margin-right:30px;"><?= $lang["admin-about"]["categories"]['misc'] ?></span></span>
-    </div>
-    <!-- <?= $globalSize - ($mpcmsSize + $dataSize + $resSize) ?>
-    <?= "<br>" ?>
-    <?= (($mpcmsSize + $dataSize + $resSize) * 100)/$globalSize ?> -->
-    <style>
-        #storagebar {
-            height: 12px;
-            width: calc(100% - 16px);
-            margin: 8px;
-            border-radius: 5px;
-            box-shadow: 0 5px 5px -5px #999 inset;
-            background-image: linear-gradient(
-                90deg,
-                #8bcf69 <?= round(($mpcmsSize*100)/$globalSize, 2) ?>%,
-                #e6d450 <?= round(($mpcmsSize*100)/$globalSize, 2) ?>%,
-                #e6d450 <?= round(($dataSize*100)/$globalSize, 2) ?>%,
-                #cf82bf <?= round(($dataSize*100)/$globalSize, 2) ?>%,
-                #cf82bf <?= round(($resSize*100)/$globalSize, 2) ?>%,
-                gray <?= round(($resSize*100)/$globalSize, 2) ?>%,
-                gray 100%
-            );
-            background-size: 100% 100%;
-        }
-    </style>
-<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?>
+    <li>PHP <?= PHP_VERSION ?> (<?= PHP_SAPI ?>, <?= PHP_BINARY ?>)</li>
+
+    <li><?= php_uname('s') . " " . php_uname('m') . " " . php_uname('r') ?></li>
+</ul>
+
+<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?>