X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=inc%2Fpoche%2FPoche.class.php;h=9014f455f83e8b2b478bccf2093817f091317929;hb=refs%2Fpull%2F1252%2Fhead;hp=a91a3f8f4fc1458f7336b223101bfbf86f58d606;hpb=f2321633b9dcc806b3c036a742bde1e4c9bcbef9;p=github%2Fwallabag%2Fwallabag.git diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index a91a3f8f..9014f455 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -85,7 +85,7 @@ class Poche if ($email != "") { // if email is filled if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) { - // if internal registration + // 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" . @@ -96,6 +96,7 @@ class Poche $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) @@ -105,6 +106,7 @@ class Poche "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'); @@ -112,7 +114,7 @@ class Poche } } 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')); + $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'); @@ -198,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'); } } @@ -233,7 +242,7 @@ 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) { @@ -257,6 +266,15 @@ class Poche } foreach($entry_ids as $id) { $msg = 'delete link #' . $id; + + // deleting tags and tags_entries + $tags = $this->store->retrieveTagsByEntry($id); + foreach ($tags as $tag) { + $this->store->removeTagForEntry($id, $tag['id']); + $this->store->cleanUnusedTag($tag['id']); + } + + // deleting pictures if ($this->store->deleteById($id, $this->user->getId())) { if (DOWNLOAD_PICTURES) { Picture::removeDirectory(ABS_PATH . $id); @@ -301,11 +319,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'); @@ -391,14 +414,14 @@ class Poche /* 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': - $id = 0; - while ($this->store->retrieveOneById($id,$this->user->getId()) == null) { - $count = $this->store->getEntriesByViewCount($view, $this->user->getId()); - $id = rand(1,$count); - } Tools::logm('get a random article'); - Tools::redirect('?view=view&id=' . $id); - //$this->displayView('view', $id); + $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; @@ -425,8 +448,9 @@ class Poche $themes = $this->tpl->getInstalledThemes(); $languages = $this->language->getInstalledLanguages(); $token = $this->user->getConfigValue('token'); - $http_auth = (isset($_SERVER['PHP_AUTH_USER']) || isset($_SERVER['REMOTE_USER'])) ? true : false; + $http_auth = isset($_SERVER['REMOTE_USER']); $only_user = ($this->store->listUsers() > 1) ? false : true; + $https = substr(Tools::getPocheUrl(), 0, 5) == 'https'; $tpl_vars = array( 'themes' => $themes, 'languages' => $languages, @@ -439,7 +463,8 @@ class Poche 'token' => $token, 'user_id' => $this->user->getId(), 'http_auth' => $http_auth, - 'only_user' => $only_user + 'only_user' => $only_user, + 'https' => $https ); Tools::logm('config view'); break; @@ -452,9 +477,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; @@ -508,6 +555,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']); @@ -515,7 +576,8 @@ class Poche 'entry' => $entry, 'content' => $content, 'flattr' => $flattr, - 'tags' => $tags + 'tags' => $tags, + 'navigate' => $navigate ); } else { @@ -528,6 +590,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 @@ -538,7 +601,7 @@ class Poche $count = $this->store->getEntriesByViewCount($view, $this->user->getId(), $id); - if ($count > 0) { + if ($count && $count > 0) { $this->pagination->set_total($count); $page_links = str_replace(array('previous', 'next'), array(_('previous'), _('next')), $this->pagination->page_links('?view=' . $view . '&sort=' . $_SESSION['sort'] . (($id)?'&id='.$id:'') . '&' )); @@ -592,9 +655,6 @@ class Poche */ 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); } @@ -634,6 +694,7 @@ class Poche setlocale(LC_ALL, $language); bindtextdomain($language, LOCALE); textdomain($language); + bind_textdomain_codeset($language, 'UTF-8'); $this->messages->add('s', _('welcome to your wallabag')); Tools::logm('login successful'); @@ -680,23 +741,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 @@ -714,7 +797,7 @@ class Poche $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)) { + if (filter_var($url, FILTER_VALIDATE_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']) : (isset($record['archive']) ? intval($record['archive']) : 0)); @@ -753,7 +836,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 @@ -819,14 +902,18 @@ class Poche */ 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'); + $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json"; + header('Content-Disposition: attachment; filename='.$filename); + + $entries = $this->store->retrieveAllWithTags($this->user->getId()); + if ($entries) { + echo $this->tpl->render('export.twig', array( + 'export' => Tools::renderJson($entries), + )); + Tools::logm('export view'); + } else { + Tools::logm('error accessing database while exporting'); + } } /** @@ -902,7 +989,7 @@ class Poche if (0 == $limit) { $limit = count($entries); } - if (count($entries) > 0) { + if ($entries && count($entries) > 0) { for ($i = 0; $i < min(count($entries), $limit); $i++) { $entry = $entries[$i]; $newItem = $feed->createNewItem(); @@ -914,7 +1001,10 @@ class Poche $feed->addItem($newItem); } } - + else + { + Tools::logm("database error while generating feeds"); + } $feed->genarateFeed(); exit; }