X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=inc%2Fpoche%2FPoche.class.php;h=d039de1f1877d6cc9b70b86d44cd2d3dabce47d0;hb=f0a819a968e5d935c757bb65acdfbca480398274;hp=81a18c8603b95af167876c943a02d6523c89d001;hpb=cdde19d6096c85a3ed9b9399482bcc04bb79583c;p=github%2Fwallabag%2Fwallabag.git
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 81a18c86..d039de1f 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -74,16 +74,57 @@ class Poche
/**
* 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 logout ?'), $newUsername));
- Tools::redirect();
+ }
+ Tools::redirect();
}
else {
Tools::logm('error during adding new user');
@@ -96,6 +137,9 @@ class Poche
Tools::redirect();
}
}
+ else {
+ Tools::logm('Password or username were empty');
+ }
}
/**
@@ -156,27 +200,34 @@ 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);
- $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');
}
}
@@ -191,13 +242,13 @@ class Poche
}
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;
@@ -259,11 +310,16 @@ class Poche
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');
@@ -337,6 +393,27 @@ 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');
+ $view = $_GET['view'];
+ if ($this->store->getRandomId($this->user->getId(),$view)) {
+ $id_array = $this->store->getRandomId($this->user->getId(),$view);
+ $id = $id_array[0];
+ Tools::redirect('?view=view&id=' . $id[0]);
+ Tools::logm('got the article with id ' . $id[0]);
+ }
+ break;
default:
break;
}
@@ -389,9 +466,31 @@ class Poche
Tools::redirect();
}
$tags = $this->store->retrieveTagsByEntry($id);
+ $all_tags = $this->store->retrieveAllTags($this->user->getId());
+ $maximus = 0;
+ foreach ($all_tags as $eachtag) { // search for the most times a tag is present
+ if ($eachtag["entriescount"] > $maximus) $maximus = $eachtag["entriescount"];
+ }
+ foreach ($all_tags as $key => $eachtag) { // get the percentage of presence of each tag
+ $percent = floor(($eachtag["entriescount"] / $maximus) * 100);
+
+ if ($percent < 20): // assign a css class, depending on the number of entries count
+ $cssclass = 'smallesttag';
+ elseif ($percent >= 20 and $percent < 40):
+ $cssclass = 'smalltag';
+ elseif ($percent >= 40 and $percent < 60):
+ $cssclass = 'mediumtag';
+ elseif ($percent >= 60 and $percent < 80):
+ $cssclass = 'largetag';
+ else:
+ $cssclass = 'largesttag';
+ endif;
+ $all_tags[$key]['cssclass'] = $cssclass;
+ }
$tpl_vars = array(
'entry_id' => $id,
'tags' => $tags,
+ 'alltags' => $all_tags,
'entry' => $entry,
);
break;
@@ -445,6 +544,20 @@ class Poche
$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 = array('previous' => $previous, 'previousid' => $previous_id, 'next' => $next, 'nextid' => $next_id);
+
# tags
$tags = $this->store->retrieveTagsByEntry($entry['id']);
@@ -452,7 +565,8 @@ class Poche
'entry' => $entry,
'content' => $content,
'flattr' => $flattr,
- 'tags' => $tags
+ 'tags' => $tags,
+ 'navigate' => $navigate
);
}
else {
@@ -465,6 +579,7 @@ class Poche
'page_links' => '',
'nb_results' => '',
'listmode' => (isset($_COOKIE['listmode']) ? true : false),
+ 'view' => $view,
);
//if id is given - we retrieve entries by tag: id is tag id
@@ -617,23 +732,45 @@ class Poche
$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;
+
+ if (Tools::get_doctype($html)->innertext == "") {
+ // Firefox-bookmarks HTML
+ foreach (array('DL','ul') as $list) {
+ foreach ($html->find($list) as $ul) {
+ foreach ($ul->find('DT') 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);
+ # the second is for read links
+ $read = ((sizeof($data) && $read)?0:1);
+ }
}
- }
- }
+ } else {
+ // regular HTML
+ 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
@@ -690,7 +827,7 @@ class Poche
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
@@ -719,17 +856,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']);
+ }
}
}
}