/**
* Creates a new user
*/
- public function createNewUser()
+ public function createNewUser($username, $password, $email = "", $internalRegistration = false)
{
- if (isset($_GET['newuser'])){
- if ($_POST['newusername'] != "" && $_POST['password4newuser'] != ""){
- $newusername = filter_var($_POST['newusername'], FILTER_SANITIZE_STRING);
- if (!$this->store->userExists($newusername)){
- if ($this->store->install($newusername, Tools::encodeString($_POST['password4newuser'] . $newusername))) {
- Tools::logm('The new user '.$newusername.' has been installed');
- $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'),$newusername));
- Tools::redirect();
- }
- else {
- Tools::logm('error during adding new user');
- Tools::redirect();
- }
+ Tools::logm('Trying to create a new user...');
+ if (!empty($username) && !empty($password)){
+ $newUsername = filter_var($username, FILTER_SANITIZE_STRING);
+ $email = filter_var($email, FILTER_SANITIZE_STRING);
+ if (!$this->store->userExists($newUsername)){
+ if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername), $email)) {
+ if ($email != "") { // if email is filled
+ if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) {
+
+ // if internal registration from config screen
+ $body_internal = _('Hi,') . "\r\n\r\n" . sprintf(_('Someone just created a wallabag account for you on %1$s.'), Tools::getPocheUrl()) .
+ "\r\n\r\n" . sprintf(_('Your login is %1$s.'), $newUsername) ."\r\n\r\n" .
+ _('Note : The password has been chosen by the person who created your account. Get in touch with that person to know your password and change it as soon as possible') . "\r\n\r\n" .
+ _('Have fun with it !') . "\r\n\r\n" .
+ _('This is an automatically generated message, no one will answer if you respond to it.');
+
+ // if external (public) registration
+ $body = sprintf(_('Hi, %1$s'), $newUsername) . "\r\n\r\n" .
+ sprintf(_('You\'ve just created a wallabag account on %1$s.'), Tools::getPocheUrl()) .
+ "\r\n\r\n" . _("Have fun with it !");
+
+ $body = $internalRegistration ? $body_internal : $body;
+
+ $body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard)
+ if (mail($email, sprintf(_('Your new wallabag account on %1$s'), Tools::getPocheUrl()), $body,
+ 'X-Mailer: PHP/' . phpversion() . "\r\n" .
+ 'Content-type: text/plain; charset=UTF-8' . "\r\n" .
+ "From: " . $newUsername . "@" . gethostname() . "\r\n")) {
+ Tools::logm('The user ' . $newUsername . ' has been emailed');
+ $this->messages->add('i', sprintf(_('The new user %1$s has been sent an email at %2$s. You may have to check spam folder.'), $newUsername, $email));
+ Tools::redirect('?');
+
+ } else {
+ Tools::logm('A problem has been encountered while sending an email');
+ $this->messages->add('e', _('A problem has been encountered while sending an email'));
+ }
+ } else {
+ Tools::logm('The user has been created, but the server did not authorize sending emails');
+ $this->messages->add('i', _('The server did not authorize sending a confirmation email, but the user was created.'));
+ }
+ } else {
+ Tools::logm('The user has been created, but no email was saved, so no confimation email was sent');
+ $this->messages->add('i', _('The user was created, but no email was sent because email was not filled in'));
+ }
+ Tools::logm('The new user ' . $newUsername . ' has been installed');
+ if (\Session::isLogged()) {
+ $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername));
+ }
+ Tools::redirect();
}
else {
- $this->messages->add('e', sprintf(_('Error : An user with the name %s already exists !'),$newusername));
- Tools::logm('An user with the name '.$newusername.' already exists !');
+ Tools::logm('error during adding new user');
Tools::redirect();
}
}
+ else {
+ $this->messages->add('e', sprintf(_('Error : An user with the name %s already exists !'), $newUsername));
+ Tools::logm('An user with the name ' . $newUsername . ' already exists !');
+ Tools::redirect();
+ }
+ }
+ else {
+ Tools::logm('Password or username were empty');
}
}
/**
* Delete an existing user
*/
- public function deleteUser()
+ public function deleteUser($password)
{
- if (isset($_GET['deluser'])){
- if ($this->store->listUsers() > 1) {
- if (Tools::encodeString($_POST['password4deletinguser'].$this->user->getUsername()) == $this->store->getUserPassword($this->user->getId())) {
- $username = $this->user->getUsername();
- $this->store->deleteUserConfig($this->user->getId());
- Tools::logm('The configuration for user '. $username .' has been deleted !');
- $this->store->deleteTagsEntriesAndEntries($this->user->getId());
- Tools::logm('The entries for user '. $username .' has been deleted !');
- $this->store->deleteUser($this->user->getId());
- Tools::logm('User '. $username .' has been completely deleted !');
- Session::logout();
- Tools::logm('logout');
- Tools::redirect();
- $this->messages->add('s', sprintf(_('User %s has been successfully deleted !'),$newusername));
- }
- else {
- Tools::logm('Bad password !');
- $this->messages->add('e', _('Error : The password is wrong !'));
- }
+ if ($this->store->listUsers() > 1) {
+ if (Tools::encodeString($password . $this->user->getUsername()) == $this->store->getUserPassword($this->user->getId())) {
+ $username = $this->user->getUsername();
+ $this->store->deleteUserConfig($this->user->getId());
+ Tools::logm('The configuration for user '. $username .' has been deleted !');
+ $this->store->deleteTagsEntriesAndEntries($this->user->getId());
+ Tools::logm('The entries for user '. $username .' has been deleted !');
+ $this->store->deleteUser($this->user->getId());
+ Tools::logm('User '. $username .' has been completely deleted !');
+ Session::logout();
+ Tools::logm('logout');
+ Tools::redirect();
+ $this->messages->add('s', sprintf(_('User %s has been successfully deleted !'), $username));
}
else {
- Tools::logm('Only user !');
- $this->messages->add('e', _('Error : You are the only user, you cannot delete your account !'));
+ Tools::logm('Bad password !');
+ $this->messages->add('e', _('Error : The password is wrong !'));
}
}
+ else {
+ Tools::logm('Only user !');
+ $this->messages->add('e', _('Error : You are the only user, you cannot delete your account !'));
+ }
}
public function getDefaultConfig()
$body = $content['rss']['channel']['item']['description'];
// clean content from prevent xss attack
- $purifier = $this->getPurifier();
+ $purifier = $this->_getPurifier();
$title = $purifier->purify($title);
$body = $purifier->purify($body);
//search for possible duplicate
$duplicate = NULL;
- $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId());
+ $clean_url = $url->getUrl();
+
+ // Clean URL to remove parameters from feedburner and all this stuff. Taken from Shaarli.
+ $i=strpos($clean_url,'&utm_source='); if ($i!==false) $clean_url=substr($clean_url,0,$i);
+ $i=strpos($clean_url,'?utm_source='); if ($i!==false) $clean_url=substr($clean_url,0,$i);
+ $i=strpos($clean_url,'#xtor=RSS-'); if ($i!==false) $clean_url=substr($clean_url,0,$i);
- $last_id = $this->store->add($url->getUrl(), $title, $body, $this->user->getId());
+ $duplicate = $this->store->retrieveOneByURL($clean_url, $this->user->getId());
+
+ $last_id = $this->store->add($clean_url, $title, $body, $this->user->getId());
if ( $last_id ) {
- Tools::logm('add link ' . $url->getUrl());
+ Tools::logm('add link ' . $clean_url);
if (DOWNLOAD_PICTURES) {
- $content = Picture::filterPicture($body, $url->getUrl(), $last_id);
+ $content = Picture::filterPicture($body, $clean_url, $last_id);
Tools::logm('updating content article');
$this->store->updateContent($last_id, $content, $this->user->getId());
}
if ($duplicate != NULL) {
// duplicate exists, so, older entry needs to be deleted (as new entry should go to the top of list), BUT favorite mark and tags should be preserved
- Tools::logm('link ' . $url->getUrl() . ' is a duplicate');
+ Tools::logm('link ' . $clean_url . ' is a duplicate');
// 1) - preserve tags and favorite, then drop old entry
$this->store->reassignTags($duplicate['id'], $last_id);
if ($duplicate['is_fav']) {
$this->store->favoriteById($last_id, $this->user->getId());
}
if ($this->store->deleteById($duplicate['id'], $this->user->getId())) {
- Tools::logm('previous link ' . $url->getUrl() .' entry deleted');
+ Tools::logm('previous link ' . $clean_url .' entry deleted');
}
}
+ // if there are tags, add them to the new article
+ if (isset($_GET['tags'])) {
+ $_POST['value'] = $_GET['tags'];
+ $_POST['entry_id'] = $last_id;
+ $this->action('add_tag', $url);
+ }
+
$this->messages->add('s', _('the link has been added successfully'));
}
else {
$this->messages->add('e', _('error during insertion : the link wasn\'t added'));
- Tools::logm('error during insertion : the link wasn\'t added ' . $url->getUrl());
+ Tools::logm('error during insertion : the link wasn\'t added ' . $clean_url);
}
if ($autoclose == TRUE) {
- Tools::redirect('?view=home');
+ Tools::redirect('?view=home&closewin=true');
} else {
- Tools::redirect('?view=home&closewin=true');
+ Tools::redirect('?view=home');
}
+ return $last_id;
break;
case 'delete':
- $msg = 'delete link #' . $id;
- if ($this->store->deleteById($id, $this->user->getId())) {
- if (DOWNLOAD_PICTURES) {
- Picture::removeDirectory(ABS_PATH . $id);
+ if (isset($_GET['search'])) {
+ //when we want to apply a delete to a search
+ $tags = array($_GET['search']);
+ $allentry_ids = $this->store->search($tags[0], $this->user->getId());
+ $entry_ids = array();
+ foreach ($allentry_ids as $eachentry) {
+ $entry_ids[] = $eachentry[0];
}
- $this->messages->add('s', _('the link has been deleted successfully'));
+ } else { // delete a single article
+ $entry_ids = array($id);
}
- else {
- $this->messages->add('e', _('the link wasn\'t deleted'));
- $msg = 'error : can\'t delete link #' . $id;
+ foreach($entry_ids as $id) {
+ $msg = 'delete link #' . $id;
+ if ($this->store->deleteById($id, $this->user->getId())) {
+ if (DOWNLOAD_PICTURES) {
+ Picture::removeDirectory(ABS_PATH . $id);
+ }
+ $this->messages->add('s', _('the link has been deleted successfully'));
+ }
+ else {
+ $this->messages->add('e', _('the link wasn\'t deleted'));
+ $msg = 'error : can\'t delete link #' . $id;
+ }
+ Tools::logm($msg);
}
- Tools::logm($msg);
Tools::redirect('?');
break;
case 'toggle_fav' :
}
break;
case 'toggle_archive' :
- $this->store->archiveById($id, $this->user->getId());
- Tools::logm('archive link #' . $id);
+ if (isset($_GET['tag_id'])) {
+ //when we want to archive a whole tag
+ $tag_id = $_GET['tag_id'];
+ $allentry_ids = $this->store->retrieveEntriesByTag($tag_id, $this->user->getId());
+ $entry_ids = array();
+ foreach ($allentry_ids as $eachentry) {
+ $entry_ids[] = $eachentry[0];
+ }
+ } else { //archive a single article
+ $entry_ids = array($id);
+ }
+ foreach($entry_ids as $id) {
+ $this->store->archiveById($id, $this->user->getId());
+ Tools::logm('archive link #' . $id);
+ }
if ( Tools::isAjaxRequest() ) {
echo 1;
exit;
- }
- else {
+ } else {
Tools::redirect();
}
break;
+ case 'archive_and_next' :
+ $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);
+ break;
case 'archive_all' :
$this->store->archiveAll($this->user->getId());
Tools::logm('archive all links');
$this->messages->add('s', _('The tag has been successfully deleted'));
Tools::redirect();
break;
+
+ case 'reload_article' :
+ Tools::logm('reload article');
+ $id = $_GET['id'];
+ $entry = $this->store->retrieveOneById($id, $this->user->getId());
+ Tools::logm('reload url ' . $entry['url']);
+ $url = new Url(base64_encode($entry['url']));
+ $this->action('add', $url);
+ break;
+
+ /* 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());
+ $id = $id_array[0];
+ Tools::redirect('?view=view&id=' . $id[0]);
+ Tools::logm('got the article with id ' . $id[0]);
+ }
+ break;
default:
break;
}
switch ($view)
{
+ case 'about':
+ break;
case 'config':
- $dev_infos = $this->getPocheVersion('dev');
+ $dev_infos = $this->_getPocheVersion('dev');
$dev = trim($dev_infos[0]);
$check_time_dev = date('d-M-Y H:i', $dev_infos[1]);
- $prod_infos = $this->getPocheVersion('prod');
+ $prod_infos = $this->_getPocheVersion('prod');
$prod = trim($prod_infos[0]);
$check_time_prod = date('d-M-Y H:i', $prod_infos[1]);
$compare_dev = version_compare(POCHE, $dev);
Tools::redirect();
}
$tags = $this->store->retrieveTagsByEntry($id);
+ $all_tags = $this->store->retrieveAllTags($this->user->getId());
$tpl_vars = array(
'entry_id' => $id,
'tags' => $tags,
+ 'alltags' => $all_tags,
'entry' => $entry,
);
break;
$this->pagination->page_links('?view=' . $view . '?search=' . $search . '&sort=' . $_SESSION['sort'] . '&' ));
$tpl_vars['page_links'] = $page_links;
$tpl_vars['nb_results'] = $count;
- $tpl_vars['search_term'] = $search;
+ $tpl_vars['searchterm'] = $search;
}
break;
case 'view':
}
# flattr checking
- $flattr = new FlattrItem();
- $flattr->checkItem($entry['url'], $entry['id']);
+ $flattr = NULL;
+ if (FLATTR) {
+ $flattr = new FlattrItem();
+ $flattr->checkItem($entry['url'], $entry['id']);
+ }
+
+ # previous and next
+ $previous = FALSE;
+ $previous_id = $this->store->getPreviousArticle($id, $this->user->getId());
+ $next = FALSE;
+ $next_id = $this->store->getNextArticle($id, $this->user->getId());
+
+ if ($this->store->retrieveOneById($previous_id, $this->user->getId())) {
+ $previous = TRUE;
+ }
+ if ($this->store->retrieveOneById($next_id, $this->user->getId())) {
+ $next = TRUE;
+ }
+ $navigate = $arrayName = array('previous' => $previous, 'previousid' => $previous_id, 'next' => $next, 'nextid' => $next_id);
# tags
$tags = $this->store->retrieveTagsByEntry($entry['id']);
'entry' => $entry,
'content' => $content,
'flattr' => $flattr,
- 'tags' => $tags
+ 'tags' => $tags,
+ 'navigate' => $navigate
);
}
else {
* @todo set the new password in function header like this updatePassword($newPassword)
* @return boolean
*/
- public function updatePassword()
+ public function updatePassword($password, $confirmPassword)
{
if (MODE_DEMO) {
$this->messages->add('i', _('in demo mode, you can\'t update your password'));
Tools::redirect('?view=config');
}
else {
- if (isset($_POST['password']) && isset($_POST['password_repeat'])) {
- if ($_POST['password'] == $_POST['password_repeat'] && $_POST['password'] != "") {
+ if (isset($password) && isset($confirmPassword)) {
+ if ($password == $confirmPassword && !empty($password)) {
$this->messages->add('s', _('your password has been updated'));
- $this->store->updatePassword($this->user->getId(), Tools::encodeString($_POST['password'] . $this->user->getUsername()));
+ $this->store->updatePassword($this->user->getId(), Tools::encodeString($password . $this->user->getUsername()));
Session::logout();
Tools::logm('password updated');
Tools::redirect();
}
/**
- * get credentials from differents sources
- * it redirects the user to the $referer link
+ * Get credentials from differents sources
+ * It redirects the user to the $referer link
+ *
* @return array
*/
- private function credentials() {
- if(isset($_SERVER['PHP_AUTH_USER'])) {
- return array($_SERVER['PHP_AUTH_USER'],'php_auth',true);
+ private function credentials()
+ {
+ if (isset($_SERVER['PHP_AUTH_USER'])) {
+ return array($_SERVER['PHP_AUTH_USER'], 'php_auth', true);
}
- if(!empty($_POST['login']) && !empty($_POST['password'])) {
- return array($_POST['login'],$_POST['password'],false);
+ if (!empty($_POST['login']) && !empty($_POST['password'])) {
+ return array($_POST['login'], $_POST['password'], false);
}
- if(isset($_SERVER['REMOTE_USER'])) {
- return array($_SERVER['REMOTE_USER'],'http_auth',true);
+ if (isset($_SERVER['REMOTE_USER'])) {
+ return array($_SERVER['REMOTE_USER'], 'http_auth', true);
}
- return array(false,false,false);
+ return array(false, false, false);
}
/**
$longlastingsession = isset($_POST['longlastingsession']);
$passwordTest = ($isauthenticated) ? $user['password'] : Tools::encodeString($password . $login);
Session::login($user['username'], $user['password'], $login, $passwordTest, $longlastingsession, array('poche_user' => new User($user)));
+
+ # reload l10n
+ $language = $user['config']['language'];
+ @putenv('LC_ALL=' . $language);
+ setlocale(LC_ALL, $language);
+ bindtextdomain($language, LOCALE);
+ textdomain($language);
+
$this->messages->add('s', _('welcome to your wallabag'));
Tools::logm('login successful');
Tools::redirect($referer);
}
$this->messages->add('e', _('login failed: bad login or password'));
+ // log login failure in web server log to allow fail2ban usage
+ error_log('user '.$login.' authentication failure');
Tools::logm('login failed');
Tools::redirect();
}
}
/**
- * import datas into your poche
+ * import datas into your wallabag
* @return boolean
*/
+
public function import() {
- if ( isset($_FILES['file']) ) {
+ if ( isset($_FILES['file']) && $_FILES['file']['tmp_name'] ) {
Tools::logm('Import stated: parsing file');
// assume, that file is in json format
$read = ((sizeof($data) && $read)?0:1);
}
}
- }
+ }
- //for readability structure
- foreach ($data as $record) {
- if (is_array($record)) {
- $data[] = $record;
- foreach ($record as $record2) {
- if (is_array($record2)) {
- $data[] = $record2;
- }
+ // for readability structure
+
+ foreach($data as $record) {
+ 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 - ').'</a> <a href="./?import">'._('click to finish import').'</a><a>');
- $body = (isset($record['content']) ? $record['content'] : '');
- $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 ) {
- $urlsInserted[] = $url; //add
-
- if ( isset($record['tags']) && trim($record['tags']) ) {
- //@TODO: set tags
+ $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 - ') . '</a> <a href="./?import">' . _('click to finish import') . '</a><a>');
+ $body = (isset($record['content']) ? $record['content'] : '');
+ $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) {
+ $urlsInserted[] = $url; //add
+ if (isset($record['tags']) && trim($record['tags'])) {
+
+ $tags = explode(',', $record['tags']);
+ foreach($tags as $tag) {
+ $entry_id = $id;
+ $tag_id = $this->store->retrieveTagByValue($tag);
+ if ($tag_id) {
+ $this->store->setTagToEntry($tag_id['id'], $entry_id);
+ } else {
+ $this->store->createTag($tag);
+ $tag_id = $this->store->retrieveTagByValue($tag);
+ $this->store->setTagToEntry($tag_id['id'], $entry_id);
+ }
+ }
- }
+ }
+ }
+ }
}
- }
- }
- $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
-
- //now download article contents if any
+ $i = sizeof($urlsInserted);
+ if ($i > 0) {
+ $this->messages->add('s', _('Articles inserted: ') . $i . _('. Please note, that some may be marked as "read".'));
+ }
- //check if we need to download any content
- $recordsDownloadRequired = $this->store->retrieveUnfetchedEntriesCount($this->user->getId());
- if ( $recordsDownloadRequired == 0 ) {
- //nothing to download
- $this->messages->add('s', _('Import finished.'));
- Tools::logm('Import finished completely');
- Tools::redirect();
+ Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).');
}
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);
-
- $purifier = $this->getPurifier();
+ $this->messages->add('e', _('Did you forget to select a file?'));
+ }
+ // file parsing finished here
+ // now download article contents if any
+ // check if we need to download any content
- foreach ($items as $item) {
- $url = new Url(base64_encode($item['url']));
- Tools::logm('Fetching article '.$item['id']);
- $content = Tools::getPageContent($url);
+ $recordsDownloadRequired = $this->store->retrieveUnfetchedEntriesCount($this->user->getId());
- $title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
- $body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
+ if ($recordsDownloadRequired == 0) {
- //clean content to prevent xss attack
- $title = $purifier->purify($title);
- $body = $purifier->purify($body);
+ // nothing to download
- $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
- Tools::logm('Article '.$item['id'].' updated.');
- }
+ $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);
+ $purifier = $this->_getPurifier();
+ foreach($items as $item) {
+ $url = new Url(base64_encode($item['url']));
+ if( $url->isCorrect() )
+ {
+ 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'));
+
+ // clean content to prevent xss attack
+
+ $title = $purifier->purify($title);
+ $body = $purifier->purify($body);
+ $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
+ Tools::logm('Article ' . $item['id'] . ' updated.');
+ } else
+ {
+ Tools::logm('Unvalid URL (' . $item['url'] .') to fetch for article ' . $item['id']);
+ }
+ }
+ }
}
- }
- return array('includeImport'=>true, 'import'=>array('recordsDownloadRequired'=>$recordsDownloadRequired, 'recordsUnderDownload'=> IMPORT_LIMIT, 'delay'=> IMPORT_DELAY * 1000) );
+ return array(
+ 'includeImport' => true,
+ 'import' => array(
+ 'recordsDownloadRequired' => $recordsDownloadRequired,
+ 'recordsUnderDownload' => IMPORT_LIMIT,
+ 'delay' => IMPORT_DELAY * 1000
+ )
+ );
}
/**
* export poche entries in json
* @return json all poche entries
*/
- public function export() {
+ public function export()
+ {
$filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
header('Content-Disposition: attachment; filename='.$filename);
* @param string $which 'prod' or 'dev'
* @return string latest $which version
*/
- private function getPocheVersion($which = 'prod') {
+ private function _getPocheVersion($which = 'prod') {
$cache_file = CACHE . '/' . $which;
$check_time = time();
return array($version, $check_time);
}
- public function generateToken()
+ /**
+ * Update token for current user
+ */
+ public function updateToken()
{
- 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 = Tools::generateToken();
+ $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')
+ /**
+ * Generate RSS feeds for current user
+ *
+ * @param $token
+ * @param $user_id
+ * @param $tag_id if $type is 'tag', the id of the tag to generate feed for
+ * @param string $type the type of feed to generate
+ * @param int $limit the maximum number of items (0 means all)
+ */
+ public function generateFeeds($token, $user_id, $tag_id, $type = 'home', $limit = 0)
{
$allowed_types = array('home', 'fav', 'archive', 'tag');
$config = $this->store->getConfigUser($user_id);
die(sprintf(_('User with this id (%d) does not exist.'), $user_id));
}
- if (!in_array($type, $allowed_types) || $token != $config['token']) {
- die(_('Uh, there is a problem while generating feeds.'));
+ if (!in_array($type, $allowed_types) || !isset($config['token']) || $token != $config['token']) {
+ die(_('Uh, there is a problem while generating feed. Wrong token used?'));
}
- // Check the token
$feed = new FeedWriter(RSS2);
$feed->setTitle('wallabag — ' . $type . ' feed');
$entries = $this->store->getEntriesByView($type, $user_id);
}
+ // if $limit is set to zero, use all entries
+ if (0 == $limit) {
+ $limit = count($entries);
+ }
if (count($entries) > 0) {
- foreach ($entries as $entry) {
+ for ($i = 0; $i < min(count($entries), $limit); $i++) {
+ $entry = $entries[$i];
$newItem = $feed->createNewItem();
$newItem->setTitle($entry['title']);
$newItem->setSource(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']);
exit;
}
- public function emptyCache() {
- $files = new RecursiveIteratorIterator(
- new RecursiveDirectoryIterator(CACHE, RecursiveDirectoryIterator::SKIP_DOTS),
- RecursiveIteratorIterator::CHILD_FIRST
- );
-
- foreach ($files as $fileinfo) {
- $todo = ($fileinfo->isDir() ? 'rmdir' : 'unlink');
- $todo($fileinfo->getRealPath());
- }
- Tools::logm('empty cache');
- $this->messages->add('s', _('Cache deleted.'));
- Tools::redirect();
- }
/**
- * return new purifier object with actual config
+ * Returns new purifier object with actual config
*/
- protected function getPurifier() {
- $config = HTMLPurifier_Config::createDefault();
- $config->set('Cache.SerializerPath', CACHE);
- $config->set('HTML.SafeIframe', true);
+ private 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/)%');
+ //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);
+ 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 =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
- . "<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\">\n"
- . "<head>"
- . "<meta http-equiv=\"Default-Style\" content=\"text/html; charset=utf-8\" />\n"
- . "<title>wallabag articles book</title>\n"
- . "</head>\n"
- . "<body>\n";
- $bookEnd = "</body>\n</html>\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 = "<h1> " . $bookTitle . "</h1>\n";
-
- $book->setCoverImage("Cover.png", file_get_contents("themes/baggy/img/apple-touch-icon-152.png"), "image/png", $fullTitle);
-
- $cover = $content_start . '<div style="text-align:center;"><p>' . _('Produced by wallabag with PHPePub') . '</p><p>'. _('Please open <a href="https://github.com/wallabag/wallabag/issues" >an issue</a> if you have trouble with the display of this E-Book on your device.') . '</p></div>' . $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</pre>" . $bookEnd); // log generation
- }
- $book->finalize();
- $zipData = $book->sendBook($bookFileName);
- }
}
projects / github / wallabag / wallabag.git / blobdiff