X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=gpluspost%2Fgpluspost.php;h=5b2b3bf6ee45e4a924fe381e54cb9037f88003d3;hb=9acc0c978527f0b40c33fba24ceaea3bca8b0747;hp=c6f2b2ebec0fdbc2fc4b5dafe468283768bd4696;hpb=503ec7d072a3d9cf8d394e97fa44a71589d16e37;p=friendica-addons.git
diff --git a/gpluspost/gpluspost.php b/gpluspost/gpluspost.php
index c6f2b2eb..5b2b3bf6 100644
--- a/gpluspost/gpluspost.php
+++ b/gpluspost/gpluspost.php
@@ -13,6 +13,7 @@ function gpluspost_install() {
register_hook('jot_networks', 'addon/gpluspost/gpluspost.php', 'gpluspost_jot_nets');
register_hook('connector_settings', 'addon/gpluspost/gpluspost.php', 'gpluspost_settings');
register_hook('connector_settings_post', 'addon/gpluspost/gpluspost.php', 'gpluspost_settings_post');
+ register_hook('queue_predeliver', 'addon/gpluspost/gpluspost.php', 'gpluspost_queue_hook');
}
@@ -22,6 +23,7 @@ function gpluspost_uninstall() {
unregister_hook('jot_networks', 'addon/gpluspost/gpluspost.php', 'gpluspost_jot_nets');
unregister_hook('connector_settings', 'addon/gpluspost/gpluspost.php', 'gpluspost_settings');
unregister_hook('connector_settings_post', 'addon/gpluspost/gpluspost.php', 'gpluspost_settings_post');
+ unregister_hook('queue_predeliver', 'addon/gpluspost/gpluspost.php', 'gpluspost_queue_hook');
}
function gpluspost_jot_nets(&$a,&$b) {
@@ -37,17 +39,26 @@ function gpluspost_jot_nets(&$a,&$b) {
}
}
+function gpluspost_nextscripts() {
+ $a = get_app();
+ return file_exists($a->get_basepath()."/addon/gpluspost/postToGooglePlus.php");
+}
+
function gpluspost_settings(&$a,&$s) {
if(! local_user())
return;
+ $result = q("SELECT `installed` FROM `addon` WHERE `name` = 'fromgplus' AND `installed`");
+ $fromgplus_enabled = count($result) > 0;
+
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= ' ' . "\r\n";
$enabled = get_pconfig(local_user(),'gpluspost','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
+ $css = (($enabled) ? '' : '-disabled');
$def_enabled = get_pconfig(local_user(),'gpluspost','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
@@ -58,19 +69,57 @@ function gpluspost_settings(&$a,&$s) {
$skip_enabled = get_pconfig(local_user(),'gpluspost','skip_without_link');
$skip_checked = (($skip_enabled) ? ' checked="checked" ' : '');
+ $mirror_enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
+ $mirror_account = get_pconfig(local_user(),'fromgplus','account');
+
+ $username = get_pconfig(local_user(), 'gpluspost', 'username');
+ $password = get_pconfig(local_user(), 'gpluspost', 'password');
+ $page = get_pconfig(local_user(), 'gpluspost', 'page');
+
+ if ($fromgplus_enabled)
+ $title = "Google+ Export/Mirror";
+ else
+ $title = "Google+ Export";
+
$s .= '';
- $s .= '' . t('Google+') . ' ';
+ $s .= ''. t($title).' ';
$s .= ' ';
$s .= '
';
$s .= '
';
- $s .= '' . t('Google+') . ' ';
+ $s .= ''. t($title).' ';
$s .= ' ';
-
$s .= '
';
+
$s .= '' . t('Enable Google+ Post Plugin') . ' ';
$s .= ' ';
$s .= '
';
+ if (gpluspost_nextscripts()) {
+ /*
+ // To-Do: Option to check the credentials if requested
+ if (($username != "") AND ($password != "")) {
+ require_once("addon/googleplus/postToGooglePlus.php");
+ $loginError = doConnectToGooglePlus2($username, $password);
+ if ($loginError)
+ $s .= '
Login Error. Please enter the correct credentials.
';
+ }*/
+
+ $s .= '
';
+ $s .= '' . t('Google+ username') . ' ';
+ $s .= ' ';
+ $s .= '
';
+
+ $s .= '
';
+ $s .= '' . t('Google+ password') . ' ';
+ $s .= ' ';
+ $s .= '
';
+
+ $s .= '
';
+ $s .= '' . t('Google+ page number') . ' ';
+ $s .= ' ';
+ $s .= '
';
+ }
+
$s .= '
';
$s .= '' . t('Post to Google+ by default') . ' ';
$s .= ' ';
@@ -81,16 +130,36 @@ function gpluspost_settings(&$a,&$s) {
$s .= ' ';
$s .= '
';
- $s .= '
';
- $s .= '' . t('Skip messages without links') . ' ';
- $s .= ' ';
- $s .= '
';
+ if (!gpluspost_nextscripts()) {
+ $s .= '
';
+ $s .= '' . t('Skip messages without links') . ' ';
+ $s .= ' ';
+ $s .= '
';
+ }
+
+ if ($fromgplus_enabled) {
+ $s .= '
';
+ $s .= ''.t('Mirror all public posts').' ';
+ $s .= ' ';
+ $s .= '
';
+ $s .= '
';
+ $s .= ''.t('Mirror Google Account ID').' ';
+ $s .= ' ';
+ $s .= '
';
+ }
/* 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 +168,24 @@ 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);
+
+ if (!$enable)
+ del_pconfig(local_user(),'fromgplus','lastdate');
+ }
}
}
@@ -147,20 +233,161 @@ function gpluspost_send(&$a,&$b) {
if (!get_pconfig($b["uid"],'gpluspost','no_loop_prevention') and ($b['app'] == "Google+"))
return;
- $itemlist = get_pconfig($b["uid"],'gpluspost','itemlist');
- $items = explode(",", $itemlist);
+ if (!gpluspost_nextscripts()) {
+ // Posting via RSS-Feed and Hootsuite
+ $itemlist = get_pconfig($b["uid"],'gpluspost','itemlist');
+ $items = explode(",", $itemlist);
+
+ $i = 0;
+ $newitems = array($b['id']);
+ foreach ($items AS $item)
+ if ($i++ < 9)
+ $newitems[] = $item;
+
+ $itemlist = implode(",", $newitems);
+
+ logger('gpluspost_send: new itemlist: '.$itemlist." for uid ".$b["uid"]);
+
+ set_pconfig($b["uid"],'gpluspost','itemlist', $itemlist);
+
+ } else {
+ // Posting via 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");
+ require_once("include/plaintext.php");
- $i = 0;
- $newitems = array($b['id']);
- foreach ($items AS $item)
- if ($i++ < 9)
- $newitems[] = $item;
+ $item = $b;
- $itemlist = implode(",", $newitems);
+ // Markup for Google+
+ if ($item["title"] != "")
+ $item["title"] = "*".$item["title"]."*";
- logger('gpluspost_send: new itemlist: '.$itemlist." for uid ".$b["uid"]);
+ $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"]);
- set_pconfig($b["uid"],'gpluspost','itemlist', $itemlist);
+ $data = plaintext($a, $item, 0, false, 9);
+
+ logger('gpluspost_send: data: '.print_r($data, true), LOGGER_DEBUG);
+
+ $loginError = doConnectToGooglePlus2($username, $password);
+ if (!$loginError) {
+ if ($data["url"] != "")
+ $lnk = doGetGoogleUrlInfo2($data["url"]);
+ 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["text"].$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_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["url"] != "")
+ $lnk = doGetGoogleUrlInfo2($data["url"]);
+ 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["text"].$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() {}
@@ -214,70 +441,13 @@ function gpluspost_init() {
killme();
}
-function gpluspost_original_url($url, $depth=1) {
-
- if ($depth > 10)
- return($url);
-
- $siteinfo = array();
- $ch = curl_init();
- curl_setopt($ch, CURLOPT_URL, $url);
- curl_setopt($ch, CURLOPT_HEADER, 1);
- curl_setopt($ch, CURLOPT_NOBODY, 0);
- curl_setopt($ch, CURLOPT_TIMEOUT, 3);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($ch,CURLOPT_USERAGENT,'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:24.0) Gecko/20100101 Firefox/24.0');
-
- $header = curl_exec($ch);
- $curl_info = @curl_getinfo($ch);
- $http_code = $curl_info['http_code'];
- curl_close($ch);
-
- if ((($curl_info['http_code'] == "301") OR ($curl_info['http_code'] == "302"))
- AND (($curl_info['redirect_url'] != "") OR ($curl_info['location'] != ""))) {
- if ($curl_info['redirect_url'] != "")
- return(gpluspost_original_url($curl_info['redirect_url'], ++$depth));
- else
- return(gpluspost_original_url($curl_info['location'], ++$depth));
- }
-
- $pos = strpos($header, "\r\n\r\n");
-
- if ($pos)
- $body = trim(substr($header, $pos));
- else
- $body = $header;
-
- $doc = new DOMDocument();
- @$doc->loadHTML($body);
-
- $xpath = new DomXPath($doc);
-
- $list = $xpath->query("//meta[@content]");
- foreach ($list as $node) {
- $attr = array();
- if ($node->attributes->length)
- foreach ($node->attributes as $attribute)
- $attr[$attribute->name] = $attribute->value;
-
- if (@$attr["http-equiv"] == 'refresh') {
- $path = $attr["content"];
- $pathinfo = explode(";", $path);
- $content = "";
- foreach ($pathinfo AS $value)
- if (substr(strtolower($value), 0, 4) == "url=")
- return(gpluspost_original_url(substr($value, 4), ++$depth));
- }
- }
-
- return($url);
-}
-
function gpluspost_feeditem($pid, $uid) {
global $a;
+ require_once('include/api.php');
require_once('include/bbcode.php');
require_once("include/html2plain.php");
+ require_once("include/network.php");
$skipwithoutlink = get_pconfig($uid,'gpluspost','skip_without_link');
@@ -286,6 +456,11 @@ function gpluspost_feeditem($pid, $uid) {
$item['body'] = bb_CleanPictureLinks($item['body']);
+ $item['body'] = bb_remove_share_information($item['body'], true);
+
+ if ($item["title"] != "")
+ $item['body'] = "*".$item["title"]."*\n\n".$item['body'];
+
// Looking for the first image
$image = '';
if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$item['body'],$matches))
@@ -310,8 +485,12 @@ function gpluspost_feeditem($pid, $uid) {
$body = $item['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);
+ $html = bbcode(api_clean_plain_items($body), false, false, 2);
// Then convert it to plain text
$msg = trim(html2plain($html, 0, true));
@@ -365,13 +544,18 @@ function gpluspost_feeditem($pid, $uid) {
$title = trim(str_replace($msglink, "", $title));
- $msglink = gpluspost_original_url($msglink);
+ $msglink = original_url($msglink);
if ($uid == 0)
$title = $item["author-name"].": ".$title;
$msglink = htmlspecialchars(html_entity_decode($msglink));
+ if (strpos($msg, $msglink) == 0)
+ $msg .= "\n".$msglink;
+
+ $msg = nl2br($msg);
+
$title = str_replace("&", "&", $title);
//$html = str_replace("&", "&", $html);
@@ -385,7 +569,7 @@ function gpluspost_feeditem($pid, $uid) {
echo "\t\t\n\t\t\t \n";
echo "\t\t\t".$item["author-link"]." \n\t\t \n";
//echo ' ';
- echo "\t\t".' \n";
+ echo "\t\t".' \n";
echo "\t\n";
}
}