Preparations for shared posts

This commit is contained in:
Michael Vogel 2012-12-17 03:04:13 +01:00
parent c5418789c9
commit 0267222fb4
4 changed files with 43 additions and 2 deletions

View file

@ -349,6 +349,30 @@ function fbpost_jot_nets(&$a,&$b) {
} }
} }
function fbpost_ShareAttributes($match) {
$attributes = $match[1];
$author = "";
preg_match("/author='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "")
$author = $matches[1];
preg_match('/author="(.*?)"/ism', $attributes, $matches);
if ($matches[1] != "")
$author = $matches[1];
$headline = '<div class="shared_header">';
$headline .= sprintf(t('%s:'), $author);
$headline .= "</div>";
$text = "<br />".$headline."</strong><blockquote>".$match[2]."</blockquote>";
return($text);
}
/** /**
* @param App $a * @param App $a
@ -562,6 +586,9 @@ function fbpost_post_hook(&$a,&$b) {
$recycle = html_entity_decode("&#x25CC; ", ENT_QUOTES, 'UTF-8'); $recycle = html_entity_decode("&#x25CC; ", ENT_QUOTES, 'UTF-8');
$body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n\t$2:\t", $body); $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n\t$2:\t", $body);
// share element
$body = preg_replace_callback("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]/ism","fbpost_ShareAttributes", $body);
$bodyparts = explode("\t", $body); $bodyparts = explode("\t", $body);
// Doesn't help with multiple repeats - the problem has to be solved later // Doesn't help with multiple repeats - the problem has to be solved later
if (sizeof($bodyparts) == 3) { if (sizeof($bodyparts) == 3) {

View file

@ -331,11 +331,19 @@ function fromgplus_fetch($a, $uid) {
//$post .= html2bbcode("&#x267B;"); //$post .= html2bbcode("&#x267B;");
//$post .= fromgplus_html2bbcode("&#x25CC;"); //$post .= fromgplus_html2bbcode("&#x25CC;");
$post .= " [url=".$item->object->actor->url."]".$item->object->actor->displayName."[/url] \n"; $post .= " [url=".$item->object->actor->url."]".$item->object->actor->displayName."[/url] \n";
/*$post .= "[share author='".$item->object->actor->displayName.
"' profile='".$item->object->actor->url.
"' avatar='".$item->object->actor->image->url.
"' link='".$item->object->url."']\n";*/
$post .= fromgplus_html2bbcode($item->object->content); $post .= fromgplus_html2bbcode($item->object->content);
if (is_array($item->object->attachments)) if (is_array($item->object->attachments))
$post .= "\n".trim(fromgplus_handleattachments($item)); $post .= "\n".trim(fromgplus_handleattachments($item));
//$post .= "[/share]";
if (isset($item->address)) if (isset($item->address))
$location = $item->address; $location = $item->address;
else else

View file

@ -435,6 +435,9 @@ function statusnet_shortenmsg($b, $max_char) {
$recycle = html_entity_decode("&#x25CC; ", ENT_QUOTES, 'UTF-8'); $recycle = html_entity_decode("&#x25CC; ", ENT_QUOTES, 'UTF-8');
$body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n", $body); $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n", $body);
// remove the share element
$body = preg_replace("/\[share(.*?)\](.*?)\[\/share\]/ism","\n\n$2\n\n",$body);
// At first convert the text to html // At first convert the text to html
$html = bbcode($body, false, false); $html = bbcode($body, false, false);
@ -632,7 +635,7 @@ function statusnet_post_hook(&$a,&$b) {
//$result = $dent->post('statuses/update', array('status' => $msg)); //$result = $dent->post('statuses/update', array('status' => $msg));
$result = $dent->post('statuses/update', $postdata); $result = $dent->post('statuses/update', $postdata);
logger('statusnet_post send, result: ' . print_r($result, true). logger('statusnet_post send, result: ' . print_r($result, true).
"\nmessage: ".$msg, LOGGER_DEBUG."\nOriginal post: ".print_r($b)."\nPost Data: ".print_r($postdata)); "\nmessage: ".$msg, LOGGER_DEBUG."\nOriginal post: ".print_r($b, true)."\nPost Data: ".print_r($postdata, true));
if ($result->error) { if ($result->error) {
logger('Send to StatusNet failed: "' . $result->error . '"'); logger('Send to StatusNet failed: "' . $result->error . '"');
} }

View file

@ -294,6 +294,9 @@ function twitter_shortenmsg($b) {
$recycle = html_entity_decode("&#x25CC; ", ENT_QUOTES, 'UTF-8'); $recycle = html_entity_decode("&#x25CC; ", ENT_QUOTES, 'UTF-8');
$body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n", $body); $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n", $body);
// remove the share element
$body = preg_replace("/\[share(.*?)\](.*?)\[\/share\]/ism","\n\n$2\n\n",$body);
// At first convert the text to html // At first convert the text to html
$html = bbcode($body, false, false); $html = bbcode($body, false, false);