moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-12-02 13:52:18 -05:00
Code Issues Releases Wiki Activity

Fixed #73 - Can't Poch url with special caracter

Browse Source
This commit is contained in:
nicosomb 2013-04-23 15:25:12 +02:00
parent 3e7188185d
commit 2987031bc3
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/config.php
View File

@ -16,6 +16,7 @@ if (!is_dir('db/')) {
define ('ABS_PATH', 'assets/'); define ('ABS_PATH', 'assets/');
define ('CONVERT_LINKS_FOOTNOTES', TRUE); define ('CONVERT_LINKS_FOOTNOTES', TRUE);
define ('REVERT_FORCED_PARAGRAPH_ELEMENTS',FALSE);
define ('DOWNLOAD_PICTURES', TRUE); define ('DOWNLOAD_PICTURES', TRUE);
$storage_type = 'sqlite'; # sqlite or file $storage_type = 'sqlite'; # sqlite or file

34
inc/functions.php
View File

@ -39,9 +39,9 @@ function get_external_file($url)
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl, CURLOPT_HEADER, false); curl_setopt($curl, CURLOPT_HEADER, false);
// FOR SSL do not verified certificate // FOR SSL do not verified certificate
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE); curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
curl_setopt($curl, CURLOPT_AUTOREFERER, TRUE ); curl_setopt($curl, CURLOPT_AUTOREFERER, TRUE );
// FeedBurner requires a proper USER-AGENT... // FeedBurner requires a proper USER-AGENT...
curl_setopt($curl, CURL_HTTP_VERSION_1_1, true); curl_setopt($curl, CURL_HTTP_VERSION_1_1, true);
@ -59,14 +59,14 @@ function get_external_file($url)
// create http context and add timeout and user-agent // create http context and add timeout and user-agent
$context = stream_context_create(array( $context = stream_context_create(array(
'http'=>array('timeout' => $timeout, 'http'=>array('timeout' => $timeout,
'header'=> "User-Agent: ".$useragent, /*spoot Mozilla Firefox*/ 'header'=> "User-Agent: ".$useragent, /*spoot Mozilla Firefox*/
'follow_location' => true), 'follow_location' => true),
// FOR SSL do not verified certificate // FOR SSL do not verified certificate
'ssl' => array('verify_peer' => false, 'ssl' => array('verify_peer' => false,
'allow_self_signed' => true) 'allow_self_signed' => true)
) )
); );
// only download page lesser than 4MB // only download page lesser than 4MB
$data = @file_get_contents($url, false, $context, -1, 4000000); // We download at most 4 MB from source. $data = @file_get_contents($url, false, $context, -1, 4000000); // We download at most 4 MB from source.
@ -122,19 +122,19 @@ function prepare_url($url)
$i=strpos($url,'#xtor=RSS-'); if ($i!==false) $url=substr($url,0,$i); $i=strpos($url,'#xtor=RSS-'); if ($i!==false) $url=substr($url,0,$i);
$title = $url; $title = $url;
$html = Encoding::toUTF8(get_external_file($url,15)); $html = Encoding::toUTF8(get_external_file($url,15));
// If get_external_file if not able to retrieve HTTPS content try the same URL with HTTP protocol // If get_external_file if not able to retrieve HTTPS content try the same URL with HTTP protocol
if (!preg_match('!^https?://!i', $url) && (!isset($html) || strlen($html) <= 0)) { if (!preg_match('!^https?://!i', $url) && (!isset($html) || strlen($html) <= 0)) {
$url = 'http://' . $url; $url = 'http://' . $url;
$html = Encoding::toUTF8(get_external_file($url,15)); $html = Encoding::toUTF8(get_external_file($url,15));
} }
if (isset($html) and strlen($html) > 0) if (isset($html) and strlen($html) > 0)
{ {
$r = new Readability($html, $url); $r = new Readability($html, $url);
$r->convertLinksToFootnotes = CONVERT_LINKS_FOOTNOTES; $r->convertLinksToFootnotes = CONVERT_LINKS_FOOTNOTES;
$r->revertForcedParagraphElements = REVERT_FORCED_PARAGRAPH_ELEMENTS; $r->revertForcedParagraphElements = REVERT_FORCED_PARAGRAPH_ELEMENTS;
if($r->init()) if($r->init())
{ {