* Version: 0.2
* Author: Michael Vogel <http://pirati.ca/profile/heluecht>
*/
+
+ use Friendica\Core\Worker;
+
require('addon/pumpio/oauth/http.php');
require('addon/pumpio/oauth/oauth_client.php');
require_once('include/enotify.php');
require_once("include/Photo.php");
require_once("mod/share.php");
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+
define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes
function pumpio_install() {
}
function pumpio_check_item_notification($a, &$notification_data) {
- $hostname = get_pconfig($notification_data["uid"], 'pumpio','host');
- $username = get_pconfig($notification_data["uid"], "pumpio", "user");
+ $hostname = PConfig::get($notification_data["uid"], 'pumpio','host');
+ $username = PConfig::get($notification_data["uid"], "pumpio", "user");
$notification_data["profiles"][] = "https://".$hostname."/".$username;
}
$params = array();
- $application_name = get_config('pumpio', 'application_name');
+ $application_name = Config::get('pumpio', 'application_name');
if ($application_name == "")
$application_name = $a->get_hostname();
session_start();
// Define the needed keys
- $consumer_key = get_pconfig(local_user(), 'pumpio','consumer_key');
- $consumer_secret = get_pconfig(local_user(), 'pumpio','consumer_secret');
- $hostname = get_pconfig(local_user(), 'pumpio','host');
+ $consumer_key = PConfig::get(local_user(), 'pumpio','consumer_key');
+ $consumer_secret = PConfig::get(local_user(), 'pumpio','consumer_secret');
+ $hostname = PConfig::get(local_user(), 'pumpio','host');
if ((($consumer_key == "") || ($consumer_secret == "")) && ($hostname != "")) {
logger("pumpio_connect: register client");
$clientdata = pumpio_registerclient($a, $hostname);
- set_pconfig(local_user(), 'pumpio','consumer_key', $clientdata->client_id);
- set_pconfig(local_user(), 'pumpio','consumer_secret', $clientdata->client_secret);
+ PConfig::set(local_user(), 'pumpio','consumer_key', $clientdata->client_id);
+ PConfig::set(local_user(), 'pumpio','consumer_secret', $clientdata->client_secret);
- $consumer_key = get_pconfig(local_user(), 'pumpio','consumer_key');
- $consumer_secret = get_pconfig(local_user(), 'pumpio','consumer_secret');
+ $consumer_key = PConfig::get(local_user(), 'pumpio','consumer_key');
+ $consumer_secret = PConfig::get(local_user(), 'pumpio','consumer_secret');
logger("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, LOGGER_DEBUG);
}
if (($success = $client->Process())) {
if (strlen($client->access_token)) {
logger("pumpio_connect: otoken: ".$client->access_token." osecrect: ".$client->access_token_secret, LOGGER_DEBUG);
- set_pconfig(local_user(), "pumpio", "oauth_token", $client->access_token);
- set_pconfig(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret);
+ PConfig::set(local_user(), "pumpio", "oauth_token", $client->access_token);
+ PConfig::set(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret);
}
}
$success = $client->Finalize($success);
if(! local_user())
return;
- $pumpio_post = get_pconfig(local_user(),'pumpio','post');
+ $pumpio_post = PConfig::get(local_user(),'pumpio','post');
if(intval($pumpio_post) == 1) {
- $pumpio_defpost = get_pconfig(local_user(),'pumpio','post_by_default');
+ $pumpio_defpost = PConfig::get(local_user(),'pumpio','post_by_default');
$selected = ((intval($pumpio_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="pumpio_enable"' . $selected . ' value="1" /> '
. t('Post to pumpio') . '</div>';
/* Get the current state of our config variables */
- $import_enabled = get_pconfig(local_user(),'pumpio','import');
+ $import_enabled = PConfig::get(local_user(),'pumpio','import');
$import_checked = (($import_enabled) ? ' checked="checked" ' : '');
- $enabled = get_pconfig(local_user(),'pumpio','post');
+ $enabled = PConfig::get(local_user(),'pumpio','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
$css = (($enabled) ? '' : '-disabled');
- $def_enabled = get_pconfig(local_user(),'pumpio','post_by_default');
+ $def_enabled = PConfig::get(local_user(),'pumpio','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $public_enabled = get_pconfig(local_user(),'pumpio','public');
+ $public_enabled = PConfig::get(local_user(),'pumpio','public');
$public_checked = (($public_enabled) ? ' checked="checked" ' : '');
- $mirror_enabled = get_pconfig(local_user(),'pumpio','mirror');
+ $mirror_enabled = PConfig::get(local_user(),'pumpio','mirror');
$mirror_checked = (($mirror_enabled) ? ' checked="checked" ' : '');
- $servername = get_pconfig(local_user(), "pumpio", "host");
- $username = get_pconfig(local_user(), "pumpio", "user");
+ $servername = PConfig::get(local_user(), "pumpio", "host");
+ $username = PConfig::get(local_user(), "pumpio", "user");
/* Add some HTML to the existing form */
if (($username != '') && ($servername != '')) {
- $oauth_token = get_pconfig(local_user(), "pumpio", "oauth_token");
- $oauth_token_secret = get_pconfig(local_user(), "pumpio", "oauth_token_secret");
+ $oauth_token = PConfig::get(local_user(), "pumpio", "oauth_token");
+ $oauth_token_secret = PConfig::get(local_user(), "pumpio", "oauth_token_secret");
$s .= '<div id="pumpio-password-wrapper">';
if (($oauth_token == "") || ($oauth_token_secret == "")) {
if(x($_POST,'pumpio-submit')) {
if(x($_POST,'pumpio_delete')) {
- set_pconfig(local_user(),'pumpio','consumer_key','');
- set_pconfig(local_user(),'pumpio','consumer_secret','');
- set_pconfig(local_user(),'pumpio','oauth_token','');
- set_pconfig(local_user(),'pumpio','oauth_token_secret','');
- set_pconfig(local_user(),'pumpio','post',false);
- set_pconfig(local_user(),'pumpio','import',false);
- set_pconfig(local_user(),'pumpio','host','');
- set_pconfig(local_user(),'pumpio','user','');
- set_pconfig(local_user(),'pumpio','public',false);
- set_pconfig(local_user(),'pumpio','mirror',false);
- set_pconfig(local_user(),'pumpio','post_by_default',false);
- set_pconfig(local_user(),'pumpio','lastdate', 0);
- set_pconfig(local_user(),'pumpio','last_id', '');
+ PConfig::set(local_user(),'pumpio','consumer_key','');
+ PConfig::set(local_user(),'pumpio','consumer_secret','');
+ PConfig::set(local_user(),'pumpio','oauth_token','');
+ PConfig::set(local_user(),'pumpio','oauth_token_secret','');
+ PConfig::set(local_user(),'pumpio','post',false);
+ PConfig::set(local_user(),'pumpio','import',false);
+ PConfig::set(local_user(),'pumpio','host','');
+ PConfig::set(local_user(),'pumpio','user','');
+ PConfig::set(local_user(),'pumpio','public',false);
+ PConfig::set(local_user(),'pumpio','mirror',false);
+ PConfig::set(local_user(),'pumpio','post_by_default',false);
+ PConfig::set(local_user(),'pumpio','lastdate', 0);
+ PConfig::set(local_user(),'pumpio','last_id', '');
} else {
// filtering the username if it is filled wrong
$user = $_POST['pumpio_user'];
$host = trim($host);
$host = str_replace(array("https://", "http://"), array("", ""), $host);
- set_pconfig(local_user(),'pumpio','post',intval($_POST['pumpio']));
- set_pconfig(local_user(),'pumpio','import',$_POST['pumpio_import']);
- set_pconfig(local_user(),'pumpio','host',$host);
- set_pconfig(local_user(),'pumpio','user',$user);
- set_pconfig(local_user(),'pumpio','public',$_POST['pumpio_public']);
- set_pconfig(local_user(),'pumpio','mirror',$_POST['pumpio_mirror']);
- set_pconfig(local_user(),'pumpio','post_by_default',intval($_POST['pumpio_bydefault']));
+ PConfig::set(local_user(),'pumpio','post',intval($_POST['pumpio']));
+ PConfig::set(local_user(),'pumpio','import',$_POST['pumpio_import']);
+ PConfig::set(local_user(),'pumpio','host',$host);
+ PConfig::set(local_user(),'pumpio','user',$user);
+ PConfig::set(local_user(),'pumpio','public',$_POST['pumpio_public']);
+ PConfig::set(local_user(),'pumpio','mirror',$_POST['pumpio_mirror']);
+ PConfig::set(local_user(),'pumpio','post_by_default',intval($_POST['pumpio_bydefault']));
if (!$_POST['pumpio_mirror'])
del_pconfig(local_user(),'pumpio','lastdate');
return;
}
- $pumpio_post = intval(get_pconfig(local_user(), 'pumpio', 'post'));
+ $pumpio_post = intval(PConfig::get(local_user(), 'pumpio', 'post'));
$pumpio_enable = (($pumpio_post && x($_REQUEST,'pumpio_enable')) ? intval($_REQUEST['pumpio_enable']) : 0);
- if ($b['api_source'] && intval(get_pconfig(local_user(), 'pumpio', 'post_by_default'))) {
+ if ($b['api_source'] && intval(PConfig::get(local_user(), 'pumpio', 'post_by_default'))) {
$pumpio_enable = 1;
}
function pumpio_send(&$a,&$b) {
- if (!get_pconfig($b["uid"],'pumpio','import')) {
+ if (!PConfig::get($b["uid"],'pumpio','import')) {
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
return;
}
// Support for native shares
// http://<hostname>/api/<type>/shares?id=<the-object-id>
- $oauth_token = get_pconfig($b['uid'], "pumpio", "oauth_token");
- $oauth_token_secret = get_pconfig($b['uid'], "pumpio", "oauth_token_secret");
- $consumer_key = get_pconfig($b['uid'], "pumpio","consumer_key");
- $consumer_secret = get_pconfig($b['uid'], "pumpio","consumer_secret");
+ $oauth_token = PConfig::get($b['uid'], "pumpio", "oauth_token");
+ $oauth_token_secret = PConfig::get($b['uid'], "pumpio", "oauth_token_secret");
+ $consumer_key = PConfig::get($b['uid'], "pumpio","consumer_key");
+ $consumer_secret = PConfig::get($b['uid'], "pumpio","consumer_secret");
- $host = get_pconfig($b['uid'], "pumpio", "host");
- $user = get_pconfig($b['uid'], "pumpio", "user");
- $public = get_pconfig($b['uid'], "pumpio", "public");
+ $host = PConfig::get($b['uid'], "pumpio", "host");
+ $user = PConfig::get($b['uid'], "pumpio", "user");
+ $public = PConfig::get($b['uid'], "pumpio", "public");
if($oauth_token && $oauth_token_secret) {
if($success) {
if ($user->generator->displayName)
- set_pconfig($b["uid"], "pumpio", "application_name", $user->generator->displayName);
+ PConfig::set($b["uid"], "pumpio", "application_name", $user->generator->displayName);
$post_id = $user->object->id;
logger('pumpio_send '.$username.': success '.$post_id);
function pumpio_action(&$a, $uid, $uri, $action, $content = "") {
// Don't do likes and other stuff if you don't import the timeline
- if (!get_pconfig($uid,'pumpio','import'))
+ if (!PConfig::get($uid,'pumpio','import'))
return;
- $ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
- $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
- $otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
- $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
- $hostname = get_pconfig($uid, 'pumpio','host');
- $username = get_pconfig($uid, "pumpio", "user");
+ $ckey = PConfig::get($uid, 'pumpio', 'consumer_key');
+ $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret');
+ $otoken = PConfig::get($uid, 'pumpio', 'oauth_token');
+ $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+ $hostname = PConfig::get($uid, 'pumpio','host');
+ $username = PConfig::get($uid, "pumpio", "user");
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($uri),
if (!count($r))
return;
- $last = get_config('pumpio','last_poll');
+ $last = Config::get('pumpio','last_poll');
- $poll_interval = intval(get_config('pumpio','poll_interval'));
+ $poll_interval = intval(Config::get('pumpio','poll_interval'));
if(! $poll_interval)
$poll_interval = PUMPIO_DEFAULT_POLL_INTERVAL;
}
}
- $abandon_days = intval(get_config('system','account_abandon_days'));
+ $abandon_days = intval(Config::get('system','account_abandon_days'));
if ($abandon_days < 1)
$abandon_days = 0;
pumpio_fetchinbox($a, $rr['uid']);
// check for new contacts once a day
- $last_contact_check = get_pconfig($rr['uid'],'pumpio','contact_check');
+ $last_contact_check = PConfig::get($rr['uid'],'pumpio','contact_check');
if($last_contact_check)
$next_contact_check = $last_contact_check + 86400;
else
if($next_contact_check <= time()) {
pumpio_getallusers($a, $rr["uid"]);
- set_pconfig($rr['uid'],'pumpio','contact_check',time());
+ PConfig::set($rr['uid'],'pumpio','contact_check',time());
}
}
}
logger('pumpio: cron_end');
- set_config('pumpio','last_poll', time());
+ Config::set('pumpio','last_poll', time());
}
function pumpio_cron(&$a,$b) {
- //pumpio_sync($a);
- proc_run("php","addon/pumpio/pumpio_sync.php");
+ Worker::add(PRIORITY_MEDIUM,"addon/pumpio/pumpio_sync.php");
}
function pumpio_fetchtimeline(&$a, $uid) {
- $ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
- $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
- $otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
- $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
- $lastdate = get_pconfig($uid, 'pumpio', 'lastdate');
- $hostname = get_pconfig($uid, 'pumpio','host');
- $username = get_pconfig($uid, "pumpio", "user");
+ $ckey = PConfig::get($uid, 'pumpio', 'consumer_key');
+ $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret');
+ $otoken = PConfig::get($uid, 'pumpio', 'oauth_token');
+ $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+ $lastdate = PConfig::get($uid, 'pumpio', 'lastdate');
+ $hostname = PConfig::get($uid, 'pumpio','host');
+ $username = PConfig::get($uid, "pumpio", "user");
// get the application name for the pump.io app
// 1st try personal config, then system config and fallback to the
// hostname of the node if neither one is set.
- $application_name = get_pconfig( $uid, 'pumpio', 'application_name');
+ $application_name = PConfig::get( $uid, 'pumpio', 'application_name');
if ($application_name == "")
- $application_name = get_config('pumpio', 'application_name');
+ $application_name = Config::get('pumpio', 'application_name');
if ($application_name == "")
$application_name = $a->get_hostname();
}
if ($lastdate != 0)
- set_pconfig($uid,'pumpio','lastdate', $lastdate);
+ PConfig::set($uid,'pumpio','lastdate', $lastdate);
}
function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) {
$postarray['edited'] = $postarray['created'];
if ($post->verb == "share") {
- if (!intval(get_config('system','wall-to-wall_share'))) {
+ if (!intval(Config::get('system','wall-to-wall_share'))) {
if (isset($post->object->author->displayName) && ($post->object->author->displayName != ""))
$share_author = $post->object->author->displayName;
elseif (isset($post->object->author->preferredUsername) && ($post->object->author->preferredUsername != ""))
function pumpio_fetchinbox(&$a, $uid) {
- $ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
- $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
- $otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
- $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
- $lastdate = get_pconfig($uid, 'pumpio', 'lastdate');
- $hostname = get_pconfig($uid, 'pumpio','host');
- $username = get_pconfig($uid, "pumpio", "user");
+ $ckey = PConfig::get($uid, 'pumpio', 'consumer_key');
+ $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret');
+ $otoken = PConfig::get($uid, 'pumpio', 'oauth_token');
+ $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+ $lastdate = PConfig::get($uid, 'pumpio', 'lastdate');
+ $hostname = PConfig::get($uid, 'pumpio','host');
+ $username = PConfig::get($uid, "pumpio", "user");
$own_id = "https://".$hostname."/".$username;
$client->access_token = $otoken;
$client->access_token_secret = $osecret;
- $last_id = get_pconfig($uid,'pumpio','last_id');
+ $last_id = PConfig::get($uid,'pumpio','last_id');
$url = 'https://'.$hostname.'/api/user/'.$username.'/inbox';
foreach ($lastitems AS $item)
pumpio_fetchallcomments($a, $uid, $item["uri"]);
- set_pconfig($uid,'pumpio','last_id', $last_id);
+ PConfig::set($uid,'pumpio','last_id', $last_id);
}
function pumpio_getallusers(&$a, $uid) {
- $ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
- $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
- $otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
- $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
- $hostname = get_pconfig($uid, 'pumpio','host');
- $username = get_pconfig($uid, "pumpio", "user");
+ $ckey = PConfig::get($uid, 'pumpio', 'consumer_key');
+ $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret');
+ $otoken = PConfig::get($uid, 'pumpio', 'oauth_token');
+ $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+ $hostname = PConfig::get($uid, 'pumpio','host');
+ $username = PConfig::get($uid, "pumpio", "user");
$client = new oauth_client_class;
$client->oauth_version = '1.0a';
//logger('pumpio_queue: fetching userdata '.print_r($userdata, true));
- $oauth_token = get_pconfig($userdata['uid'], "pumpio", "oauth_token");
- $oauth_token_secret = get_pconfig($userdata['uid'], "pumpio", "oauth_token_secret");
- $consumer_key = get_pconfig($userdata['uid'], "pumpio","consumer_key");
- $consumer_secret = get_pconfig($userdata['uid'], "pumpio","consumer_secret");
+ $oauth_token = PConfig::get($userdata['uid'], "pumpio", "oauth_token");
+ $oauth_token_secret = PConfig::get($userdata['uid'], "pumpio", "oauth_token_secret");
+ $consumer_key = PConfig::get($userdata['uid'], "pumpio","consumer_key");
+ $consumer_secret = PConfig::get($userdata['uid'], "pumpio","consumer_secret");
- $host = get_pconfig($userdata['uid'], "pumpio", "host");
- $user = get_pconfig($userdata['uid'], "pumpio", "user");
+ $host = PConfig::get($userdata['uid'], "pumpio", "host");
+ $user = PConfig::get($userdata['uid'], "pumpio", "user");
$success = false;
if(! strstr($b['postopts'],'pumpio'))
return $receiver;
- $public = get_pconfig($b['uid'], "pumpio", "public");
+ $public = PConfig::get($b['uid'], "pumpio", "public");
if ($public)
$receiver["to"][] = Array(
}
function pumpio_fetchallcomments(&$a, $uid, $id) {
- $ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
- $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
- $otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
- $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
- $hostname = get_pconfig($uid, 'pumpio','host');
- $username = get_pconfig($uid, "pumpio", "user");
+ $ckey = PConfig::get($uid, 'pumpio', 'consumer_key');
+ $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret');
+ $otoken = PConfig::get($uid, 'pumpio', 'oauth_token');
+ $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+ $hostname = PConfig::get($uid, 'pumpio','host');
+ $username = PConfig::get($uid, "pumpio", "user");
logger("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id);
* Requirements: PHP5, curl [Slinky library]
*/
+ use Friendica\Core\Worker;
+
require_once('include/enotify.php');
require_once("include/socgraph.php");
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+
define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
function twitter_install() {
}
function twitter_check_item_notification($a, &$notification_data) {
- $own_id = get_pconfig($notification_data["uid"], 'twitter', 'own_id');
+ $own_id = PConfig::get($notification_data["uid"], 'twitter', 'own_id');
$own_user = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
intval($notification_data["uid"]),
$uid = $a->user["uid"];
- $ckey = get_config('twitter', 'consumerkey');
- $csecret = get_config('twitter', 'consumersecret');
- $otoken = get_pconfig($uid, 'twitter', 'oauthtoken');
- $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+ $ckey = Config::get('twitter', 'consumerkey');
+ $csecret = Config::get('twitter', 'consumersecret');
+ $otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
+ $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
require_once("addon/twitter/codebird.php");
if(! local_user())
return;
- $tw_post = get_pconfig(local_user(),'twitter','post');
+ $tw_post = PConfig::get(local_user(),'twitter','post');
if(intval($tw_post) == 1) {
- $tw_defpost = get_pconfig(local_user(),'twitter','post_by_default');
+ $tw_defpost = PConfig::get(local_user(),'twitter','post_by_default');
$selected = ((intval($tw_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . ' value="1" /> '
. t('Post to Twitter') . '</div>';
* if the twitter-disconnect checkbox is set, clear the OAuth key/secret pair
* from the user configuration
*/
- del_pconfig(local_user(), 'twitter', 'consumerkey');
- del_pconfig(local_user(), 'twitter', 'consumersecret');
- del_pconfig(local_user(), 'twitter', 'oauthtoken');
- del_pconfig(local_user(), 'twitter', 'oauthsecret');
- del_pconfig(local_user(), 'twitter', 'post');
- del_pconfig(local_user(), 'twitter', 'post_by_default');
- del_pconfig(local_user(), 'twitter', 'lastid');
- del_pconfig(local_user(), 'twitter', 'mirror_posts');
- del_pconfig(local_user(), 'twitter', 'import');
- del_pconfig(local_user(), 'twitter', 'create_user');
- del_pconfig(local_user(), 'twitter', 'own_id');
+ PConfig::delete(local_user(), 'twitter', 'consumerkey');
+ PConfig::delete(local_user(), 'twitter', 'consumersecret');
+ PConfig::delete(local_user(), 'twitter', 'oauthtoken');
+ PConfig::delete(local_user(), 'twitter', 'oauthsecret');
+ PConfig::delete(local_user(), 'twitter', 'post');
+ PConfig::delete(local_user(), 'twitter', 'post_by_default');
+ PConfig::delete(local_user(), 'twitter', 'lastid');
+ PConfig::delete(local_user(), 'twitter', 'mirror_posts');
+ PConfig::delete(local_user(), 'twitter', 'import');
+ PConfig::delete(local_user(), 'twitter', 'create_user');
+ PConfig::delete(local_user(), 'twitter', 'own_id');
} else {
if (isset($_POST['twitter-pin'])) {
// if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
logger('got a Twitter PIN');
require_once('library/twitteroauth.php');
- $ckey = get_config('twitter', 'consumerkey');
- $csecret = get_config('twitter', 'consumersecret');
+ $ckey = Config::get('twitter', 'consumerkey');
+ $csecret = Config::get('twitter', 'consumersecret');
// the token and secret for which the PIN was generated were hidden in the settings
// form as token and token2, we need a new connection to Twitter using these token
// and secret to request a Access Token with the PIN
$connection = new TwitterOAuth($ckey, $csecret, $_POST['twitter-token'], $_POST['twitter-token2']);
$token = $connection->getAccessToken( $_POST['twitter-pin'] );
// ok, now that we have the Access Token, save them in the user config
- set_pconfig(local_user(),'twitter', 'oauthtoken', $token['oauth_token']);
- set_pconfig(local_user(),'twitter', 'oauthsecret', $token['oauth_token_secret']);
- set_pconfig(local_user(),'twitter', 'post', 1);
+ PConfig::set(local_user(),'twitter', 'oauthtoken', $token['oauth_token']);
+ PConfig::set(local_user(),'twitter', 'oauthsecret', $token['oauth_token_secret']);
+ PConfig::set(local_user(),'twitter', 'post', 1);
// reload the Addon Settings page, if we don't do it see Bug #42
goaway($a->get_baseurl().'/settings/connectors');
} else {
// if no PIN is supplied in the POST variables, the user has changed the setting
// to post a tweet for every new __public__ posting to the wall
- set_pconfig(local_user(),'twitter','post',intval($_POST['twitter-enable']));
- set_pconfig(local_user(),'twitter','post_by_default',intval($_POST['twitter-default']));
- set_pconfig(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
- set_pconfig(local_user(), 'twitter', 'import', intval($_POST['twitter-import']));
- set_pconfig(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user']));
+ PConfig::set(local_user(),'twitter','post',intval($_POST['twitter-enable']));
+ PConfig::set(local_user(),'twitter','post_by_default',intval($_POST['twitter-default']));
+ PConfig::set(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
+ PConfig::set(local_user(), 'twitter', 'import', intval($_POST['twitter-import']));
+ PConfig::set(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user']));
if (!intval($_POST['twitter-mirror']))
- del_pconfig(local_user(),'twitter','lastid');
+ PConfig::delete(local_user(),'twitter','lastid');
info(t('Twitter settings updated.') . EOL);
}}
/***
* 1) Check that we have global consumer key & secret
* 2) If no OAuthtoken & stuff is present, generate button to get some
- * 3) Checkbox for "Send public notices (140 chars only)
+ * 3) Checkbox for "Send public notices (280 chars only)
*/
- $ckey = get_config('twitter', 'consumerkey' );
- $csecret = get_config('twitter', 'consumersecret' );
- $otoken = get_pconfig(local_user(), 'twitter', 'oauthtoken' );
- $osecret = get_pconfig(local_user(), 'twitter', 'oauthsecret' );
- $enabled = get_pconfig(local_user(), 'twitter', 'post');
+ $ckey = Config::get('twitter', 'consumerkey' );
+ $csecret = Config::get('twitter', 'consumersecret' );
+ $otoken = PConfig::get(local_user(), 'twitter', 'oauthtoken' );
+ $osecret = PConfig::get(local_user(), 'twitter', 'oauthsecret' );
+ $enabled = PConfig::get(local_user(), 'twitter', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $defenabled = get_pconfig(local_user(),'twitter','post_by_default');
+ $defenabled = PConfig::get(local_user(),'twitter','post_by_default');
$defchecked = (($defenabled) ? ' checked="checked" ' : '');
- $mirrorenabled = get_pconfig(local_user(),'twitter','mirror_posts');
+ $mirrorenabled = PConfig::get(local_user(),'twitter','mirror_posts');
$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
- $importenabled = get_pconfig(local_user(),'twitter','import');
+ $importenabled = PConfig::get(local_user(),'twitter','import');
$importchecked = (($importenabled) ? ' checked="checked" ' : '');
- $create_userenabled = get_pconfig(local_user(),'twitter','create_user');
+ $create_userenabled = PConfig::get(local_user(),'twitter','create_user');
$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
$css = (($enabled) ? '' : '-disabled');
return;
}
- $twitter_post = intval(get_pconfig(local_user(), 'twitter', 'post'));
+ $twitter_post = intval(PConfig::get(local_user(), 'twitter', 'post'));
$twitter_enable = (($twitter_post && x($_REQUEST, 'twitter_enable')) ? intval($_REQUEST['twitter_enable']) : 0);
// if API is used, default to the chosen settings
- if ($b['api_source'] && intval(get_pconfig(local_user(), 'twitter', 'post_by_default'))) {
+ if ($b['api_source'] && intval(PConfig::get(local_user(), 'twitter', 'post_by_default'))) {
$twitter_enable = 1;
}
function twitter_action($a, $uid, $pid, $action) {
- $ckey = get_config('twitter', 'consumerkey');
- $csecret = get_config('twitter', 'consumersecret');
- $otoken = get_pconfig($uid, 'twitter', 'oauthtoken');
- $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+ $ckey = Config::get('twitter', 'consumerkey');
+ $csecret = Config::get('twitter', 'consumersecret');
+ $otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
+ $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
require_once("addon/twitter/codebird.php");
require_once("include/network.php");
- if (!get_pconfig($b["uid"],'twitter','import')) {
+ if (!PConfig::get($b["uid"],'twitter','import')) {
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
return;
}
logger('twitter post invoked');
- load_pconfig($b['uid'], 'twitter');
+ PConfig::load($b['uid'], 'twitter');
- $ckey = get_config('twitter', 'consumerkey');
- $csecret = get_config('twitter', 'consumersecret');
- $otoken = get_pconfig($b['uid'], 'twitter', 'oauthtoken');
- $osecret = get_pconfig($b['uid'], 'twitter', 'oauthsecret');
+ $ckey = Config::get('twitter', 'consumerkey');
+ $csecret = Config::get('twitter', 'consumersecret');
+ $otoken = PConfig::get($b['uid'], 'twitter', 'oauthtoken');
+ $osecret = PConfig::get($b['uid'], 'twitter', 'oauthsecret');
if($ckey && $csecret && $otoken && $osecret) {
logger('twitter: we have customer key and oauth stuff, going to send.', LOGGER_DEBUG);
require_once('include/bbcode.php');
$tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
- $max_char = 140;
+ $max_char = 280;
require_once("include/plaintext.php");
$msgarr = plaintext($a, $b, $max_char, true, 8);
$msg = $msgarr["text"];
logger('twitter_post_with_media send, result: ' . print_r($result, true), LOGGER_DEBUG);
if ($result->source)
- set_config("twitter", "application_name", strip_tags($result->source));
+ Config::set("twitter", "application_name", strip_tags($result->source));
if ($result->errors || $result->error) {
logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG);
if ($result->source)
- set_config("twitter", "application_name", strip_tags($result->source));
+ Config::set("twitter", "application_name", strip_tags($result->source));
if ($result->errors) {
logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
$consumerkey = ((x($_POST,'consumerkey')) ? notags(trim($_POST['consumerkey'])) : '');
$consumersecret = ((x($_POST,'consumersecret')) ? notags(trim($_POST['consumersecret'])): '');
$applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'])):'');
- set_config('twitter','consumerkey',$consumerkey);
- set_config('twitter','consumersecret',$consumersecret);
- //set_config('twitter','application_name',$applicationname);
+ Config::set('twitter','consumerkey',$consumerkey);
+ Config::set('twitter','consumersecret',$consumersecret);
+ //Config::set('twitter','application_name',$applicationname);
info( t('Settings updated.'). EOL );
}
function twitter_plugin_admin(&$a, &$o){
$o = replace_macros($t, array(
'$submit' => t('Save Settings'),
// name, label, value, help, [extra values]
- '$consumerkey' => array('consumerkey', t('Consumer key'), get_config('twitter', 'consumerkey' ), ''),
- '$consumersecret' => array('consumersecret', t('Consumer secret'), get_config('twitter', 'consumersecret' ), ''),
- //'$applicationname' => array('applicationname', t('Name of the Twitter Application'), get_config('twitter','application_name'),t('Set this to the exact name you gave the app on twitter.com/apps to avoid mirroring postings from ~friendica back to ~friendica'))
+ '$consumerkey' => array('consumerkey', t('Consumer key'), Config::get('twitter', 'consumerkey' ), ''),
+ '$consumersecret' => array('consumersecret', t('Consumer secret'), Config::get('twitter', 'consumersecret' ), ''),
+ //'$applicationname' => array('applicationname', t('Name of the Twitter Application'), Config::get('twitter','application_name'),t('Set this to the exact name you gave the app on twitter.com/apps to avoid mirroring postings from ~friendica back to ~friendica'))
));
}
function twitter_cron($a,$b) {
- $last = get_config('twitter','last_poll');
+ $last = Config::get('twitter','last_poll');
- $poll_interval = intval(get_config('twitter','poll_interval'));
+ $poll_interval = intval(Config::get('twitter','poll_interval'));
if(! $poll_interval)
$poll_interval = TWITTER_DEFAULT_POLL_INTERVAL;
if(count($r)) {
foreach($r as $rr) {
logger('twitter: fetching for user '.$rr['uid']);
- proc_run(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int)$rr['uid']);
+ Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int)$rr['uid']);
}
}
- $abandon_days = intval(get_config('system','account_abandon_days'));
+ $abandon_days = intval(Config::get('system','account_abandon_days'));
if ($abandon_days < 1)
$abandon_days = 0;
}
logger('twitter: importing timeline from user '.$rr['uid']);
- proc_run(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, (int)$rr['uid']);
+ Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, (int)$rr['uid']);
/*
// To-Do
// check for new contacts once a day
- $last_contact_check = get_pconfig($rr['uid'],'pumpio','contact_check');
+ $last_contact_check = PConfig::get($rr['uid'],'pumpio','contact_check');
if($last_contact_check)
$next_contact_check = $last_contact_check + 86400;
else
if($next_contact_check <= time()) {
pumpio_getallusers($a, $rr["uid"]);
- set_pconfig($rr['uid'],'pumpio','contact_check',time());
+ PConfig::set($rr['uid'],'pumpio','contact_check',time());
}
*/
logger('twitter: cron_end');
- set_config('twitter','last_poll', time());
+ Config::set('twitter','last_poll', time());
}
function twitter_expire($a,$b) {
- $days = get_config('twitter', 'expire');
+ $days = Config::get('twitter', 'expire');
if ($days == 0)
return;
return;
if ($b["preview"]) {
- $max_char = 140;
+ $max_char = 280;
require_once("include/plaintext.php");
$item = $b["item"];
$item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
}
function twitter_fetchtimeline($a, $uid) {
- $ckey = get_config('twitter', 'consumerkey');
- $csecret = get_config('twitter', 'consumersecret');
- $otoken = get_pconfig($uid, 'twitter', 'oauthtoken');
- $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
- $lastid = get_pconfig($uid, 'twitter', 'lastid');
+ $ckey = Config::get('twitter', 'consumerkey');
+ $csecret = Config::get('twitter', 'consumersecret');
+ $otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
+ $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+ $lastid = PConfig::get($uid, 'twitter', 'lastid');
- $application_name = get_config('twitter', 'application_name');
+ $application_name = Config::get('twitter', 'application_name');
if ($application_name == "")
$application_name = $a->get_hostname();
foreach ($posts as $post) {
if ($post->id_str > $lastid) {
$lastid = $post->id_str;
- set_pconfig($uid, 'twitter', 'lastid', $lastid);
+ PConfig::set($uid, 'twitter', 'lastid', $lastid);
}
if ($first_time)
}
}
}
- set_pconfig($uid, 'twitter', 'lastid', $lastid);
+ PConfig::set($uid, 'twitter', 'lastid', $lastid);
}
function twitter_queue_hook(&$a,&$b) {
$user = $r[0];
- $ckey = get_config('twitter', 'consumerkey');
- $csecret = get_config('twitter', 'consumersecret');
- $otoken = get_pconfig($user['uid'], 'twitter', 'oauthtoken');
- $osecret = get_pconfig($user['uid'], 'twitter', 'oauthsecret');
+ $ckey = Config::get('twitter', 'consumerkey');
+ $csecret = Config::get('twitter', 'consumersecret');
+ $otoken = PConfig::get($user['uid'], 'twitter', 'oauthtoken');
+ $osecret = PConfig::get($user['uid'], 'twitter', 'oauthsecret');
$success = false;
}
function twitter_fetchuser($a, $uid, $screen_name = "", $user_id = "") {
- $ckey = get_config('twitter', 'consumerkey');
- $csecret = get_config('twitter', 'consumersecret');
- $otoken = get_pconfig($uid, 'twitter', 'oauthtoken');
- $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+ $ckey = Config::get('twitter', 'consumerkey');
+ $csecret = Config::get('twitter', 'consumersecret');
+ $otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
+ $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
require_once("addon/twitter/codebird.php");
}
// Is it me?
- $own_id = get_pconfig($uid, 'twitter', 'own_id');
+ $own_id = PConfig::get($uid, 'twitter', 'own_id');
if ($post->user->id_str == $own_id) {
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
}
function twitter_fetchhometimeline($a, $uid) {
- $ckey = get_config('twitter', 'consumerkey');
- $csecret = get_config('twitter', 'consumersecret');
- $otoken = get_pconfig($uid, 'twitter', 'oauthtoken');
- $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
- $create_user = get_pconfig($uid, 'twitter', 'create_user');
- $mirror_posts = get_pconfig($uid, 'twitter', 'mirror_posts');
+ $ckey = Config::get('twitter', 'consumerkey');
+ $csecret = Config::get('twitter', 'consumersecret');
+ $otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
+ $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+ $create_user = PConfig::get($uid, 'twitter', 'create_user');
+ $mirror_posts = PConfig::get($uid, 'twitter', 'mirror_posts');
logger("twitter_fetchhometimeline: Fetching for user ".$uid, LOGGER_DEBUG);
- $application_name = get_config('twitter', 'application_name');
+ $application_name = Config::get('twitter', 'application_name');
if ($application_name == "")
$application_name = $a->get_hostname();
// Fetching timeline
- $lastid = get_pconfig($uid, 'twitter', 'lasthometimelineid');
+ $lastid = PConfig::get($uid, 'twitter', 'lasthometimelineid');
$first_time = ($lastid == "");
foreach ($posts as $post) {
if ($post->id_str > $lastid) {
$lastid = $post->id_str;
- set_pconfig($uid, 'twitter', 'lasthometimelineid', $lastid);
+ PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
}
if ($first_time)
}
}
- set_pconfig($uid, 'twitter', 'lasthometimelineid', $lastid);
+ PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
// Fetching mentions
- $lastid = get_pconfig($uid, 'twitter', 'lastmentionid');
+ $lastid = PConfig::get($uid, 'twitter', 'lastmentionid');
$first_time = ($lastid == "");
}
}
- set_pconfig($uid, 'twitter', 'lastmentionid', $lastid);
+ PConfig::set($uid, 'twitter', 'lastmentionid', $lastid);
}
function twitter_fetch_own_contact($a, $uid) {
- $ckey = get_config('twitter', 'consumerkey');
- $csecret = get_config('twitter', 'consumersecret');
- $otoken = get_pconfig($uid, 'twitter', 'oauthtoken');
- $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+ $ckey = Config::get('twitter', 'consumerkey');
+ $csecret = Config::get('twitter', 'consumersecret');
+ $otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
+ $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
- $own_id = get_pconfig($uid, 'twitter', 'own_id');
+ $own_id = PConfig::get($uid, 'twitter', 'own_id');
$contact_id = 0;
// Fetching user data
$user = $connection->get('account/verify_credentials');
- set_pconfig($uid, 'twitter', 'own_id', $user->id_str);
+ PConfig::set($uid, 'twitter', 'own_id', $user->id_str);
$contact_id = twitter_fetch_contact($uid, $user, true);
if(count($r))
$contact_id = $r[0]["id"];
else
- del_pconfig($uid, 'twitter', 'own_id');
+ PConfig::delete($uid, 'twitter', 'own_id');
}
logger('twitter_is_retweet: Retweeting id '.$id.' for user '.$uid, LOGGER_DEBUG);
- $ckey = get_config('twitter', 'consumerkey');
- $csecret = get_config('twitter', 'consumersecret');
- $otoken = get_pconfig($uid, 'twitter', 'oauthtoken');
- $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+ $ckey = Config::get('twitter', 'consumerkey');
+ $csecret = Config::get('twitter', 'consumersecret');
+ $otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
+ $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
require_once('library/twitteroauth.php');
$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
projects / friendica-addons.git / commitdiff