From 47fbf40d0689231f204cc7955a7a906a78a743bf 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

---
 Admin/Install/Navigation.install.json | 10 +++++-----
 Theme/Backend/dashboard-task.tpl.php  |  2 +-
 Theme/Backend/task-dashboard.tpl.php  |  4 ++--
 Theme/Backend/task-single.tpl.php     |  8 ++++----
 Views/TaskView.php                    |  4 ++--
 info.json                             |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 6dd3d29..d05337a 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 1,
         "subtype": 1,
         "name": "Tasks",
-        "uri": "{/prefix}task/dashboard?{?}",
+        "uri": "{/lang}/{/app}/task/dashboard?{?}",
         "target": "self",
         "icon": "fa fa-bolt",
         "order": 15,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/prefix}task/dashboard?{?}",
+                "uri": "{/lang}/{/app}/task/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -33,7 +33,7 @@
                         "type": 0,
                         "subtype": 1,
                         "name": "Tasks",
-                        "uri": "{/prefix}task/single?{?}",
+                        "uri": "{/lang}/{/app}/task/single?{?}",
                         "target": "self",
                         "icon": null,
                         "order": 1,
@@ -50,7 +50,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/prefix}task/create?{?}",
+                "uri": "{/lang}/{/app}/task/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 10,
@@ -65,7 +65,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Analysis",
-                "uri": "{/prefix}task/analysis?{?}",
+                "uri": "{/lang}/{/app}/task/analysis?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 20,
diff --git a/Theme/Backend/dashboard-task.tpl.php b/Theme/Backend/dashboard-task.tpl.php
index d90ec0f..8b3e759 100755
--- a/Theme/Backend/dashboard-task.tpl.php
+++ b/Theme/Backend/dashboard-task.tpl.php
@@ -54,7 +54,7 @@ $tasksList = $this->getData('tasks') ?? [];
         </table>
         </div>
         <div class="portlet-foot">
-            <a class="button" href="<?= UriFactory::build('task/dashboard?{?}'); ?>"><?= $this->getHtml('More', '0', '0'); ?></a>
+            <a class="button" href="<?= UriFactory::build('{/lang}/{/app}/task/dashboard?{?}'); ?>"><?= $this->getHtml('More', '0', '0'); ?></a>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/Theme/Backend/task-dashboard.tpl.php b/Theme/Backend/task-dashboard.tpl.php
index 3226277..3556f76 100755
--- a/Theme/Backend/task-dashboard.tpl.php
+++ b/Theme/Backend/task-dashboard.tpl.php
@@ -80,7 +80,7 @@ if ($open !== null) :
                             </a>
                             <?php endforeach; ?>
                         <td data-label="<?= $this->getHtml('Creator'); ?>">
-                            <a class="content" href="<?= UriFactory::build('profile/single?{?}&for=' . $task->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?></a>
+                            <a class="content" href="<?= UriFactory::build('{/lang}/{/app}/profile/single?{?}&for=' . $task->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?></a>
                         <td data-label="<?= $this->getHtml('Created'); ?>">
                             <a href="<?= $url; ?>"><?= $this->printHtml($task->createdAt->format('Y-m-d H:i')); ?></a>
                         <?php endforeach; if ($c == 0) : ?>
@@ -141,7 +141,7 @@ if ($open !== null) :
                             </a>
                             <?php endforeach; ?>
                         <td data-label="<?= $this->getHtml('Creator'); ?>">
-                            <a class="content" href="<?= UriFactory::build('profile/single?{?}&for=' . $task->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?></a>
+                            <a class="content" href="<?= UriFactory::build('{/lang}/{/app}/profile/single?{?}&for=' . $task->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?></a>
                         <td data-label="<?= $this->getHtml('Created'); ?>">
                             <a href="<?= $url; ?>"><?= $this->printHtml($task->createdAt->format('Y-m-d H:i')); ?></a>
                 <?php endforeach; if ($c == 0) : ?>
diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
index 699724b..3f9d30c 100755
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -84,7 +84,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; ?>
@@ -254,7 +254,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; ?>
@@ -300,14 +300,14 @@ echo $this->getData('nav')->render(); ?>
                     ) : ?>
                     <section class="portlet wf-100">
                         <div class="portlet-body">
-                            <a href="<?= UriFactory::build('profile/single?{?}&for=' . $element->createdBy->getId()); ?>"><?= $this->printHtml(
+                            <a href="<?= UriFactory::build('{/lang}/{/app}/profile/single?{?}&for=' . $element->createdBy->getId()); ?>"><?= $this->printHtml(
                                 $this->renderUserName(
                                     '%3$s %2$s %1$s',
                                     [$element->createdBy->name1, $element->createdBy->name2, $element->createdBy->name3, $element->createdBy->login])
                                 ); ?></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/TaskView.php b/Views/TaskView.php
index 97b4c7e..acdd6f3 100755
--- a/Views/TaskView.php
+++ b/Views/TaskView.php
@@ -74,10 +74,10 @@ class TaskView extends View
             ->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 3efa7be..7bc9f8e 100755
--- a/info.json
+++ b/info.json
@@ -12,7 +12,7 @@
     },
     "creator": {
         "name": "Karaka",
-        "website": "www.spl1nes.com"
+        "website": "jingga.app"
     },
     "description": "Tasks module.",
     "directory": "Tasks",