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

Merge branch 'dev' into 'dev'

Browse Source 
Remove unneccessary fetch_image_from_url() function

See merge request hubzilla/core!1393
This commit is contained in:
Mario 2018-11-14 09:30:28 +01:00
commit 08e0f172de
2 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Zotlabs/Module/Photo.php
View File

@ -4,7 +4,6 @@ namespace Zotlabs\Module;
require_once('include/security.php'); require_once('include/security.php');
require_once('include/attach.php'); require_once('include/attach.php');
require_once('include/photo/photo_driver.php'); require_once('include/photo/photo_driver.php');
require_once('include/photos.php');
class Photo extends \Zotlabs\Web\Controller { class Photo extends \Zotlabs\Web\Controller {
@ -89,10 +88,9 @@ class Photo extends \Zotlabs\Web\Controller {
} }
if(! $data) { if(! $data) {
$data = fetch_image_from_url($default,$mimetype); $x = z_fetch_url($default,true,0,[ 'novalidate' => true ]);
} $data = ($x['success'] ? $x['body'] : EMPTY_STR);
if(! $mimetype) { $mimetype = 'image/png';
$mimetype = 'image/png';
} }
} }
else { else {
@ -200,19 +198,22 @@ class Photo extends \Zotlabs\Web\Controller {
if(isset($resolution)) { if(isset($resolution)) {
switch($resolution) { switch($resolution) {
case 4: case 4:
$data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(),$mimetype); $default = get_default_profile_photo();
break; break;
case 5: case 5:
$data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(80),$mimetype); $default = get_default_profile_photo(80);
break; break;
case 6: case 6:
$data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(48),$mimetype); $default = get_default_profile_photo(48);
break; break;
default: default:
killme(); killme();
// NOTREACHED // NOTREACHED
break; break;
} }
$x = z_fetch_url(z_root() . '/' . $default,true,0,[ 'novalidate' => true ]);
$data = ($x['success'] ? $x['body'] : EMPTY_STR);
$mimetype = 'image/png';
} }
} }

20
include/photos.php
View File

@ -1011,23 +1011,3 @@ function profile_photo_set_profile_perms($uid, $profileid = 0) {
} }
} }
} }
function fetch_image_from_url($url,&$mimetype) {
$redirects = 0;
$x = z_fetch_url($url,true,$redirects,[ 'novalidate' => true ]);
if($x['success']) {
$hdrs = [];
$h = explode("\n",$x['header']);
foreach ($h as $l) {
list($k,$v) = array_map("trim", explode(":", trim($l), 2));
$hdrs[strtolower($k)] = $v;
}
if (array_key_exists('content-type', $hdrs))
$mimetype = $hdrs['content-type'];
return $x['body'];
}
return EMPTY_STR;
}