';
@@ -169,7 +179,7 @@ function buffer_settings(&$a,&$s) {
$profiles = $buffer->go('/profiles');
if (is_array($profiles)) {
$s .= '
';
- $s .= t("Posts are going to all accounts that are enabled by default:");
+ $s .= L10n::t("Posts are going to all accounts that are enabled by default:");
$s .= "
";
foreach ($profiles as $profile) {
if (!$profile->default)
@@ -189,7 +199,7 @@ function buffer_settings(&$a,&$s) {
/* provide a submit button */
- $s .= '
';
+ $s .= '
';
}
@@ -198,101 +208,124 @@ function buffer_settings_post(&$a,&$b) {
if(x($_POST,'buffer-submit')) {
if(x($_POST,'buffer_delete')) {
- set_pconfig(local_user(),'buffer','access_token','');
- set_pconfig(local_user(),'buffer','post',false);
- set_pconfig(local_user(),'buffer','post_by_default',false);
+ PConfig::set(local_user(),'buffer','access_token','');
+ PConfig::set(local_user(),'buffer','post',false);
+ PConfig::set(local_user(),'buffer','post_by_default',false);
} else {
- set_pconfig(local_user(),'buffer','post',intval($_POST['buffer']));
- set_pconfig(local_user(),'buffer','post_by_default',intval($_POST['buffer_bydefault']));
+ PConfig::set(local_user(),'buffer','post',intval($_POST['buffer']));
+ PConfig::set(local_user(),'buffer','post_by_default',intval($_POST['buffer_bydefault']));
}
}
}
function buffer_post_local(&$a,&$b) {
- if((! local_user()) || (local_user() != $b['uid']))
+ if (!local_user() || (local_user() != $b['uid'])) {
return;
+ }
- $buffer_post = intval(get_pconfig(local_user(),'buffer','post'));
+ $buffer_post = intval(PConfig::get(local_user(),'buffer','post'));
$buffer_enable = (($buffer_post && x($_REQUEST,'buffer_enable')) ? intval($_REQUEST['buffer_enable']) : 0);
- if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'buffer','post_by_default')))
+ if ($b['api_source'] && intval(PConfig::get(local_user(),'buffer','post_by_default'))) {
$buffer_enable = 1;
+ }
- if(! $buffer_enable)
+ if (!$buffer_enable) {
return;
+ }
- if(strlen($b['postopts']))
+ if (strlen($b['postopts'])) {
$b['postopts'] .= ',';
+ }
$b['postopts'] .= 'buffer';
}
-function buffer_send(&$a,&$b) {
-
- if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+function buffer_send(App $a, &$b)
+{
+ if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
return;
+ }
- logger("buffer_send: parameter ".print_r($b, true), LOGGER_DATA);
+ if(! strstr($b['postopts'],'buffer')) {
+ return;
+ }
- if(! strstr($b['postopts'],'buffer'))
+ if($b['parent'] != $b['id']) {
return;
+ }
- if($b['parent'] != $b['id'])
+ // Dont't post if the post doesn't belong to us.
+ // This is a check for forum postings
+ $self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+ if ($b['contact-id'] != $self['id']) {
return;
+ }
// if post comes from buffer don't send it back
- if($b['app'] == "Buffer")
- return;
+ //if($b['app'] == "Buffer")
+ // return;
- $client_id = get_config("buffer", "client_id");
- $client_secret = get_config("buffer", "client_secret");
- $access_token = get_pconfig($b['uid'], "buffer","access_token");
+ $client_id = Config::get("buffer", "client_id");
+ $client_secret = Config::get("buffer", "client_secret");
+ $access_token = PConfig::get($b['uid'], "buffer","access_token");
- if($access_token) {
+ if ($access_token) {
$buffer = new BufferApp($client_id, $client_secret, $callback_url, $access_token);
- $result = q("SELECT `installed` FROM `addon` WHERE `name` = 'privacy_image_cache' AND `installed`");
- $image_cache = (count($result) > 0);
-
- require_once("include/plaintext.php");
- require_once("include/network.php");
-
$profiles = $buffer->go('/profiles');
if (is_array($profiles)) {
+ logger("Will send these parameter ".print_r($b, true), LOGGER_DEBUG);
+
foreach ($profiles as $profile) {
if (!$profile->default)
continue;
+ $send = false;
+
switch ($profile->service) {
case 'appdotnet':
+ $send = ($b["extid"] != NETWORK_APPNET);
$limit = 256;
$markup = false;
$includedlinks = true;
+ $htmlmode = 6;
break;
case 'facebook':
+ $send = ($b["extid"] != NETWORK_FACEBOOK);
$limit = 0;
$markup = false;
$includedlinks = false;
+ $htmlmode = 9;
break;
case 'google':
+ $send = ($b["extid"] != NETWORK_GPLUS);
$limit = 0;
$markup = true;
$includedlinks = false;
+ $htmlmode = 9;
break;
case 'twitter':
- $limit = 140;
+ $send = ($b["extid"] != NETWORK_TWITTER);
+ $limit = 280;
$markup = false;
$includedlinks = true;
+ $htmlmode = 8;
break;
case 'linkedin':
+ $send = ($b["extid"] != NETWORK_LINKEDIN);
$limit = 700;
$markup = false;
$includedlinks = true;
+ $htmlmode = 2;
break;
}
+ if (!$send)
+ continue;
+
$item = $b;
// Markup for Google+
@@ -305,42 +338,41 @@ function buffer_send(&$a,&$b) {
$item["body"] = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$item["body"]);
}
- $post = plaintext($a, $item, $limit, $includedlinks);
+ $post = BBCode::toPlaintext($item, $limit, $includedlinks, $htmlmode);
logger("buffer_send: converted message ".$b["id"]." result: ".print_r($post, true), LOGGER_DEBUG);
- // The image cache is used as a sanitizer. Buffer seems to be really picky about pictures
- if ($image_cache) {
- require_once("addon/privacy_image_cache/privacy_image_cache.php");
- if (isset($post["image"]))
- $post["image"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($post["image"]);
+ // The image proxy is used as a sanitizer. Buffer seems to be really picky about pictures
+ require_once("mod/proxy.php");
+ if (isset($post["image"]))
+ $post["image"] = proxy_url($post["image"]);
- if (isset($post["preview"]))
- $post["preview"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($post["preview"]);
- }
+ if (isset($post["preview"]))
+ $post["preview"] = proxy_url($post["preview"]);
- //if ($profile->service == "twitter") {
- if ($includedlinks) {
- if (isset($post["url"]))
- $post["url"] = short_link($post["url"]);
- if (isset($post["image"]))
- $post["image"] = short_link($post["image"]);
- if (isset($post["preview"]))
- $post["preview"] = short_link($post["preview"]);
- }
+ //if ($includedlinks) {
+ // if (isset($post["url"]))
+ // $post["url"] = Network::shortenUrl($post["url"]);
+ // if (isset($post["image"]))
+ // $post["image"] = Network::shortenUrl($post["image"]);
+ // if (isset($post["preview"]))
+ // $post["preview"] = Network::shortenUrl($post["preview"]);
+ //}
// Seems like a bug to me
// Buffer doesn't add links to Twitter and App.net (but pictures)
- //if ($includedlinks AND isset($post["url"]))
- if (($profile->service == "twitter") AND isset($post["url"]))
+ //if ($includedlinks && isset($post["url"]))
+ if (($profile->service == "twitter") && isset($post["url"]) && ($post["type"] != "photo"))
$post["text"] .= " ".$post["url"];
- elseif (($profile->service == "appdotnet") AND isset($post["url"]) AND isset($post["title"])) {
- $post["title"] = shortenmsg($post["title"], 90);
- $post["text"] = shortenmsg($post["text"], $limit - (24 + strlen($post["title"])));
+ elseif (($profile->service == "appdotnet") && isset($post["url"]) && isset($post["title"]) && ($post["type"] != "photo")) {
+ $post["title"] = Plaintext::shorten($post["title"], 90);
+ $post["text"] = Plaintext::shorten($post["text"], $limit - (24 + strlen($post["title"])));
$post["text"] .= "\n[".$post["title"]."](".$post["url"].")";
- } elseif (($profile->service == "appdotnet") AND isset($post["url"]))
+ } elseif (($profile->service == "appdotnet") && isset($post["url"]) && ($post["type"] != "photo"))
$post["text"] .= " ".$post["url"];
+ elseif ($profile->service == "google")
+ $post["text"] .= html_entity_decode(" ", ENT_QUOTES, 'UTF-8'); // Send a special blank to identify the post through the "fromgplus" addon
- $message = array();
+ $message = [];
$message["text"] = $post["text"];
$message["profile_ids[]"] = $profile->id;
$message["shorten"] = false;
@@ -352,7 +384,7 @@ function buffer_send(&$a,&$b) {
if (isset($post["description"]))
$message["media[description]"] = $post["description"];
- if (isset($post["url"]) AND ($post["type"] != "photo"))
+ if (isset($post["url"]) && ($post["type"] != "photo"))
$message["media[link]"] = $post["url"];
if (isset($post["image"])) {
@@ -365,6 +397,7 @@ function buffer_send(&$a,&$b) {
$message["media[thumbnail]"] = $post["preview"];
//print_r($message);
+ logger("buffer_send: data for message ".$b["id"].": ".print_r($message, true), LOGGER_DEBUG);
$ret = $buffer->go('/updates/create', $message);
logger("buffer_send: send message ".$b["id"]." result: ".print_r($ret, true), LOGGER_DEBUG);
}