git.cweiske.de
/
grauphel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #41: Use correct SQL datetime format for tokens
[grauphel.git]
/
controller
/
guicontroller.php
diff --git
a/controller/guicontroller.php
b/controller/guicontroller.php
index 127daafb1ada681d6b5f4f94c95c5c0b602a27f3..d48296d49af8b50343b8e3e51c03d195560dc06a 100644
(file)
--- a/
controller/guicontroller.php
+++ b/
controller/guicontroller.php
@@
-59,7
+59,18
@@
class GuiController extends Controller
*/
public function index()
{
*/
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(
$res = new TemplateResponse('grauphel', 'index');
$res->setParams(
@@
-85,7
+96,9
@@
class GuiController extends Controller
$note = $this->getNotes()->load($guid, false);
if ($note === null) {
$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();
}
$converter = new \OCA\Grauphel\Converter\Html();
@@
-109,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)
),
@@
-149,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,
@@
-269,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,
);
@@
-301,7
+322,7
@@
class GuiController extends Controller
protected function checkDeps()
{
if (!class_exists('OAuthProvider')) {
protected function checkDeps()
{
if (!class_exists('OAuthProvider')) {
- throw new \Exception('PHP extension "oauth" is required');
+ throw new \Exception('PHP extension "oauth" is required'
, 1001
);
}
}
}
}
@@
-333,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);
+ }
}
?>
}
?>