From 066b6ddafb84fb3cc621293b965c0a75918ea6c0 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 10 Dec 2022 22:17:54 +0100
Subject: [PATCH] fix urls

---
 .../Shop/Themes/Default/tpl/footer.tpl.php           |  6 +++---
 .../Shop/Themes/Default/tpl/header.tpl.php           |  4 ++--
 Admin/Install/Application/Shop/info.json             |  2 +-
 Admin/Install/Navigation.install.json                | 12 ++++++------
 Theme/Backend/support-list.tpl.php                   |  6 +++---
 Theme/Backend/support-ticket.tpl.php                 |  8 ++++----
 Views/TicketView.php                                 |  4 ++--
 info.json                                            |  2 +-
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php
index f6e2bf9..03dbd03 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php
@@ -19,9 +19,9 @@ use phpOMS\Uri\UriFactory;
     <div class="floater">
         <hr>
         <ul>
-            <li><a href="<?= UriFactory::build('{/app}/terms'); ?>">Terms</a>
-            <li><a href="<?= UriFactory::build('{/app}/privacy'); ?>">Data Protection</a>
-            <li><a href="<?= UriFactory::build('{/app}/imprint'); ?>">Imprint</a>
+            <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/terms'); ?>">Terms</a>
+            <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/privacy'); ?>">Data Protection</a>
+            <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/imprint'); ?>">Imprint</a>
         </ul>
     </div>
 </footer>
\ No newline at end of file
diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php
index a1c58d4..974ff49 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php
@@ -18,8 +18,8 @@ use phpOMS\Uri\UriFactory;
 <header>
     <nav>
        <ul>
-          <li><a href="<?= UriFactory::build('{/app}'); ?>">Website</a>
-          <li><a href="<?= UriFactory::build('{/app}/components'); ?>">Profile</a>
+          <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}'); ?>">Website</a>
+          <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/components'); ?>">Profile</a>
        </ul>
     </nav>
     <div id="search">
diff --git a/Admin/Install/Application/Shop/info.json b/Admin/Install/Application/Shop/info.json
index 449489a..5bafc76 100755
--- a/Admin/Install/Application/Shop/info.json
+++ b/Admin/Install/Application/Shop/info.json
@@ -12,7 +12,7 @@
     },
     "creator": {
         "name": "Karaka",
-        "website": "www.spl1nes.com"
+        "website": "jingga.app"
     },
     "description": "The shop application.",
     "directory": "Shop",
diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index b5413e5..8b7841c 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -19,7 +19,7 @@
                 "type": 2,
                 "subtype": 1,
                 "name": "Tickets",
-                "uri": "{/prefix}support/list",
+                "uri": "{/lang}/{/app}/support/list",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -33,7 +33,7 @@
                         "type": 3,
                         "subtype": 1,
                         "name": "List",
-                        "uri": "{/prefix}support/list",
+                        "uri": "{/lang}/{/app}/support/list",
                         "target": "self",
                         "icon": null,
                         "order": 1,
@@ -49,7 +49,7 @@
                         "type": 3,
                         "subtype": 1,
                         "name": "Create",
-                        "uri": "{/prefix}support/create?{?}",
+                        "uri": "{/lang}/{/app}/support/create?{?}",
                         "target": "self",
                         "icon": null,
                         "order": 5,
@@ -67,7 +67,7 @@
                 "type": 2,
                 "subtype": 1,
                 "name": "Settings",
-                "uri": "{/prefix}support/settings/dashboard?{?}",
+                "uri": "{/lang}/{/app}/support/settings/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -83,7 +83,7 @@
                 "type": 2,
                 "subtype": 1,
                 "name": "Analysis",
-                "uri": "{/prefix}support/analysis/dashboard?{?}",
+                "uri": "{/lang}/{/app}/support/analysis/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 10,
@@ -101,7 +101,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Support",
-        "uri": "{/prefix}private/support/dashboard?{?}",
+        "uri": "{/lang}/{/app}/private/support/dashboard?{?}",
         "target": "self",
         "icon": null,
         "order": 5,
diff --git a/Theme/Backend/support-list.tpl.php b/Theme/Backend/support-list.tpl.php
index a7bc7f6..4486df7 100755
--- a/Theme/Backend/support-list.tpl.php
+++ b/Theme/Backend/support-list.tpl.php
@@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
                 <?php
                     $c = 0;
                 foreach ($tickets as $key => $ticket) : ++$c;
-                    $url = UriFactory::build('support/ticket?{?}&id=' . $ticket->getId());
+                    $url = UriFactory::build('{/lang}/{/app}/support/ticket?{?}&id=' . $ticket->getId());
                 ?>
                     <tr data-href="<?= $url; ?>">
                         <td><a href="<?= $url; ?>">
@@ -49,9 +49,9 @@ echo $this->getData('nav')->render(); ?>
                             </span></a>
                         <td><a href="<?= $url; ?>"><?= $this->getHtml('P' . $ticket->task->getPriority(), 'Tasks'); ?></a>
                         <td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->task->title); ?></a>
