From b8e097dc2b647fab74956308d00d84f719b0b516 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Wed, 1 May 2019 20:57:20 +0200
Subject: [PATCH] Implement changed rest usage

---
 .../monitoring-security-file-list.tpl.php     | 55 ++++++-----
 Theme/Backend/monitoring-security.tpl.php     | 94 +++++++++----------
 2 files changed, 79 insertions(+), 70 deletions(-)

diff --git a/Theme/Backend/monitoring-security-file-list.tpl.php b/Theme/Backend/monitoring-security-file-list.tpl.php
index e3e5508..1c0163d 100644
--- a/Theme/Backend/monitoring-security-file-list.tpl.php
+++ b/Theme/Backend/monitoring-security-file-list.tpl.php
@@ -21,26 +21,35 @@ use phpOMS\Uri\Http;
 
 $files = \phpOMS\System\File\Local\Directory(__DIR__ . '/../../../../phpOMS', '^.+\.php$');
 
-echo $this->getData('nav')->render(); ?>
-
-<div class="row">
-    <div class="box col-xs-12 wf-100">
-        <table class="table darkred">
-            <caption><?= $this->getHtml('Files') ?><i class="fa fa-download floatRight download btn"></i></caption>
-            <thead>
-            <tr>
-                <td class="wf-100"><?= $this->getHtml('File') ?>
-                <td><?= $this->getHtml('Unicode') ?>
-                <td><?= $this->getHtml('Deprecated') ?>
-                <td><?= $this->getHtml('Integrity') ?>
-                    <tbody>
-                    <?php foreach ($files as $key => $file) : $source = \file_get_contents($file); ?>
-            <tr>
-                <td><?= $file; ?>
-                <td><?= \phpOMS\Security\PhpCode::hasUnicode($source); ?>
-                <td><?= \phpOMS\Security\PhpCode::hasDeprecatedFunction($source); ?>
-                <td><?= \phpOMS\Security\PhpCode::validateFileIntegrity($file, \md5(Rest::request(new Request(new Http('https://raw.githubusercontent.com/Orange-Management/phpOMS/develop/Account/Account.php'))))); ?>
-                    <?php endforeach; ?>
-        </table>
-    </div>
-</div>
+echo $this->getData('nav')->render(); ?>
+
+<div class="row">
+    <div class="box col-xs-12 wf-100">
+        <table class="table darkred">
+            <caption><?= $this->getHtml('Files') ?><i class="fa fa-download floatRight download btn"></i></caption>
+            <thead>
+            <tr>
+                <td class="wf-100"><?= $this->getHtml('File') ?>
+                <td><?= $this->getHtml('Unicode') ?>
+                <td><?= $this->getHtml('Deprecated') ?>
+                <td><?= $this->getHtml('Integrity') ?>
+                    <tbody>
+                    <?php foreach ($files as $key => $file) : $source = \file_get_contents($file); ?>
+            <tr>
+                <td><?= $file; ?>
+                <td><?= \phpOMS\Security\PhpCode::hasUnicode($source); ?>
+                <td><?= \phpOMS\Security\PhpCode::hasDeprecatedFunction($source); ?>
+                <td><?= \phpOMS\Security\PhpCode::validateFileIntegrity(
+                        $file,
+                        \md5(
+                            Rest::request(
+                                new Request(
+                                    new Http('https://raw.githubusercontent.com/Orange-Management/phpOMS/develop/Account/Account.php')
+                                )
+                            )->getBody()
+                        )
+                    ); ?>
+                    <?php endforeach; ?>
+        </table>
+    </div>
+</div>
diff --git a/Theme/Backend/monitoring-security.tpl.php b/Theme/Backend/monitoring-security.tpl.php
index 4e4f8ed..ca945b5 100644
--- a/Theme/Backend/monitoring-security.tpl.php
+++ b/Theme/Backend/monitoring-security.tpl.php
@@ -1,23 +1,23 @@
-<?php declare(strict_types=1);
-/**
- * Orange Management
- *
- * PHP Version 7.2
- *
- * @package    TBD
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://website.orange-management.de
- */
-
-use phpOMS\Message\Http\Request;
-use phpOMS\Message\Http\Rest;
-use phpOMS\Security\PhpCode;
-use phpOMS\System\File\Local\Directory;
-use phpOMS\System\File\Local\File;
-use phpOMS\Uri\Http;
-
+<?php declare(strict_types=1);
+/**
+ * Orange Management
+ *
+ * PHP Version 7.2
+ *
+ * @package    TBD
+ * @copyright  Dennis Eichhorn
+ * @license    OMS License 1.0
+ * @version    1.0.0
+ * @link       http://website.orange-management.de
+ */
+
+use phpOMS\Message\Http\Request;
+use phpOMS\Message\Http\Rest;
+use phpOMS\Security\PhpCode;
+use phpOMS\System\File\Local\Directory;
+use phpOMS\System\File\Local\File;
+use phpOMS\Uri\Http;
+
 echo $this->getData('nav')->render(); ?>
 
 <div class="row">
