/**
* Creates a new user
*/
- public function createNewUser($username, $password, $email = "")
+ 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), $email)) {
- Tools::logm('The new user ' . $newUsername . ' has been installed');
+ 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();
+ }
+ Tools::redirect();
}
else {
Tools::logm('error during adding new user');
Tools::redirect();
}
}
+ else {
+ Tools::logm('Password or username were empty');
+ }
}
/**
//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');
}
}
}
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':
if (isset($_GET['search'])) {
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;
}
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;
$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 {
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();
}
$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);
+ }
+ }
}
}
Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).');
}
else {
- $this->messages->add('s', _('Did you forget to select a file?'));
+ $this->messages->add('e', _('Did you forget to select a file?'));
}
// file parsing finished here
// now download article contents if any
$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']);
+ }
}
}
}
*
* @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);
$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']);
projects / github / wallabag / wallabag.git / blobdiff