Merge commit 'upstream/master'

diff --git a/facebook/facebook.php b/facebook/facebook.php
index 24632240652e3decca5ba0b856ae844d2c00bae7..20690eddc404ba6a25fc5a3d0d199913c9d75cf0 100755 (executable)
--- a/facebook/facebook.php
+++ b/facebook/facebook.php
@@ -672,6 +672,7 @@ function facebook_post_hook(&$a,&$b) {
         */
 
        require_once('include/group.php');
+       require_once('include/html2plain.php');
 
        logger('Facebook post');
 
@@ -792,7 +793,7 @@ function facebook_post_hook(&$a,&$b) {
                                if($b['verb'] == ACTIVITY_DISLIKE)
                                        $msg = trim(strip_tags(bbcode($msg)));
 
-                               $search_str = $a->get_baseurl() . '/search';
+                               /*$search_str = $a->get_baseurl() . '/search';
 
                                if(preg_match("/\[url=(.*?)\](.*?)\[\/url\]/is",$msg,$matches)) {
 
@@ -821,25 +822,51 @@ function facebook_post_hook(&$a,&$b) {
                                if((strpos($link,z_root()) !== false) && (! $image))
                                        $image = $a->get_baseurl() . '/images/friendica-64.jpg';
 
-                               $msg = trim(strip_tags(bbcode($msg)));
+                               $msg = trim(strip_tags(bbcode($msg)));*/
+
+                               // Test
+
+                               // Looking for images
+                               if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$b['body'],$matches))
+                                       $image = $matches[3];
+
+                               if(preg_match("/\[img\](.*?)\[\/img\]/is",$b['body'],$matches))
+                                       $image = $matches[1];
+
+                               $html = bbcode($b['body']);
+                               $msg = trim($b['title']." \n".html2plain($html, 0, true));
                                $msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
 
+                               $toolong = false;
+
                                // add any attachments as text urls
 
-                           $arr = explode(',',$b['attach']);
+                               $arr = explode(',',$b['attach']);
 
-                           if(count($arr)) {
+                               if(count($arr)) {
                                        $msg .= "\n";
-                               foreach($arr as $r) {
-                               $matches = false;
+                                       foreach($arr as $r) {
+                                               $matches = false;
                                                $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
                                                if($cnt) {
-                                                       $msg .= $matches[1];
+                                                       $msg .= "\n".$matches[1];
                                                }
                                        }
                                }
 
-                               if (strlen($msg) > FACEBOOK_MAXPOSTLEN) {
+                               // To-Do: look for bookmark-bbcode and handle it with priority
+
+                               $links = collecturls($html);
+                               if (sizeof($links) > 0) {
+                                       reset($links);
+                                       $link = current($links);
+                                       /*if (strlen($msg."\n".$link) <= FACEBOOK_MAXPOSTLEN)
+                                               $msg .= "\n".$link;
+                                       else
+                                               $toolong = true;*/
+                               }
+
+                               if ((strlen($msg) > FACEBOOK_MAXPOSTLEN) or $toolong) {
                                        $shortlink = "";
                                        require_once('library/slinky.php');
 
@@ -1586,4 +1613,4 @@ function facebook_delete_url($url,$headers = null, &$redirects = 0, $timeout = 0
 
        curl_close($ch);
        return($body);
-}}
\ No newline at end of file
+}}

diff --git a/pages/pages.php b/pages/pages.php
index bc56d2e4e9cafc0642cb1182218652116eee6df1..d0cdc589c71487eeda976e767e71c18f1ad62e5c 100755 (executable)
--- a/pages/pages.php
+++ b/pages/pages.php
@@ -82,7 +82,12 @@ function pages_page_end($a,&$b) {
                                $contact["Name"]."</a></li>";
        }
        $pages .= "</ul></div></div>";
-       if (sizeof($contacts) > 0)
-               $a->page['aside'] = $pages.$a->page['aside'];
+       if (sizeof($contacts) > 0) {
+               $pos = strpos($a->page['aside'], '<div id="saved-search-list"');
+               if ($pos > 0) {
+                       $a->page['aside'] = substr($a->page['aside'], 0, $pos).$pages.substr($a->page['aside'], $pos);
+               } else
+                       $a->page['aside'] = $pages.$a->page['aside'];
+       }
 }
 ?>

diff --git a/showmore/showmore.php b/showmore/showmore.php
index 7842a58e624c8473b4970838f3d9dd800ae2c62e..6aeb6ff3ba770ae45d503708c116707ead597cad 100755 (executable)
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -83,7 +83,7 @@ function showmore_prepare_body(&$a,&$b) {
        if($found) {
                $rnd = random_string(8);
                $b['html'] = '<span id="showmore-teaser-'.$rnd.'" style="display: block;">'.$shortened." ".
-                               '<span id="showmore-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'showmore-'.$rnd.'\'); openClose(\'showmore-teaser-'.$rnd.'\');" >'.sprintf(t('Show More')).'</span></span>'.
+                               '<span id="showmore-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'showmore-'.$rnd.'\'); openClose(\'showmore-teaser-'.$rnd.'\');" >'.sprintf(t('show more')).'</span></span>'.
                                '<div id="showmore-'.$rnd.'" style="display: none;">'.$b['html'].'</div>';
        }
 }