From 9b22829650adc98abf36e553bd4670ec76ee1773 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 |  6 +++---
 Theme/Backend/editor-list.tpl.php     | 20 ++++++++++----------
 Theme/Backend/editor-single.tpl.php   |  6 +++---
 info.json                             |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index fc07128..76c0fd6 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Editor",
-        "uri": "{/prefix}editor/list",
+        "uri": "{/lang}/{/app}/editor/list",
         "target": "self",
         "icon": null,
         "order": 75,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/prefix}editor/list",
+                "uri": "{/lang}/{/app}/editor/list",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 5,
                 "name": "Create",
-                "uri": "{/prefix}editor/create?{?}",
+                "uri": "{/lang}/{/app}/editor/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 15,
diff --git a/Theme/Backend/editor-list.tpl.php b/Theme/Backend/editor-list.tpl.php
index bafd5ca..b868da3 100755
--- a/Theme/Backend/editor-list.tpl.php
+++ b/Theme/Backend/editor-list.tpl.php
@@ -27,8 +27,8 @@ $account     = $this->getData('account');
 
 $accountDir = $account->getId() . ' ' . $account->login;
 
-$previous = empty($docs) ? 'editor/list' : 'editor/list?{?}&id=' . \reset($docs)->getId() . '&ptype=p';
-$next     = empty($docs) ? 'editor/list' : 'editor/list?{?}&id=' . \end($docs)->getId() . '&ptype=n';
+$previous = empty($docs) ? '{/lang}/{/app}/editor/list' : '{/lang}/{/app}/editor/list?{?}&id=' . \reset($docs)->getId() . '&ptype=p';
+$next     = empty($docs) ? '{/lang}/{/app}/editor/list' : '{/lang}/{/app}/editor/list?{?}&id=' . \end($docs)->getId() . '&ptype=n';
 
 $docs = $this->getData('docs');
 
@@ -37,8 +37,8 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <div class="box">
             <ul class="crumbs-2">
-                <li data-href="<?= UriFactory::build('editor/list?path=/Accounts/' . $accountDir); ?>"><a href="<?= UriFactory::build('editor/list?path=/Accounts/' . $accountDir); ?>"><i class="fa fa-home"></i></a>
-                <li data-href="<?= UriFactory::build('editor/list?path=/'); ?>"><a href="<?= UriFactory::build('editor/list?path=/'); ?>">/</a></li>
+                <li data-href="<?= UriFactory::build('{/lang}/{/app}/editor/list?path=/Accounts/' . $accountDir); ?>"><a href="<?= UriFactory::build('{/lang}/{/app}/editor/list?path=/Accounts/' . $accountDir); ?>"><i class="fa fa-home"></i></a>
+                <li data-href="<?= UriFactory::build('{/lang}/{/app}/editor/list?path=/'); ?>"><a href="<?= UriFactory::build('{/lang}/{/app}/editor/list?path=/'); ?>">/</a></li>
                 <?php
                     $subPath    = '';
                     $paths      = \explode('/', \ltrim($mediaPath, '/'));
@@ -56,7 +56,7 @@ echo $this->getData('nav')->render(); ?>
 
                         $subPath .= '/' . $paths[$i];
 
-                        $url = UriFactory::build('editor/list?path=' . $subPath);
+                        $url = UriFactory::build('{/lang}/{/app}/editor/list?path=' . $subPath);
                 ?>
                     <li data-href="<?= $url; ?>"<?= $i === $length - 1 ? 'class="active"' : ''; ?>><a href="<?= $url; ?>"><?= $this->printHtml($paths[$i]); ?></a></li>
                 <?php endfor; ?>
@@ -115,7 +115,7 @@ echo $this->getData('nav')->render(); ?>
                             <i class="filter fa fa-filter"></i>
                         </label>
             <tbody>
-            <?php if (!empty($parentPath)) : $url = UriFactory::build('editor/list?path=' . $parentPath); ?>
+            <?php if (!empty($parentPath)) : $url = UriFactory::build('{/lang}/{/app}/editor/list?path=' . $parentPath); ?>
                         <tr tabindex="0" data-href="<?= $url; ?>">
                             <td>
                             <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="fa fa-folder-open-o"></i></a>
