diff options
| author | Mario <mario@mariovavti.com> | 2018-11-14 09:30:28 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-11-14 09:30:28 +0100 |
| commit | 08e0f172ded6abcf8175d9f133d4aa2cf2ec2b4e (patch) | |
| tree | 28fc933b09c19a30327c258e7dc53d4153651e28 | |
| parent | 1260887fa743a4e5522dea366f0a584430b0a9a0 (diff) | |
| parent | cf2f7f2132e11dc37d1d62576a5ea7ed8ee9839d (diff) | |
| download | volse-hubzilla-08e0f172ded6abcf8175d9f133d4aa2cf2ec2b4e.tar.gz volse-hubzilla-08e0f172ded6abcf8175d9f133d4aa2cf2ec2b4e.tar.bz2 volse-hubzilla-08e0f172ded6abcf8175d9f133d4aa2cf2ec2b4e.zip | |
Merge branch 'dev' into 'dev'
Remove unneccessary fetch_image_from_url() function
See merge request hubzilla/core!1393
| -rw-r--r-- | Zotlabs/Module/Photo.php | 17 | ||||
| -rw-r--r-- | include/photos.php | 20 |
2 files changed, 9 insertions, 28 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 95e3404fb..30e8340e2 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -4,7 +4,6 @@ namespace Zotlabs\Module; require_once('include/security.php'); require_once('include/attach.php'); require_once('include/photo/photo_driver.php'); -require_once('include/photos.php'); class Photo extends \Zotlabs\Web\Controller { @@ -89,10 +88,9 @@ class Photo extends \Zotlabs\Web\Controller { } if(! $data) { - $data = fetch_image_from_url($default,$mimetype); - } - if(! $mimetype) { - $mimetype = 'image/png'; + $x = z_fetch_url($default,true,0,[ 'novalidate' => true ]); + $data = ($x['success'] ? $x['body'] : EMPTY_STR); + $mimetype = 'image/png'; } } else { @@ -200,19 +198,22 @@ class Photo extends \Zotlabs\Web\Controller { if(isset($resolution)) { switch($resolution) { case 4: - $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(),$mimetype); + $default = get_default_profile_photo(); break; case 5: - $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(80),$mimetype); + $default = get_default_profile_photo(80); break; case 6: - $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(48),$mimetype); + $default = get_default_profile_photo(48); break; default: killme(); // NOTREACHED break; } + $x = z_fetch_url(z_root() . '/' . $default,true,0,[ 'novalidate' => true ]); + $data = ($x['success'] ? $x['body'] : EMPTY_STR); + $mimetype = 'image/png'; } } diff --git a/include/photos.php b/include/photos.php index d0c5f77fc..d5553b495 100644 --- a/include/photos.php +++ b/include/photos.php @@ -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; -}
\ No newline at end of file |