* Version: 0.2
* Author: Michael Vogel <http://pirati.ca/profile/heluecht>
*/
-require('addon/buffer/bufferapp.php');
+require 'addon/buffer/bufferapp.php';
+
+use Friendica\App;
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\Plaintext;
+use Friendica\Core\Addon;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
function buffer_install() {
- register_hook('post_local', 'addon/buffer/buffer.php', 'buffer_post_local');
- register_hook('notifier_normal', 'addon/buffer/buffer.php', 'buffer_send');
- register_hook('jot_networks', 'addon/buffer/buffer.php', 'buffer_jot_nets');
- register_hook('connector_settings', 'addon/buffer/buffer.php', 'buffer_settings');
- register_hook('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post');
+ Addon::registerHook('post_local', 'addon/buffer/buffer.php', 'buffer_post_local');
+ Addon::registerHook('notifier_normal', 'addon/buffer/buffer.php', 'buffer_send');
+ Addon::registerHook('jot_networks', 'addon/buffer/buffer.php', 'buffer_jot_nets');
+ Addon::registerHook('connector_settings', 'addon/buffer/buffer.php', 'buffer_settings');
+ Addon::registerHook('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post');
}
function buffer_uninstall() {
- unregister_hook('post_local', 'addon/buffer/buffer.php', 'buffer_post_local');
- unregister_hook('notifier_normal', 'addon/buffer/buffer.php', 'buffer_send');
- unregister_hook('jot_networks', 'addon/buffer/buffer.php', 'buffer_jot_nets');
- unregister_hook('connector_settings', 'addon/buffer/buffer.php', 'buffer_settings');
- unregister_hook('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post');
+ Addon::unregisterHook('post_local', 'addon/buffer/buffer.php', 'buffer_post_local');
+ Addon::unregisterHook('notifier_normal', 'addon/buffer/buffer.php', 'buffer_send');
+ Addon::unregisterHook('jot_networks', 'addon/buffer/buffer.php', 'buffer_jot_nets');
+ Addon::unregisterHook('connector_settings', 'addon/buffer/buffer.php', 'buffer_settings');
+ Addon::unregisterHook('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post');
}
function buffer_module() {}
function buffer_content(&$a) {
if(! local_user()) {
- notice( t('Permission denied.') . EOL);
+ notice(L10n::t('Permission denied.') . EOL);
return '';
}
return $o;
}
-function buffer_plugin_admin(&$a, &$o){
- $t = get_markup_template( "admin.tpl", "addon/buffer/" );
+function buffer_addon_admin(&$a, &$o)
+{
+ $t = get_markup_template("admin.tpl", "addon/buffer/");
- $o = replace_macros($t, array(
- '$submit' => t('Save Settings'),
- // name, label, value, help, [extra values]
- '$client_id' => array('client_id', t('Client ID'), get_config('buffer', 'client_id' ), ''),
- '$client_secret' => array('client_secret', t('Client Secret'), get_config('buffer', 'client_secret' ), ''),
- ));
+ $o = replace_macros($t, [
+ '$submit' => L10n::t('Save Settings'),
+ // name, label, value, help, [extra values]
+ '$client_id' => ['client_id', L10n::t('Client ID'), Config::get('buffer', 'client_id'), ''],
+ '$client_secret' => ['client_secret', L10n::t('Client Secret'), Config::get('buffer', 'client_secret'), ''],
+ ]);
}
-function buffer_plugin_admin_post(&$a){
- $client_id = ((x($_POST,'client_id')) ? notags(trim($_POST['client_id'])) : '');
- $client_secret = ((x($_POST,'client_secret')) ? notags(trim($_POST['client_secret'])): '');
- set_config('buffer','client_id',$client_id);
- set_config('buffer','client_secret',$client_secret);
- info( t('Settings updated.'). EOL );
+function buffer_addon_admin_post(&$a)
+{
+ $client_id = ((x($_POST, 'client_id')) ? notags(trim($_POST['client_id'])) : '');
+ $client_secret = ((x($_POST, 'client_secret')) ? notags(trim($_POST['client_secret'])): '');
+ Config::set('buffer', 'client_id', $client_id);
+ Config::set('buffer', 'client_secret', $client_secret);
+ info(L10n::t('Settings updated.'). EOL);
}
function buffer_connect(&$a) {
if (isset($_REQUEST["error"])) {
- $o = t('Error when registering buffer connection:')." ".$_REQUEST["error"];
+ $o = L10n::t('Error when registering buffer connection:')." ".$_REQUEST["error"];
return $o;
}
// Start a session. This is necessary to hold on to a few keys the callback script will also need
session_start();
// Define the needed keys
- $client_id = get_config('buffer','client_id');
- $client_secret = get_config('buffer','client_secret');
+ $client_id = Config::get('buffer','client_id');
+ $client_secret = Config::get('buffer','client_secret');
// The callback URL is the script that gets called after the user authenticates with buffer
$callback_url = $a->get_baseurl()."/buffer/connect";
$o .= '<a href="' . $buffer->get_login_url() . '">Connect to Buffer!</a>';
} else {
logger("buffer_connect: authenticated");
- $o .= t("You are now authenticated to buffer. ");
- $o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.t("return to the connector page").'</a>';
- set_pconfig(local_user(), 'buffer','access_token', $buffer->access_token);
+ $o .= L10n::t("You are now authenticated to buffer. ");
+ $o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.L10n::t("return to the connector page").'</a>';
+ PConfig::set(local_user(), 'buffer','access_token', $buffer->access_token);
}
return($o);
if(! local_user())
return;
- $buffer_post = get_pconfig(local_user(),'buffer','post');
+ $buffer_post = PConfig::get(local_user(),'buffer','post');
if(intval($buffer_post) == 1) {
- $buffer_defpost = get_pconfig(local_user(),'buffer','post_by_default');
+ $buffer_defpost = PConfig::get(local_user(),'buffer','post_by_default');
$selected = ((intval($buffer_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="buffer_enable"' . $selected . ' value="1" /> '
- . t('Post to Buffer') . '</div>';
+ . L10n::t('Post to Buffer') . '</div>';
}
}
/* Get the current state of our config variables */
- $enabled = get_pconfig(local_user(),'buffer','post');
+ $enabled = PConfig::get(local_user(),'buffer','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
$css = (($enabled) ? '' : '-disabled');
- $def_enabled = get_pconfig(local_user(),'buffer','post_by_default');
+ $def_enabled = PConfig::get(local_user(),'buffer','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
/* Add some HTML to the existing form */
$s .= '<span id="settings_buffer_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_buffer_expanded\'); openClose(\'settings_buffer_inflated\');">';
- $s .= '<img class="connector'.$css.'" src="images/buffer.png" /><h3 class="connector">'. t('Buffer Export').'</h3>';
+ $s .= '<img class="connector'.$css.'" src="images/buffer.png" /><h3 class="connector">'. L10n::t('Buffer Export').'</h3>';
$s .= '</span>';
$s .= '<div id="settings_buffer_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_buffer_expanded\'); openClose(\'settings_buffer_inflated\');">';
- $s .= '<img class="connector'.$css.'" src="images/buffer.png" /><h3 class="connector">'. t('Buffer Export').'</h3>';
+ $s .= '<img class="connector'.$css.'" src="images/buffer.png" /><h3 class="connector">'. L10n::t('Buffer Export').'</h3>';
$s .= '</span>';
- $client_id = get_config("buffer", "client_id");
- $client_secret = get_config("buffer", "client_secret");
- $access_token = get_pconfig(local_user(), "buffer", "access_token");
+ $client_id = Config::get("buffer", "client_id");
+ $client_secret = Config::get("buffer", "client_secret");
+ $access_token = PConfig::get(local_user(), "buffer", "access_token");
$s .= '<div id="buffer-password-wrapper">';
if ($access_token == "") {
$s .= '<div id="buffer-authenticate-wrapper">';
- $s .= '<a href="'.$a->get_baseurl().'/buffer/connect">'.t("Authenticate your Buffer connection").'</a>';
+ $s .= '<a href="'.$a->get_baseurl().'/buffer/connect">'.L10n::t("Authenticate your Buffer connection").'</a>';
$s .= '</div><div class="clear"></div>';
} else {
$s .= '<div id="buffer-enable-wrapper">';
- $s .= '<label id="buffer-enable-label" for="buffer-checkbox">' . t('Enable Buffer Post Plugin') . '</label>';
+ $s .= '<label id="buffer-enable-label" for="buffer-checkbox">' . L10n::t('Enable Buffer Post Addon') . '</label>';
$s .= '<input id="buffer-checkbox" type="checkbox" name="buffer" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="buffer-bydefault-wrapper">';
- $s .= '<label id="buffer-bydefault-label" for="buffer-bydefault">' . t('Post to Buffer by default') . '</label>';
+ $s .= '<label id="buffer-bydefault-label" for="buffer-bydefault">' . L10n::t('Post to Buffer by default') . '</label>';
$s .= '<input id="buffer-bydefault" type="checkbox" name="buffer_bydefault" value="1" ' . $def_checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="buffer-delete-wrapper">';
- $s .= '<label id="buffer-delete-label" for="buffer-delete">' . t('Check to delete this preset') . '</label>';
+ $s .= '<label id="buffer-delete-label" for="buffer-delete">' . L10n::t('Check to delete this preset') . '</label>';
$s .= '<input id="buffer-delete" type="checkbox" name="buffer_delete" value="1" />';
$s .= '</div><div class="clear"></div>';
$profiles = $buffer->go('/profiles');
if (is_array($profiles)) {
$s .= '<div id="buffer-accounts-wrapper">';
- $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 .= "<ul>";
foreach ($profiles as $profile) {
if (!$profile->default)
/* provide a submit button */
- $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="buffer-submit" name="buffer-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+ $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="buffer-submit" name="buffer-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
}
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) {
+function buffer_send(App $a, &$b)
+{
+ if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+ return;
+ }
- if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+ 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;
- $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);
- 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);
break;
case 'twitter':
$send = ($b["extid"] != NETWORK_TWITTER);
- $limit = 140;
+ $limit = 280;
$markup = false;
$includedlinks = true;
$htmlmode = 8;
$item["body"] = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$item["body"]);
}
- $post = plaintext($a, $item, $limit, $includedlinks, $htmlmode);
+ $post = BBCode::toPlaintext($item, $limit, $includedlinks, $htmlmode);
logger("buffer_send: converted message ".$b["id"]." result: ".print_r($post, true), LOGGER_DEBUG);
// The image proxy is used as a sanitizer. Buffer seems to be really picky about pictures
//if ($includedlinks) {
// if (isset($post["url"]))
- // $post["url"] = short_link($post["url"]);
+ // $post["url"] = Network::shortenUrl($post["url"]);
// if (isset($post["image"]))
- // $post["image"] = short_link($post["image"]);
+ // $post["image"] = Network::shortenUrl($post["image"]);
// if (isset($post["preview"]))
- // $post["preview"] = short_link($post["preview"]);
+ // $post["preview"] = Network::shortenUrl($post["preview"]);
//}
// Seems like a bug to me
if (($profile->service == "twitter") && isset($post["url"]) && ($post["type"] != "photo"))
$post["text"] .= " ".$post["url"];
elseif (($profile->service == "appdotnet") && isset($post["url"]) && isset($post["title"]) && ($post["type"] != "photo")) {
- $post["title"] = shortenmsg($post["title"], 90);
- $post["text"] = shortenmsg($post["text"], $limit - (24 + strlen($post["title"])));
+ $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") && 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;