From 56fa001bf9c99c517de36af1297fb8a6ce6e8277 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 31 Dec 2015 18:05:19 +0100
Subject: [PATCH] Restructure

---
 Admin/Activate.php                                           | 2 +-
 Admin/Deactivate.php                                         | 2 +-
 Admin/Install/Navigation.php                                 | 2 ++
 Admin/Installer.php                                          | 2 +-
 Admin/Uninstall.php                                          | 2 +-
 Admin/Update.php                                             | 5 ++++-
 .../Lang/Navigation.en.lang.php}                             | 0
 info.json                                                    | 4 ++--
 8 files changed, 12 insertions(+), 7 deletions(-)
 rename Theme/{lang/nav.backend.en.lang.php => Backend/Lang/Navigation.en.lang.php} (100%)

diff --git a/Admin/Activate.php b/Admin/Activate.php
index 8fd6d3f..d8a31a1 100644
--- a/Admin/Activate.php
+++ b/Admin/Activate.php
@@ -15,7 +15,7 @@
  */
 namespace Modules\BusinessExpenses\Admin;
 
-use phpOMS\DataStorage\Database\DatabaseType;
+
 use phpOMS\DataStorage\Database\Pool;
 use phpOMS\Module\ActivateAbstract;
 
diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php
index f20e218..55136ba 100644
--- a/Admin/Deactivate.php
+++ b/Admin/Deactivate.php
@@ -15,7 +15,7 @@
  */
 namespace Modules\BusinessExpenses\Admin;
 
-use phpOMS\DataStorage\Database\DatabaseType;
+
 use phpOMS\DataStorage\Database\Pool;
 use phpOMS\Module\DeactivateAbstract;
 
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 8f2d63b..3883fe6 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -14,6 +14,7 @@
  * @link       http://orange-management.com
  */
 namespace Modules\BusinessExpenses\Admin\Install;
+use phpOMS\DataStorage\Database\Pool;
 
 /**
  * Navigation class.
@@ -33,6 +34,7 @@ class Navigation
         $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
 
         $class = '\\Modules\\Navigation\\Admin\\Installer';
+        /** @var $class \Modules\Navigation\Admin\Installer */
         $class::installExternal($dbPool, $navData);
     }
 }
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 9bf1ebc..4c94ee4 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -15,7 +15,7 @@
  */
 namespace Modules\BusinessExpenses\Admin;
 
-use phpOMS\DataStorage\Database\DatabaseType;
+
 use phpOMS\DataStorage\Database\Pool;
 use phpOMS\Module\InstallerAbstract;
 
diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
index d26f19d..0c1cf5d 100644
--- a/Admin/Uninstall.php
+++ b/Admin/Uninstall.php
@@ -15,7 +15,7 @@
  */
 namespace Modules\BusinessExpenses\Admin;
 
-use phpOMS\DataStorage\Database\DatabaseType;
+
 use phpOMS\DataStorage\Database\Pool;
 use phpOMS\Module\UninstallAbstract;
 
diff --git a/Admin/Update.php b/Admin/Update.php
index efeba44..0a5eeea 100644
--- a/Admin/Update.php
+++ b/Admin/Update.php
@@ -15,9 +15,10 @@
  */
 namespace Modules\BusinessExpenses\Admin;
 
-use phpOMS\DataStorage\Database\DatabaseType;
+
 use phpOMS\DataStorage\Database\Pool;
 use phpOMS\Module\UpdateAbstract;
+use phpOMS\System\FileSystem;
 
 /**
  * Navigation class.
@@ -38,6 +39,8 @@ class Update extends UpdateAbstract
      */
     public static function update(Pool $dbPool, array $info)
     {
+        FileSystem::deletePath(__DIR__ . '/Update');
+        mkdir('Update');
         parent::update($dbPool, $info);
     }
 }
diff --git a/Theme/lang/nav.backend.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
similarity index 100%
rename from Theme/lang/nav.backend.en.lang.php
rename to Theme/Backend/Lang/Navigation.en.lang.php
diff --git a/info.json b/info.json
index 4d2a8a0..3ec5f52 100644
--- a/info.json
+++ b/info.json
@@ -27,7 +27,7 @@
             "type": 5,
             "from": "BusinessExpenses",
             "for": "Navigation",
-            "file": "nav.backend"
+            "file": "Navigation"
         },
         {
             "pid": [
@@ -35,7 +35,7 @@
             ],
             "type": 5,
             "for": "Content",
-            "file": "backend",
+            "file": "",
             "from": "BusinessExpenses"
         }
     ]