friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Showmore: A little html bug was fixed (missing </div>)

pull/40/head
Michael Vogel 2012-04-06 23:36:41 +02:00
parent 33df399574
commit 3689c821b6
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
facebook/facebook.php
View File

@ -1365,21 +1365,26 @@ function fb_consume_stream($uid,$j,$wall = false) {
if($entry->description) if($entry->description)
$quote = $entry->description; $quote = $entry->description;
foreach ($entry->properties as $property) if ($entry->properties)
$quote .= "\n".$property->name.": [url=".$property->href."]".$property->text."[/url]"; foreach ($entry->properties as $property)
$quote .= "\n".$property->name.": [url=".$property->href."]".$property->text."[/url]";
if ($quote) if ($quote)
$datarray['body'] .= "\n[quote]".$quote."[/quote]"; $datarray['body'] .= "\n[quote]".$quote."[/quote]";
if($entry->picture && $entry->link) { // Only import the picture when the message is no video
$datarray['body'] .= "\n" . '[url=' . $entry->link . '][img]' . $entry->picture . '[/img][/url]'; // oembed display a picture of the video as well
} if ($entry->type != "video") {
else { if($entry->picture && $entry->link) {
if($entry->picture) $datarray['body'] .= "\n" . '[url=' . $entry->link . '][img]'.$entry->picture.'[/img][/url]';
$datarray['body'] .= "\n" . '[img]' . $entry->picture . '[/img]'; }
// if just a link, it may be a wall photo - check else {
if($entry->link) if($entry->picture)
$datarray['body'] .= fb_get_photo($uid,$entry->link); $datarray['body'] .= "\n" . '[img]' . $entry->picture . '[/img]';
// if just a link, it may be a wall photo - check
if($entry->link)
$datarray['body'] .= fb_get_photo($uid,$entry->link);
}
} }
if(trim($datarray['body']) == '') { if(trim($datarray['body']) == '') {
@ -1392,9 +1397,10 @@ function fb_consume_stream($uid,$j,$wall = false) {
if ($entry->icon) if ($entry->icon)
$datarray['body'] .= "[img]".$entry->icon."[/img] &nbsp; "; $datarray['body'] .= "[img]".$entry->icon."[/img] &nbsp; ";
foreach ($entry->actions as $action) if ($entry->actions)
if (($action->name != "Comment") and ($action->name != "Like")) foreach ($entry->actions as $action)
$datarray['body'] .= "[url=".$action->link."]".$action->name."[/url] &nbsp; "; if (($action->name != "Comment") and ($action->name != "Like"))
$datarray['body'] .= "[url=".$action->link."]".$action->name."[/url] &nbsp; ";
$datarray['body'] = trim($datarray['body']); $datarray['body'] = trim($datarray['body']);

3
showmore/showmore.php
View File

@ -46,7 +46,8 @@ function showmore_addon_settings(&$a,&$s) {
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="showmore-submit" name="showmore-submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="showmore-submit" name="showmore-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
// $s .= '<div class="showmore-desc">' . t('Use /expression/ to provide regular expressions') . '</div></div>'; // $s .= '<div class="showmore-desc">' . t('Use /expression/ to provide regular expressions') . '</div>';
$s .= '</div>';
return; return;
} }