VPS "maintenance" status (#77)

* Update Composer setup signature * Added support for VPS "maintenance" status, considered as "warning/danger" status. * Update CSS * Update style for CI * Update style * Update style * Update style * Update style
jbelien · Mar 15, 2021 · 384c0f6 · 384c0f6
1 parent af7eaeb
commit 384c0f6
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 20 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,7 +16,7 @@ ENV COMPOSER_ALLOW_SUPERUSER 1
 ENV COMPOSER_HOME /composer
 
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'a5c698ffe4b8e849a443b120cd5ba38043260d5c4023dbf93e1558871f1f07f58274fc6f4c93bcfd858c6bd0775cd8d1') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === '756890a4488ce9024fc62c56153228907f1545c228516cbf63f885e036d37e9a59d27d63f46af1d4d07ee0f76181c7d3') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php --no-ansi --install-dir=/usr/bin --filename=composer \
   && php -r "unlink('composer-setup.php');" \
   && composer --ansi --version --no-interaction \

diff --git a/public/style.css b/public/style.css
@@ -8,3 +8,6 @@
 .table-striped > tbody > tr.odd {
   background-color: rgb(255,255,255);
 }
+tr.table-danger i.fa-info-circle {
+  color:#e91e6;
+}
diff --git a/public/vps-xhr.php b/public/vps-xhr.php
@@ -272,9 +272,9 @@
         $diff = $d1->diff($d2); ?>
   <table class="table table-sm table-striped">
     <tbody>
-      <tr<?= (in_array($vps->infos->status, ['expired', 'unPaid']) ? ' class="text-danger"' : '') ?>>
+      <tr<?= ($vps->state === 'maintenance' || in_array($vps->infos->status, ['expired', 'unPaid']) ? ' class="text-danger"' : '') ?>>
         <th><i class="fa fa-fw fa-circle" aria-hidden="true"></i> <?= _('Status') ?></th>
-        <td><?= $vps->infos->status ?></td>
+        <td><?= ($vps->state === 'maintenance' ? $vps->state : $vps->infos->status) ?></td>
       </tr>
       <tr>
         <th><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> <?= _('Creation') ?></th>

diff --git a/public/vps.php b/public/vps.php
@@ -20,7 +20,7 @@
 
         $_v['infos'] = $ovh->get('/vps/'.$v.'/serviceInfos');
 
-        if (!$_v['state'] === 'maintenance' && $_v['infos']['status'] === 'ok') {
+        if ($_v['state'] !== 'maintenance' && $_v['infos']['status'] === 'ok') {
             $_v['distribution'] = $ovh->get('/vps/'.$v.'/distribution');
             $_v['ipAddresses'] = $ovh->get('/vps/'.$v.'/ips');
         }
@@ -79,7 +79,7 @@
     $d2 = new DateTime($v->infos->expiration);
     $diff = $d1->diff($d2);
     $expiration = ($diff->days <= 30); ?>
-          <tr data-vps="<?= $v->name ?>"<?= (in_array($v->infos->status, ['expired', 'unPaid']) ? ' class="table-danger"' : '') ?>>
+          <tr data-vps="<?= $v->name ?>"<?= ($v->state === 'maintenance' || in_array($v->infos->status, ['expired', 'unPaid']) ? ' class="table-danger"' : '') ?>>
             <th class="text-nowrap">
 <?php if ($expiration === true && $v->infos->renewalType === 'manual') {
         ?>
@@ -107,37 +107,46 @@
         } ?>
               </ul>
 <?php
-    } ?>
+    } else { ?>
+      <span class="unknow-data">Unknown</span>
+<?php
+        } ?>
             </td>
             <td style="text-nowrap"><?= $v->zone ?></td>
             <td class="text-nowrap"><?= $v->model->offer ?><br><em class="small"><?= $v->model->version ?> - <?= $v->model->name ?></em></td>
+<?php if (isset($v->distribution)) {
+            ?>
             <td style="vertical-align: middle;"><?= (isset($v->distribution) ? $v->distribution->name : '') ?></td>
             <td style="vertical-align: middle;" class="text-nowrap"><?= (isset($v->distribution) ? $v->distribution->bitFormat.' bits' : '') ?></td>
+<?php
+        } else { ?>
+            <td colspan="2" style="vertical-align: middle;"><span class="unknow-data">Unknown</span></td>
+<?php
+        } ?>
+
             <td style="vertical-align: middle;" class="text-nowrap text-right"><?= $v->model->disk ?> Go</td>
 <?php if (!in_array($v->infos->status, ['expired', 'unPaid'])) {
-        ?>
+            ?>
             <td style="vertical-align: middle;" class="text-nowrap text-right disk-live"><i class="fa fa fa-spinner fa-pulse fa-fw"></i></td>
             <td style="vertical-align: middle;" class="text-nowrap text-center"><a href="#disk-chart" style="text-decoration: none;"><i class="fa fa-line-chart" aria-hidden="true"></i></a></td>
 <?php
-    } else {
-        ?>
+        } else { ?>
             <td colspan="2"></td>
 <?php
-    } ?>
+        } ?>
             <td style="vertical-align: middle;" class="text-right"><?= $v->vcore ?></td>
 <?php if (!in_array($v->infos->status, ['expired', 'unPaid'])) {
-        ?>
+            ?>
             <td style="vertical-align: middle;" class="text-nowrap text-right cpu-live"><i class="fa fa fa-spinner fa-pulse fa-fw"></i></td>
             <td style="vertical-align: middle;" class="text-nowrap text-center"><a href="#cpu-chart" style="text-decoration: none;"><i class="fa fa-line-chart" aria-hidden="true"></i></a></td>
 <?php
-    } else {
-        ?>
+        } else { ?>
             <td colspan="2"></td>
 <?php
-    } ?>
+        } ?>
             <td style="vertical-align: middle;" class="text-nowrap text-right"><?= ($v->memoryLimit / 1024) ?> Go</td>
 <?php if (!in_array($v->infos->status, ['expired', 'unPaid'])) {
-        ?>
+            ?>
             <td style="vertical-align: middle;" class="text-nowrap text-right ram-live"><i class="fa fa fa-spinner fa-pulse fa-fw"></i></td>
             <td style="vertical-align: middle;" class="text-nowrap text-center"><a href="#ram-chart" style="text-decoration: none;"><i class="fa fa-line-chart" aria-hidden="true"></i></a></td>
             <td style="vertical-align: middle;" class="text-nowrap">
@@ -150,16 +159,15 @@
               <span class="badge badge-secondary status-tools">tools</span>
             </td>
 <?php
-    } else {
-        ?>
+        } else {
+            ?>
             <td colspan="2"></td>
             <td></td>
 <?php
-    } ?>
+        } ?>
           </tr>
 <?php
-}
-?>
+} ?>
         </tbody>
         <tfoot>
           <tr>