From 041d91e423110a68959702c746f5b2d48f8a0b81 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

---
 .../Application/QA/Themes/Default/tpl/footer.tpl.php |  6 +++---
 .../Application/QA/Themes/Default/tpl/header.tpl.php |  4 ++--
 Admin/Install/Application/QA/info.json               |  2 +-
 Admin/Install/Navigation.install.json                |  8 ++++----
 Admin/Settings/Theme/Backend/settings.tpl.php        |  2 +-
 Theme/Backend/qa-dashboard.tpl.php                   |  6 +++---
 Theme/Backend/qa-question.tpl.php                    | 12 ++++++------
 Theme/Backend/qa-tag-list.tpl.php                    |  2 +-
 info.json                                            |  2 +-
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Admin/Install/Application/QA/Themes/Default/tpl/footer.tpl.php b/Admin/Install/Application/QA/Themes/Default/tpl/footer.tpl.php
index f6e2bf9..03dbd03 100755
--- a/Admin/Install/Application/QA/Themes/Default/tpl/footer.tpl.php
+++ b/Admin/Install/Application/QA/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/QA/Themes/Default/tpl/header.tpl.php b/Admin/Install/Application/QA/Themes/Default/tpl/header.tpl.php
index 63364ab..0ae76d5 100755
--- a/Admin/Install/Application/QA/Themes/Default/tpl/header.tpl.php
+++ b/Admin/Install/Application/QA/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/QA/info.json b/Admin/Install/Application/QA/info.json
index 449489a..5bafc76 100755
--- a/Admin/Install/Application/QA/info.json
+++ b/Admin/Install/Application/QA/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 b49e473..954db48 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "QA",
-        "uri": "{/prefix}qa/dashboard?{?}",
+        "uri": "{/lang}/{/app}/qa/dashboard?{?}",
         "target": "self",
         "icon": null,
         "order": 50,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "QA",
-                "uri": "{/prefix}qa/dashboard?{?}",
+                "uri": "{/lang}/{/app}/qa/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/prefix}qa/question/create?{?}",
+                "uri": "{/lang}/{/app}/qa/question/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -49,7 +49,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Badges",
-                "uri": "{/prefix}qa/badge/list",
+                "uri": "{/lang}/{/app}/qa/badge/list",
                 "target": "self",
                 "icon": null,
                 "order": 10,
diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php
index f0e821f..5fd148b 100755
--- a/Admin/Settings/Theme/Backend/settings.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings.tpl.php
@@ -57,7 +57,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <?php $count = 0;
                 foreach ($apps as $key => $app) : ++$count;
-                    $url = UriFactory::build('admin/module/settings?id=QA&app=' . $app->id); ?>
+                    $url = UriFactory::build('{/lang}/{/app}/admin/module/settings?id=QA&app=' . $app->id); ?>
                     <tr tabindex="0" data-href="<?= $url; ?>">
                         <td><a href="<?= $url; ?>"><?= $app->getId(); ?></a>
                         <td><a href="<?= $url; ?>"><?= $this->printHtml($app->name); ?></a>
diff --git a/Theme/Backend/qa-dashboard.tpl.php b/Theme/Backend/qa-dashboard.tpl.php
index 3552309..16879f9 100755
--- a/Theme/Backend/qa-dashboard.tpl.php
+++ b/Theme/Backend/qa-dashboard.tpl.php
@@ -51,7 +51,7 @@ echo $this->getData('nav')->render(); ?>
                         </div>
                     </div>
                     <div class="title">
-                        <a href="<?= UriFactory::build('qa/question?{?}&id=' . $question->getId()); ?>"><?= $this->printHtml($question->name); ?></a>
+                        <a href="<?= UriFactory::build('{/lang}/{/app}/qa/question?{?}&id=' . $question->getId()); ?>"><?= $this->printHtml($question->name); ?></a>
                     </div>
                 </div>
             </div>
@@ -62,10 +62,10 @@ echo $this->getData('nav')->render(); ?>
                     <?php endforeach; ?>
                 </div>
 
-                <a class="account-info" href="<?= UriFactory::build('profile/single?{?}&id=' . $question->createdBy->getId()); ?>">
+                <a class="account-info" href="<?= UriFactory::build('{/lang}/{/app}/profile/single?{?}&id=' . $question->createdBy->getId()); ?>">
                     <span class="name content"><?= $this->printHtml($question->createdBy->account->name2); ?> <?= $this->printHtml($question->createdBy->account->name1); ?></span>
                     <?php if ($question->createdBy->image !== null && !($question->createdBy->image instanceof NullMedia)) : ?>
-                        <img width="40px" alt="<?= $this->getHtml('AccountImage', '0', '0'); ?>" loading="lazy" src="<?= UriFactory::build('' . $question->createdBy->image->getPath()); ?>">
+                        <img width="40px" alt="<?= $this->getHtml('AccountImage', '0', '0'); ?>" loading="lazy" src="<?= UriFactory::build('{/lang}/{/app}/' . $question->createdBy->image->getPath()); ?>">
                     <?php endif; ?>
                 </a>
             </div>
