From 6d5924c359377aa0c1f43fab86fb4f9b3382fade Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 9 Oct 2016 20:07:30 +0200
Subject: [PATCH 1/7] Fix install

---
 Admin/Install/Navigation.php | 2 +-
 Admin/Installer.php          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 75faa44..4772626 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool;
  */
 class Navigation
 {
-    public static function install(Pool $dbPool)
+    public static function install(string $path, Pool $dbPool)
     {
         $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
 
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 6e7427f..cf76d5f 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -36,8 +36,8 @@ class Installer extends InstallerAbstract
     /**
      * {@inheritdoc}
      */
-    public static function install(Pool $dbPool, InfoManager $info)
+    public static function install(string $path, Pool $dbPool, InfoManager $info)
     {
-        parent::install($dbPool, $info);
+        parent::install($path, $dbPool, $info);
     }
 }

From 785a3fc2a8f6215720f607b7ca1f0620cc9ef7b0 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Mon, 17 Oct 2016 21:08:43 +0200
Subject: [PATCH 2/7] Bug fixes

---
 Theme/backend/monitoring-dashboard.tpl.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Theme/backend/monitoring-dashboard.tpl.php b/Theme/backend/monitoring-dashboard.tpl.php
index 92c5d3a..2b1f2f1 100644
--- a/Theme/backend/monitoring-dashboard.tpl.php
+++ b/Theme/backend/monitoring-dashboard.tpl.php
@@ -30,7 +30,6 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><?= $this->getText('MemoryLimit') ?><td><?= ini_get('memory_limit'); ?>
                 <tr><td><?= $this->getText('SystemRAM') ?><td><?= \phpOMS\System\SystemUtils::getRAM()/(1024); ?> MB
                 <tr><td><?= $this->getText('CPUUsage') ?><td><?= \phpOMS\System\SystemUtils::getCpuUsage(); ?>%
-                <tr><td><?= $this->getText('Monitoring', 'DiskUsage') ?><td><?= round(\phpOMS\System\File\Directory::getFolderSize(ROOT_PATH)/1000000, 'Backend', true); ?> MB
         </table>
     </div>
 </section>

From 2eb5d96f3d1ad80cde9b27c54bf16fa3fe663afb Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Mon, 17 Oct 2016 21:08:50 +0200
Subject: [PATCH 3/7] Naming fix

---
 Theme/Backend/monitoring-dashboard.tpl.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Theme/Backend/monitoring-dashboard.tpl.php b/Theme/Backend/monitoring-dashboard.tpl.php
index 92c5d3a..2b1f2f1 100644
--- a/Theme/Backend/monitoring-dashboard.tpl.php
+++ b/Theme/Backend/monitoring-dashboard.tpl.php
@@ -30,7 +30,6 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><?= $this->getText('MemoryLimit') ?><td><?= ini_get('memory_limit'); ?>
                 <tr><td><?= $this->getText('SystemRAM') ?><td><?= \phpOMS\System\SystemUtils::getRAM()/(1024); ?> MB
                 <tr><td><?= $this->getText('CPUUsage') ?><td><?= \phpOMS\System\SystemUtils::getCpuUsage(); ?>%
-                <tr><td><?= $this->getText('Monitoring', 'DiskUsage') ?><td><?= round(\phpOMS\System\File\Directory::getFolderSize(ROOT_PATH)/1000000, 'Backend', true); ?> MB
         </table>
     </div>
 </section>

From 1f0beece5a0feb604be90afa824e1c1821b1f05a Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 29 Oct 2016 20:44:52 +0200
Subject: [PATCH 4/7] Adjust database pool name

---
 Admin/Activate.php           | 4 ++--
 Admin/Deactivate.php         | 4 ++--
 Admin/Install/Navigation.php | 4 ++--
 Admin/Installer.php          | 4 ++--
 Admin/Uninstall.php          | 4 ++--
 Admin/Update.php             | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Admin/Activate.php b/Admin/Activate.php
index d56f012..88d19e7 100644
--- a/Admin/Activate.php
+++ b/Admin/Activate.php
@@ -16,7 +16,7 @@
 namespace Modules\Monitoring\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\ActivateAbstract;
 use phpOMS\Module\InfoManager;
 
@@ -37,7 +37,7 @@ class Activate extends ActivateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function activate(Pool $dbPool, InfoManager $info)
+    public static function activate(DatabasePool $dbPool, InfoManager $info)
     {
         parent::activate($dbPool, $info);
     }
diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php
index 1dd1673..611724c 100644
--- a/Admin/Deactivate.php
+++ b/Admin/Deactivate.php
@@ -16,7 +16,7 @@
 namespace Modules\Monitoring\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\DeactivateAbstract;
 use phpOMS\Module\InfoManager;
 
@@ -37,7 +37,7 @@ class Deactivate extends DeactivateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function deactivate(Pool $dbPool, InfoManager $info)
+    public static function deactivate(DatabasePool $dbPool, InfoManager $info)
     {
         parent::deactivate($dbPool, $info);
     }
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 4772626..568c4a9 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -14,7 +14,7 @@
  * @link       http://orange-management.com
  */
 namespace Modules\Monitoring\Admin\Install;
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 
 /**
  * Navigation class.
@@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool;
  */
 class Navigation
 {
-    public static function install(string $path, Pool $dbPool)
+    public static function install(string $path, DatabasePool $dbPool)
     {
         $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
 
diff --git a/Admin/Installer.php b/Admin/Installer.php
index cf76d5f..4e4ceda 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -15,7 +15,7 @@
  */
 namespace Modules\Monitoring\Admin;
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\InstallerAbstract;
 use phpOMS\Module\InfoManager;
 
@@ -36,7 +36,7 @@ class Installer extends InstallerAbstract
     /**
      * {@inheritdoc}
      */
-    public static function install(string $path, Pool $dbPool, InfoManager $info)
+    public static function install(string $path, DatabasePool $dbPool, InfoManager $info)
     {
         parent::install($path, $dbPool, $info);
     }
diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
index 795831b..9cff108 100644
--- a/Admin/Uninstall.php
+++ b/Admin/Uninstall.php
@@ -16,7 +16,7 @@
 namespace Modules\Monitoring\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\UninstallAbstract;
 
 /**
@@ -36,7 +36,7 @@ class Uninstall extends UninstallAbstract
     /**
      * {@inheritdoc}
      */
-    public static function uninstall(Pool $dbPool, InfoManager $info)
+    public static function uninstall(DatabasePool $dbPool, InfoManager $info)
     {
         parent::uninstall($dbPool, $info);
     }
diff --git a/Admin/Update.php b/Admin/Update.php
index c29ee5c..e08e112 100644
--- a/Admin/Update.php
+++ b/Admin/Update.php
@@ -16,7 +16,7 @@
 namespace Modules\Monitoring\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\UpdateAbstract;
 use phpOMS\System\File\Directory;
 
@@ -37,7 +37,7 @@ class Update extends UpdateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function update(Pool $dbPool, array $info)
+    public static function update(DatabasePool $dbPool, array $info)
     {
         Directory::deletePath(__DIR__ . '/Update');
         mkdir('Update');

From 86cbac336cd6361894756308549967ff01698030 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Wed, 7 Dec 2016 20:23:04 +0100
Subject: [PATCH 5/7] Prepare const visibility

---
 Controller.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Controller.php b/Controller.php
index 70e68ef..ef25fe3 100644
--- a/Controller.php
+++ b/Controller.php
@@ -45,7 +45,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_PATH = __DIR__;
+    /* public */ const MODULE_PATH = __DIR__;
 
     /**
      * Module version.
@@ -53,7 +53,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_VERSION = '1.0.0';
+    /* public */ const MODULE_VERSION = '1.0.0';
 
     /**
      * Module name.
@@ -61,7 +61,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_NAME = 'Monitoring';
+    /* public */ const MODULE_NAME = 'Monitoring';
 
     /**
      * Providing.

From ace1258f143c43d3eb81f3f6d8fe7f68ee30fc54 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Wed, 7 Dec 2016 20:56:15 +0100
Subject: [PATCH 6/7] Increase php version requirement

---
 Admin/Activate.php                           | 2 +-
 Admin/Deactivate.php                         | 2 +-
 Admin/Install/Navigation.php                 | 2 +-
 Admin/Installer.php                          | 2 +-
 Admin/Uninstall.php                          | 2 +-
 Admin/Update.php                             | 2 +-
 Controller.php                               | 2 +-
 Theme/Backend/Lang/Navigation.en.lang.php    | 2 +-
 Theme/Backend/Lang/api.en.lang.php           | 2 +-
 Theme/Backend/Lang/en.lang.php               | 2 +-
 Theme/Backend/monitoring-dashboard.tpl.php   | 2 +-
 Theme/Backend/monitoring-logs-single.tpl.php | 2 +-
 Theme/Backend/monitoring-logs.tpl.php        | 2 +-
 Theme/backend/Lang/Navigation.en.lang.php    | 2 +-
 Theme/backend/Lang/api.en.lang.php           | 2 +-
 Theme/backend/Lang/en.lang.php               | 2 +-
 Theme/backend/monitoring-dashboard.tpl.php   | 2 +-
 Theme/backend/monitoring-logs-single.tpl.php | 2 +-
 Theme/backend/monitoring-logs.tpl.php        | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Admin/Activate.php b/Admin/Activate.php
index 88d19e7..3cd1b2a 100644
--- a/Admin/Activate.php
+++ b/Admin/Activate.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php
index 611724c..745e4a5 100644
--- a/Admin/Deactivate.php
+++ b/Admin/Deactivate.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 568c4a9..ec4f951 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 4e4ceda..57651e2 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
index 9cff108..16c47e1 100644
--- a/Admin/Uninstall.php
+++ b/Admin/Uninstall.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Admin/Update.php b/Admin/Update.php
index e08e112..8f06b91 100644
--- a/Admin/Update.php
+++ b/Admin/Update.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Controller.php b/Controller.php
index ef25fe3..ca738fb 100644
--- a/Controller.php
+++ b/Controller.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index 5df946d..30b2ceb 100644
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/Lang/api.en.lang.php b/Theme/Backend/Lang/api.en.lang.php
index d53f90f..f8e29de 100644
--- a/Theme/Backend/Lang/api.en.lang.php
+++ b/Theme/Backend/Lang/api.en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index c4fdc0c..bcff7ff 100644
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/monitoring-dashboard.tpl.php b/Theme/Backend/monitoring-dashboard.tpl.php
index 2b1f2f1..ce37b55 100644
--- a/Theme/Backend/monitoring-dashboard.tpl.php
+++ b/Theme/Backend/monitoring-dashboard.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/monitoring-logs-single.tpl.php b/Theme/Backend/monitoring-logs-single.tpl.php
index aa7b476..9cd811b 100644
--- a/Theme/Backend/monitoring-logs-single.tpl.php
+++ b/Theme/Backend/monitoring-logs-single.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/monitoring-logs.tpl.php b/Theme/Backend/monitoring-logs.tpl.php
index fbae0bb..d62cf71 100644
--- a/Theme/Backend/monitoring-logs.tpl.php
+++ b/Theme/Backend/monitoring-logs.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php
index 5df946d..30b2ceb 100644
--- a/Theme/backend/Lang/Navigation.en.lang.php
+++ b/Theme/backend/Lang/Navigation.en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/Lang/api.en.lang.php b/Theme/backend/Lang/api.en.lang.php
index d53f90f..f8e29de 100644
--- a/Theme/backend/Lang/api.en.lang.php
+++ b/Theme/backend/Lang/api.en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php
index c4fdc0c..bcff7ff 100644
--- a/Theme/backend/Lang/en.lang.php
+++ b/Theme/backend/Lang/en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/monitoring-dashboard.tpl.php b/Theme/backend/monitoring-dashboard.tpl.php
index 2b1f2f1..ce37b55 100644
--- a/Theme/backend/monitoring-dashboard.tpl.php
+++ b/Theme/backend/monitoring-dashboard.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/monitoring-logs-single.tpl.php b/Theme/backend/monitoring-logs-single.tpl.php
index aa7b476..9cd811b 100644
--- a/Theme/backend/monitoring-logs-single.tpl.php
+++ b/Theme/backend/monitoring-logs-single.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/monitoring-logs.tpl.php b/Theme/backend/monitoring-logs.tpl.php
index fbae0bb..d62cf71 100644
--- a/Theme/backend/monitoring-logs.tpl.php
+++ b/Theme/backend/monitoring-logs.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD

From 8d9444ec6841d370c15d9fe4470896739ad03a6a Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 22 Jan 2017 21:08:46 +0100
Subject: [PATCH 7/7] Fixing json serialization and reporter

---
 Models/Log.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Models/Log.php b/Models/Log.php
index b77e7d9..b603add 100644
--- a/Models/Log.php
+++ b/Models/Log.php
@@ -29,6 +29,6 @@ class Log implements \JsonSerializable
 
 	public function jsonSerialize()
 	{
-		return json_encode($this->toArray());
+		return $this->toArray();
 	}
 }
\ No newline at end of file