aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-04-22 18:12:16 -0700
committerzotlabs <mike@macgirvin.com>2018-04-22 18:12:16 -0700
commit55dc6fbc1cae70e4f2b207c517c8c9155fda9662 (patch)
tree9ddc0e8c082e01695d6156f9a98407cc6824b254 /Zotlabs/Module
parent95059f2bfd2c7dbffe4dba2df277f7356fb124a1 (diff)
downloadvolse-hubzilla-55dc6fbc1cae70e4f2b207c517c8c9155fda9662.tar.gz
volse-hubzilla-55dc6fbc1cae70e4f2b207c517c8c9155fda9662.tar.bz2
volse-hubzilla-55dc6fbc1cae70e4f2b207c517c8c9155fda9662.zip
imagemagick preserves exif when scaling. GD does not. We do not want to preserve exif on thumbnails which we have rotated, as a browser reading the exif information could rotate them yet again. This checkin adds an abstract function to the generic photo driver which makes the behaviour consistent by stripping EXIF from imagick processed images. However, we will attempt to preserve any ICC colour profiles. See http://php.net/manual/en/imagick.stripimage.php
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Webfinger.php28
1 files changed, 5 insertions, 23 deletions
diff --git a/Zotlabs/Module/Webfinger.php b/Zotlabs/Module/Webfinger.php
index c50680de7..0dafae23c 100644
--- a/Zotlabs/Module/Webfinger.php
+++ b/Zotlabs/Module/Webfinger.php
@@ -17,33 +17,15 @@ class Webfinger extends \Zotlabs\Web\Controller {
$o .= '<br /><br />';
- $old = false;
if(x($_GET,'addr')) {
$addr = trim($_GET['addr']);
- // if(strpos($addr,'@') !== false) {
- $res = webfinger_rfc7033($addr,true);
- if(! $res) {
- $res = old_webfinger($addr);
- $old = true;
- }
- // }
- // else {
- // if(function_exists('lrdd'))
- // $res = lrdd($addr);
- // }
-
- if($res && $old) {
- foreach($res as $r) {
- if($r['@attributes']['rel'] === 'http://microformats.org/profile/hcard') {
- $hcard = unamp($r['@attributes']['href']);
- require_once('library/HTML5/Parser.php');
- $res['vcard'] = scrape_vcard($hcard);
- break;
- }
- }
+
+ $res = webfinger_rfc7033($addr,true);
+ if(! $res) {
+ $res = old_webfinger($addr);
}
-
+
$o .= '<pre>';
$o .= str_replace("\n",'<br />',print_r($res,true));
$o .= '</pre>';