X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=inc%2Fpoche%2FPoche.class.php;h=a662f695eaffd261a85514e8a7401bfc094516ae;hb=a297fb1e38ce70a2c25f5dd9096fcfbf988ddf05;hp=134925060fde8c05eaf77962152dd164270ccf0c;hpb=f0d584503ffda109bd4f48c75783916625fb754d;p=github%2Fwallabag%2Fwallabag.git diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 13492506..a662f695 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -18,7 +18,7 @@ class Poche public $tpl; public $messages; public $pagination; - + private $currentTheme = ''; private $currentLanguage = ''; private $notInstalledMessage = array(); @@ -32,21 +32,21 @@ class Poche 'fr_FR.utf8' => 'Français', 'it_IT.utf8' => 'Italiano', 'pl_PL.utf8' => 'Polski', + 'pt_BR.utf8' => 'Português (Brasil)', 'ru_RU.utf8' => 'Pусский', 'sl_SI.utf8' => 'Slovenščina', 'uk_UA.utf8' => 'Українська', - 'pt_BR.utf8' => 'Brasileiro', ); public function __construct() { if ($this->configFileIsAvailable()) { $this->init(); } - + if ($this->themeIsInstalled()) { $this->initTpl(); } - + if ($this->systemIsInstalled()) { $this->store = new Database(); $this->messages = new Messages(); @@ -57,12 +57,10 @@ class Poche $this->store->checkTags(); } } - - private function init() + + private function init() { Tools::initPhp(); - Session::$sessionName = 'poche'; - Session::init(); if (isset($_SESSION['poche_user']) && $_SESSION['poche_user'] != array()) { $this->user = $_SESSION['poche_user']; @@ -76,28 +74,28 @@ class Poche $language = $this->user->getConfigValue('language'); putenv('LC_ALL=' . $language); setlocale(LC_ALL, $language); - bindtextdomain($language, LOCALE); - textdomain($language); + bindtextdomain($language, LOCALE); + textdomain($language); # Pagination $this->pagination = new Paginator($this->user->getConfigValue('pager'), 'p'); - + # Set up theme $themeDirectory = $this->user->getConfigValue('theme'); - + if ($themeDirectory === false) { $themeDirectory = DEFAULT_THEME; } - + $this->currentTheme = $themeDirectory; # Set up language $languageDirectory = $this->user->getConfigValue('language'); - + if ($languageDirectory === false) { $languageDirectory = DEFAULT_THEME; } - + $this->currentLanguage = $languageDirectory; } @@ -110,7 +108,7 @@ class Poche return true; } - + public function themeIsInstalled() { $passTheme = TRUE; # Twig is an absolute requirement for Poche to function. Abort immediately if the Composer installer hasn't been run yet @@ -125,27 +123,27 @@ class Poche self::$canRenderTemplates = false; $passTheme = FALSE; - } - + } + # Check if the selected theme and its requirements are present $theme = $this->getTheme(); if ($theme != '' && ! is_dir(THEME . '/' . $theme)) { $this->notInstalledMessage[] = 'The currently selected theme (' . $theme . ') does not seem to be properly installed (Missing directory: ' . THEME . '/' . $theme . ')'; - + self::$canRenderTemplates = false; - + $passTheme = FALSE; } - + $themeInfo = $this->getThemeInfo($theme); if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) { foreach ($themeInfo['requirements'] as $requiredTheme) { if (! is_dir(THEME . '/' . $requiredTheme)) { $this->notInstalledMessage[] = 'The required "' . $requiredTheme . '" theme is missing for the current theme (' . $theme . ')'; - + self::$canRenderTemplates = false; - + $passTheme = FALSE; } } @@ -155,21 +153,21 @@ class Poche return FALSE; } - + return true; } - + /** * all checks before installation. * @todo move HTML to template - * @return boolean + * @return boolean */ public function systemIsInstalled() { $msg = TRUE; - + $configSalt = defined('SALT') ? constant('SALT') : ''; - + if (empty($configSalt)) { $this->notInstalledMessage[] = 'You have not yet filled in the SALT value in the config.inc.php file.'; $msg = FALSE; @@ -195,7 +193,7 @@ class Poche return true; } - + public function getNotInstalledMessage() { return $this->notInstalledMessage; } @@ -204,7 +202,7 @@ class Poche { $loaderChain = new Twig_Loader_Chain(); $theme = $this->getTheme(); - + # add the current theme as first to the loader chain so Twig will look there first for overridden template files try { $loaderChain->addLoader(new Twig_Loader_Filesystem(THEME . '/' . $theme)); @@ -212,7 +210,7 @@ class Poche # @todo isInstalled() should catch this, inject Twig later die('The currently selected theme (' . $theme . ') does not seem to be properly installed (' . THEME . '/' . $theme .' is missing)'); } - + # add all required themes to the loader chain $themeInfo = $this->getThemeInfo($theme); if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) { @@ -225,16 +223,16 @@ class Poche } } } - + if (DEBUG_POCHE) { $twigParams = array(); } else { $twigParams = array('cache' => CACHE); } - + $this->tpl = new Twig_Environment($loaderChain, $twigParams); $this->tpl->addExtension(new Twig_Extensions_Extension_I18n()); - + # filter to display domain name of an url $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain'); $this->tpl->addFilter($filter); @@ -253,7 +251,7 @@ class Poche 'poche_url' => Tools::getPocheUrl() )); if (isset($_GET['install'])) { - if (($_POST['password'] == $_POST['password_repeat']) + if (($_POST['password'] == $_POST['password_repeat']) && $_POST['password'] != "" && $_POST['login'] != "") { # let's rock, install poche baby ! if ($this->store->install($_POST['login'], Tools::encodeString($_POST['password'] . $_POST['login']))) @@ -270,7 +268,7 @@ class Poche } exit(); } - + public function getTheme() { return $this->currentTheme; } @@ -295,7 +293,7 @@ class Poche if (is_file($themeIniFile) && is_readable($themeIniFile)) { $themeInfo = parse_ini_file($themeIniFile); } - + if ($themeInfo === false) { $themeInfo = array(); } @@ -306,7 +304,7 @@ class Poche return $themeInfo; } - + public function getInstalledThemes() { $handle = opendir(THEME); $themes = array(); @@ -333,28 +331,28 @@ class Poche public function getInstalledLanguages() { $handle = opendir(LOCALE); $languages = array(); - + 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('..', '.', 'tools'))) { continue; } - + $current = false; - + if ($language === $this->getLanguage()) { $current = true; } - + $languages[] = array('name' => (isset($this->language_names[$language]) ? $this->language_names[$language] : $language), 'value' => $language, 'current' => $current); } - + return $languages; } public function getDefaultConfig() - { + { return array( 'pager' => PAGINATION, 'language' => LANG, @@ -370,35 +368,24 @@ class Poche switch ($action) { case 'add': - if (!$import) { - $content = Tools::getPageContent($url); - $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(); - $config->set('Cache.SerializerPath', CACHE); - $purifier = new HTMLPurifier($config); - $title = $purifier->purify($title); - $body = $purifier->purify($body); - } - else { - $title = ''; - $body = ''; - } - - //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())) { + $content = Tools::getPageContent($url); + $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(); + $config->set('Cache.SerializerPath', CACHE); + $purifier = new HTMLPurifier($config); + $title = $purifier->purify($title); + $body = $purifier->purify($body); + + //search for possible duplicate + $duplicate = NULL; + $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId()); + + $last_id = $this->store->add($url->getUrl(), $title, $body, $this->user->getId()); + if ( $last_id ) { Tools::logm('add link ' . $url->getUrl()); - $sequence = ''; - if (STORAGE == 'postgres') { - $sequence = 'entries_id_seq'; - } - $last_id = $this->store->getLastId($sequence); if (DOWNLOAD_PICTURES) { $content = filtre_picture($body, $url->getUrl(), $last_id); Tools::logm('updating content article'); @@ -418,23 +405,17 @@ class Poche } } - if (!$import) { - $this->messages->add('s', _('the link has been added successfully')); - } + $this->messages->add('s', _('the link has been added successfully')); } else { - if (!$import) { - $this->messages->add('e', _('error during insertion : the link wasn\'t added')); - Tools::logm('error during insertion : the link wasn\'t added ' . $url->getUrl()); - } + $this->messages->add('e', _('error during insertion : the link wasn\'t added')); + Tools::logm('error during insertion : the link wasn\'t added ' . $url->getUrl()); } - if (!$import) { - if ($autoclose == TRUE) { - Tools::redirect('?view=home'); - } else { - Tools::redirect('?view=home&closewin=true'); - } + if ($autoclose == TRUE) { + Tools::redirect('?view=home'); + } else { + Tools::redirect('?view=home&closewin=true'); } break; case 'delete': @@ -455,62 +436,56 @@ class Poche case 'toggle_fav' : $this->store->favoriteById($id, $this->user->getId()); Tools::logm('mark as favorite link #' . $id); - if (!$import) { - Tools::redirect(); - } + Tools::redirect(); break; case 'toggle_archive' : $this->store->archiveById($id, $this->user->getId()); Tools::logm('archive link #' . $id); - if (!$import) { - Tools::redirect(); - } + Tools::redirect(); break; case 'archive_all' : $this->store->archiveAll($this->user->getId()); Tools::logm('archive all links'); - if (!$import) { - Tools::redirect(); - } + Tools::redirect(); break; case 'add_tag' : - if($import){ - $entry_id = $id; - $tags = explode(',', $tags); - } - else{ - $tags = explode(',', $_POST['value']); - $entry_id = $_POST['entry_id']; - } + $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(); } + //get all already set tags to preven duplicates + $already_set_tags = array(); + $entry_tags = $this->store->retrieveTagsByEntry($entry_id); + foreach ($entry_tags as $tag) { + $already_set_tags[] = $tag['value']; + } foreach($tags as $key => $tag_value) { $value = trim($tag_value); - $tag = $this->store->retrieveTagByValue($value); - - if (is_null($tag)) { - # we create the tag - $tag = $this->store->createTag($value); - $sequence = ''; - if (STORAGE == 'postgres') { - $sequence = 'tags_id_seq'; - } - $tag_id = $this->store->getLastId($sequence); - } - else { - $tag_id = $tag['id']; + if ($value && !in_array($value, $already_set_tags)) { + $tag = $this->store->retrieveTagByValue($value); + + if (is_null($tag)) { + # we create the tag + $tag = $this->store->createTag($value); + $sequence = ''; + if (STORAGE == 'postgres') { + $sequence = 'tags_id_seq'; + } + $tag_id = $this->store->getLastId($sequence); + } + else { + $tag_id = $tag['id']; + } + + # we assign the tag to the article + $this->store->setTagToEntry($tag_id, $entry_id); } - - # we assign the tag to the article - $this->store->setTagToEntry($tag_id, $entry_id); - } - if(!$import) { - Tools::redirect(); } + Tools::redirect(); break; case 'remove_tag' : $tag_id = $_GET['tag_id']; @@ -579,13 +554,36 @@ class Poche break; case 'tags': $token = $this->user->getConfigValue('token'); - $tags = $this->store->retrieveAllTags($this->user->getId()); + //if term is set - search tags for this term + $term = Tools::checkVar('term'); + $tags = $this->store->retrieveAllTags($this->user->getId(), $term); + if (Tools::isAjaxRequest()) { + $result = array(); + foreach ($tags as $tag) { + $result[] = $tag['value']; + } + echo json_encode($result); + exit; + } $tpl_vars = array( 'token' => $token, 'user_id' => $this->user->getId(), 'tags' => $tags, ); break; + case 'search': + if (isset($_GET['search'])) { + $search = filter_var($_GET['search'], FILTER_SANITIZE_STRING); + $tpl_vars['entries'] = $this->store->search($search, $this->user->getId()); + $count = count($tpl_vars['entries']); + $this->pagination->set_total($count); + $page_links = str_replace(array('previous', 'next'), array(_('previous'), _('next')), + $this->pagination->page_links('?view=' . $view . '?search=' . $search . '&sort=' . $_SESSION['sort'] . '&' )); + $tpl_vars['page_links'] = $page_links; + $tpl_vars['nb_results'] = $count; + $tpl_vars['search_term'] = $search; + } + break; case 'view': $entry = $this->store->retrieveOneById($id, $this->user->getId()); if ($entry != NULL) { @@ -622,7 +620,7 @@ class Poche 'nb_results' => '', 'listmode' => (isset($_COOKIE['listmode']) ? true : false), ); - + //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()); @@ -647,8 +645,8 @@ class Poche } /** - * update the password of the current user. - * if MODE_DEMO is TRUE, the password can't be updated. + * update the password of the current user. + * if MODE_DEMO is TRUE, the password can't be updated. * @todo add the return value * @todo set the new password in function header like this updatePassword($newPassword) * @return boolean @@ -676,44 +674,44 @@ class Poche } } } - + public function updateTheme() { # no data if (empty($_POST['theme'])) { } - + # we are not going to change it to the current theme... if ($_POST['theme'] == $this->getTheme()) { $this->messages->add('w', _('still using the "' . $this->getTheme() . '" theme!')); Tools::redirect('?view=config'); } - + $themes = $this->getInstalledThemes(); $actualTheme = false; - + foreach (array_keys($themes) as $theme) { if ($theme == $_POST['theme']) { $actualTheme = true; break; } } - + if (! $actualTheme) { $this->messages->add('e', _('that theme does not seem to be installed')); Tools::redirect('?view=config'); } - + $this->store->updateUserConfig($this->user->getId(), 'theme', $_POST['theme']); $this->messages->add('s', _('you have changed your theme preferences')); - + $currentConfig = $_SESSION['poche_user']->config; $currentConfig['theme'] = $_POST['theme']; - + $_SESSION['poche_user']->setConfig($currentConfig); $this->emptyCache(); - + Tools::redirect('?view=config'); } @@ -722,41 +720,40 @@ class Poche # no data if (empty($_POST['language'])) { } - + # we are not going to change it to the current language... if ($_POST['language'] == $this->getLanguage()) { $this->messages->add('w', _('still using the "' . $this->getLanguage() . '" language!')); Tools::redirect('?view=config'); } - + $languages = $this->getInstalledLanguages(); $actualLanguage = false; - + foreach ($languages as $language) { if ($language['value'] == $_POST['language']) { $actualLanguage = true; break; } } - + if (! $actualLanguage) { $this->messages->add('e', _('that language does not seem to be installed')); Tools::redirect('?view=config'); } - + $this->store->updateUserConfig($this->user->getId(), 'language', $_POST['language']); $this->messages->add('s', _('you have changed your language preferences')); - + $currentConfig = $_SESSION['poche_user']->config; $currentConfig['language'] = $_POST['language']; - + $_SESSION['poche_user']->setConfig($currentConfig); $this->emptyCache(); - + Tools::redirect('?view=config'); } - /** * get credentials from differents sources * it redirects the user to the $referer link @@ -811,7 +808,7 @@ class Poche /** * log out the poche user. It cleans the session. * @todo add the return value - * @return boolean + * @return boolean */ public function logout() { @@ -822,235 +819,123 @@ class Poche } /** - * import from Instapaper. poche needs a ./instapaper-export.html file - * @todo add the return value - * @param string $targetFile the file used for importing + * import datas into your poche * @return boolean */ - private function importFromInstapaper($targetFile) - { - # TODO gestion des articles favs - $html = new simple_html_dom(); - $html->load_file($targetFile); - Tools::logm('starting import from instapaper'); - - $read = 0; - $errors = array(); - foreach($html->find('ol') as $ul) - { - foreach($ul->find('li') as $li) - { - $a = $li->find('a'); - $url = new Url(base64_encode($a[0]->href)); - $this->action('add', $url, 0, TRUE); - 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); - } + public function import() { + + if (!defined('IMPORT_LIMIT')) { + define('IMPORT_LIMIT', 5); + } + if (!defined('IMPORT_DELAY')) { + define('IMPORT_DELAY', 5); + } + + if ( isset($_FILES['file']) ) { + // assume, that file is in json format + $str_data = file_get_contents($_FILES['file']['tmp_name']); + $data = json_decode($str_data, true); + + if ( $data === null ) { + //not json - assume html + $html = new simple_html_dom(); + $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; + } + } + # the second
    is for read links + $read = ((sizeof($data) && $read)?0:1); } - - # the second
      is for read links - $read = 1; + } } - $this->messages->add('s', _('import from instapaper completed. You have to execute the cron to fetch content.')); - Tools::logm('import from instapaper completed'); - Tools::redirect(); - } - /** - * import from Pocket. poche needs a ./ril_export.html file - * @todo add the return value - * @param string $targetFile the file used for importing - * @return boolean - */ - private function importFromPocket($targetFile) - { - # TODO gestion des articles favs - $html = new simple_html_dom(); - $html->load_file($targetFile); - Tools::logm('starting import from pocket'); - - $read = 0; - $errors = array(); - foreach($html->find('ul') as $ul) - { - foreach($ul->find('li') as $li) - { - $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') { - $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); - } + //for readability structure + foreach ($data as $record) { + if (is_array($record)) { + $data[] = $record; + foreach ($record as $record2) { + if (is_array($record2)) { + $data[] = $record2; + } } - - # the second