Updated 26 files and added 1074 files (automated)

1 files changed, 13 insertions, 10 deletions

diff --git a/pages/computers.inc b/pages/computers.inc
index d2b9cbd..67cb6ef 100644
--- a/pages/computers.inc
+++ b/pages/computers.inc
@@ -68,9 +68,9 @@ if (str_ends_with($computer["os"], "unknown")) {
 
             <?php if ($computer["luna_version"] === "1.0.0"): ?>
             <div class="alert alert-danger">
-                <p><b>We are unable to give you access to this computer.</b></p>
-                <p>This computer is running xsion 1.0.0. This version of Luna is considered malware because of inconspicuous behavior and is therefore not usable anymore and has been disabled. This means you cannot access this computer at the moment.</p>
-                Update this computer to run Luna 1.1.0 or newer and try again.
+                <p><b>We are unable to give you access to this device.</b></p>
+                <p>This computer is running Luna version 1.0.0. This version of Luna is considered malware because of inconspicuous behavior and is therefore not usable anymore and has been disabled. This means you cannot access this computer at the moment.</p>
+                Update this device to run Luna 1.1.0 or newer and try again.
             </div>
             <?php else: ?>
             <h4 style="margin-top: 20px;margin-bottom: 10px;">Overview</h4>
@@ -266,7 +266,7 @@ if (str_ends_with($computer["os"], "unknown")) {
                     <td style="padding-right: 10px; text-align: right;"><b>Remaining capacity:</b></td>
                     <td><?= $computer["battery"]["currentCapacity"] ?>/<?= $computer["battery"]["maxCapacity"] ?> <?= $computer["battery"]["capacityUnit"] ?> (designed for <?= $computer["battery"]["designedCapacity"] ?> <?= $computer["battery"]["capacityUnit"] ?><?php if ($computer["battery"]["designedCapacity"] > 0): ?>, <?= round(($computer["battery"]["maxCapacity"] / $computer["battery"]["designedCapacity"]) * 100, 2) ?>% left<?php endif; ?>)</td>
                 </tr>
-                <?php else: ?><tr><td colspan="2">This computer does not contain a battery.</td></tr><?php endif; ?><?php else: ?><tr><td colspan="2">This operating system does not support reporting battery info.</td></tr><?php endif; ?>
+                <?php else: ?><tr><td colspan="2">This device does not contain a battery.</td></tr><?php endif; ?><?php else: ?><tr><td colspan="2">This operating system does not support reporting battery info.</td></tr><?php endif; ?>
 
                 <tr>
                     <td colspan="2"><h4 style="margin-top: 20px;margin-bottom: 10px;">Operating system</h4></td>
@@ -304,6 +304,9 @@ if (str_ends_with($computer["os"], "unknown")) {
                 </tr>
                 <?php endif; ?>
 
+                <?php if (count(array_filter($computer["versions"], function ($version, $software) {
+                    return trim($version) !== "" && $software !== "systemOpensslLib" && $software !== "openssl" && $software !== "node" && $software !== "v8";
+                }, ARRAY_FILTER_USE_BOTH)) > 0): ?>
                 <tr>
                     <td colspan="2"><h4 style="margin-top: 20px;margin-bottom: 10px;">Software versions</h4></td>
                 </tr>
@@ -345,15 +348,15 @@ if (str_ends_with($computer["os"], "unknown")) {
                     ?>:</b></td>
                     <td><?= $version ?></td>
                 </tr>
-                <?php endif; endforeach; ?>
+                <?php endif; endforeach; endif; ?>
                 </tbody>
             </table>
 
             <?php if (!isset($computer["remote_control"]) || $computer["remote_control"] === true): ?>
             <h4 style="margin-top: 20px;margin-bottom: 10px;" id="screens">Remote control</h4>
             <p id="page-content">
-                You can remotely control this computer. <a href="./<?= $id ?>/control">Open remote control.</a><br>
-                <small class="text-muted">Note: The user of this computer will need to approve your connection request before you can see and control their screen.</small>
+                You can remotely control this device. <a href="./<?= $id ?>/control">Open remote device.</a><br>
+                <small class="text-muted">Note: The user of this device will need to approve your connection request before you can see and control their screen.</small>
             </p>
             <?php endif; ?>
 
@@ -864,8 +867,8 @@ if (str_ends_with($computer["os"], "unknown")) {
         <?php endif; ?>
     <?php else: ?>
         <div>
-            <h2>Computers</h2>
-            <p>Click on a computer to view information about it (open windows, installed apps, ...).</p>
+            <h2>Devices</h2>
+            <p>Click on a device to view information about it</p>
 
             <ul class="list-group">
                 <?php foreach (array_filter(scandir($_SERVER['DOCUMENT_ROOT'] . "/includes/data/computers/metadata"), function ($i) {
@@ -900,7 +903,7 @@ if (str_ends_with($computer["os"], "unknown")) {
                         <div style="display: flex; align-items: center;">
                             <div>
                                 <b><?= $computer["host"] ?></b> · <?= $computer["os"] ?><br>
-                                Owned by <?= $owner === "raindrops" ? "Raindrops System" : "Cloudburst System"; ?><br>
+                                Computer · Owned by <?= $owner === "raindrops" ? "Raindrops System" : "Cloudburst System"; ?><br>
                                 <?php if (timeAgo($computer["date"]) === "now"): ?>Online<?php else: ?>Offline since <?= timeAgo($computer["date"]) ?><?php endif; ?>
                             </div>
                         </div>