X-Git-Url: https://git.cweiske.de/grauphel.git/blobdiff_plain/46a9ff9889466f23c310e2de100d0ae16c5a2a1a..0cff53bab0eaf5152e91bebd5070d817d301f0e7:/controller/guicontroller.php?ds=sidebyside
diff --git a/controller/guicontroller.php b/controller/guicontroller.php
index 4f74ab5..cac2f29 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,26 +96,57 @@ 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)
+ ),
+ )
)
);
- $selectedRawtag = null;
+ $selectedRawtag = 'grauphel:special:untagged';
if (count($note->tags) > 0) {
$selectedRawtag = $note->tags[0];
}
$this->addNavigation($res, $selectedRawtag);
+ $this->addGlobalVars($res);
return $res;
}
@@ -127,13 +169,42 @@ class GuiController extends Controller
*/
public function tag($rawtag)
{
- $notes = $this->getNotes()->loadNotesOverview(null, $rawtag);
- usort(
- $notes,
- function($noteA, $noteB) {
- return strcmp($noteA['title'], $noteB['title']);
+ $rawtag = $this->unescapeTagFromUrl($rawtag);
+ $notes = $this->getNotes()->loadNotesOverview(null, $rawtag, true);
+
+ 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(
+ (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(
@@ -141,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;
@@ -167,6 +243,7 @@ class GuiController extends Controller
'username' => $this->user->getUid(),
)
);
+ $this->addGlobalVars($res);
$this->addNavigation($res, null);
return $res;
@@ -207,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', '');
@@ -236,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,
);
@@ -268,7 +359,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);
}
}
@@ -300,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);
+ }
}
?>