gpluspost: Using new plaintext function
Michael Vogel
parent
6f2799b2f0
commit
5926adc0c0
|
|
@ -256,15 +256,27 @@ function gpluspost_send(&$a,&$b) {
|
||||||
|
|
||||||
if($username && $password) {
|
if($username && $password) {
|
||||||
require_once("addon/gpluspost/postToGooglePlus.php");
|
require_once("addon/gpluspost/postToGooglePlus.php");
|
||||||
|
require_once("include/plaintext.php");
|
||||||
|
require_once("include/network.php");
|
||||||
|
|
||||||
$data = gpluspost_createmsg($b);
|
$item = $b;
|
||||||
|
|
||||||
|
// Markup for Google+
|
||||||
|
if ($item["title"] != "")
|
||||||
|
$item["title"] = "*".$item["title"]."*";
|
||||||
|
|
||||||
|
$item["body"] = preg_replace("(\[b\](.*?)\[\/b\])ism",'*$1*',$item["body"]);
|
||||||
|
$item["body"] = preg_replace("(\[i\](.*?)\[\/i\])ism",'_$1_',$item["body"]);
|
||||||
|
$item["body"] = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$item["body"]);
|
||||||
|
|
||||||
|
$data = plaintext($a, $item, 0, false);
|
||||||
|
|
||||||
logger('gpluspost_send: data: '.print_r($data, true), LOGGER_DEBUG);
|
logger('gpluspost_send: data: '.print_r($data, true), LOGGER_DEBUG);
|
||||||
|
|
||||||
$loginError = doConnectToGooglePlus2($username, $password);
|
$loginError = doConnectToGooglePlus2($username, $password);
|
||||||
if (!$loginError) {
|
if (!$loginError) {
|
||||||
if ($data["link"] != "")
|
if ($data["url"] != "")
|
||||||
$lnk = doGetGoogleUrlInfo2($data["link"]);
|
$lnk = doGetGoogleUrlInfo2($data["url"]);
|
||||||
elseif ($data["image"] != "")
|
elseif ($data["image"] != "")
|
||||||
$lnk = array('img'=>$data["image"]);
|
$lnk = array('img'=>$data["image"]);
|
||||||
else
|
else
|
||||||
|
|
@ -273,7 +285,7 @@ function gpluspost_send(&$a,&$b) {
|
||||||
// Send a special blank to identify the post through the "fromgplus" addon
|
// Send a special blank to identify the post through the "fromgplus" addon
|
||||||
$blank = html_entity_decode(" ", ENT_QUOTES, 'UTF-8');
|
$blank = html_entity_decode(" ", ENT_QUOTES, 'UTF-8');
|
||||||
|
|
||||||
doPostToGooglePlus2($data["msg"].$blank, $lnk, $page);
|
doPostToGooglePlus2($data["text"].$blank, $lnk, $page);
|
||||||
|
|
||||||
$success = true;
|
$success = true;
|
||||||
|
|
||||||
|
|
@ -299,136 +311,6 @@ function gpluspost_send(&$a,&$b) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function gpluspost_createmsg($b) {
|
|
||||||
require_once("include/bbcode.php");
|
|
||||||
require_once("include/html2plain.php");
|
|
||||||
|
|
||||||
$b['body'] = bb_CleanPictureLinks($b['body']);
|
|
||||||
|
|
||||||
// Looking for the first image
|
|
||||||
$image = '';
|
|
||||||
if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$b['body'],$matches))
|
|
||||||
$image = $matches[3];
|
|
||||||
|
|
||||||
if ($image == '')
|
|
||||||
if(preg_match("/\[img\](.*?)\[\/img\]/is",$b['body'],$matches))
|
|
||||||
$image = $matches[1];
|
|
||||||
|
|
||||||
$multipleimages = (strpos($b['body'], "[img") != strrpos($b['body'], "[img"));
|
|
||||||
|
|
||||||
// When saved into the database the content is sent through htmlspecialchars
|
|
||||||
// That means that we have to decode all image-urls
|
|
||||||
$image = htmlspecialchars_decode($image);
|
|
||||||
|
|
||||||
$body = $b["body"];
|
|
||||||
|
|
||||||
if ($b["title"] != "")
|
|
||||||
$body = "*".$b["title"]."*\n\n".$body;
|
|
||||||
|
|
||||||
if (strpos($body, "[bookmark") !== false) {
|
|
||||||
// splitting the text in two parts:
|
|
||||||
// before and after the bookmark
|
|
||||||
$pos = strpos($body, "[bookmark");
|
|
||||||
$body1 = substr($body, 0, $pos);
|
|
||||||
$body2 = substr($body, $pos);
|
|
||||||
|
|
||||||
// Removing all quotes after the bookmark
|
|
||||||
// they are mostly only the content after the bookmark.
|
|
||||||
$body2 = preg_replace("/\[quote\=([^\]]*)\](.*?)\[\/quote\]/ism",'',$body2);
|
|
||||||
$body2 = preg_replace("/\[quote\](.*?)\[\/quote\]/ism",'',$body2);
|
|
||||||
|
|
||||||
$pos2 = strpos($body2, "[/bookmark]");
|
|
||||||
if ($pos2)
|
|
||||||
$body2 = substr($body2, $pos2 + 11);
|
|
||||||
|
|
||||||
$body = $body1.$body2;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add some newlines so that the message could be cut better
|
|
||||||
$body = str_replace(array("[quote", "[bookmark", "[/bookmark]", "[/quote]"),
|
|
||||||
array("\n[quote", "\n[bookmark", "[/bookmark]\n", "[/quote]\n"), $body);
|
|
||||||
|
|
||||||
// remove the recycle signs and the names since they aren't helpful on twitter
|
|
||||||
// recycle 1
|
|
||||||
$recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
|
|
||||||
$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);
|
|
||||||
|
|
||||||
$body = preg_replace("(\[b\](.*?)\[\/b\])ism",'*$1*',$body);
|
|
||||||
$body = preg_replace("(\[i\](.*?)\[\/i\])ism",'_$1_',$body);
|
|
||||||
$body = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$body);
|
|
||||||
|
|
||||||
// At first convert the text to html
|
|
||||||
$html = bbcode($body, false, false, 2);
|
|
||||||
|
|
||||||
// Then convert it to plain text
|
|
||||||
//$msg = trim($b['title']." \n\n".html2plain($html, 0, true));
|
|
||||||
$msg = trim(html2plain($html, 0, true));
|
|
||||||
$msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
|
|
||||||
|
|
||||||
// Removing multiple newlines
|
|
||||||
while (strpos($msg, "\n\n\n") !== false)
|
|
||||||
$msg = str_replace("\n\n\n", "\n\n", $msg);
|
|
||||||
|
|
||||||
// Removing multiple spaces
|
|
||||||
while (strpos($msg, " ") !== false)
|
|
||||||
$msg = str_replace(" ", " ", $msg);
|
|
||||||
|
|
||||||
// Removing URLs
|
|
||||||
$msg = preg_replace('/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/i', "", $msg);
|
|
||||||
|
|
||||||
$msg = trim($msg);
|
|
||||||
|
|
||||||
$link = '';
|
|
||||||
// look for bookmark-bbcode and handle it with priority
|
|
||||||
if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
|
|
||||||
$link = $matches[1];
|
|
||||||
|
|
||||||
$multiplelinks = (strpos($b['body'], "[bookmark") != strrpos($b['body'], "[bookmark"));
|
|
||||||
|
|
||||||
// If there is no bookmark element then take the first link
|
|
||||||
if ($link == '') {
|
|
||||||
$links = collecturls($html);
|
|
||||||
if (sizeof($links) > 0) {
|
|
||||||
reset($links);
|
|
||||||
$link = current($links);
|
|
||||||
}
|
|
||||||
$multiplelinks = (sizeof($links) > 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
$msglink = "";
|
|
||||||
if ($multiplelinks)
|
|
||||||
$msglink = $b["plink"];
|
|
||||||
else if ($link != "")
|
|
||||||
$msglink = $link;
|
|
||||||
else if ($multipleimages)
|
|
||||||
$msglink = $b["plink"];
|
|
||||||
else if ($image != "")
|
|
||||||
$msglink = $image;
|
|
||||||
|
|
||||||
// Removing multiple spaces - again
|
|
||||||
while (strpos($msg, " ") !== false)
|
|
||||||
$msg = str_replace(" ", " ", $msg);
|
|
||||||
|
|
||||||
if ($msglink != "") {
|
|
||||||
// Looking if the link points to an image
|
|
||||||
$img_str = fetch_url($msglink);
|
|
||||||
|
|
||||||
$tempfile = tempnam(get_config("system","temppath"), "cache");
|
|
||||||
file_put_contents($tempfile, $img_str);
|
|
||||||
$mime = image_type_to_mime_type(exif_imagetype($tempfile));
|
|
||||||
unlink($tempfile);
|
|
||||||
} else
|
|
||||||
$mime = "";
|
|
||||||
|
|
||||||
if (($image == $msglink) OR (substr($mime, 0, 6) == "image/"))
|
|
||||||
return(array("msg"=>trim($msg), "link"=>"", "image"=>$msglink));
|
|
||||||
else
|
|
||||||
return(array("msg"=>trim($msg), "link"=>$msglink, "image"=>""));
|
|
||||||
}
|
|
||||||
|
|
||||||
function gpluspost_queue_hook(&$a,&$b) {
|
function gpluspost_queue_hook(&$a,&$b) {
|
||||||
|
|
||||||
$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
|
$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
|
||||||
|
|
@ -476,8 +358,8 @@ function gpluspost_queue_hook(&$a,&$b) {
|
||||||
|
|
||||||
$loginError = doConnectToGooglePlus2($username, $password);
|
$loginError = doConnectToGooglePlus2($username, $password);
|
||||||
if (!$loginError) {
|
if (!$loginError) {
|
||||||
if ($data["link"] != "")
|
if ($data["url"] != "")
|
||||||
$lnk = doGetGoogleUrlInfo2($data["link"]);
|
$lnk = doGetGoogleUrlInfo2($data["url"]);
|
||||||
elseif ($data["image"] != "")
|
elseif ($data["image"] != "")
|
||||||
$lnk = array('img'=>$data["image"]);
|
$lnk = array('img'=>$data["image"]);
|
||||||
else
|
else
|
||||||
|
|
@ -486,7 +368,7 @@ function gpluspost_queue_hook(&$a,&$b) {
|
||||||
// Send a special blank to identify the post through the "fromgplus" addon
|
// Send a special blank to identify the post through the "fromgplus" addon
|
||||||
$blank = html_entity_decode(" ", ENT_QUOTES, 'UTF-8');
|
$blank = html_entity_decode(" ", ENT_QUOTES, 'UTF-8');
|
||||||
|
|
||||||
doPostToGooglePlus2($data["msg"].$blank, $lnk, $page);
|
doPostToGooglePlus2($data["text"].$blank, $lnk, $page);
|
||||||
|
|
||||||
logger('gpluspost_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
|
logger('gpluspost_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue