harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make sure old fetch_url calls (and those that provided their own curl wrapper) go through z_fetch_url

Browse Source
This commit is contained in:
friendica 2013-02-25 20:06:33 -08:00
parent 46a89910ae
commit c45a8e2763
3 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/Photo.php
View File

@ -672,9 +672,12 @@ function import_profile_photo($photo,$xchan) {
$filename = basename($photo);
$img_str = fetch_url($photo,true);
$type = guess_image_type($photo,true);
$result = z_fetch_url($photo,true);
if($result['success'])
$img_str = $result['body'];
$img = new Photo($img_str, $type);
if($img->is_valid()) {

32
mod/parse_url.php
View File

@ -55,34 +55,18 @@ function completeurl($url, $scheme) {
function parseurl_getsiteinfo($url) {
$siteinfo = array();
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_HEADER, 1);
curl_setopt($ch, CURLOPT_NOBODY, 0);
curl_setopt($ch, CURLOPT_TIMEOUT, 3);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch,CURLOPT_USERAGENT,'Opera/9.64(Windows NT 5.1; U; de) Presto/2.1.1');
$header = curl_exec($ch);
curl_close($ch);
$result = z_fetch_url($url);
if(! $result['success'])
return $siteinfo;
// Fetch the first mentioned charset. Can be in body or header
if (preg_match('/charset=(.*?)['."'".'"\s\n]/', $header, $matches))
$charset = trim(array_pop($matches));
else
$charset = "utf-8";
$header = $result['header'];
$body = $result['body'];
$pos = strpos($header, "\r\n\r\n");
$body = mb_convert_encoding($body, "UTF-8", $charset);
$body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
if ($pos)
$body = trim(substr($header, $pos));
else
$body = $header;
$body = mb_convert_encoding($body, "UTF-8", $charset);
$body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
$doc = new DOMDocument();
$doc = new DOMDocument();
@$doc->loadHTML($body);
deletenode($doc, 'style');

4
mod/setup.php
View File

@ -467,8 +467,8 @@ function check_htaccess(&$checks) {
$status = true;
$help = "";
if (function_exists('curl_init')){
$test = fetch_url($a->get_baseurl()."/setup/testrewrite");
if ($test!="ok") {
$test = z_fetch_url($a->get_baseurl()."/setup/testrewrite");
if ((! $test['success']) || ($test['body'] != "ok")) {
$status = false;
$help = t('Url rewrite in .htaccess is not working. Check your server configuration.');
}