X-Git-Url: https://git.cweiske.de/grauphel.git/blobdiff_plain/0c9b45d210a5d94b3ba219e32b73233a5a795f61..a921b71a121666b9973e1b2815f55dc416d96d28:/controller/guicontroller.php
diff --git a/controller/guicontroller.php b/controller/guicontroller.php
index fc97b04..d48296d 100644
--- a/controller/guicontroller.php
+++ b/controller/guicontroller.php
@@ -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,23 +96,43 @@ 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\Lib\Converter\Html();
+ $converter = new \OCA\Grauphel\Converter\Html();
$converter->internalLinkHandler = array($this, 'noteLinkHandler');
+
+ try {
+ $contentHtml = $converter->convert($note->{'note-content'});
+ } catch (\OCA\Grauphel\Converter\Exception $e) {
+ $contentHtml = '
'
+ . '
There was an error converting the note to HTML:
'
+ . '
' . htmlspecialchars($e->getMessage()) . '
'
+ . '
Please open a bug report at'
+ . ' '
+ . 'github.com/cweiske/grauphel/issues'
+ . ' and attach the XML version of the note.'
+ . '
';
+ }
+
$res->setParams(
array(
'note' => $note,
- 'note-content' => $converter->convert(
- $note->{'note-content'}
- ),
+ '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)
),
@@ -109,7 +140,7 @@ class GuiController extends Controller
)
);
- $selectedRawtag = null;
+ $selectedRawtag = 'grauphel:special:untagged';
if (count($note->tags) > 0) {
$selectedRawtag = $note->tags[0];
}
@@ -137,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) {
@@ -145,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(
@@ -246,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,
);
@@ -278,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);
}
}
@@ -310,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);
+ }
}
?>