Fix #22 and #24: Escape slashes in tags in URLs

[grauphel.git] / controller / guicontroller.php

diff --git a/controller/guicontroller.php b/controller/guicontroller.php
index 8ebea8c58f5b8900e4dfeb7a14cc97ed1e079f13..d48296d49af8b50343b8e3e51c03d195560dc06a 100644 (file)
--- a/controller/guicontroller.php
+++ b/controller/guicontroller.php
@@ -122,11 +122,17 @@ class GuiController extends Controller
                 'note' => $note,
                 'note-content' => $contentHtml,
                 'links' => array(
                 '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()
                         )
                     ),
                     '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)
                     ),
                     'xml' => $this->urlGen->linkToRoute(
                         'grauphel.notes.xml', array('guid' => $guid)
                     ),


@@ -162,6 +168,7 @@ class GuiController extends Controller
      */
     public function tag($rawtag)
     {
      */
     public function tag($rawtag)
     {

+        $rawtag = $this->unescapeTagFromUrl($rawtag);

         $notes = $this->getNotes()->loadNotesOverview(null, $rawtag, true);
         usort(
             $notes,
         $notes = $this->getNotes()->loadNotesOverview(null, $rawtag, true);
         usort(
             $notes,


@@ -282,7 +289,8 @@ class GuiController extends Controller
                     'name' => $name,
                     'id'   => $rawtag,
                     'href' => $this->urlGen->linkToRoute(
                     '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,
                 );
                     ),
                     'selected' => $rawtag == $selectedRawtag,
                 );


@@ -346,5 +354,15 @@ class GuiController extends Controller
         }
         return false;
     }
         }
         return false;
     }

+
+    protected function escapeTagForUrl($rawtag)
+    {
+        return str_replace('/', '%2F', $rawtag);
+    }
+
+    protected function unescapeTagFromUrl($rawtag)
+    {
+        return str_replace('%2F', '/', $rawtag);
+    }

 }
 ?>
 }
 ?>