mirror of
https://github.com/moparisthebest/wallabag
synced 2024-11-14 05:15:14 -05:00
Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev
This commit is contained in:
commit
ab5bb94b12
2
inc/3rdparty/config.php
vendored
Normal file → Executable file
2
inc/3rdparty/config.php
vendored
Normal file → Executable file
@ -11,6 +11,8 @@
|
||||
// options you'd like to override in custom_config.php.
|
||||
// .....................................................
|
||||
|
||||
global $options;
|
||||
|
||||
// Create config object
|
||||
if (!isset($options)) $options = new stdClass();
|
||||
|
||||
|
1
inc/3rdparty/makefulltextfeed.php
vendored
Normal file → Executable file
1
inc/3rdparty/makefulltextfeed.php
vendored
Normal file → Executable file
@ -424,6 +424,7 @@ $http->rewriteUrls = $options->rewrite_url;
|
||||
//////////////////////////////////
|
||||
// Set up Content Extractor
|
||||
//////////////////////////////////
|
||||
global $extractor;
|
||||
$extractor = new ContentExtractor(dirname(__FILE__).'/site_config/custom', dirname(__FILE__).'/site_config/standard');
|
||||
$extractor->debug = $debug_mode;
|
||||
SiteConfig::$debug = $debug_mode;
|
||||
|
@ -345,7 +345,7 @@ class Database {
|
||||
}
|
||||
|
||||
public function retrieveAllTags($user_id) {
|
||||
$sql = "SELECT tags.* FROM tags
|
||||
$sql = "SELECT DISTINCT tags.* FROM tags
|
||||
LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
|
||||
LEFT JOIN entries ON tags_entries.entry_id=entries.id
|
||||
WHERE entries.user_id=?";
|
||||
@ -357,7 +357,7 @@ class Database {
|
||||
|
||||
public function retrieveTag($id, $user_id) {
|
||||
$tag = NULL;
|
||||
$sql = "SELECT tags.* FROM tags
|
||||
$sql = "SELECT DISTINCT tags.* FROM tags
|
||||
LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
|
||||
LEFT JOIN entries ON tags_entries.entry_id=entries.id
|
||||
WHERE tags.id=? AND entries.user_id=?";
|
||||
|
58
inc/poche/Poche.class.php
Normal file → Executable file
58
inc/poche/Poche.class.php
Normal file → Executable file
@ -348,17 +348,55 @@ class Poche
|
||||
|
||||
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" ) {
|
||||
$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);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user