X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fpoche%2FPoche.class.php;h=0c4143e190f3a87c20dfe9109017588e38e4ff0f;hb=223268c2fa34c497d91338e2553bc74bb1b26859;hp=fc9a455ae5feace87f4c92de0674340ed5401293;hpb=ab5bb94b12e04b357f8faee376704bc29ff019a5;p=github%2Fwallabag%2Fwallabag.git diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index fc9a455a..0c4143e1 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -23,6 +23,20 @@ class Poche private $currentLanguage = ''; private $notInstalledMessage = array(); + private $language_names = array( + 'cs_CZ.utf8' => 'čeština', + 'de_DE.utf8' => 'German', + 'en_EN.utf8' => 'English', + 'es_ES.utf8' => 'Español', + 'fa_IR.utf8' => 'فارسی', + 'fr_FR.utf8' => 'Français', + 'it_IT.utf8' => 'Italiano', + 'pl_PL.utf8' => 'Polski', + 'ru_RU.utf8' => 'Pусский', + 'sl_SI.utf8' => 'Slovenščina', + 'uk_UA.utf8' => 'Українська', + 'pt_BR.utf8' => 'Brasileiro', + ); public function __construct() { if ($this->configFileIsAvailable()) { @@ -307,6 +321,8 @@ class Poche $themes[$theme] = $this->getThemeInfo($theme); } + ksort($themes); + return $themes; } @@ -321,7 +337,7 @@ class Poche while (($language = readdir($handle)) !== false) { # Languages are stored in a directory, so all directory names are languages # @todo move language installation data to database - if (! is_dir(LOCALE . '/' . $language) || in_array($language, array('..', '.'))) { + if (! is_dir(LOCALE . '/' . $language) || in_array($language, array('..', '.', 'tools'))) { continue; } @@ -331,7 +347,7 @@ class Poche $current = true; } - $languages[] = array('name' => $language, 'current' => $current); + $languages[] = array('name' => (isset($this->language_names[$language]) ? $this->language_names[$language] : $language), 'value' => $language, 'current' => $current); } return $languages; @@ -351,7 +367,7 @@ class Poche // Saving and clearing context $REAL = array(); foreach( $GLOBALS as $key => $value ) { - if( $key != "GLOBALS" && $key != "_SESSION" ) { + if( $key != 'GLOBALS' && $key != '_SESSION' && $key != 'HTTP_SESSION_VARS' ) { $GLOBALS[$key] = array(); $REAL[$key] = $value; } @@ -403,7 +419,7 @@ class Poche /** * Call action (mark as fav, archive, delete, etc.) */ - public function action($action, Url $url, $id = 0, $import = FALSE, $autoclose = FALSE) + public function action($action, Url $url, $id = 0, $import = FALSE, $autoclose = FALSE, $tags = null) { switch ($action) { @@ -412,6 +428,12 @@ class Poche $title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'); $body = $content['rss']['channel']['item']['description']; + // clean content from prevent xss attack + $config = HTMLPurifier_Config::createDefault(); + $purifier = new HTMLPurifier($config); + $title = $purifier->purify($title); + $body = $purifier->purify($body); + //search for possible duplicate if not in import mode if (!$import) { $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId()); @@ -499,8 +521,14 @@ class Poche } break; case 'add_tag' : - $tags = explode(',', $_POST['value']); - $entry_id = $_POST['entry_id']; + if($import){ + $entry_id = $id; + $tags = explode(',', $tags); + } + else{ + $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!')); @@ -527,7 +555,9 @@ class Poche # we assign the tag to the article $this->store->setTagToEntry($tag_id, $entry_id); } - Tools::redirect(); + if(!$import) { + Tools::redirect(); + } break; case 'remove_tag' : $tag_id = $_GET['tag_id']; @@ -585,14 +615,7 @@ class Poche $tpl_vars = array( 'entry_id' => $id, 'tags' => $tags, - ); - break; - case 'tag': - $entries = $this->store->retrieveEntriesByTag($id, $this->user->getId()); - $tag = $this->store->retrieveTag($id, $this->user->getId()); - $tpl_vars = array( - 'tag' => $tag, - 'entries' => $entries, + 'entry' => $entry, ); break; case 'tags': @@ -633,22 +656,29 @@ class Poche Tools::logm('error in view call : entry is null'); } break; - default: # home, favorites and archive views - $entries = $this->store->getEntriesByView($view, $this->user->getId()); + default: # home, favorites, archive and tag views $tpl_vars = array( 'entries' => '', 'page_links' => '', 'nb_results' => '', + 'listmode' => (isset($_COOKIE['listmode']) ? true : false), ); - if (count($entries) > 0) { - $this->pagination->set_total(count($entries)); + //if id is given - we retrive entries by tag: id is tag id + if ($id) { + $tpl_vars['tag'] = $this->store->retrieveTag($id, $this->user->getId()); + $tpl_vars['id'] = intval($id); + } + + $count = $this->store->getEntriesByViewCount($view, $this->user->getId(), $id); + + if ($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'] . '&')); - $datas = $this->store->getEntriesByView($view, $this->user->getId(), $this->pagination->get_limit()); - $tpl_vars['entries'] = $datas; + $this->pagination->page_links('?view=' . $view . '&sort=' . $_SESSION['sort'] . (($id)?'&id='.$id:'') . '&' )); + $tpl_vars['entries'] = $this->store->getEntriesByView($view, $this->user->getId(), $this->pagination->get_limit(), $id); $tpl_vars['page_links'] = $page_links; - $tpl_vars['nb_results'] = count($entries); + $tpl_vars['nb_results'] = $count; } Tools::logm('display ' . $view . ' view'); break; @@ -722,6 +752,8 @@ class Poche $currentConfig['theme'] = $_POST['theme']; $_SESSION['poche_user']->setConfig($currentConfig); + + $this->emptyCache(); Tools::redirect('?view=config'); } @@ -742,7 +774,7 @@ class Poche $actualLanguage = false; foreach ($languages as $language) { - if ($language['name'] == $_POST['language']) { + if ($language['value'] == $_POST['language']) { $actualLanguage = true; break; } @@ -760,6 +792,8 @@ class Poche $currentConfig['language'] = $_POST['language']; $_SESSION['poche_user']->setConfig($currentConfig); + + $this->emptyCache(); Tools::redirect('?view=config'); } @@ -890,14 +924,18 @@ class Poche $a = $li->find('a'); $url = new Url(base64_encode($a[0]->href)); $this->action('add', $url, 0, TRUE); + $sequence = ''; + if (STORAGE == 'postgres') { + $sequence = 'entries_id_seq'; + } + $last_id = $this->store->getLastId($sequence); if ($read == '1') { - $sequence = ''; - if (STORAGE == 'postgres') { - $sequence = 'entries_id_seq'; - } - $last_id = $this->store->getLastId($sequence); $this->action('toggle_archive', $url, $last_id, TRUE); } + $tags = $a[0]->tags; + if(!empty($tags)) { + $this->action('add_tag',$url,$last_id,true,false,$tags); + } } # the second