';
- //var_dump($record);
- // foreach ($record as $key=>$val) {
- // echo "\n=================\n$i: $key: $val\n";
- // }
- // exit;
-
- $url = trim($record['url']);
- if ( $url ) {
+ if (is_array($record)) {
+ $data[] = $record;
+ foreach ($record as $record2) {
+ if (is_array($record2)) {
+ $data[] = $record2;
+ }
+ }
+ }
+ }
+
+ $urlsInserted = array(); //urls of articles inserted
+ foreach ($data as $record) {
+ $url = trim( isset($record['article__url']) ? $record['article__url'] : (isset($record['url']) ? $record['url'] : '') );
+ if ( $url and !in_array($url, $urlsInserted) ) {
$title = (isset($record['title']) ? $record['title'] : _('Untitled - Import - ').' '._('click to finish import').'');
$body = (isset($record['content']) ? $record['content'] : '');
- $isRead = (isset($record['is_read']) ? intval($record['is_read']) : 0);
- $isFavorite = (isset($record['is_fav']) ? intval($record['is_fav']) : 0);
+ $isRead = (isset($record['is_read']) ? intval($record['is_read']) : (isset($record['archive'])?intval($record['archive']):0));
+ $isFavorite = (isset($record['is_fav']) ? intval($record['is_fav']) : (isset($record['favorite'])?intval($record['favorite']):0) );
//insert new record
$id = $this->store->add($url, $title, $body, $this->user->getId(), $isFavorite, $isRead);
if ( $id ) {
- //increment no of records inserted
- $i++;
+ $urlsInserted[] = $url; //add
+
if ( isset($record['tags']) && trim($record['tags']) ) {
- //@TODO: set tags
+ //@TODO: set tags
}
}
}
}
+ $i = sizeof($urlsInserted);
if ( $i > 0 ) {
$this->messages->add('s', _('Articles inserted: ').$i._('. Please note, that some may be marked as "read".'));
}
+ Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).');
}
//file parsing finished here
@@ -1109,30 +985,32 @@ class Poche
if ( $recordsDownloadRequired == 0 ) {
//nothing to download
$this->messages->add('s', _('Import finished.'));
+ Tools::logm('Import finished completely');
Tools::redirect();
}
else {
//if just inserted - don't download anything, download will start in next reload
if ( !isset($_FILES['file']) ) {
//download next batch
+ Tools::logm('Fetching next batch of articles...');
$items = $this->store->retrieveUnfetchedEntries($this->user->getId(), IMPORT_LIMIT);
- $config = HTMLPurifier_Config::createDefault();
- $config->set('Cache.SerializerPath', CACHE);
- $purifier = new HTMLPurifier($config);
+ $purifier = $this->getPurifier();
foreach ($items as $item) {
- $url = new Url(base64_encode($item['url']));
- $content = Tools::getPageContent($url);
+ $url = new Url(base64_encode($item['url']));
+ Tools::logm('Fetching article '.$item['id']);
+ $content = Tools::getPageContent($url);
- $title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
- $body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
+ $title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
+ $body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
- //clean content to prevent xss attack
- $title = $purifier->purify($title);
- $body = $purifier->purify($body);
+ //clean content to prevent xss attack
+ $title = $purifier->purify($title);
+ $body = $purifier->purify($body);
- $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
+ $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
+ Tools::logm('Article '.$item['id'].' updated.');
}
}
@@ -1141,36 +1019,19 @@ class Poche
return array('includeImport'=>true, 'import'=>array('recordsDownloadRequired'=>$recordsDownloadRequired, 'recordsUnderDownload'=> IMPORT_LIMIT, 'delay'=> IMPORT_DELAY * 1000) );
}
- public function uploadFile() {
- if (isset($_FILES['file']))
- {
- $dir = CACHE . '/';
- $file = basename($_FILES['file']['name']);
- if(move_uploaded_file($_FILES['file']['tmp_name'], $dir . $file)) {
- $this->messages->add('s', _('File uploaded. You can now execute import.'));
- }
- else {
- $this->messages->add('e', _('Error while importing file. Do you have access to upload it?'));
- }
- }
-
- Tools::redirect('?view=config');
- }
-
/**
* export poche entries in json
* @return json all poche entries
*/
- public function export()
- {
- $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
- header('Content-Disposition: attachment; filename='.$filename);
-
- $entries = $this->store->retrieveAll($this->user->getId());
- echo $this->tpl->render('export.twig', array(
- 'export' => Tools::renderJson($entries),
- ));
- Tools::logm('export view');
+ public function export() {
+ $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
+ header('Content-Disposition: attachment; filename='.$filename);
+
+ $entries = $this->store->retrieveAll($this->user->getId());
+ echo $this->tpl->render('export.twig', array(
+ 'export' => Tools::renderJson($entries),
+ ));
+ Tools::logm('export view');
}
/**
@@ -1178,43 +1039,42 @@ class Poche
* @param string $which 'prod' or 'dev'
* @return string latest $which version
*/
- private function getPocheVersion($which = 'prod')
- {
- $cache_file = CACHE . '/' . $which;
- $check_time = time();
-
- # checks if the cached version file exists
- if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
- $version = file_get_contents($cache_file);
- $check_time = filemtime($cache_file);
- } else {
- $version = file_get_contents('http://static.wallabag.org/versions/' . $which);
- file_put_contents($cache_file, $version, LOCK_EX);
- }
- return array($version, $check_time);
+ private function getPocheVersion($which = 'prod') {
+ $cache_file = CACHE . '/' . $which;
+ $check_time = time();
+
+ # checks if the cached version file exists
+ if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
+ $version = file_get_contents($cache_file);
+ $check_time = filemtime($cache_file);
+ } else {
+ $version = file_get_contents('http://static.wallabag.org/versions/' . $which);
+ file_put_contents($cache_file, $version, LOCK_EX);
+ }
+ return array($version, $check_time);
}
public function generateToken()
{
- if (ini_get('open_basedir') === '') {
- if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
- echo 'This is a server using Windows!';
- // alternative to /dev/urandom for Windows
- $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
- } else {
- $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
- }
- }
- else {
- $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
+ if (ini_get('open_basedir') === '') {
+ if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+ echo 'This is a server using Windows!';
+ // alternative to /dev/urandom for Windows
+ $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
+ } else {
+ $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
}
+ }
+ else {
+ $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
+ }
- $token = str_replace('+', '', $token);
- $this->store->updateUserConfig($this->user->getId(), 'token', $token);
- $currentConfig = $_SESSION['poche_user']->config;
- $currentConfig['token'] = $token;
- $_SESSION['poche_user']->setConfig($currentConfig);
- Tools::redirect();
+ $token = str_replace('+', '', $token);
+ $this->store->updateUserConfig($this->user->getId(), 'token', $token);
+ $currentConfig = $_SESSION['poche_user']->config;
+ $currentConfig['token'] = $token;
+ $_SESSION['poche_user']->setConfig($currentConfig);
+ Tools::redirect();
}
public function generateFeeds($token, $user_id, $tag_id, $type = 'home')
@@ -1223,11 +1083,10 @@ class Poche
$config = $this->store->getConfigUser($user_id);
if ($config == null) {
- die(_('User with this id (' . $user_id . ') does not exist.'));
+ die(sprintf(_('User with this id (%d) does not exist.'), $user_id));
}
- if (!in_array($type, $allowed_types) ||
- $token != $config['token']) {
+ if (!in_array($type, $allowed_types) || $token != $config['token']) {
die(_('Uh, there is a problem while generating feeds.'));
}
// Check the token
@@ -1250,6 +1109,7 @@ class Poche
foreach ($entries as $entry) {
$newItem = $feed->createNewItem();
$newItem->setTitle($entry['title']);
+ $newItem->setSource(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']);
$newItem->setLink($entry['url']);
$newItem->setDate(time());
$newItem->setDescription($entry['content']);
@@ -1276,4 +1136,132 @@ class Poche
$this->messages->add('s', _('Cache deleted.'));
Tools::redirect();
}
+
+ /**
+ * return new purifier object with actual config
+ */
+ protected function getPurifier() {
+ $config = HTMLPurifier_Config::createDefault();
+ $config->set('Cache.SerializerPath', CACHE);
+ $config->set('HTML.SafeIframe', true);
+
+ //allow YouTube, Vimeo and dailymotion videos
+ $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/|www\.dailymotion\.com/embed/video/)%');
+
+ return new HTMLPurifier($config);
+ }
+
+ /**
+ * handle epub
+ */
+ public function createEpub() {
+
+ switch ($_GET['method']) {
+ case 'id':
+ $entryID = filter_var($_GET['id'],FILTER_SANITIZE_NUMBER_INT);
+ $entry = $this->store->retrieveOneById($entryID, $this->user->getId());
+ $entries = array($entry);
+ $bookTitle = $entry['title'];
+ $bookFileName = substr($bookTitle, 0, 200);
+ break;
+ case 'all':
+ $entries = $this->store->retrieveAll($this->user->getId());
+ $bookTitle = sprintf(_('All my articles on '), date(_('d.m.y'))); #translatable because each country has it's own date format system
+ $bookFileName = _('Allarticles') . date(_('dmY'));
+ break;
+ case 'tag':
+ $tag = filter_var($_GET['tag'],FILTER_SANITIZE_STRING);
+ $tags_id = $this->store->retrieveAllTags($this->user->getId(),$tag);
+ $tag_id = $tags_id[0]["id"]; // we take the first result, which is supposed to match perfectly. There must be a workaround.
+ $entries = $this->store->retrieveEntriesByTag($tag_id,$this->user->getId());
+ $bookTitle = sprintf(_('Articles tagged %s'),$tag);
+ $bookFileName = substr(sprintf(_('Tag %s'),$tag), 0, 200);
+ break;
+ case 'category':
+ $category = filter_var($_GET['category'],FILTER_SANITIZE_STRING);
+ $entries = $this->store->getEntriesByView($category,$this->user->getId());
+ $bookTitle = sprintf(_('All articles in category %s'), $category);
+ $bookFileName = substr(sprintf(_('Category %s'),$category), 0, 200);
+ break;
+ case 'search':
+ $search = filter_var($_GET['search'],FILTER_SANITIZE_STRING);
+ $entries = $this->store->search($search,$this->user->getId());
+ $bookTitle = sprintf(_('All articles for search %s'), $search);
+ $bookFileName = substr(sprintf(_('Search %s'), $search), 0, 200);
+ break;
+ case 'default':
+ die(_('Uh, there is a problem while generating epub.'));
+
+ }
+
+ $content_start =
+ "\n"
+ . "\n"
+ . ""
+ . "\n"
+ . "wallabag articles book \n"
+ . "\n"
+ . "\n";
+
+ $bookEnd = "\n\n";
+
+ $log = new Logger("wallabag", TRUE);
+ $fileDir = CACHE;
+
+ $book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE);
+ $log->logLine("new EPub()");
+ $log->logLine("EPub class version: " . EPub::VERSION);
+ $log->logLine("EPub Req. Zip version: " . EPub::REQ_ZIP_VERSION);
+ $log->logLine("Zip version: " . Zip::VERSION);
+ $log->logLine("getCurrentServerURL: " . $book->getCurrentServerURL());
+ $log->logLine("getCurrentPageURL..: " . $book->getCurrentPageURL());
+
+ $book->setTitle(_('wallabag\'s articles'));
+ $book->setIdentifier("http://$_SERVER[HTTP_HOST]", EPub::IDENTIFIER_URI); // Could also be the ISBN number, prefered for published books, or a UUID.
+ //$book->setLanguage("en"); // Not needed, but included for the example, Language is mandatory, but EPub defaults to "en". Use RFC3066 Language codes, such as "en", "da", "fr" etc.
+ $book->setDescription(_("Some articles saved on my wallabag"));
+ $book->setAuthor("wallabag","wallabag");
+ $book->setPublisher("wallabag","wallabag"); // I hope this is a non existant address :)
+ $book->setDate(time()); // Strictly not needed as the book date defaults to time().
+ //$book->setRights("Copyright and licence information specific for the book."); // As this is generated, this _could_ contain the name or licence information of the user who purchased the book, if needed. If this is used that way, the identifier must also be made unique for the book.
+ $book->setSourceURL("http://$_SERVER[HTTP_HOST]");
+
+ $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "PHP");
+ $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "wallabag");
+
+ $cssData = "body {\n margin-left: .5em;\n margin-right: .5em;\n text-align: justify;\n}\n\np {\n font-family: serif;\n font-size: 10pt;\n text-align: justify;\n text-indent: 1em;\n margin-top: 0px;\n margin-bottom: 1ex;\n}\n\nh1, h2 {\n font-family: sans-serif;\n font-style: italic;\n text-align: center;\n background-color: #6b879c;\n color: white;\n width: 100%;\n}\n\nh1 {\n margin-bottom: 2px;\n}\n\nh2 {\n margin-top: -2px;\n margin-bottom: 2px;\n}\n";
+
+ $log->logLine("Add Cover");
+
+ $fullTitle = " " . $bookTitle . "
\n";
+
+ $book->setCoverImage("Cover.png", file_get_contents("themes/baggy/img/apple-touch-icon-152.png"), "image/png", $fullTitle);
+
+ $cover = $content_start . '' . _('Produced by wallabag with PHPePub') . '
'. _('Please open an issue if you have trouble with the display of this E-Book on your device.') . '
' . $bookEnd;
+
+ //$book->addChapter("Table of Contents", "TOC.xhtml", NULL, false, EPub::EXTERNAL_REF_IGNORE);
+ $book->addChapter("Notices", "Cover2.html", $cover);
+
+ $book->buildTOC();
+
+ foreach ($entries as $entry) { //set tags as subjects
+ $tags = $this->store->retrieveTagsByEntry($entry['id']);
+ foreach ($tags as $tag) {
+ $book->setSubject($tag['value']);
+ }
+
+ $log->logLine("Set up parameters");
+
+ $chapter = $content_start . $entry['content'] . $bookEnd;
+ $book->addChapter($entry['title'], htmlspecialchars($entry['title']) . ".html", $chapter, true, EPub::EXTERNAL_REF_ADD);
+ $log->logLine("Added chapter " . $entry['title']);
+ }
+
+ if (DEBUG_POCHE) {
+ $epuplog = $book->getLog();
+ $book->addChapter("Log", "Log.html", $content_start . $log->getLog() . "\n" . $bookEnd); // log generation
+ }
+ $book->finalize();
+ $zipData = $book->sendBook($bookFileName);
+ }
}