From 9fcd47e5b8c07b5bf7d9216501eb38a1a69b2d5d Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Wed, 8 Nov 2017 22:39:51 +0100
Subject: [PATCH] Fix #13

---
 Admin/Install/Navigation.install.json | 14 +++++++-------
 Theme/Backend/dashboard.tpl.php       |  6 +++---
 Theme/Backend/mail-out-view.tpl.php   |  4 ++--
 Theme/Backend/mail-spam-view.tpl.php  |  4 ++--
 Theme/Backend/mail-trash-view.tpl.php |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index d1d08d3..4203b53 100644
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 1,
         "subtype": 1,
         "name": "Messages",
-        "uri": "{/base}/{/lang}/backend/messages/dashboard?{?}",
+        "uri": "/{/lang}/backend/messages/dashboard?{?}",
         "target": "self",
         "icon": "fa fa-envelope",
         "order": 10,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Inbox",
-                "uri": "{/base}/{/lang}/backend/messages/dashboard?{?}",
+                "uri": "/{/lang}/backend/messages/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Outbox",
-                "uri": "{/base}/{/lang}/backend/messages/outbox?{?}",
+                "uri": "/{/lang}/backend/messages/outbox?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -49,7 +49,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Trash",
-                "uri": "{/base}/{/lang}/backend/messages/trash?{?}",
+                "uri": "/{/lang}/backend/messages/trash?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 10,
@@ -64,7 +64,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Spam",
-                "uri": "{/base}/{/lang}/backend/messages/spam?{?}",
+                "uri": "/{/lang}/backend/messages/spam?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 15,
@@ -79,7 +79,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Draft",
-                "uri": "{/base}/{/lang}/backend/messages/draft?{?}",
+                "uri": "/{/lang}/backend/messages/draft?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 20,
@@ -94,7 +94,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Settings",
-                "uri": "{/base}/{/lang}/backend/messages/settings?{?}",
+                "uri": "/{/lang}/backend/messages/settings?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 50,
diff --git a/Theme/Backend/dashboard.tpl.php b/Theme/Backend/dashboard.tpl.php
index c39fcaf..da4da09 100644
--- a/Theme/Backend/dashboard.tpl.php
+++ b/Theme/Backend/dashboard.tpl.php
@@ -21,7 +21,7 @@ echo $this->getData('nav')->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getHtml('Create', 0, 0); ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getHtml('Create', 0, 0); ?></a>
         <li><a href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete') ?></a>
     </ul>
 </section>
@@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
         <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
         <tbody>
             <?php $count = 0; foreach ($unseen as $key => $value) : $count++;
-            $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
+            $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
             <tr>
                 <td><span class="check"><input type="checkbox"></span>
                 <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>
@@ -50,7 +50,7 @@ echo $this->getData('nav')->render(); ?>
             <?php endforeach; ?>
 
                     <?php foreach ($seen as $key => $value) : $count++;
-                    $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
+                    $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
             <tr>
                 <td><span class="check"><input type="checkbox"></span>
                 <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>
diff --git a/Theme/Backend/mail-out-view.tpl.php b/Theme/Backend/mail-out-view.tpl.php
index 70033f5..dbb9c7c 100644
--- a/Theme/Backend/mail-out-view.tpl.php
+++ b/Theme/Backend/mail-out-view.tpl.php
@@ -20,7 +20,7 @@ echo $this->getData('nav')->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getHtml('Create', 0, 0); ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getHtml('Create', 0, 0); ?></a>
         <li><a href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete') ?></a>
     </ul>
 </section>
@@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?>
         <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
         <tbody>
         <?php $count = 0; foreach ($sent as $key => $value) : $count++;
-        $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
+        $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>
diff --git a/Theme/Backend/mail-spam-view.tpl.php b/Theme/Backend/mail-spam-view.tpl.php
index 70033f5..dbb9c7c 100644
--- a/Theme/Backend/mail-spam-view.tpl.php
+++ b/Theme/Backend/mail-spam-view.tpl.php
@@ -20,7 +20,7 @@ echo $this->getData('nav')->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getHtml('Create', 0, 0); ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getHtml('Create', 0, 0); ?></a>
         <li><a href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete') ?></a>
     </ul>
 </section>
@@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?>
         <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
         <tbody>
         <?php $count = 0; foreach ($sent as $key => $value) : $count++;
-        $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
+        $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>
diff --git a/Theme/Backend/mail-trash-view.tpl.php b/Theme/Backend/mail-trash-view.tpl.php
index 70033f5..dbb9c7c 100644
--- a/Theme/Backend/mail-trash-view.tpl.php
+++ b/Theme/Backend/mail-trash-view.tpl.php
@@ -20,7 +20,7 @@ echo $this->getData('nav')->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getHtml('Create', 0, 0); ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getHtml('Create', 0, 0); ?></a>
         <li><a href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete') ?></a>
     </ul>
 </section>
@@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?>
         <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
         <tbody>
         <?php $count = 0; foreach ($sent as $key => $value) : $count++;
-        $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
+        $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>