';
diff --git a/blogger/blogger.php b/blogger/blogger.php
index 852f1fc6..17124b37 100755
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -71,11 +71,11 @@ function blogger_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '';
- $s .= '
' . t('Blogger Export') . '
';
+ $s .= '
'. t('Blogger Export').'
';
$s .= '';
$s .= '
';
$s .= '';
- $s .= '
' . t('Blogger Export') . '
';
+ $s .= '
'. t('Blogger Export').'
';
$s .= '';
$s .= '
';
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 45b59cc0..53e1890c 100755
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -146,11 +146,11 @@ function diaspora_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '';
- $s .= '
' . t('Diaspora Export') . '
';
+ $s .= '
'. t('Diaspora Export').'
';
$s .= '';
$s .= '
';
$s .= '';
- $s .= '
' . t('Diaspora Export') . '
';
+ $s .= '
'. t('Diaspora Export').'
';
$s .= '';
if ($status) {
diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php
index 839c42b3..3d28a969 100644
--- a/fbpost/fbpost.php
+++ b/fbpost/fbpost.php
@@ -152,6 +152,12 @@ function fbpost_post(&$a) {
set_pconfig($uid,'facebook','post_to_page', $values[0]);
set_pconfig($uid,'facebook','page_access_token', $values[1]);
+ $result = q("SELECT `installed` FROM `addon` WHERE `name` = 'fbsync' AND `installed`");
+ if (count($result) > 0) {
+ set_pconfig(local_user(),'fbsync','sync',intval($_POST['fbsync']));
+ set_pconfig(local_user(),'fbsync','create_user',intval($_POST['create_user']));
+ }
+
info( t('Settings updated.') . EOL);
}
@@ -207,7 +213,15 @@ function fbpost_content(&$a) {
$a->page['htmlhead'] .= '' . "\r\n";
- $o .= '
';
+ }
/* provide a submit button */
$s .= '';
- $s .= '
Register an account at Hootsuite, add your G+ page and add the feed-url there. ';
- $s .= 'Feed-url: '.$a->get_baseurl().'/gpluspost/'.urlencode($a->user["nickname"]).'
';
+
+ if (gpluspost_nextscripts()) {
+ $s .= "
If the plugin doesn't work or if it stopped, please login to Google+, then unlock your account by following this link. ";
+ $s .= 'At this page please click on "Continue". Then your posts should arrive in several minutes.
';
+ } else {
+ $s .= '
Register an account at Hootsuite, add your G+ page and add the feed-url there. ';
+ $s .= 'Feed-url: '.$a->get_baseurl().'/gpluspost/'.urlencode($a->user["nickname"]).'
';
+ }
+ $s .= '
';
}
function gpluspost_settings_post(&$a,&$b) {
@@ -99,7 +167,21 @@ function gpluspost_settings_post(&$a,&$b) {
set_pconfig(local_user(),'gpluspost','post',intval($_POST['gpluspost']));
set_pconfig(local_user(),'gpluspost','post_by_default',intval($_POST['gpluspost_bydefault']));
set_pconfig(local_user(),'gpluspost','no_loop_prevention',intval($_POST['gpluspost_noloopprevention']));
- set_pconfig(local_user(),'gpluspost','skip_without_link',intval($_POST['gpluspost_skipwithoutlink']));
+
+ if (!gpluspost_nextscripts()) {
+ set_pconfig(local_user(),'gpluspost','skip_without_link',intval($_POST['gpluspost_skipwithoutlink']));
+ } else {
+ set_pconfig(local_user(),'gpluspost','username',trim($_POST['username']));
+ set_pconfig(local_user(),'gpluspost','password',trim($_POST['password']));
+ set_pconfig(local_user(),'gpluspost','page',trim($_POST['page']));
+ }
+
+ $result = q("SELECT `installed` FROM `addon` WHERE `name` = 'fromgplus' AND `installed`");
+ if (count($result) > 0) {
+ set_pconfig(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
+ $enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0);
+ set_pconfig(local_user(),'fromgplus','enable', $enable);
+ }
}
}
@@ -145,8 +227,9 @@ function gpluspost_send(&$a,&$b) {
// if post comes from Google+ don't send it back
if (!get_pconfig($b["uid"],'gpluspost','no_loop_prevention') and ($b['app'] == "Google+"))
- return;
+ return;
+ // Always do the export via RSS-Feed (even if NextScripts is enabled), since it doesn't hurt
$itemlist = get_pconfig($b["uid"],'gpluspost','itemlist');
$items = explode(",", $itemlist);
@@ -161,6 +244,263 @@ function gpluspost_send(&$a,&$b) {
logger('gpluspost_send: new itemlist: '.$itemlist." for uid ".$b["uid"]);
set_pconfig($b["uid"],'gpluspost','itemlist', $itemlist);
+
+ // Posting via NextScripts
+ if (gpluspost_nextscripts()) {
+ $username = get_pconfig($b['uid'],'gpluspost','username');
+ $password = get_pconfig($b['uid'],'gpluspost','password');
+ $page = get_pconfig($b['uid'],'gpluspost','page');
+
+ $success = false;
+
+ if($username && $password) {
+ require_once("addon/gpluspost/postToGooglePlus.php");
+
+ $data = gpluspost_createmsg($b);
+
+ logger('gpluspost_send: data: '.print_r($data, true), LOGGER_DEBUG);
+
+ $loginError = doConnectToGooglePlus2($username, $password);
+ if (!$loginError) {
+ if ($data["link"] != "")
+ $lnk = doGetGoogleUrlInfo2($data["link"]);
+ elseif ($data["image"] != "")
+ $lnk = array('img'=>$data["image"]);
+ else
+ $lnk = "";
+
+ // Send a special blank to identify the post through the "fromgplus" addon
+ $blank = html_entity_decode(" ", ENT_QUOTES, 'UTF-8');
+
+ doPostToGooglePlus2($data["msg"].$blank, $lnk, $page);
+
+ $success = true;
+
+ logger('gpluspost_send: '.$b['uid'].' success', LOGGER_DEBUG);
+ } else
+ logger('gpluspost_send: '.$b['uid'].' failed '.$loginError, LOGGER_DEBUG);
+
+ if (!$success) {
+ logger('gpluspost_send: requeueing '.$b['uid'], LOGGER_DEBUG);
+
+ $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']);
+ if (count($r))
+ $a->contact = $r[0]["id"];
+
+ $s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $data));
+ require_once('include/queue_fn.php');
+ add_to_queue($a->contact,NETWORK_GPLUS,$s);
+ notice(t('Google+ post failed. Queued for retry.').EOL);
+ }
+ } else
+ logger('gpluspost_send: '.$b['uid'].' missing username or password', LOGGER_DEBUG);
+ }
+
+}
+
+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) {
+
+ $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
+ dbesc(NETWORK_GPLUS)
+ );
+ if(! count($qi))
+ return;
+
+ require_once('include/queue_fn.php');
+
+ foreach($qi as $x) {
+ if($x['network'] !== NETWORK_GPLUS)
+ continue;
+
+ logger('gpluspost_queue: run');
+
+ $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid`
+ WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
+ intval($x['cid'])
+ );
+ if(! count($r))
+ continue;
+
+ $userdata = $r[0];
+
+ //logger('gpluspost_queue: fetching userdata '.print_r($userdata, true));
+
+ $username = get_pconfig($userdata['uid'],'gpluspost','username');
+ $password = get_pconfig($userdata['uid'],'gpluspost','password');
+ $page = get_pconfig($userdata['uid'],'gpluspost','page');
+
+ $success = false;
+
+ if($username && $password) {
+ require_once("addon/googleplus/postToGooglePlus.php");
+
+ logger('gpluspost_queue: able to post for user '.$username);
+
+ $z = unserialize($x['content']);
+
+ $data = $z['post'];
+ // $z['url']
+
+ logger('gpluspost_send: data: '.print_r($data, true), LOGGER_DATA);
+
+ $loginError = doConnectToGooglePlus2($username, $password);
+ if (!$loginError) {
+ if ($data["link"] != "")
+ $lnk = doGetGoogleUrlInfo2($data["link"]);
+ elseif ($data["image"] != "")
+ $lnk = array('img'=>$data["image"]);
+ else
+ $lnk = "";
+
+ // Send a special blank to identify the post through the "fromgplus" addon
+ $blank = html_entity_decode(" ", ENT_QUOTES, 'UTF-8');
+
+ doPostToGooglePlus2($data["msg"].$blank, $lnk, $page);
+
+ logger('gpluspost_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
+
+ $success = true;
+
+ remove_queue_item($x['id']);
+ } else
+ logger('gpluspost_queue: send '.$userdata['uid'].' failed '.$loginError, LOGGER_DEBUG);
+ } else
+ logger('gpluspost_queue: send '.$userdata['uid'].' missing username or password', LOGGER_DEBUG);
+
+ if (!$success) {
+ logger('gpluspost_queue: delayed');
+ update_queue_time($x['id']);
+ }
+ }
}
function gpluspost_module() {}
diff --git a/libertree/libertree.php b/libertree/libertree.php
index b064c6bc..123bfe2b 100755
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -64,11 +64,11 @@ function libertree_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '';
- $s .= '
' . t('libertree Export') . '
';
+ $s .= '
'. t('libertree Export').'
';
$s .= '';
$s .= '
';
$s .= '';
- $s .= '
' . t('libertree Export') . '
';
+ $s .= '
'. t('libertree Export').'
';
$s .= '';
$s .= '
';
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 1575f14b..3083d732 100755
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -219,11 +219,11 @@ function pumpio_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '';
- $s .= '
