mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2025-07-08 17:38:49 +00:00
Revert to stable version 3.5.4
This commit is contained in:
Hypolite Petovan
parent
38db18b624
commit
5360f08f42
355 changed files with 21449 additions and 4957 deletions
|
|
@ -5,11 +5,7 @@
|
|||
* Version: 0.2
|
||||
* Author: Michael Vogel <http://pirati.ca/profile/heluecht>
|
||||
*/
|
||||
require 'addon/buffer/bufferapp.php';
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\PConfig;
|
||||
require('addon/buffer/bufferapp.php');
|
||||
|
||||
function buffer_install() {
|
||||
register_hook('post_local', 'addon/buffer/buffer.php', 'buffer_post_local');
|
||||
|
|
@ -57,18 +53,18 @@ function buffer_content(&$a) {
|
|||
function buffer_plugin_admin(&$a, &$o){
|
||||
$t = get_markup_template( "admin.tpl", "addon/buffer/" );
|
||||
|
||||
$o = replace_macros($t, [
|
||||
$o = replace_macros($t, array(
|
||||
'$submit' => t('Save Settings'),
|
||||
// name, label, value, help, [extra values]
|
||||
'$client_id' => ['client_id', t('Client ID'), Config::get('buffer', 'client_id' ), ''],
|
||||
'$client_secret' => ['client_secret', t('Client Secret'), Config::get('buffer', 'client_secret' ), ''],
|
||||
]);
|
||||
'$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' ), ''),
|
||||
));
|
||||
}
|
||||
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'])): '');
|
||||
Config::set('buffer','client_id',$client_id);
|
||||
Config::set('buffer','client_secret',$client_secret);
|
||||
set_config('buffer','client_id',$client_id);
|
||||
set_config('buffer','client_secret',$client_secret);
|
||||
info( t('Settings updated.'). EOL );
|
||||
}
|
||||
|
||||
|
|
@ -82,8 +78,8 @@ function buffer_connect(&$a) {
|
|||
session_start();
|
||||
|
||||
// Define the needed keys
|
||||
$client_id = Config::get('buffer','client_id');
|
||||
$client_secret = Config::get('buffer','client_secret');
|
||||
$client_id = get_config('buffer','client_id');
|
||||
$client_secret = get_config('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";
|
||||
|
|
@ -96,7 +92,7 @@ function buffer_connect(&$a) {
|
|||
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>';
|
||||
PConfig::set(local_user(), 'buffer','access_token', $buffer->access_token);
|
||||
set_pconfig(local_user(), 'buffer','access_token', $buffer->access_token);
|
||||
}
|
||||
|
||||
return($o);
|
||||
|
|
@ -106,9 +102,9 @@ function buffer_jot_nets(&$a,&$b) {
|
|||
if(! local_user())
|
||||
return;
|
||||
|
||||
$buffer_post = PConfig::get(local_user(),'buffer','post');
|
||||
$buffer_post = get_pconfig(local_user(),'buffer','post');
|
||||
if(intval($buffer_post) == 1) {
|
||||
$buffer_defpost = PConfig::get(local_user(),'buffer','post_by_default');
|
||||
$buffer_defpost = get_pconfig(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>';
|
||||
|
|
@ -126,11 +122,11 @@ function buffer_settings(&$a,&$s) {
|
|||
|
||||
/* Get the current state of our config variables */
|
||||
|
||||
$enabled = PConfig::get(local_user(),'buffer','post');
|
||||
$enabled = get_pconfig(local_user(),'buffer','post');
|
||||
$checked = (($enabled) ? ' checked="checked" ' : '');
|
||||
$css = (($enabled) ? '' : '-disabled');
|
||||
|
||||
$def_enabled = PConfig::get(local_user(),'buffer','post_by_default');
|
||||
$def_enabled = get_pconfig(local_user(),'buffer','post_by_default');
|
||||
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
|
||||
|
||||
/* Add some HTML to the existing form */
|
||||
|
|
@ -143,9 +139,9 @@ function buffer_settings(&$a,&$s) {
|
|||
$s .= '<img class="connector'.$css.'" src="images/buffer.png" /><h3 class="connector">'. t('Buffer Export').'</h3>';
|
||||
$s .= '</span>';
|
||||
|
||||
$client_id = Config::get("buffer", "client_id");
|
||||
$client_secret = Config::get("buffer", "client_secret");
|
||||
$access_token = PConfig::get(local_user(), "buffer", "access_token");
|
||||
$client_id = get_config("buffer", "client_id");
|
||||
$client_secret = get_config("buffer", "client_secret");
|
||||
$access_token = get_pconfig(local_user(), "buffer", "access_token");
|
||||
|
||||
$s .= '<div id="buffer-password-wrapper">';
|
||||
if ($access_token == "") {
|
||||
|
|
@ -202,12 +198,12 @@ function buffer_settings_post(&$a,&$b) {
|
|||
|
||||
if(x($_POST,'buffer-submit')) {
|
||||
if(x($_POST,'buffer_delete')) {
|
||||
PConfig::set(local_user(),'buffer','access_token','');
|
||||
PConfig::set(local_user(),'buffer','post',false);
|
||||
PConfig::set(local_user(),'buffer','post_by_default',false);
|
||||
set_pconfig(local_user(),'buffer','access_token','');
|
||||
set_pconfig(local_user(),'buffer','post',false);
|
||||
set_pconfig(local_user(),'buffer','post_by_default',false);
|
||||
} else {
|
||||
PConfig::set(local_user(),'buffer','post',intval($_POST['buffer']));
|
||||
PConfig::set(local_user(),'buffer','post_by_default',intval($_POST['buffer_bydefault']));
|
||||
set_pconfig(local_user(),'buffer','post',intval($_POST['buffer']));
|
||||
set_pconfig(local_user(),'buffer','post_by_default',intval($_POST['buffer_bydefault']));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -218,11 +214,11 @@ function buffer_post_local(&$a,&$b) {
|
|||
return;
|
||||
}
|
||||
|
||||
$buffer_post = intval(PConfig::get(local_user(),'buffer','post'));
|
||||
$buffer_post = intval(get_pconfig(local_user(),'buffer','post'));
|
||||
|
||||
$buffer_enable = (($buffer_post && x($_REQUEST,'buffer_enable')) ? intval($_REQUEST['buffer_enable']) : 0);
|
||||
|
||||
if ($b['api_source'] && intval(PConfig::get(local_user(),'buffer','post_by_default'))) {
|
||||
if ($b['api_source'] && intval(get_pconfig(local_user(),'buffer','post_by_default'))) {
|
||||
$buffer_enable = 1;
|
||||
}
|
||||
|
||||
|
|
@ -237,34 +233,24 @@ function buffer_post_local(&$a,&$b) {
|
|||
$b['postopts'] .= 'buffer';
|
||||
}
|
||||
|
||||
function buffer_send(App $a, &$b)
|
||||
{
|
||||
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
|
||||
return;
|
||||
}
|
||||
function buffer_send(&$a,&$b) {
|
||||
|
||||
if(! strstr($b['postopts'],'buffer')) {
|
||||
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
|
||||
return;
|
||||
}
|
||||
|
||||
if($b['parent'] != $b['id']) {
|
||||
if(! strstr($b['postopts'],'buffer'))
|
||||
return;
|
||||
}
|
||||
|
||||
// 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']) {
|
||||
if($b['parent'] != $b['id'])
|
||||
return;
|
||||
}
|
||||
|
||||
// if post comes from buffer don't send it back
|
||||
//if($b['app'] == "Buffer")
|
||||
// return;
|
||||
|
||||
$client_id = Config::get("buffer", "client_id");
|
||||
$client_secret = Config::get("buffer", "client_secret");
|
||||
$access_token = PConfig::get($b['uid'], "buffer","access_token");
|
||||
$client_id = get_config("buffer", "client_id");
|
||||
$client_secret = get_config("buffer", "client_secret");
|
||||
$access_token = get_pconfig($b['uid'], "buffer","access_token");
|
||||
|
||||
if($access_token) {
|
||||
$buffer = new BufferApp($client_id, $client_secret, $callback_url, $access_token);
|
||||
|
|
@ -306,7 +292,7 @@ function buffer_send(App $a, &$b)
|
|||
break;
|
||||
case 'twitter':
|
||||
$send = ($b["extid"] != NETWORK_TWITTER);
|
||||
$limit = 280;
|
||||
$limit = 140;
|
||||
$markup = false;
|
||||
$includedlinks = true;
|
||||
$htmlmode = 8;
|
||||
|
|
@ -335,7 +321,7 @@ function buffer_send(App $a, &$b)
|
|||
$item["body"] = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$item["body"]);
|
||||
}
|
||||
|
||||
$post = plaintext($item, $limit, $includedlinks, $htmlmode);
|
||||
$post = plaintext($a, $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
|
||||
|
|
@ -369,7 +355,7 @@ function buffer_send(App $a, &$b)
|
|||
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 = [];
|
||||
$message = array();
|
||||
$message["text"] = $post["text"];
|
||||
$message["profile_ids[]"] = $profile->id;
|
||||
$message["shorten"] = false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue