From 6541247bd33838557d931b82c92cf4e554808aa3 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 15 Jul 2014 08:47:36 +0200 Subject: [PATCH 1/4] Use the GUID to refer to items (preparation for future changes) --- include/text.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index 4d6aa8697a..3c08fe3785 100644 --- a/include/text.php +++ b/include/text.php @@ -1629,10 +1629,11 @@ function get_plink($item) { if ($a->user['nickname'] != "") { $ret = array( - 'href' => $a->get_baseurl()."/display/".$a->user['nickname']."/".$item['id'], + //'href' => $a->get_baseurl()."/display/".$a->user['nickname']."/".$item['id'], + 'href' => $a->get_baseurl()."/display/".$item['guid'], + 'orig' => $a->get_baseurl()."/display/".$item['guid'], 'title' => t('link to source'), ); - $ret["orig"] = $ret["href"]; if (x($item,'plink')) $ret["href"] = $item['plink']; From 4e6e09a44f59bc9b11b4de47dd5bea2601ab0355 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 15 Jul 2014 08:48:40 +0200 Subject: [PATCH 2/4] The function "get_attached_data" hasn't always detected photos --- include/plaintext.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/plaintext.php b/include/plaintext.php index 4bbca636ce..eb33d16e96 100644 --- a/include/plaintext.php +++ b/include/plaintext.php @@ -53,7 +53,6 @@ function get_attached_data($body) { if (count($pictures) == 1) { // Checking, if the link goes to a picture $data = parseurl_getsiteinfo($pictures[0][1], true); - if ($data["type"] == "photo") { $post["type"] = "photo"; if (isset($data["images"][0])) @@ -64,8 +63,7 @@ function get_attached_data($body) { $post["preview"] = $pictures[0][2]; $post["text"] = str_replace($pictures[0][0], "", $body); } else { - $img_str = fetch_url($pictures[0][1]); - $imgdata = get_photo_info($img_str); + $imgdata = get_photo_info($pictures[0][1]); if (substr($imgdata["mime"], 0, 6) == "image/") { $post["type"] = "photo"; $post["image"] = $pictures[0][1]; From a553dda2efe5ffe262b79e7600ca8fc73ebadcd2 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 15 Jul 2014 08:49:41 +0200 Subject: [PATCH 3/4] New function to upload photos to the wall. (Will be used in connectors) --- include/Photo.php | 144 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/include/Photo.php b/include/Photo.php index d20dd2ca08..fc2ce149c4 100644 --- a/include/Photo.php +++ b/include/Photo.php @@ -824,3 +824,147 @@ function scale_image($width, $height, $max) { } return array("width" => $dest_width, "height" => $dest_height); } + +function store_photo($a, $uid, $imagedata = "", $url = "") { + $r = q("SELECT `user`.`nickname`, `user`.`page-flags`, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid` + WHERE `user`.`uid` = %d AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1", + intval($uid)); + + if(!count($r)) { + logger("Can't detect user data for uid ".$uid, LOGGER_DEBUG); + return(array()); + } + + $page_owner_nick = $r[0]['nickname']; + +// To-Do: +// $default_cid = $r[0]['id']; +// $community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); + + if ((strlen($imagedata) == 0) AND ($url == "")) { + logger("No image data and no url provided", LOGGER_DEBUG); + return(array()); + } elseif (strlen($imagedata) == 0) { + logger("Uploading picture from ".$url, LOGGER_DEBUG); + $imagedata = @file_get_contents($url); + } + + $maximagesize = get_config('system','maximagesize'); + + if(($maximagesize) && (strlen($imagedata) > $maximagesize)) { + logger("Image exceeds size limit of ".$maximagesize, LOGGER_DEBUG); + return(array()); + } + +/* + $r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ", + intval($uid) + ); + + $limit = service_class_fetch($uid,'photo_upload_limit'); + + if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) { + logger("Image exceeds personal limit of uid ".$uid, LOGGER_DEBUG); + return(array()); + } +*/ + + $tempfile = tempnam(get_temppath(), "cache"); + file_put_contents($tempfile, $imagedata); + $data = getimagesize($tempfile); + + if (!isset($data["mime"])) { + unlink($tempfile); + logger("File is no picture", LOGGER_DEBUG); + return(array()); + } + + $ph = new Photo($imagedata, $data["mime"]); + + if(!$ph->is_valid()) { + unlink($tempfile); + logger("Picture is no valid picture", LOGGER_DEBUG); + return(array()); + } + + $ph->orient($tempfile); + unlink($tempfile); + + $max_length = get_config('system','max_image_length'); + if(! $max_length) + $max_length = MAX_IMAGE_LENGTH; + if($max_length > 0) + $ph->scaleImage($max_length); + + $width = $ph->getWidth(); + $height = $ph->getHeight(); + + $hash = photo_new_resource(); + + $smallest = 0; + + // Pictures are always public by now + //$defperm = '<'.$default_cid.'>'; + $defperm = ""; + $visitor = 0; + + $r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 0, 0, $defperm); + + if(!$r) { + logger("Picture couldn't be stored", LOGGER_DEBUG); + return(array()); + } + + $image = array("page" => $a->get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash, + "full" => $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt()); + + if($width > 800 || $height > 800) + $image["large"] = $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt(); + + if($width > 640 || $height > 640) { + $ph->scaleImage(640); + $r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 1, 0, $defperm); + if($r) + $image["medium"] = $a->get_baseurl()."/photo/{$hash}-1.".$ph->getExt(); + } + + if($width > 320 || $height > 320) { + $ph->scaleImage(320); + $r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 2, 0, $defperm); + if($r) + $image["small"] = $a->get_baseurl()."/photo/{$hash}-2.".$ph->getExt(); + } + + if($width > 160 AND $height > 160) { + $x = 0; + $y = 0; + + $min = $ph->getWidth(); + if ($min > 160) + $x = ($min - 160) / 2; + + if ($ph->getHeight() < $min) { + $min = $ph->getHeight(); + if ($min > 160) + $y = ($min - 160) / 2; + } + + $min = 160; + $ph->cropImage(160, $x, $y, $min, $min); + + $r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 3, 0, $defperm); + if($r) + $image["thumb"] = $a->get_baseurl()."/photo/{$hash}-3.".$ph->getExt(); + } + + if (isset($image["thumb"])) + $image["preview"] = $image["thumb"]; + + if (isset($image["small"])) + $image["preview"] = $image["small"]; + + if (isset($image["medium"])) + $image["preview"] = $image["medium"]; + + return($image); +} From 5114e018d0a519576d011a21a09707d8de796627 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 15 Jul 2014 08:50:49 +0200 Subject: [PATCH 4/4] Setting "verb" for postings from Diaspora, Feeds and Mails --- include/diaspora.php | 4 +++- include/items.php | 2 ++ include/onepoll.php | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/diaspora.php b/include/diaspora.php index 6df7f4baf8..72f91ee56e 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -872,7 +872,8 @@ function diaspora_post($importer,$xml,$msg) { $datarray['uid'] = $importer['uid']; $datarray['contact-id'] = $contact['id']; $datarray['wall'] = 0; - $datarray['network'] = NETWORK_DIASPORA; + $datarray['network'] = NETWORK_DIASPORA; + $datarray['verb'] = ACTIVITY_POST; $datarray['guid'] = $guid; $datarray['uri'] = $datarray['parent-uri'] = $message_id; $datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert('UTC','UTC',$created); @@ -1346,6 +1347,7 @@ function diaspora_comment($importer,$xml,$msg) { $datarray['type'] = 'remote-comment'; $datarray['wall'] = $parent_item['wall']; $datarray['network'] = NETWORK_DIASPORA; + $datarray['verb'] = ACTIVITY_POST; $datarray['gravity'] = GRAVITY_COMMENT; $datarray['guid'] = $guid; $datarray['uri'] = $message_id; diff --git a/include/items.php b/include/items.php index d71c0e2031..8e99d82df1 100644 --- a/include/items.php +++ b/include/items.php @@ -678,6 +678,8 @@ function get_atom_elements($feed, $item, $contact = array()) { if($rawgeo) $res['coord'] = unxmlify($rawgeo[0]['data']); + if ($contact["network"] == NETWORK_FEED) + $res['verb'] = ACTIVITY_POST; $rawverb = $item->get_item_tags(NAMESPACE_ACTIVITY, 'verb'); diff --git a/include/onepoll.php b/include/onepoll.php index 309764c74f..f5c253803b 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -330,6 +330,7 @@ function onepoll_run(&$argv, &$argc){ logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA); $datarray = array(); + $datarray['verb'] = ACTIVITY_POST; // $meta = email_msg_meta($mbox,$msg_uid); // $headers = email_msg_headers($mbox,$msg_uid);