diff --git a/Theme/Backend/qa-question.tpl.php b/Theme/Backend/qa-question.tpl.php
index 35f9dab..4605b1c 100755
--- a/Theme/Backend/qa-question.tpl.php
+++ b/Theme/Backend/qa-question.tpl.php
@@ -75,17 +75,17 @@ echo $this->getData('nav')->render();
                     </div>
 
                     <?php $files = $question->getMedia(); foreach ($files as $file) : ?>
-                         <span><a class="content" href="<?= UriFactory::build('media/single?id=' . $file->getId());?>"><?= $file->name; ?></a></span>
+                         <span><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/media/single?id=' . $file->getId());?>"><?= $file->name; ?></a></span>
                     <?php endforeach; ?>
 
-                    <a class="account-info" href="<?= UriFactory::build('profile/single?{?}&id=' . $question->createdBy->getId()); ?>">
+                    <a class="account-info" href="<?= UriFactory::build('{/lang}/{/app}/profile/single?{?}&id=' . $question->createdBy->getId()); ?>">
                         <span class="name">
                             <div class="content"><?= $this->printHtml($question->createdBy->account->name2); ?> <?= $this->printHtml($question->createdBy->account->name1); ?></div>
                             <div class="name-score">Score: <?= $scores[$question->createdBy->account->getId()] ?? 0; ?></div>
                         </span>
 
                         <?php if ($question->createdBy->image !== null && !($question->createdBy->image instanceof NullMedia)) : ?>
-                            <img width="40px" alt="<?= $this->getHtml('AccountImage', '0', '0'); ?>" loading="lazy" src="<?= UriFactory::build('' . $question->createdBy->image->getPath()); ?>">
+                            <img width="40px" alt="<?= $this->getHtml('AccountImage', '0', '0'); ?>" loading="lazy" src="<?= UriFactory::build('{/lang}/{/app}/' . $question->createdBy->image->getPath()); ?>">
                         <?php endif; ?>
                     </a>
                 </div>
@@ -147,16 +147,16 @@ echo $this->getData('nav')->render();
                 </div>
                 <div class="portlet-foot qa-portlet-foot">
                     <?php $files = $answer->getMedia(); foreach ($files as $file) : ?>
-                        <span><a class="content" href="<?= UriFactory::build('media/single?id=' . $file->getId());?>"><?= $file->name; ?></a></span>
+                        <span><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/media/single?id=' . $file->getId());?>"><?= $file->name; ?></a></span>
                     <?php endforeach; ?>
 
-                    <a class="account-info" href="<?= UriFactory::build('profile/single?{?}&id=' . $answer->createdBy->getId()); ?>">
+                    <a class="account-info" href="<?= UriFactory::build('{/lang}/{/app}/profile/single?{?}&id=' . $answer->createdBy->getId()); ?>">
                         <span class="name">
                             <div class="content"><?= $this->printHtml($answer->createdBy->account->name2); ?> <?= $this->printHtml($answer->createdBy->account->name1); ?></div>
                             <div class="name-score">Score: <?= $scores[$answer->createdBy->account->getId()] ?? 0; ?></div>
                         </span>
                         <?php if ($answer->createdBy->image !== null && !($answer->createdBy->image instanceof NullMedia)) : ?>
-                            <img width="40px" alt="<?= $this->getHtml('AccountImage', '0', '0'); ?>" loading="lazy" src="<?= UriFactory::build('' . $answer->createdBy->image->getPath()); ?>">
+                            <img width="40px" alt="<?= $this->getHtml('AccountImage', '0', '0'); ?>" loading="lazy" src="<?= UriFactory::build('{/lang}/{/app}/' . $answer->createdBy->image->getPath()); ?>">
                         <?php endif; ?>
                     </a>
                 </div>
diff --git a/Theme/Backend/qa-tag-list.tpl.php b/Theme/Backend/qa-tag-list.tpl.php
index 6cb1720..2592bbc 100755
--- a/Theme/Backend/qa-tag-list.tpl.php
+++ b/Theme/Backend/qa-tag-list.tpl.php
@@ -32,7 +32,7 @@ echo $this->getData('nav')->render();
                 <tr><td colspan="2">
                         <tbody>
                         <?php $c = 0; foreach ($tags as $key => $value) : ++$c;
-                        $url     = \phpOMS\Uri\UriFactory::build('admin/account/settings?{?}&id=' . $value->getId()); ?>
+                        $url     = \phpOMS\Uri\UriFactory::build('{/lang}/{/app}/admin/account/settings?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
diff --git a/info.json b/info.json
index f78b83b..148fa10 100755
--- a/info.json
+++ b/info.json
@@ -12,7 +12,7 @@
     },
     "creator": {
         "name": "Karaka",
-        "website": "www.spl1nes.com"
+        "website": "jingga.app"
     },
     "description": "QA module.",
     "directory": "QA",