-                        <td><a class="content" href="<?= UriFactory::build('profile/single?for=' . $ticket->task->createdBy->getId()); ?>"><?= $this->printHtml($ticket->task->createdBy->name1); ?> <?= $this->printHtml($ticket->task->createdBy->name2); ?></a>
+                        <td><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/profile/single?for=' . $ticket->task->createdBy->getId()); ?>"><?= $this->printHtml($ticket->task->createdBy->name1); ?> <?= $this->printHtml($ticket->task->createdBy->name2); ?></a>
                         <td><a class="content" href="<?= $url; ?>"><?= $this->printHtml($ticket->task->createdBy->name1); ?> <?= $this->printHtml($ticket->task->createdBy->name2); ?></a>
-                        <td><a class="content" href="<?= UriFactory::build('profile/single?for=' . $ticket->for->getId()); ?>"><?= $this->printHtml($ticket->for->name1); ?> <?= $this->printHtml($ticket->for->name2); ?></a>
+                        <td><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/profile/single?for=' . $ticket->for->getId()); ?>"><?= $this->printHtml($ticket->for->name1); ?> <?= $this->printHtml($ticket->for->name2); ?></a>
                         <td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->task->createdAt->format('Y-m-d H:i')); ?></a>
                 <?php endforeach; if ($c == 0) : ?>
                     <tr><td colspan="7" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
diff --git a/Theme/Backend/support-ticket.tpl.php b/Theme/Backend/support-ticket.tpl.php
index e2e7c75..40f87b4 100755
--- a/Theme/Backend/support-ticket.tpl.php
+++ b/Theme/Backend/support-ticket.tpl.php
@@ -88,7 +88,7 @@ echo $this->getData('nav')->render(); ?>
                         <?php if (!empty($taskMedia)) : ?>
                             <div>
                                 <?php foreach ($taskMedia as $media) : ?>
-                                     <span><a class="content" href="<?= UriFactory::build('media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
+                                     <span><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
                                 <?php endforeach; ?>
                             </div>
                         <?php endif; ?>
@@ -245,7 +245,7 @@ echo $this->getData('nav')->render(); ?>
                         <?php if (!empty($elementMedia)) : ?>
                             <div>
                                 <?php foreach ($elementMedia as $media) : ?>
-                                     <span><a class="content" href="<?= UriFactory::build('media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
+                                     <span><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
                                 <?php endforeach; ?>
                             </div>
                         <?php endif; ?>
@@ -291,10 +291,10 @@ echo $this->getData('nav')->render(); ?>
                     ) : ?>
                     <section class="portlet wf-100">
                         <div class="portlet-body">
-                            <a href="<?= UriFactory::build('profile/single?{?}&for=' . $element->taskElement->createdBy->getId()); ?>"><?= $this->printHtml($element->taskElement->createdBy->name1); ?></a> <?= $this->getHtml('forwarded_to'); ?>
+                            <a href="<?= UriFactory::build('{/lang}/{/app}/profile/single?{?}&for=' . $element->taskElement->createdBy->getId()); ?>"><?= $this->printHtml($element->taskElement->createdBy->name1); ?></a> <?= $this->getHtml('forwarded_to'); ?>
                             <?php foreach ($tos as $to) : ?>
                                 <?php if ($to instanceof AccountRelation) : ?>
-                                    <a href="<?= UriFactory::build('profile/single?{?}&for=' . $to->getRelation()->getId()); ?>"><?= $this->printHtml($to->getRelation()->name1); ?></a>
+                                    <a href="<?= UriFactory::build('{/lang}/{/app}/profile/single?{?}&for=' . $to->getRelation()->getId()); ?>"><?= $this->printHtml($to->getRelation()->name1); ?></a>
                                 <?php elseif ($to instanceof GroupRelation) : ?>
                                     <?= $this->printHtml($to->getRelation()->name); ?>
                                 <?php endif; ?>
diff --git a/Views/TicketView.php b/Views/TicketView.php
index a5cf594..d7e4c80 100755
--- a/Views/TicketView.php
+++ b/Views/TicketView.php
@@ -70,10 +70,10 @@ class TicketView extends View
         $profile = ProfileMapper::get()->with('image')->where('account', $account)->execute();
 
         if (($profile instanceof NullProfile) || $profile->image->getPath() === '') {
-            return UriFactory::build('' . $this->defaultProfileImage->getPath());
+            return UriFactory::build('{/lang}/{/app}/' . $this->defaultProfileImage->getPath());
         }
 
-        return UriFactory::build('' . $profile->image->getPath());
+        return UriFactory::build('{/lang}/{/app}/' . $profile->image->getPath());
     }
 
     /**
diff --git a/info.json b/info.json
index e69b66b..8c270d5 100755
--- a/info.json
+++ b/info.json
@@ -12,7 +12,7 @@
     },
     "creator": {
         "name": "Karaka",
-        "website": "www.spl1nes.com"
+        "website": "jingga.app"
     },
     "description": "Support module.",
     "directory": "Support",