X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=inc%2Fpoche%2FPoche.class.php;h=fc9a455ae5feace87f4c92de0674340ed5401293;hb=6203ef8e51c8b2712e54a01a183f30d282926b0b;hp=74827253fa33cf906ce32d971c93b475a9646cbf;hpb=c515ffec9c4e43c6e826645168a36cedaf0b6870;p=github%2Fwallabag%2Fwallabag.git
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
old mode 100644
new mode 100755
index 74827253..fc9a455a
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -101,7 +101,7 @@ class Poche
$passTheme = TRUE;
# Twig is an absolute requirement for Poche to function. Abort immediately if the Composer installer hasn't been run yet
if (! self::$canRenderTemplates) {
- $this->notInstalledMessage[] = 'Twig does not seem to be installed. Please initialize the Composer installation to automatically fetch dependencies. Have a look at the documentation.';
+ $this->notInstalledMessage[] = 'Twig does not seem to be installed. Please initialize the Composer installation to automatically fetch dependencies. You can also download vendor.zip and extract it in your wallabag folder.';
$passTheme = FALSE;
}
@@ -228,10 +228,6 @@ class Poche
# filter for reading time
$filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
$this->tpl->addFilter($filter);
-
- # filter for simple filenames in config view
- $filter = new Twig_SimpleFilter('getPrettyFilename', function($string) { return str_replace(ROOT, '', $string); });
- $this->tpl->addFilter($filter);
}
private function install()
@@ -352,17 +348,55 @@ class Poche
protected function getPageContent(Url $url)
{
- $options = array('http' => array('user_agent' => 'poche'));
- if (isset($_SERVER['AUTH_TYPE']) && "basic" === strtolower($_SERVER['AUTH_TYPE'])) {
- $options['http']['header'] = sprintf(
- "Authorization: Basic %s",
- base64_encode(
- sprintf('%s:%s', $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])
- )
+ // Saving and clearing context
+ $REAL = array();
+ foreach( $GLOBALS as $key => $value ) {
+ if( $key != "GLOBALS" && $key != "_SESSION" ) {
+ $GLOBALS[$key] = array();
+ $REAL[$key] = $value;
+ }
+ }
+ // Saving and clearing session
+ $REAL_SESSION = array();
+ foreach( $_SESSION as $key => $value ) {
+ $REAL_SESSION[$key] = $value;
+ unset($_SESSION[$key]);
+ }
+
+ // Running code in different context
+ $scope = function() {
+ extract( func_get_arg(1) );
+ $_GET = $_REQUEST = array(
+ "url" => $url->getUrl(),
+ "max" => 5,
+ "links" => "preserve",
+ "exc" => "",
+ "format" => "json",
+ "submit" => "Create Feed"
);
+ ob_start();
+ require func_get_arg(0);
+ $json = ob_get_flush();
+ return $json;
+ };
+ $json = $scope( "inc/3rdparty/makefulltextfeed.php", array("url" => $url) );
+
+ // Clearing and restoring context
+ foreach( $GLOBALS as $key => $value ) {
+ if( $key != "GLOBALS" && $key != "_SESSION" ) {
+ unset($GLOBALS[$key]);
+ }
+ }
+ foreach( $REAL as $key => $value ) {
+ $GLOBALS[$key] = $value;
+ }
+ // Clearing and restoring session
+ foreach( $_SESSION as $key => $value ) {
+ unset($_SESSION[$key]);
+ }
+ foreach( $REAL_SESSION as $key => $value ) {
+ $_SESSION[$key] = $value;
}
- $context = stream_context_create($options);
- $json = file_get_contents(Tools::getPocheUrl() . '/inc/3rdparty/makefulltextfeed.php?url='.urlencode($url->getUrl()).'&max=5&links=preserve&exc=&format=json&submit=Create+Feed', false, $context);
return json_decode($json, true);
}
@@ -378,6 +412,11 @@ class Poche
$title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled');
$body = $content['rss']['channel']['item']['description'];
+ //search for possible duplicate if not in import mode
+ if (!$import) {
+ $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId());
+ }
+
if ($this->store->add($url->getUrl(), $title, $body, $this->user->getId())) {
Tools::logm('add link ' . $url->getUrl());
$sequence = '';
@@ -390,6 +429,20 @@ class Poche
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');
+ // 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');
+ }
+ }
+
if (!$import) {
$this->messages->add('s', _('the link has been added successfully'));
}
@@ -438,9 +491,22 @@ class Poche
Tools::redirect();
}
break;
+ case 'archive_all' :
+ $this->store->archiveAll($this->user->getId());
+ Tools::logm('archive all links');
+ if (!$import) {
+ Tools::redirect();
+ }
+ break;
case 'add_tag' :
$tags = explode(',', $_POST['value']);
$entry_id = $_POST['entry_id'];
+ $entry = $this->store->retrieveOneById($entry_id, $this->user->getId());
+ if (!$entry) {
+ $this->messages->add('e', _('Article not found!'));
+ Tools::logm('error : article not found');
+ Tools::redirect();
+ }
foreach($tags as $key => $tag_value) {
$value = trim($tag_value);
$tag = $this->store->retrieveTagByValue($value);
@@ -465,6 +531,12 @@ class Poche
break;
case 'remove_tag' :
$tag_id = $_GET['tag_id'];
+ $entry = $this->store->retrieveOneById($id, $this->user->getId());
+ if (!$entry) {
+ $this->messages->add('e', _('Article not found!'));
+ Tools::logm('error : article not found');
+ Tools::redirect();
+ }
$this->store->removeTagForEntry($id, $tag_id);
Tools::redirect();
break;
@@ -480,8 +552,8 @@ class Poche
switch ($view)
{
case 'config':
- $dev = $this->getPocheVersion('dev');
- $prod = $this->getPocheVersion('prod');
+ $dev = trim($this->getPocheVersion('dev'));
+ $prod = trim($this->getPocheVersion('prod'));
$compare_dev = version_compare(POCHE, $dev);
$compare_prod = version_compare(POCHE, $prod);
$themes = $this->getInstalledThemes();
@@ -503,6 +575,12 @@ class Poche
break;
case 'edit-tags':
# tags
+ $entry = $this->store->retrieveOneById($id, $this->user->getId());
+ if (!$entry) {
+ $this->messages->add('e', _('Article not found!'));
+ Tools::logm('error : article not found');
+ Tools::redirect();
+ }
$tags = $this->store->retrieveTagsByEntry($id);
$tpl_vars = array(
'entry_id' => $id,
@@ -510,8 +588,8 @@ class Poche
);
break;
case 'tag':
- $entries = $this->store->retrieveEntriesByTag($id);
- $tag = $this->store->retrieveTag($id);
+ $entries = $this->store->retrieveEntriesByTag($id, $this->user->getId());
+ $tag = $this->store->retrieveTag($id, $this->user->getId());
$tpl_vars = array(
'tag' => $tag,
'entries' => $entries,
@@ -519,7 +597,7 @@ class Poche
break;
case 'tags':
$token = $this->user->getConfigValue('token');
- $tags = $this->store->retrieveAllTags();
+ $tags = $this->store->retrieveAllTags($this->user->getId());
$tpl_vars = array(
'token' => $token,
'user_id' => $this->user->getId(),
@@ -727,7 +805,7 @@ 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)));
- $this->messages->add('s', _('welcome to your poche'));
+ $this->messages->add('s', _('welcome to your wallabag'));
Tools::logm('login successful');
Tools::redirect($referer);
}
@@ -746,7 +824,6 @@ class Poche
{
$this->user = array();
Session::logout();
- $this->messages->add('s', _('see you soon!'));
Tools::logm('logout');
Tools::redirect();
}
@@ -1010,6 +1087,7 @@ class Poche
$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;
@@ -1028,13 +1106,13 @@ class Poche
// Check the token
$feed = new FeedWriter(RSS2);
- $feed->setTitle('poche - ' . $type . ' feed');
+ $feed->setTitle('wallabag â ' . $type . ' feed');
$feed->setLink(Tools::getPocheUrl());
$feed->setChannelElement('updated', date(DATE_RSS , time()));
- $feed->setChannelElement('author', 'poche');
+ $feed->setChannelElement('author', 'wallabag');
if ($type == 'tag') {
- $entries = $this->store->retrieveEntriesByTag($tag_id);
+ $entries = $this->store->retrieveEntriesByTag($tag_id, $user_id);
}
else {
$entries = $this->store->getEntriesByView($type, $user_id);
@@ -1054,4 +1132,20 @@ class Poche
$feed->genarateFeed();
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();
+ }
}