Merge remote-tracking branch 'remotes/upstream/master'

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 4fea52c9c7a556a1733f4071b6dc4fcbcd726309..4a9142bb202285c6553a2a2dd2e2317ea9c914fd 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -22,10 +22,10 @@ function item_extract_images($body) {
                if(! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
                        // This is an embedded image
 
-                       $saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - $img_start);
-                       $cnt++;
-
+                       $saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - ($img_start + $img_st_close));
                        $new_body = $new_body . substr($orig_body, 0, $img_start) . '[!#saved_image' . $cnt . '#!]';
+
+                       $cnt++;
                }
                else
                        $new_body = $new_body . substr($orig_body, 0, $img_end + strlen('[/img]'));
@@ -48,25 +48,31 @@ function item_extract_images($body) {
 if(! function_exists('item_redir_and_replace_images')) {
 function item_redir_and_replace_images($body, $images, $cid) {
 
-       $newbody = $body;
+       $origbody = $body;
+       $newbody = '';
 
        for($i = 0; $i < count($images); $i++) {
                $search = '/\[url\=(.*?)\]\[!#saved_image' . $i . '#!\]\[\/url\]' . '/is';
                $replace = '[url=' . z_path() . '/redir/' . $cid 
                           . '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/url]' ;
 
-               $newbody = preg_replace($search, $replace, $newbody);
+               $img_end = strpos($origbody, '[!#saved_image' . $i . '#!][/url]') + strlen('[!#saved_image' . $i . '#!][/url]');
+               $process_part = substr($origbody, 0, $img_end);
+               $origbody = substr($origbody, $img_end);
+
+               $process_part = preg_replace($search, $replace, $process_part);
+               $newbody = $newbody . $process_part;
        }
+       $newbody = $newbody . $origbody;
 
        $cnt = 0;
        foreach($images as $image) {
                // We're depending on the property of 'foreach' (specified on the PHP website) that
                // it loops over the array starting from the first element and going sequentially
                // to the last element
-               $newbody = str_replace('[$#saved_image' . $cnt . '#$]', '[img]' . $image . '[/img]', $newbody);
+               $newbody = str_replace('[!#saved_image' . $cnt . '#!]', '[img]' . $image . '[/img]', $newbody);
                $cnt++;
        }
-
        return $newbody;
 }}
 
@@ -156,6 +162,49 @@ function localize_item(&$item){
                $item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
 
        }
+       if (stristr($item['verb'],ACTIVITY_POKE)) {
+               $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
+               if(! $verb)
+                       return;
+               if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return;
+
+               $Aname = $item['author-name'];
+               $Alink = $item['author-link'];
+               
+               $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
+               
+               $obj = parse_xml_string($xmlhead.$item['object']);
+               $links = parse_xml_string($xmlhead."<links>".unxmlify($obj->link)."</links>");
+               
+               $Bname = $obj->title;
+               $Blink = ""; $Bphoto = "";
+               foreach ($links->link as $l){
+                       $atts = $l->attributes();
+                       switch($atts['rel']){
+                               case "alternate": $Blink = $atts['href'];
+                               case "photo": $Bphoto = $atts['href'];
+                       }
+                       
+               }
+               
+               $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
+               $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+               if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
+
+               // we can't have a translation string with three positions but no distinguishable text
+               // So here is the translate string.
+
+               $txt = t('%1$s poked %2$s');
+
+               // now translate the verb
+
+               $txt = str_replace( t('poked'), t($verb), $txt);
+
+               // then do the sprintf on the translation string
+
+               $item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto;
+
+       }
     if ($item['verb']===ACTIVITY_TAG){
                $r = q("SELECT * from `item`,`contact` WHERE 
                `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
@@ -228,6 +277,7 @@ function localize_item(&$item){
                                $item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
                }
        }
+
        // add zrl's to public images
        if(preg_match_all('/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
                foreach($matches as $mtch) {
@@ -235,6 +285,17 @@ function localize_item(&$item){
                }
        }
 
+       // add sparkle links to appropriate permalinks
+
+       $x = stristr($item['plink'],'/display/');
+       if($x) {
+               $sparkle = false;
+               $y = best_link_url($item,$sparkle,true);
+               if(strstr($y,'/redir/'))
+                       $item['plink'] = $y . '?f=&url=' . $item['plink'];
+       } 
+
+
 
 }
 
@@ -754,7 +815,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                        'text' => strip_tags(template_escape($body)),
                                        'id' => $item['item_id'],
                                        'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
-                                       'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
+                                       'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner-name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
                                        'to' => t('to'),
                                        'wall' => t('Wall-to-Wall'),
                                        'vwall' => t('via Wall-To-Wall:'),
@@ -849,6 +910,7 @@ function item_photo_menu($item){
                 if(! count($a->contacts))
                        load_contact_links(local_user());
        }
+       $poke_link="";
        $contact_url="";
        $pm_url="";
        $status_link="";
@@ -878,6 +940,7 @@ function item_photo_menu($item){
                }
        }
        if(($cid) && (! $item['self'])) {
+               $poke_link = $a->get_baseurl($ssl_state) . '/poke/?f=&c=' . $cid;
                $contact_url = $a->get_baseurl($ssl_state) . '/contacts/' . $cid;
                $posts_link = $a->get_baseurl($ssl_state) . '/network/?cid=' . $cid;
 
@@ -900,6 +963,7 @@ function item_photo_menu($item){
                t("Network Posts") => $posts_link, 
                t("Edit Contact") => $contact_url,
                t("Send PM") => $pm_url,
+               t("Poke") => $poke_link
        );
        
        
@@ -911,7 +975,7 @@ function item_photo_menu($item){
 
        $o = "";
        foreach($menu as $k=>$v){
-               if ($v!="") $o .= "<li><a href='$v'>$k</a></li>\n";
+               if ($v!="") $o .= "<li><a href=\"$v\">$k</a></li>\n";
        }
        return $o;
 }}