X-Git-Url: https://git.cweiske.de/grauphel.git/blobdiff_plain/e74217a7bbd58cf76963c15c73221669e1153510..d2bc4dfd1c4c2c54c75cd4b316c4e8b2c013a25b:/controller/guicontroller.php

diff --git a/controller/guicontroller.php b/controller/guicontroller.php
index b09ef4a..cac2f29 100644
--- a/controller/guicontroller.php
+++ b/controller/guicontroller.php
@@ -96,7 +96,9 @@ class GuiController extends Controller
 
         $note = $this->getNotes()->load($guid, false);
         if ($note === null) {
-            return new ErrorResponse('Note does not exist');
+            $res = new ErrorResponse('Note does not exist');
+            $res->setStatus(\OCP\AppFramework\Http::STATUS_NOT_FOUND);
+            return $res;
         }
 
         $converter = new \OCA\Grauphel\Converter\Html();
@@ -120,11 +122,17 @@ class GuiController extends Controller
                 'note' => $note,
                 'note-content' => $contentHtml,
                 'links' => array(
+                    'html' => $this->urlGen->linkToRoute(
+                        'grauphel.notes.html', array('guid' => $guid)
+                    ),
                     'json' => $this->urlGen->linkToRoute(
                         'grauphel.api.note', array(
                             'guid' => $guid, 'username' => $this->user->getUid()
                         )
                     ),
+                    'text' => $this->urlGen->linkToRoute(
+                        'grauphel.notes.text', array('guid' => $guid)
+                    ),
                     'xml' => $this->urlGen->linkToRoute(
                         'grauphel.notes.xml', array('guid' => $guid)
                     ),
@@ -138,6 +146,7 @@ class GuiController extends Controller
         }
 
         $this->addNavigation($res, $selectedRawtag);
+        $this->addGlobalVars($res);
         return $res;
     }
 
@@ -160,13 +169,31 @@ class GuiController extends Controller
      */
     public function tag($rawtag)
     {
+        $rawtag = $this->unescapeTagFromUrl($rawtag);
         $notes = $this->getNotes()->loadNotesOverview(null, $rawtag, true);
-        usort(
-            $notes,
-            function($noteA, $noteB) {
-                return strcmp($noteA['title'], $noteB['title']);
-            }
-        );
+
+        if (!isset($_GET['sortby'])) {
+            $_GET['sortby'] = 'title';
+        }
+
+        switch ($_GET['sortby']) {
+        case 'title':
+            usort(
+                $notes,
+                function($noteA, $noteB) {
+                    return strcasecmp($noteA['title'], $noteB['title']);
+                }
+            );
+            break;
+        case 'date':
+            usort(
+                $notes,
+                function($noteA, $noteB) {
+                    return strcmp($noteB['last-change-date'], $noteA['last-change-date']);
+                }
+            );
+            break;
+        }
 
         foreach ($notes as &$note) {
             $diffInDays = intval(
@@ -185,8 +212,13 @@ class GuiController extends Controller
                 'tag'    => $this->getPrettyTagName($rawtag),
                 'rawtag' => $rawtag,
                 'notes'  => $notes,
+                'tagUrl' => $this->urlGen->linkToRoute(
+                    'grauphel.gui.tag',
+                    array('rawtag' => $this->escapeTagForUrl($rawtag))
+                ),
             )
         );
+        $this->addGlobalVars($res);
         $this->addNavigation($res, $rawtag);
 
         return $res;
@@ -211,6 +243,7 @@ class GuiController extends Controller
                 'username' => $this->user->getUid(),
             )
         );
+        $this->addGlobalVars($res);
         $this->addNavigation($res, null);
 
         return $res;
@@ -251,6 +284,19 @@ class GuiController extends Controller
         return $this->database($reset);
     }
 
+    /**
+     * Register some variables that templates will probably need.
+     *
+     * @return void
+     */
+    protected function addGlobalVars(TemplateResponse $res)
+    {
+        $params = $res->getParams();
+        $params['date']   = \OC::$server->getDateTimeFormatter();
+        $params['urlGen'] = \OC::$server->getURLGenerator();
+        $res->setParams($params);
+    }
+
     protected function addNavigation(TemplateResponse $res, $selectedRawtag = null)
     {
         $nav = new \OCP\Template('grauphel', 'appnavigation', '');
@@ -280,7 +326,8 @@ class GuiController extends Controller
                     'name' => $name,
                     'id'   => $rawtag,
                     'href' => $this->urlGen->linkToRoute(
-                        'grauphel.gui.tag', array('rawtag' => $rawtag)
+                        'grauphel.gui.tag',
+                        array('rawtag' => $this->escapeTagForUrl($rawtag))
                     ),
                     'selected' => $rawtag == $selectedRawtag,
                 );
@@ -344,5 +391,15 @@ class GuiController extends Controller
         }
         return false;
     }
+
+    protected function escapeTagForUrl($rawtag)
+    {
+        return str_replace('/', '%2F', $rawtag);
+    }
+
+    protected function unescapeTagFromUrl($rawtag)
+    {
+        return str_replace('%2F', '/', $rawtag);
+    }
 }
 ?>