aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2018-05-18 13:07:24 -0400
committerAndrew Manning <tamanning@zoho.com>2018-05-18 13:07:24 -0400
commit40d99c171678654817e392b7f59050dccce770a8 (patch)
tree4fc7352d72b0c40ef27998243d9c3b0a209db78b /include
parent179eeb10a6e1b661dc7788d74d60a7c11dfca6bf (diff)
parent5a6141faa2a87a4aeb00a566c1230f35544ff3d2 (diff)
downloadvolse-hubzilla-40d99c171678654817e392b7f59050dccce770a8.tar.gz
volse-hubzilla-40d99c171678654817e392b7f59050dccce770a8.tar.bz2
volse-hubzilla-40d99c171678654817e392b7f59050dccce770a8.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'include')
-rwxr-xr-xinclude/items.php2
-rw-r--r--include/photos.php20
2 files changed, 21 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index 55b5a73db..e75a9659d 100755
--- a/include/items.php
+++ b/include/items.php
@@ -261,6 +261,7 @@ function can_comment_on_post($observer_xchan, $item) {
return true;
break;
case 'public':
+ case 'authenticated':
// We don't really allow or support public comments yet, but anonymous
// folks won't ever reach this point (as $observer_xchan will be empty).
// This means the viewer has an xchan and we can identify them.
@@ -268,7 +269,6 @@ function can_comment_on_post($observer_xchan, $item) {
break;
case 'any connections':
case 'contacts':
- case 'authenticated':
case '':
if(array_key_exists('owner',$item) && get_abconfig($item['uid'],$item['owner']['abook_xchan'],'their_perms','post_comments')) {
return true;
diff --git a/include/photos.php b/include/photos.php
index 2d2c9cc13..9fb872700 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -1011,3 +1011,23 @@ 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