Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved facebook export, small changes to pages and showmore #31

Merged
merged 4 commits into from
Mar 28, 2012
Merged

Improved facebook export, small changes to pages and showmore #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
619c758
Show more: Changed "Show More" to "show more"
annando Mar 17, 2012
60db7fb
Pages: Moved under Networks
annando Mar 17, 2012
40d779a
Facebook: detecting of images when exporting
annando Mar 21, 2012
1fce805
Merge commit 'upstream/master'
annando Mar 28, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 36 additions & 9 deletions facebook/facebook.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,7 @@ function facebook_post_hook(&$a,&$b) {
*/

require_once('include/group.php');
require_once('include/html2plain.php');

logger('Facebook post');

Expand Down Expand Up @@ -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)) {

Expand Down Expand Up @@ -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');

Expand Down Expand Up @@ -1586,4 +1613,4 @@ function facebook_delete_url($url,$headers = null, &$redirects = 0, $timeout = 0

curl_close($ch);
return($body);
}}
}}
9 changes: 7 additions & 2 deletions pages/pages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'];
}
}
?>
2 changes: 1 addition & 1 deletion showmore/showmore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>';
}
}
Expand Down