'ru_RU.utf8' => 'Pусский',
'sl_SI.utf8' => 'Slovenščina',
'uk_UA.utf8' => 'Українська',
+ 'pt_BR.utf8' => 'Brasileiro',
);
public function __construct()
{
);
}
- protected function getPageContent(Url $url)
- {
- // 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;
- }
- return json_decode($json, true);
- }
-
/**
* Call action (mark as fav, archive, delete, etc.)
*/
switch ($action)
{
case 'add':
- $content = $this->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();
- $purifier = new HTMLPurifier($config);
- $title = $purifier->purify($title);
- $body = $purifier->purify($body);
+ 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) {
switch ($view)
{
case 'config':
- $dev = trim($this->getPocheVersion('dev'));
- $prod = trim($this->getPocheVersion('prod'));
+ $dev_infos = $this->getPocheVersion('dev');
+ $dev = trim($dev_infos[0]);
+ $check_time_dev = date('d-M-Y H:i', $dev_infos[1]);
+ $prod_infos = $this->getPocheVersion('prod');
+ $prod = trim($prod_infos[0]);
+ $check_time_prod = date('d-M-Y H:i', $prod_infos[1]);
$compare_dev = version_compare(POCHE, $dev);
$compare_prod = version_compare(POCHE, $prod);
$themes = $this->getInstalledThemes();
'languages' => $languages,
'dev' => $dev,
'prod' => $prod,
+ 'check_time_dev' => $check_time_dev,
+ 'check_time_prod' => $check_time_prod,
'compare_dev' => $compare_dev,
'compare_prod' => $compare_prod,
'token' => $token,
'entries' => '',
'page_links' => '',
'nb_results' => '',
+ 'listmode' => (isset($_COOKIE['listmode']) ? true : false),
);
//if id is given - we retrive entries by tag: id is tag id
$currentConfig['theme'] = $_POST['theme'];
$_SESSION['poche_user']->setConfig($currentConfig);
+
+ $this->emptyCache();
Tools::redirect('?view=config');
}
$currentConfig['language'] = $_POST['language'];
$_SESSION['poche_user']->setConfig($currentConfig);
+
+ $this->emptyCache();
Tools::redirect('?view=config');
}
# the second <ol> is for read links
$read = 1;
}
- $this->messages->add('s', _('import from instapaper completed'));
+ $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();
}
# the second <ul> is for read links
$read = 1;
}
- $this->messages->add('s', _('import from pocket completed'));
+ $this->messages->add('s', _('import from pocket completed. You have to execute the cron to fetch content.'));
Tools::logm('import from pocket completed');
Tools::redirect();
}
}
}
}
- $this->messages->add('s', _('import from Readability completed. ' . $count . ' new links.'));
+ $this->messages->add('s', _('import from Readability completed. You have to execute the cron to fetch content.'));
Tools::logm('import from Readability completed');
Tools::redirect();
}
}
}
- $this->messages->add('s', _('import from Poche completed. ' . $count . ' new links.'));
+ $this->messages->add('s', _('import from Poche completed. You have to execute the cron to fetch content.'));
Tools::logm('import from Poche completed');
Tools::redirect();
}
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
private function getPocheVersion($which = 'prod')
{
$cache_file = CACHE . '/' . $which;
+ $check_time = time();
# checks if the cached version file exists
if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
$version = file_get_contents($cache_file);
+ $check_time = filemtime($cache_file);
} else {
$version = file_get_contents('http://static.wallabag.org/versions/' . $which);
file_put_contents($cache_file, $version, LOCK_EX);
}
- return $version;
+ return array($version, $check_time);
}
public function generateToken()
$feed = new FeedWriter(RSS2);
$feed->setTitle('wallabag — ' . $type . ' feed');
$feed->setLink(Tools::getPocheUrl());
- $feed->setChannelElement('updated', date(DATE_RSS , time()));
- $feed->setChannelElement('author', 'wallabag');
+ $feed->setChannelElement('pubDate', date(DATE_RSS , time()));
+ $feed->setChannelElement('generator', 'wallabag');
+ $feed->setDescription('wallabag ' . $type . ' elements');
if ($type == 'tag') {
$entries = $this->store->retrieveEntriesByTag($tag_id, $user_id);