@@ -125,7 +125,7 @@ echo $this->getData('nav')->render(); ?>
                             <td>
             <?php endif; ?>
             <?php $count = 0; foreach ($collections as $key => $value) : ++$count;
-                $url     = UriFactory::build('editor/list?path=' . \rtrim($value->getVirtualPath(), '/') . '/' . $value->name);
+                $url     = UriFactory::build('{/lang}/{/app}/editor/list?path=' . \rtrim($value->getVirtualPath(), '/') . '/' . $value->name);
             ?>
                 <tr data-href="<?= $url; ?>">
                     <td><label class="checkbox" for="editorList-<?= $key; ?>">
@@ -134,11 +134,11 @@ echo $this->getData('nav')->render(); ?>
                             </label>
                     <td><a href="<?= $url; ?>"><i class="fa fa-folder-open-o"></i></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
-                    <td><a class="content" href="<?= UriFactory::build('profile/single?{?}&for=' . $value->createdBy->getId()); ?>"><?= $this->printHtml($value->createdBy->name1); ?></a>
+                    <td><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/profile/single?{?}&for=' . $value->createdBy->getId()); ?>"><?= $this->printHtml($value->createdBy->name1); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d')); ?></a>
             <?php endforeach; ?>
             <?php foreach ($docs as $key => $value) : ++$count;
-            $url         = UriFactory::build('editor/single?{?}&id=' . $value->getId()); ?>
+            $url         = UriFactory::build('{/lang}/{/app}/editor/single?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td><label class="checkbox" for="editorList-<?= $key; ?>">
                                 <input type="checkbox" id="editorList-<?= $key; ?>" name="editorselect">
@@ -146,7 +146,7 @@ echo $this->getData('nav')->render(); ?>
                             </label>
                     <td><i class="fa fa-file-o"></i>
                     <td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->title); ?></a>
-                    <td data-label="<?= $this->getHtml('Creator'); ?>"><a class="content" href="<?= UriFactory::build('profile/single?{?}&for=' . $value->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?></a>
+                    <td data-label="<?= $this->getHtml('Creator'); ?>"><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/profile/single?{?}&for=' . $value->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?></a>
                     <td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d')); ?></a>
             <?php endforeach; ?>
             <?php if ($count === 0) : ?>
diff --git a/Theme/Backend/editor-single.tpl.php b/Theme/Backend/editor-single.tpl.php
index 9b531af..c215193 100755
--- a/Theme/Backend/editor-single.tpl.php
+++ b/Theme/Backend/editor-single.tpl.php
@@ -45,7 +45,7 @@ echo $this->getData('nav')->render(); ?>
                     </div>
                     <?php if ($editable) : ?>
                     <div class="col-xs-6 end-xs plain-grid">
-                        <a tabindex="0" class="button" href="<?= UriFactory::build('editor/edit?id=' . $doc->getId()); ?>"><?= $this->getHtml('Edit', '0', '0'); ?></a>
+                        <a tabindex="0" class="button" href="<?= UriFactory::build('{/lang}/{/app}/editor/edit?id=' . $doc->getId()); ?>"><?= $this->getHtml('Edit', '0', '0'); ?></a>
                     </div>
                     <?php endif; ?>
                 </div>
@@ -56,8 +56,8 @@ echo $this->getData('nav')->render(); ?>
                 <ul>
                     <?php foreach ($files as $file) :
                         $url = $file->extension === 'collection'
-                                ? UriFactory::build('media/list?path=' . \rtrim($file->getVirtualPath(), '/') . '/' . $file->name)
-                                : UriFactory::build('media/single?id=' . $file->getId()
+                                ? UriFactory::build('{/lang}/{/app}/media/list?path=' . \rtrim($file->getVirtualPath(), '/') . '/' . $file->name)
+                                : UriFactory::build('{/lang}/{/app}/media/single?id=' . $file->getId()
                                     . '&path={?path}' . (
                                             $file->getId() === 0
                                                 ? '/' . $file->name
diff --git a/info.json b/info.json
index 6cc7f63..9a9d36a 100755
--- a/info.json
+++ b/info.json
@@ -12,7 +12,7 @@
     },
     "creator": {
         "name": "Karaka",
-        "website": "www.spl1nes.com"
+        "website": "jingga.app"
     },
     "description": "The administration module.",
     "directory": "Editor",