X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=inc%2Fpoche%2FPoche.class.php;h=30d42c61bb3ffb9ee6b9632d7b6fc44729236640;hb=9e5dc91c0383973470f2292b1ec123c48e908e17;hp=098dd7c19c16b6f1891157c32a7639ac0b10e1f1;hpb=fa9a7bbb3c61116e5db76c9f25ef2340fef971d7;p=github%2Fwallabag%2Fwallabag.git
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 098dd7c1..30d42c61 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -74,15 +74,57 @@ class Poche
/**
* Creates a new user
*/
- public function createNewUser($username, $password)
+ public function createNewUser($username, $password, $email = "", $internalRegistration = false)
{
+ 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))) {
- Tools::logm('The new user ' . $newUsername . ' has been installed');
+ 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 logout ?'), $newUsername));
- Tools::redirect();
+ }
+ Tools::redirect();
}
else {
Tools::logm('error during adding new user');
@@ -95,6 +137,9 @@ class Poche
Tools::redirect();
}
}
+ else {
+ Tools::logm('Password or username were empty');
+ }
}
/**
@@ -155,56 +200,84 @@ class Poche
//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);
+
+ $duplicate = $this->store->retrieveOneByURL($clean_url, $this->user->getId());
- $last_id = $this->store->add($url->getUrl(), $title, $body, $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' :
@@ -219,8 +292,21 @@ class Poche
}
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;
@@ -302,6 +388,26 @@ class Poche
$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;
}
@@ -313,6 +419,8 @@ class Poche
switch ($view)
{
+ case 'about':
+ break;
case 'config':
$dev_infos = $this->_getPocheVersion('dev');
$dev = trim($dev_infos[0]);
@@ -387,7 +495,7 @@ class Poche
$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':
@@ -402,9 +510,12 @@ class Poche
}
# flattr checking
- $flattr = new FlattrItem();
- $flattr->checkItem($entry['url'], $entry['id']);
-
+ $flattr = NULL;
+ if (FLATTR) {
+ $flattr = new FlattrItem();
+ $flattr->checkItem($entry['url'], $entry['id']);
+ }
+
# tags
$tags = $this->store->retrieveTagsByEntry($entry['id']);
@@ -524,11 +635,21 @@ class Poche
$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();
}
@@ -551,42 +672,39 @@ class Poche
* import datas into your wallabag
* @return boolean
*/
- public function import()
- {
- if (isset($_FILES['file'])) {
- Tools::logm('Import stated: parsing file');
-
- // assume, that file is in json format
-
- $str_data = file_get_contents($_FILES['file']['tmp_name']);
- $data = json_decode($str_data, true);
- if ($data === null) {
-
- // not json - assume html
-
- $html = new simple_html_dom();
- $html->load_file($_FILES['file']['tmp_name']);
- $data = array();
- $read = 0;
- foreach(array('ol','ul') as $list) {
- foreach($html->find($list) as $ul) {
- foreach($ul->find('li') as $li) {
- $tmpEntry = array();
- $a = $li->find('a');
- $tmpEntry['url'] = $a[0]->href;
- $tmpEntry['tags'] = $a[0]->tags;
- $tmpEntry['is_read'] = $read;
- if ($tmpEntry['url']) {
- $data[] = $tmpEntry;
- }
- }
-
- // the second is for read links
- $read = ((sizeof($data) && $read) ? 0 : 1);
- }
- }
+ public function import() {
+
+ if ( isset($_FILES['file']) && $_FILES['file']['tmp_name'] ) {
+ Tools::logm('Import stated: parsing file');
+
+ // assume, that file is in json format
+ $str_data = file_get_contents($_FILES['file']['tmp_name']);
+ $data = json_decode($str_data, true);
+
+ if ( $data === null ) {
+ //not json - assume html
+ $html = new simple_html_dom();
+ $html->load_file($_FILES['file']['tmp_name']);
+ $data = array();
+ $read = 0;
+ foreach (array('ol','ul') as $list) {
+ foreach ($html->find($list) as $ul) {
+ foreach ($ul->find('li') as $li) {
+ $tmpEntry = array();
+ $a = $li->find('a');
+ $tmpEntry['url'] = $a[0]->href;
+ $tmpEntry['tags'] = $a[0]->tags;
+ $tmpEntry['is_read'] = $read;
+ if ($tmpEntry['url']) {
+ $data[] = $tmpEntry;
+ }
+ }
+ # the second is for read links
+ $read = ((sizeof($data) && $read)?0:1);
}
+ }
+ }
// for readability structure
@@ -617,7 +735,18 @@ class Poche
$urlsInserted[] = $url; //add
if (isset($record['tags']) && trim($record['tags'])) {
- // @TODO: set 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);
+ }
+ }
}
}
@@ -629,9 +758,11 @@ class Poche
$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).');
- }
-
+ Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).');
+ }
+ else {
+ $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
@@ -659,17 +790,23 @@ class Poche
$purifier = $this->_getPurifier();
foreach($items as $item) {
$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'));
-
- // 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.');
+ 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']);
+ }
}
}
}
@@ -738,10 +875,11 @@ class Poche
*
* @param $token
* @param $user_id
- * @param $tag_id
- * @param string $type
+ * @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')
+ 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);
@@ -768,8 +906,13 @@ class Poche
$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']);