Fix #22 and #24: Escape slashes in tags in URLs
[grauphel.git] / controller / guicontroller.php
index d186207..d48296d 100644 (file)
@@ -59,7 +59,18 @@ class GuiController extends Controller
      */
     public function index()
     {
-        $this->checkDeps();
+        try {
+            $this->checkDeps();
+        } catch (\Exception $e) {
+            $res = new TemplateResponse('grauphel', 'error');
+            $res->setParams(
+                array(
+                    'message' => $e->getMessage(),
+                    'code' => $e->getCode(),
+                )
+            );
+            return $res;
+        }
 
         $res = new TemplateResponse('grauphel', 'index');
         $res->setParams(
@@ -85,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();
@@ -109,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)
                     ),
@@ -149,7 +168,8 @@ class GuiController extends Controller
      */
     public function tag($rawtag)
     {
-        $notes = $this->getNotes()->loadNotesOverview(null, $rawtag);
+        $rawtag = $this->unescapeTagFromUrl($rawtag);
+        $notes = $this->getNotes()->loadNotesOverview(null, $rawtag, true);
         usort(
             $notes,
             function($noteA, $noteB) {
@@ -157,6 +177,17 @@ class GuiController extends Controller
             }
         );
 
+        foreach ($notes as &$note) {
+            $diffInDays = intval(
+                (time() - strtotime($note['last-change-date'])) / 86400
+            );
+            $value = 0 + $diffInDays;
+            if ($value > 160) {
+                $value = 160;
+            }
+            $note['dateColor'] = '#' . str_repeat(sprintf('%02X', $value), 3);
+        }
+
         $res = new TemplateResponse('grauphel', 'tag');
         $res->setParams(
             array(
@@ -258,7 +289,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,
                 );
@@ -290,7 +322,7 @@ class GuiController extends Controller
     protected function checkDeps()
     {
         if (!class_exists('OAuthProvider')) {
-            throw new \Exception('PHP extension "oauth" is required');
+            throw new \Exception('PHP extension "oauth" is required', 1001);
         }
     }
 
@@ -322,5 +354,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);
+    }
 }
 ?>