pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'dev' of https://github.com/wallabag/wallabag into dev

Browse Source
This commit is contained in:
tcit
2014-04-23 10:34:22 +02:00
parent 4d99bae893 2a6440c134
commit c97d23c533
17 changed files with 190 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
inc/3rdparty/libraries/feedwriter/FeedWriter.php vendored
View File

@ -89,18 +89,11 @@ define('JSONP', 3, true);
*/
public function genarateFeed()
{
if ($this->version == RSS2) {
// header('Content-type: text/xml; charset=UTF-8');
// this line prevents Chrome 20 from prompting download
// used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss
// header('X-content-type-options: nosniff');
} elseif ($this->version == JSON) {
// header('Content-type: application/json; charset=UTF-8');
$this->json = new stdClass();
} elseif ($this->version == JSONP) {
// header('Content-type: application/javascript; charset=UTF-8');
$this->json = new stdClass();
}
header('Content-type: text/xml; charset=UTF-8');
// this line prevents Chrome 20 from prompting download
// used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss
header('X-content-type-options: nosniff');
$this->printHead();
$this->printChannels();
$this->printItems();

6
inc/3rdparty/site_config/custom/mobile.lemondeinformatique.fr.txt vendored Normal file
View File

@ -0,0 +1,6 @@
title: //h2
body: div[@id='illustration'] | //p
prune: no
tidy: no
test_url: http://mobile.lemondeinformatique.fr/actualites/lire-les-datacenters-d-apple-google-et-facebook-eco-responsables-selon-greenpeace-le-monde-informatique-57122.html

25
inc/poche/Poche.class.php
View File

@ -101,7 +101,7 @@ class Poche
public function configFileIsAvailable() {
if (! self::$configFileAvailable) {
$this->notInstalledMessage[] = 'You have to rename inc/poche/config.inc.php.new to inc/poche/config.inc.php.';
$this->notInstalledMessage[] = 'You have to copy (don\'t just rename!) inc/poche/config.inc.default.php to inc/poche/config.inc.php.';
return false;
}
@ -486,12 +486,24 @@ class Poche
case 'toggle_fav' :
$this->store->favoriteById($id, $this->user->getId());
Tools::logm('mark as favorite link #' . $id);
Tools::redirect();
if ( Tools::isAjaxRequest() ) {
echo 1;
exit;
}
else {
Tools::redirect();
}
break;
case 'toggle_archive' :
$this->store->archiveById($id, $this->user->getId());
Tools::logm('archive link #' . $id);
Tools::redirect();
if ( Tools::isAjaxRequest() ) {
echo 1;
exit;
}
else {
Tools::redirect();
}
break;
case 'archive_all' :
$this->store->archiveAll($this->user->getId());
@ -876,13 +888,6 @@ class Poche
*/
public function import() {
if (!defined('IMPORT_LIMIT')) {
define('IMPORT_LIMIT', 5);
}
if (!defined('IMPORT_DELAY')) {
define('IMPORT_DELAY', 5);
}
if ( isset($_FILES['file']) ) {
Tools::logm('Import stated: parsing file');

4
inc/poche/config.inc.php.new → inc/poche/config.inc.default.php
View File

@ -42,6 +42,10 @@ define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url=');
define ('NOT_FLATTRABLE', '0');
define ('FLATTRABLE', '1');
define ('FLATTRED', '2');
// display or not print link in article view
define ('SHOW_PRINTLINK', '1');
// display or not percent of read in article view. Affects only default theme.
define ('SHOW_READPERCENT', '1');
define ('ABS_PATH', 'assets/');
define ('DEFAULT_THEME', 'baggy');

1
inc/poche/global.inc.php Normal file → Executable file
View File

@ -43,6 +43,7 @@ if (! file_exists(INCLUDES . '/poche/config.inc.php')) {
Poche::$configFileAvailable = false;
} else {
require_once INCLUDES . '/poche/config.inc.php';
require_once INCLUDES . '/poche/config.inc.default.php';
}
if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) {