}
break;
case 'archive_and_next' :
- $nextid = $this->store->getNextArticle($id, $this->user->getId());
+ $nextid = $this->store->getPreviousArticle($id, $this->user->getId());
$this->store->archiveById($id, $this->user->getId());
Tools::logm('archive link #' . $id);
Tools::redirect('?view=view&id=' . $nextid);
/* For some unknown reason I can't get displayView() to work here (it redirects to home view afterwards). So here's a dirty fix which redirects directly to URL */
case 'random':
Tools::logm('get a random article');
- if ($this->store->getRandomId($this->user->getId())) {
- $id_array = $this->store->getRandomId($this->user->getId());
+ $view = $_GET['view'];
+ if ($this->store->getRandomId($this->user->getId(),$view)) {
+ $id_array = $this->store->getRandomId($this->user->getId(),$view);
$id = $id_array[0];
Tools::redirect('?view=view&id=' . $id[0]);
Tools::logm('got the article with id ' . $id[0]);
Tools::redirect();
}
$tags = $this->store->retrieveTagsByEntry($id);
+ $all_tags = $this->store->retrieveAllTags($this->user->getId());
+ $maximus = 0;
+ foreach ($all_tags as $eachtag) { // search for the most times a tag is present
+ if ($eachtag["entriescount"] > $maximus) $maximus = $eachtag["entriescount"];
+ }
+ foreach ($all_tags as $key => $eachtag) { // get the percentage of presence of each tag
+ $percent = floor(($eachtag["entriescount"] / $maximus) * 100);
+
+ if ($percent < 20): // assign a css class, depending on the number of entries count
+ $cssclass = 'smallesttag';
+ elseif ($percent >= 20 and $percent < 40):
+ $cssclass = 'smalltag';
+ elseif ($percent >= 40 and $percent < 60):
+ $cssclass = 'mediumtag';
+ elseif ($percent >= 60 and $percent < 80):
+ $cssclass = 'largetag';
+ else:
+ $cssclass = 'largesttag';
+ endif;
+ $all_tags[$key]['cssclass'] = $cssclass;
+ }
$tpl_vars = array(
'entry_id' => $id,
'tags' => $tags,
+ 'alltags' => $all_tags,
'entry' => $entry,
);
break;
if ($this->store->retrieveOneById($next_id, $this->user->getId())) {
$next = TRUE;
}
- $navigate = $arrayName = array('previous' => $previous, 'previousid' => $previous_id, 'next' => $next, 'nextid' => $next_id);
+ $navigate = array('previous' => $previous, 'previousid' => $previous_id, 'next' => $next, 'nextid' => $next_id);
# tags
$tags = $this->store->retrieveTagsByEntry($entry['id']);
'page_links' => '',
'nb_results' => '',
'listmode' => (isset($_COOKIE['listmode']) ? true : false),
+ 'view' => $view,
);
//if id is given - we retrieve entries by tag: id is tag id
$filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
header('Content-Disposition: attachment; filename='.$filename);
- $entries = $this->store->retrieveAll($this->user->getId());
+ $entries = $this->store->retrieveAllWithTags($this->user->getId());
echo $this->tpl->render('export.twig', array(
'export' => Tools::renderJson($entries),
));