permission changes & minor bug fixes

Models/NullTask.php

@@ -36,4 +36,12 @@ final class NullTask extends Task
         $this->id = $id;
         parent::__construct();
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function jsonSerialize() : mixed
+    {
+        return ['id' => $this->id];
+    }
 }

Theme/Backend/Components/Tasks/list.tpl.php

@@ -31,7 +31,7 @@ use phpOMS\Uri\UriFactory;
             <?php
             $c = 0;
             foreach ($this->tasks as $key => $task) : ++$c;
-            $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('{/prefix}task/single?{?}&id=' . $task->getId()));
+            $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('task/single?{?}&id=' . $task->getId()));
 
             $color                                                         = 'darkred';
             if ($task->getStatus() === TaskStatus::DONE) { $color          = 'green'; }

Theme/Backend/dashboard-task.tpl.php

@@ -34,7 +34,7 @@ $tasksList = $this->getData('tasks') ?? [];
             foreach ($tasksList as $key => $task) : ++$c;
                 $url = UriFactory::build(!empty($task->redirect)
                     ? $task->redirect
-                    : ('{/prefix}task/single?{?}&id=' . $task->getId())
+                    : ('task/single?{?}&id=' . $task->getId())
                 );
             ?>
                 <tr data-href="<?= $url; ?>">
@@ -54,7 +54,7 @@ $tasksList = $this->getData('tasks') ?? [];
         </table>
         </div>
         <div class="portlet-foot">
-            <a class="button" href="<?= UriFactory::build('{/prefix}task/dashboard?{?}'); ?>"><?= $this->getHtml('More', '0', '0'); ?></a>
+            <a class="button" href="<?= UriFactory::build('task/dashboard?{?}'); ?>"><?= $this->getHtml('More', '0', '0'); ?></a>
         </div>
     </div>
 </div>

Theme/Backend/task-dashboard.tpl.php

@@ -27,8 +27,8 @@ use phpOMS\Uri\UriFactory;
 /** @var \Modules\Tasks\Models\Task[] $tasks */
 $tasks = $this->getData('tasks') ?? [];
 
-$previous = empty($tasks) ? '{/prefix}task/dashboard' : '{/prefix}task/dashboard?{?}&id=' . \reset($tasks)->getId() . '&ptype=p';
+$previous = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&id=' . \reset($tasks)->getId() . '&ptype=p';
-$next     = empty($tasks) ? '{/prefix}task/dashboard' : '{/prefix}task/dashboard?{?}&id=' . \end($tasks)->getId() . '&ptype=n';
+$next     = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&id=' . \end($tasks)->getId() . '&ptype=n';
 
 $open = $this->getData('open');
 
@@ -54,7 +54,7 @@ if ($open !== null) :
                 <?php
                     $c = 0;
                     foreach ($open as $key => $task) : ++$c;
-                        $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('{/prefix}task/single?{?}&id=' . $task->getId()));
+                        $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('task/single?{?}&id=' . $task->getId()));
                 ?>
                     <tr tabindex="0" data-href="<?= $url; ?>">
                         <td data-label="<?= $this->getHtml('Status'); ?>">
@@ -80,7 +80,7 @@ if ($open !== null) :
                             </a>
                             <?php endforeach; ?>
                         <td data-label="<?= $this->getHtml('Creator'); ?>">
-                            <a class="content" href="<?= UriFactory::build('{/prefix}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('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) : ?>
@@ -115,7 +115,7 @@ if ($open !== null) :
                         }
 
                         ++$c;
-                        $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('{/prefix}task/single?{?}&id=' . $task->getId()));
+                        $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('task/single?{?}&id=' . $task->getId()));
                 ?>
                     <tr tabindex="0" data-href="<?= $url; ?>">
                         <td data-label="<?= $this->getHtml('Status'); ?>">
@@ -141,7 +141,7 @@ if ($open !== null) :
                             </a>
                             <?php endforeach; ?>
                         <td data-label="<?= $this->getHtml('Creator'); ?>">
-                            <a class="content" href="<?= UriFactory::build('{/prefix}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('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) : ?>

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('{/prefix}media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
+                                    <span><a class="content" href="<?= UriFactory::build('media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
                                 <?php endforeach; ?>
                             </div>
                         <?php endif; ?>
@@ -176,7 +176,7 @@ echo $this->getData('nav')->render(); ?>
                     <section class="portlet">
                         <div class="portlet-body">
                             <?= \sprintf($this->getHtml('status_change'),
-                                '<a href="' . UriFactory::build('{/prefix}profile/single?{?}&for=' . $element->createdBy->getId()) . '">' . $this->printHtml(
+                                '<a href="' . UriFactory::build('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])
@@ -196,7 +196,7 @@ echo $this->getData('nav')->render(); ?>
                     <section class="portlet">
                         <div class="portlet-body">
                             <?= \sprintf($this->getHtml('priority_change'),
-                                '<a href="' . UriFactory::build('{/prefix}profile/single?{?}&for=' . $element->createdBy->getId()) . '">' . $this->printHtml(
+                                '<a href="' . UriFactory::build('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])
@@ -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('{/prefix}media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
+                                    <span><a class="content" href="<?= UriFactory::build('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('{/prefix}profile/single?{?}&for=' . $element->createdBy->getId()); ?>"><?= $this->printHtml(
+                            <a href="<?= UriFactory::build('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('{/prefix}profile/single?{?}&for=' . $to->getRelation()->getId()); ?>"><?= $this->printHtml($to->getRelation()->name1); ?></a>
+                                    <a href="<?= UriFactory::build('profile/single?{?}&for=' . $to->getRelation()->getId()); ?>"><?= $this->printHtml($to->getRelation()->name1); ?></a>
                                 <?php elseif ($to instanceof GroupRelation) : ?>
                                     <?= $this->printHtml($to->getRelation()->name); ?>
                                 <?php endif; ?>

Views/TaskView.php

@@ -74,10 +74,10 @@ class TaskView extends View
             ->execute();
 
         if (($profile instanceof NullProfile) || $profile->image->getPath() === '') {
-            return UriFactory::build('{/prefix}' . $this->defaultProfileImage->getPath());
+            return UriFactory::build('' . $this->defaultProfileImage->getPath());
         }
 
-        return UriFactory::build('{/prefix}' . $profile->image->getPath());
+        return UriFactory::build('' . $profile->image->getPath());
     }
 
     /**