X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=twitter%2Ftwitter.php;h=2fff1b18221f11d0b67bd05301e8977c7be0370d;hb=2effabed63e9c762cb72e16dfd02bbb00319201a;hp=0f074ba3179375587accbd77f283a6cc81e58cad;hpb=cd4af64ff2fd1dfa275c78905acc5e409d2599b9;p=friendica-addons.git
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 0f074ba3..2fff1b18 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -32,7 +32,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-
+
/* Twitter Plugin for Friendica
*
* Author: Tobias Diekershoff
@@ -63,6 +63,9 @@
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() {
@@ -103,7 +106,7 @@ function twitter_uninstall() {
}
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"]),
@@ -118,7 +121,7 @@ function twitter_follow($a, &$contact) {
logger("twitter_follow: Check if contact is twitter contact. ".$contact["url"], LOGGER_DEBUG);
- if (!strstr($contact["url"], "://twitter.com") AND !strstr($contact["url"], "@twitter.com"))
+ if (!strstr($contact["url"], "://twitter.com") && !strstr($contact["url"], "@twitter.com"))
return;
// contact seems to be a twitter contact, so continue
@@ -127,10 +130,10 @@ function twitter_follow($a, &$contact) {
$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");
@@ -157,11 +160,11 @@ function twitter_jot_nets(&$a,&$b) {
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 .= '
'
+ $b .= '
'
. t('Post to Twitter') . '
';
}
}
@@ -194,27 +197,27 @@ function twitter_settings_post ($a,$post) {
// 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');
@@ -229,21 +232,21 @@ function twitter_settings(&$a,&$s) {
/***
* 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');
@@ -327,42 +330,48 @@ function twitter_settings(&$a,&$s) {
$s .= '';
$s .= '';
$s .= '