@@ -49,8 +49,8 @@ echo $this->getData('nav')->render(); ?>
                     <td><?= $this->getHtml('Modified') ?>
                     <td><?= $this->getHtml('Integrity') ?>
                 <tbody>
-                        <?php
-                        $files = Directory::listByExtension(__DIR__ . '/../../../../phpOMS/', 'php', 'tests(\/|\\\)');
+                        <?php
+                        $files = Directory::listByExtension(__DIR__ . '/../../../../phpOMS/', 'php', 'tests(\/|\\\)');
                         foreach ($files as $file) : $content = \file_get_contents(__DIR__ . '/../../../../phpOMS/' . $file); ?>
                         <tr>
                             <td>
@@ -59,17 +59,17 @@ echo $this->getData('nav')->render(); ?>
                             <td><?= PhpCode::hasDeprecatedFunction($content) ? $this->getHtml('NG') : $this->getHtml('OK'); ?>
                             <td><?= File::changed(__DIR__ . '/../../../../phpOMS/' . $file)->format('Y-m-d'); ?>
                             <td>
-                                <?= \phpOMS\Security\PhpCode::validateStringIntegrity(
-                                    $content,
-                                    Rest::request(
-                                        new Request(
-                                            new Http('https://raw.githubusercontent.com/Orange-Management/phpOMS/develop/' . $file)
-                                        )
-                                    )
+                                <?= \phpOMS\Security\PhpCode::validateStringIntegrity(
+                                    $content,
+                                    Rest::request(
+                                        new Request(
+                                            new Http('https://raw.githubusercontent.com/Orange-Management/phpOMS/develop/' . $file)
+                                        )
+                                    )->getBody()
                                 ) ? $this->getHtml('OK') : $this->getHtml('NG'); ?>
                         <?php endforeach; ?>
-                        <?php
-                        $files = Directory::listByExtension(__DIR__ . '/../../../../Model/', 'php', 'tests(\/|\\\)');
+                        <?php
+                        $files = Directory::listByExtension(__DIR__ . '/../../../../Model/', 'php', 'tests(\/|\\\)');
                         foreach ($files as $file) : $content = \file_get_contents(__DIR__ . '/../../../../Model/' . $file); ?>
                         <tr>
                             <td>
@@ -78,17 +78,17 @@ echo $this->getData('nav')->render(); ?>
                             <td><?= PhpCode::hasDeprecatedFunction($content) ? $this->getHtml('NG') : $this->getHtml('OK'); ?>
                             <td><?= File::changed(__DIR__ . '/../../../../Model/' . $file)->format('Y-m-d'); ?>
                             <td>
-                                <?= \phpOMS\Security\PhpCode::validateStringIntegrity(
-                                    $content,
-                                    Rest::request(
-                                        new Request(
-                                            new Http('https://raw.githubusercontent.com/Orange-Management/Model/develop/' . $file)
-                                        )
-                                    )
+                                <?= \phpOMS\Security\PhpCode::validateStringIntegrity(
+                                    $content,
+                                    Rest::request(
+                                        new Request(
+                                            new Http('https://raw.githubusercontent.com/Orange-Management/Model/develop/' . $file)
+                                        )
+                                    )->getBody()
                                 ) ? $this->getHtml('OK') : $this->getHtml('NG'); ?>
                         <?php endforeach; ?>
-                        <?php
-                        $files = Directory::listByExtension(__DIR__ . '/../../../../Modules/', 'php', 'tests(\/|\\\)');
+                        <?php
+                        $files = Directory::listByExtension(__DIR__ . '/../../../../Modules/', 'php', 'tests(\/|\\\)');
                         foreach ($files as $file) : $content = \file_get_contents(__DIR__ . '/../../../../Modules/' . $file); ?>
                         <tr>
                             <td>
@@ -97,13 +97,13 @@ echo $this->getData('nav')->render(); ?>
                             <td><?= PhpCode::hasDeprecatedFunction($content) ? $this->getHtml('NG') : $this->getHtml('OK'); ?>
                             <td><?= File::changed(__DIR__ . '/../../../../Modules/' . $file)->format('Y-m-d'); ?>
                             <td>
-                                <?= \phpOMS\Security\PhpCode::validateStringIntegrity(
-                                    $content,
-                                    Rest::request(
-                                        new Request(
-                                            new Http('https://raw.githubusercontent.com/Orange-Management/Modules/develop/' . $file)
-                                        )
-                                    )
+                                <?= \phpOMS\Security\PhpCode::validateStringIntegrity(
+                                    $content,
+                                    Rest::request(
+                                        new Request(
+                                            new Http('https://raw.githubusercontent.com/Orange-Management/Modules/develop/' . $file)
+                                        )
+                                    )->getBody()
                                 ) ? $this->getHtml('OK') : $this->getHtml('NG'); ?>
                         <?php endforeach; ?>
             </table>