X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=statusnet%2Fstatusnet.php;h=3c6ac4995cad988726636829fed15d99f0583495;hb=cdfa834f05d0c5fdda6a117ada87d95bb7def033;hp=e030232f184fb42e5b01ea415e2774a6d53b49e7;hpb=6d6e73096afb22e95678c651e055337f1bf5405d;p=friendica-addons.git
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index e030232f..3c6ac499 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -43,8 +43,13 @@
define('STATUSNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
-require_once('library/twitteroauth.php');
-require_once('include/enotify.php');
+require_once 'library/twitteroauth.php';
+require_once 'include/enotify.php';
+
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Model\GlobalContact;
+use Friendica\Object\Photo;
class StatusNetOAuth extends TwitterOAuth {
function get_maxlength() {
@@ -70,11 +75,11 @@ class StatusNetOAuth extends TwitterOAuth {
$this->http_info = array();
$ci = curl_init();
/* Curl settings */
- $prx = get_config('system','proxy');
+ $prx = Config::get('system','proxy');
if(strlen($prx)) {
curl_setopt($ci, CURLOPT_HTTPPROXYTUNNEL, 1);
curl_setopt($ci, CURLOPT_PROXY, $prx);
- $prxusr = get_config('system','proxyuser');
+ $prxusr = Config::get('system','proxyuser');
if(strlen($prxusr))
curl_setopt($ci, CURLOPT_PROXYUSERPWD, $prxusr);
}
@@ -143,18 +148,18 @@ function statusnet_uninstall() {
}
function statusnet_check_item_notification($a, &$notification_data) {
- $notification_data["profiles"][] = get_pconfig($notification_data["uid"], 'statusnet', 'own_url');
+ $notification_data["profiles"][] = PConfig::get($notification_data["uid"], 'statusnet', 'own_url');
}
function statusnet_jot_nets(&$a,&$b) {
if(! local_user())
return;
- $statusnet_post = get_pconfig(local_user(),'statusnet','post');
+ $statusnet_post = PConfig::get(local_user(),'statusnet','post');
if(intval($statusnet_post) == 1) {
- $statusnet_defpost = get_pconfig(local_user(),'statusnet','post_by_default');
+ $statusnet_defpost = PConfig::get(local_user(),'statusnet','post_by_default');
$selected = ((intval($statusnet_defpost) == 1) ? ' checked="checked" ' : '');
- $b .= '
'
+ $b .= '
'
. t('Post to GNU Social') . '
';
}
}
@@ -170,18 +175,18 @@ function statusnet_settings_post ($a,$post) {
/***
* if the GNU Social-disconnect checkbox is set, clear the GNU Social configuration
*/
- del_pconfig(local_user(), 'statusnet', 'consumerkey');
- del_pconfig(local_user(), 'statusnet', 'consumersecret');
- del_pconfig(local_user(), 'statusnet', 'post');
- del_pconfig(local_user(), 'statusnet', 'post_by_default');
- del_pconfig(local_user(), 'statusnet', 'oauthtoken');
- del_pconfig(local_user(), 'statusnet', 'oauthsecret');
- del_pconfig(local_user(), 'statusnet', 'baseapi');
- del_pconfig(local_user(), 'statusnet', 'lastid');
- del_pconfig(local_user(), 'statusnet', 'mirror_posts');
- del_pconfig(local_user(), 'statusnet', 'import');
- del_pconfig(local_user(), 'statusnet', 'create_user');
- del_pconfig(local_user(), 'statusnet', 'own_id');
+ PConfig::delete(local_user(), 'statusnet', 'consumerkey');
+ PConfig::delete(local_user(), 'statusnet', 'consumersecret');
+ PConfig::delete(local_user(), 'statusnet', 'post');
+ PConfig::delete(local_user(), 'statusnet', 'post_by_default');
+ PConfig::delete(local_user(), 'statusnet', 'oauthtoken');
+ PConfig::delete(local_user(), 'statusnet', 'oauthsecret');
+ PConfig::delete(local_user(), 'statusnet', 'baseapi');
+ PConfig::delete(local_user(), 'statusnet', 'lastid');
+ PConfig::delete(local_user(), 'statusnet', 'mirror_posts');
+ PConfig::delete(local_user(), 'statusnet', 'import');
+ PConfig::delete(local_user(), 'statusnet', 'create_user');
+ PConfig::delete(local_user(), 'statusnet', 'own_id');
} else {
if (isset($_POST['statusnet-preconf-apiurl'])) {
/***
@@ -189,16 +194,16 @@ function statusnet_settings_post ($a,$post) {
* use them. All the data are available in the global config.
* Check the API Url never the less and blame the admin if it's not working ^^
*/
- $globalsn = get_config('statusnet', 'sites');
+ $globalsn = Config::get('statusnet', 'sites');
foreach ( $globalsn as $asn) {
if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl'] ) {
$apibase = $asn['apiurl'];
$c = fetch_url( $apibase . 'statusnet/version.xml' );
if (strlen($c) > 0) {
- set_pconfig(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey'] );
- set_pconfig(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret'] );
- set_pconfig(local_user(), 'statusnet', 'baseapi', $asn['apiurl'] );
- //set_pconfig(local_user(), 'statusnet', 'application_name', $asn['applicationname'] );
+ PConfig::set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey'] );
+ PConfig::set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret'] );
+ PConfig::set(local_user(), 'statusnet', 'baseapi', $asn['apiurl'] );
+ //PConfig::set(local_user(), 'statusnet', 'application_name', $asn['applicationname'] );
} else {
notice( t('Please contact your site administrator.
The provided API URL is not valid.').EOL.$asn['apiurl'].EOL );
}
@@ -214,19 +219,19 @@ function statusnet_settings_post ($a,$post) {
$c = fetch_url( $apibase . 'statusnet/version.xml' );
if (strlen($c) > 0) {
// ok the API path is correct, let's save the settings
- set_pconfig(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
- set_pconfig(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
- set_pconfig(local_user(), 'statusnet', 'baseapi', $apibase );
- //set_pconfig(local_user(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] );
+ PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
+ PConfig::set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
+ PConfig::set(local_user(), 'statusnet', 'baseapi', $apibase );
+ //PConfig::set(local_user(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] );
} else {
// the API path is not correct, maybe missing trailing / ?
$apibase = $apibase . '/';
$c = fetch_url( $apibase . 'statusnet/version.xml' );
if (strlen($c) > 0) {
// ok the API path is now correct, let's save the settings
- set_pconfig(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
- set_pconfig(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
- set_pconfig(local_user(), 'statusnet', 'baseapi', $apibase );
+ PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
+ PConfig::set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
+ PConfig::set(local_user(), 'statusnet', 'baseapi', $apibase );
} else {
// still not the correct API base, let's do noting
notice( t('We could not contact the GNU Social API with the Path you entered.').EOL );
@@ -236,32 +241,32 @@ function statusnet_settings_post ($a,$post) {
} else {
if (isset($_POST['statusnet-pin'])) {
// if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
- $api = get_pconfig(local_user(), 'statusnet', 'baseapi');
- $ckey = get_pconfig(local_user(), 'statusnet', 'consumerkey' );
- $csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' );
+ $api = PConfig::get(local_user(), 'statusnet', 'baseapi');
+ $ckey = PConfig::get(local_user(), 'statusnet', 'consumerkey' );
+ $csecret = PConfig::get(local_user(), 'statusnet', '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 GNU Social using these token
// and secret to request a Access Token with the PIN
$connection = new StatusNetOAuth($api, $ckey, $csecret, $_POST['statusnet-token'], $_POST['statusnet-token2']);
$token = $connection->getAccessToken( $_POST['statusnet-pin'] );
// ok, now that we have the Access Token, save them in the user config
- set_pconfig(local_user(),'statusnet', 'oauthtoken', $token['oauth_token']);
- set_pconfig(local_user(),'statusnet', 'oauthsecret', $token['oauth_token_secret']);
- set_pconfig(local_user(),'statusnet', 'post', 1);
- set_pconfig(local_user(),'statusnet', 'post_taglinks', 1);
+ PConfig::set(local_user(),'statusnet', 'oauthtoken', $token['oauth_token']);
+ PConfig::set(local_user(),'statusnet', 'oauthsecret', $token['oauth_token_secret']);
+ PConfig::set(local_user(),'statusnet', 'post', 1);
+ PConfig::set(local_user(),'statusnet', 'post_taglinks', 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 dent for every new __public__ posting to the wall
- set_pconfig(local_user(),'statusnet','post',intval($_POST['statusnet-enable']));
- set_pconfig(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default']));
- set_pconfig(local_user(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror']));
- set_pconfig(local_user(), 'statusnet', 'import', intval($_POST['statusnet-import']));
- set_pconfig(local_user(), 'statusnet', 'create_user', intval($_POST['statusnet-create_user']));
+ PConfig::set(local_user(),'statusnet','post',intval($_POST['statusnet-enable']));
+ PConfig::set(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default']));
+ PConfig::set(local_user(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror']));
+ PConfig::set(local_user(), 'statusnet', 'import', intval($_POST['statusnet-import']));
+ PConfig::set(local_user(), 'statusnet', 'create_user', intval($_POST['statusnet-create_user']));
if (!intval($_POST['statusnet-mirror']))
- del_pconfig(local_user(),'statusnet','lastid');
+ PConfig::delete(local_user(),'statusnet','lastid');
info( t('GNU Social settings updated.') . EOL);
}}}}
@@ -276,23 +281,23 @@ function statusnet_settings(&$a,&$s) {
* allow the user to cancel the connection process at this step
* 3) Checkbox for "Send public notices (respect size limitation)
*/
- $api = get_pconfig(local_user(), 'statusnet', 'baseapi');
- $ckey = get_pconfig(local_user(), 'statusnet', 'consumerkey');
- $csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret');
- $otoken = get_pconfig(local_user(), 'statusnet', 'oauthtoken');
- $osecret = get_pconfig(local_user(), 'statusnet', 'oauthsecret');
- $enabled = get_pconfig(local_user(), 'statusnet', 'post');
+ $api = PConfig::get(local_user(), 'statusnet', 'baseapi');
+ $ckey = PConfig::get(local_user(), 'statusnet', 'consumerkey');
+ $csecret = PConfig::get(local_user(), 'statusnet', 'consumersecret');
+ $otoken = PConfig::get(local_user(), 'statusnet', 'oauthtoken');
+ $osecret = PConfig::get(local_user(), 'statusnet', 'oauthsecret');
+ $enabled = PConfig::get(local_user(), 'statusnet', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $defenabled = get_pconfig(local_user(),'statusnet','post_by_default');
+ $defenabled = PConfig::get(local_user(),'statusnet','post_by_default');
$defchecked = (($defenabled) ? ' checked="checked" ' : '');
- $mirrorenabled = get_pconfig(local_user(),'statusnet','mirror_posts');
+ $mirrorenabled = PConfig::get(local_user(),'statusnet','mirror_posts');
$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
- $import = get_pconfig(local_user(),'statusnet','import');
+ $import = PConfig::get(local_user(),'statusnet','import');
$importselected = array("", "", "");
$importselected[$import] = ' selected="selected"';
- //$importenabled = get_pconfig(local_user(),'statusnet','import');
+ //$importenabled = PConfig::get(local_user(),'statusnet','import');
//$importchecked = (($importenabled) ? ' checked="checked" ' : '');
- $create_userenabled = get_pconfig(local_user(),'statusnet','create_user');
+ $create_userenabled = PConfig::get(local_user(),'statusnet','create_user');
$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
$css = (($enabled) ? '' : '-disabled');
@@ -309,7 +314,7 @@ function statusnet_settings(&$a,&$s) {
/***
* no consumer keys
*/
- $globalsn = get_config('statusnet', 'sites');
+ $globalsn = Config::get('statusnet', 'sites');
/***
* lets check if we have one or more globally configured GNU Social
* server OAuth credentials in the configuration. If so offer them
@@ -420,41 +425,47 @@ function statusnet_settings(&$a,&$s) {
$s .= '
';
$s .= '
';
$s .= '