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()) {
$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 <a href="http://doc.wallabag.org/doku.php?id=users:begin:install">the documentation.</a>';
+ $this->notInstalledMessage[] = 'Twig does not seem to be installed. Please initialize the Composer installation to automatically fetch dependencies. You can also download <a href="http://wllbg.org/vendor">vendor.zip</a> and extract it in your wallabag folder.';
$passTheme = FALSE;
}
$themes[$theme] = $this->getThemeInfo($theme);
}
+ ksort($themes);
+
return $themes;
}
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;
}
$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;
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' && $key != 'HTTP_SESSION_VARS' ) {
+ $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);
}
/**
* 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)
{
$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());
+ }
+
if ($this->store->add($url->getUrl(), $title, $body, $this->user->getId())) {
Tools::logm('add link ' . $url->getUrl());
$sequence = '';
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'));
}
}
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!'));
+ Tools::logm('error : article not found');
+ Tools::redirect();
+ }
foreach($tags as $key => $tag_value) {
$value = trim($tag_value);
$tag = $this->store->retrieveTagByValue($value);
# 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'];
+ $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;
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,
'tags' => $tags,
- );
- break;
- case 'tag':
- $entries = $this->store->retrieveEntriesByTag($id);
- $tag = $this->store->retrieveTag($id);
- $tpl_vars = array(
- 'tag' => $tag,
- 'entries' => $entries,
+ 'entry' => $entry,
);
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(),
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;
$currentConfig['theme'] = $_POST['theme'];
$_SESSION['poche_user']->setConfig($currentConfig);
+
+ $this->emptyCache();
Tools::redirect('?view=config');
}
$actualLanguage = false;
foreach ($languages as $language) {
- if ($language['name'] == $_POST['language']) {
+ if ($language['value'] == $_POST['language']) {
$actualLanguage = true;
break;
}
$currentConfig['language'] = $_POST['language'];
$_SESSION['poche_user']->setConfig($currentConfig);
+
+ $this->emptyCache();
Tools::redirect('?view=config');
}
$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 <ul> is for read links
Tools::redirect();
}
- $targetDefinition = 'IMPORT_' . strtoupper($from) . '_FILE';
- $targetFile = constant($targetDefinition);
-
- if (! defined($targetDefinition)) {
- $this->messages->add('e', _('Incomplete inc/poche/define.inc.php file, please define "' . $targetDefinition . '".'));
- Tools::redirect();
- }
+ $targetFile = CACHE . '/' . constant(strtoupper($from) . '_FILE');
if (! file_exists($targetFile)) {
$this->messages->add('e', _('Could not find required "' . $targetFile . '" import file.'));
$this->$providers[$from]($targetFile);
}
+ public function uploadFile() {
+ if(isset($_FILES['file']))
+ {
+ $dir = CACHE . '/';
+ $file = basename($_FILES['file']['name']);
+ if(move_uploaded_file($_FILES['file']['tmp_name'], $dir . $file)) {
+ $this->messages->add('s', _('File uploaded. You can now execute import.'));
+ }
+ else {
+ $this->messages->add('e', _('Error while importing file. Do you have access to upload it?'));
+ }
+ }
+
+ Tools::redirect('?view=config');
+ }
+
/**
* export poche entries in json
* @return json all poche entries
$currentConfig = $_SESSION['poche_user']->config;
$currentConfig['token'] = $token;
$_SESSION['poche_user']->setConfig($currentConfig);
+ Tools::redirect();
}
public function generateFeeds($token, $user_id, $tag_id, $type = 'home')
$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);
$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();
+ }
}
projects / github / wallabag / wallabag.git / blobdiff