pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

secure database functions

Browse Source
This commit is contained in:
Thomas Citharel
2015-07-17 22:54:57 +02:00
parent 7473f0cc4a
commit 4a746679c8
2 changed files with 84 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
inc/poche/Poche.class.php
View File

@ -599,7 +599,7 @@ class Poche
$count = $this->store->getEntriesByViewCount($view, $this->user->getId(), $id);
if ($count > 0) {
if ($count && $count > 0) {
$this->pagination->set_total($count);
$page_links = str_replace(array('previous', 'next'), array(_('previous'), _('next')),
$this->pagination->page_links('?view=' . $view . '&sort=' . $_SESSION['sort'] . (($id)?'&id='.$id:'') . '&' ));
@ -903,14 +903,18 @@ class Poche
*/
public function export()
{
$filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
header('Content-Disposition: attachment; filename='.$filename);
$filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
header('Content-Disposition: attachment; filename='.$filename);
$entries = $this->store->retrieveAllWithTags($this->user->getId());
echo $this->tpl->render('export.twig', array(
'export' => Tools::renderJson($entries),
));
Tools::logm('export view');
$entries = $this->store->retrieveAllWithTags($this->user->getId());
if ($entries) {
echo $this->tpl->render('export.twig', array(
'export' => Tools::renderJson($entries),
));
Tools::logm('export view');
} else {
Tools::logm('error accessing database while exporting');
}
}
/**
@ -986,7 +990,7 @@ class Poche
if (0 == $limit) {
$limit = count($entries);
}
if (count($entries) > 0) {
if ($entries && count($entries) > 0) {
for ($i = 0; $i < min(count($entries), $limit); $i++) {
$entry = $entries[$i];
$newItem = $feed->createNewItem();
@ -998,7 +1002,10 @@ class Poche
$feed->addItem($newItem);
}
}
else
{
Tools::logm("database error while generating feeds");
}
$feed->genarateFeed();
exit;
}