toddy/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge pull request #31 from annando/master

Browse source 
Improved facebook export, small changes to pages and showmore
This commit is contained in:
friendica 2012-03-28 15:09:18 -07:00
parent 64a429ed31 1fce805ee9
commit 74fdd56ced
3 changed files with 44 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
facebook/facebook.php
View file

@ -672,6 +672,7 @@ function facebook_post_hook(&$a,&$b) {
*/ */
require_once('include/group.php'); require_once('include/group.php');
require_once('include/html2plain.php');
logger('Facebook post'); logger('Facebook post');
@ -792,7 +793,7 @@ function facebook_post_hook(&$a,&$b) {
if($b['verb'] == ACTIVITY_DISLIKE) if($b['verb'] == ACTIVITY_DISLIKE)
$msg = trim(strip_tags(bbcode($msg))); $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)) { if(preg_match("/\[url=(.*?)\](.*?)\[\/url\]/is",$msg,$matches)) {
@ -821,9 +822,23 @@ function facebook_post_hook(&$a,&$b) {
if((strpos($link,z_root()) !== false) && (! $image)) if((strpos($link,z_root()) !== false) && (! $image))
$image = $a->get_baseurl() . '/images/friendica-64.jpg'; $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'); $msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
$toolong = false;
// add any attachments as text urls // add any attachments as text urls
$arr = explode(',',$b['attach']); $arr = explode(',',$b['attach']);
@ -834,12 +849,24 @@ function facebook_post_hook(&$a,&$b) {
$matches = false; $matches = false;
$cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches); $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
if($cnt) { 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 = ""; $shortlink = "";
require_once('library/slinky.php'); require_once('library/slinky.php');

7
pages/pages.php
View file

@ -82,7 +82,12 @@ function pages_page_end($a,&$b) {
$contact["Name"]."</a></li>"; $contact["Name"]."</a></li>";
} }
$pages .= "</ul></div></div>"; $pages .= "</ul></div></div>";
if (sizeof($contacts) > 0) 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']; $a->page['aside'] = $pages.$a->page['aside'];
}
} }
?> ?>

2
showmore/showmore.php
View file

@ -83,7 +83,7 @@ function showmore_prepare_body(&$a,&$b) {
if($found) { if($found) {
$rnd = random_string(8); $rnd = random_string(8);
$b['html'] = '<span id="showmore-teaser-'.$rnd.'" style="display: block;">'.$shortened." ". $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>'; '<div id="showmore-'.$rnd.'" style="display: none;">'.$b['html'].'</div>';
} }
} }