';
}
}
-function statusnet_settings_post ($a,$post) {
- if(! local_user())
+function statusnet_settings_post(App $a, $post)
+{
+ if (!local_user()) {
return;
+ }
// don't check GNU Social settings if GNU Social submit button is not clicked
- if (!x($_POST,'statusnet-submit'))
+ if (!x($_POST, 'statusnet-submit')) {
return;
+ }
if (isset($_POST['statusnet-disconnect'])) {
- /***
+ /* * *
* if the GNU Social-disconnect checkbox is set, clear the GNU Social configuration
*/
PConfig::delete(local_user(), 'statusnet', 'consumerkey');
@@ -188,94 +217,100 @@ function statusnet_settings_post ($a,$post) {
PConfig::delete(local_user(), 'statusnet', 'create_user');
PConfig::delete(local_user(), 'statusnet', 'own_id');
} else {
- if (isset($_POST['statusnet-preconf-apiurl'])) {
- /***
- * If the user used one of the preconfigured GNU Social server credentials
- * 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 = 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 (isset($_POST['statusnet-preconf-apiurl'])) {
+ /* * *
+ * If the user used one of the preconfigured GNU Social server credentials
+ * 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 = 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) {
+ 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);
+ }
+ }
+ }
+ goaway($a->get_baseurl() . '/settings/connectors');
+ } else {
+ if (isset($_POST['statusnet-consumersecret'])) {
+ // check if we can reach the API of the GNU Social server
+ // we'll check the API Version for that, if we don't get one we'll try to fix the path but will
+ // resign quickly after this one try to fix the path ;-)
+ $apibase = $_POST['statusnet-baseapi'];
+ $c = fetch_url($apibase . 'statusnet/version.xml');
if (strlen($c) > 0) {
- 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'] );
+ // ok the API path is correct, let's save the settings
+ 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 {
- notice( t('Please contact your site administrator. The provided API URL is not valid.').EOL.$asn['apiurl'].EOL );
+ // 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
+ 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);
+ }
+ }
+ goaway($a->get_baseurl() . '/settings/connectors');
+ } else {
+ if (isset($_POST['statusnet-pin'])) {
+ // if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
+ $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
+ 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
+ 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']))
+ PConfig::delete(local_user(), 'statusnet', 'lastid');
+
+ info(t('GNU Social settings updated.') . EOL);
}
}
}
- goaway($a->get_baseurl().'/settings/connectors');
- } else {
- if (isset($_POST['statusnet-consumersecret'])) {
- // check if we can reach the API of the GNU Social server
- // we'll check the API Version for that, if we don't get one we'll try to fix the path but will
- // resign quickly after this one try to fix the path ;-)
- $apibase = $_POST['statusnet-baseapi'];
- $c = fetch_url( $apibase . 'statusnet/version.xml' );
- if (strlen($c) > 0) {
- // ok the API path is correct, let's save the settings
- 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
- 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 );
- }
- }
- goaway($a->get_baseurl().'/settings/connectors');
- } else {
- if (isset($_POST['statusnet-pin'])) {
- // if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
- $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
- 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
- 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']))
- PConfig::delete(local_user(),'statusnet','lastid');
-
- info( t('GNU Social settings updated.') . EOL);
- }}}}
+ }
}
-function statusnet_settings(&$a,&$s) {
- if(! local_user())
+
+function statusnet_settings(App $a, &$s)
+{
+ if (!local_user()) {
return;
+ }
$a->page['htmlhead'] .= '' . "\r\n";
- /***
+ /* * *
* 1) Check that we have a base api url and a consumer key & secret
* 2) If no OAuthtoken & stuff is present, generate button to get some
* allow the user to cancel the connection process at this step
@@ -288,59 +323,59 @@ function statusnet_settings(&$a,&$s) {
$osecret = PConfig::get(local_user(), 'statusnet', 'oauthsecret');
$enabled = PConfig::get(local_user(), 'statusnet', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $defenabled = PConfig::get(local_user(),'statusnet','post_by_default');
+ $defenabled = PConfig::get(local_user(), 'statusnet', 'post_by_default');
$defchecked = (($defenabled) ? ' checked="checked" ' : '');
- $mirrorenabled = PConfig::get(local_user(),'statusnet','mirror_posts');
+ $mirrorenabled = PConfig::get(local_user(), 'statusnet', 'mirror_posts');
$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
- $import = PConfig::get(local_user(),'statusnet','import');
+ $import = PConfig::get(local_user(), 'statusnet', 'import');
$importselected = array("", "", "");
$importselected[$import] = ' selected="selected"';
//$importenabled = PConfig::get(local_user(),'statusnet','import');
//$importchecked = (($importenabled) ? ' checked="checked" ' : '');
- $create_userenabled = PConfig::get(local_user(),'statusnet','create_user');
+ $create_userenabled = PConfig::get(local_user(), 'statusnet', 'create_user');
$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
$css = (($enabled) ? '' : '-disabled');
$s .= '';
- $s .= '
'. t('GNU Social Import/Export/Mirror').'
';
+ $s .= '
' . t('GNU Social Import/Export/Mirror') . '
';
$s .= '';
$s .= '
';
$s .= '';
- $s .= '
'. t('GNU Social Import/Export/Mirror').'
';
+ $s .= '
' . t('GNU Social Import/Export/Mirror') . '
';
$s .= '';
- if ( (!$ckey) && (!$csecret) ) {
- /***
+ if ((!$ckey) && (!$csecret)) {
+ /* * *
* no consumer keys
*/
$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
* with a little explanation to the user as choice - otherwise
* ignore this option entirely.
*/
- if (! $globalsn == null) {
+ if (!$globalsn == null) {
$s .= '
' . t('Globally Available GNU Social OAuthKeys') . '
';
- $s .= '
'. t("There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance \x28see below\x29.") .'
';
+ $s .= '
' . t("There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance \x28see below\x29.") . '
'. t('No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root. Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation.') .'
';
+ $s .= '
' . t('No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root. Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation.') . '
';
} else {
- /***
+ /* * *
* ok we have a consumer key pair now look into the OAuth stuff
*/
- if ( (!$otoken) && (!$osecret) ) {
- /***
+ if ((!$otoken) && (!$osecret)) {
+ /* * *
* the user has not yet connected the account to GNU Social
* get a temporary OAuth key/secret pair and display a button with
* which the user can request a PIN to connect the account to a
@@ -362,67 +397,67 @@ function statusnet_settings(&$a,&$s) {
$connection = new StatusNetOAuth($api, $ckey, $csecret);
$request_token = $connection->getRequestToken('oob');
$token = $request_token['oauth_token'];
- /***
+ /* * *
* make some nice form
*/
- $s .= '
'. t('To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your public posts will be posted to GNU Social.') .'
';
- $s .= '';
+ $s .= '
' . t('To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your public posts will be posted to GNU Social.') . '
' . t('Current GNU Social API is') . ': ' . $api . '
';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '';
} else {
- /***
+ /* * *
* we have an OAuth key / secret pair for the user
* so let's give a chance to disable the postings to GNU Social
*/
- $connection = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
+ $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
$details = $connection->get('account/verify_credentials');
- $s .= '
'. t('If enabled all your public postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') .'
' . t('If enabled all your public postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') . '
';
if ($a->user['hidewall']) {
- $s .= '
'. t('Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') .'
';
+ $s .= '
' . t('Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '
';
}
-
-function statusnet_post_local(&$a, &$b) {
+function statusnet_post_local(App $a, &$b)
+{
if ($b['edit']) {
return;
}
@@ -441,11 +476,11 @@ function statusnet_post_local(&$a, &$b) {
return;
}
- $statusnet_post = PConfig::get(local_user(),'statusnet','post');
- $statusnet_enable = (($statusnet_post && x($_REQUEST,'statusnet_enable')) ? intval($_REQUEST['statusnet_enable']) : 0);
+ $statusnet_post = PConfig::get(local_user(), 'statusnet', 'post');
+ $statusnet_enable = (($statusnet_post && x($_REQUEST, 'statusnet_enable')) ? intval($_REQUEST['statusnet_enable']) : 0);
// if API is used, default to the chosen settings
- if ($b['api_source'] && intval(PConfig::get(local_user(),'statusnet','post_by_default'))) {
+ if ($b['api_source'] && intval(PConfig::get(local_user(), 'statusnet', 'post_by_default'))) {
$statusnet_enable = 1;
}
@@ -460,64 +495,61 @@ function statusnet_post_local(&$a, &$b) {
$b['postopts'] .= 'statusnet';
}
-function statusnet_action($a, $uid, $pid, $action) {
- $api = PConfig::get($uid, 'statusnet', 'baseapi');
- $ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
+function statusnet_action(App $a, $uid, $pid, $action)
+{
+ $api = PConfig::get($uid, 'statusnet', 'baseapi');
+ $ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
- $otoken = PConfig::get($uid, 'statusnet', 'oauthtoken');
+ $otoken = PConfig::get($uid, 'statusnet', 'oauthtoken');
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
- $connection = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
+ $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
- logger("statusnet_action '".$action."' ID: ".$pid, LOGGER_DATA);
+ logger("statusnet_action '" . $action . "' ID: " . $pid, LOGGER_DATA);
switch ($action) {
case "delete":
- $result = $connection->post("statuses/destroy/".$pid);
+ $result = $connection->post("statuses/destroy/" . $pid);
break;
case "like":
- $result = $connection->post("favorites/create/".$pid);
+ $result = $connection->post("favorites/create/" . $pid);
break;
case "unlike":
- $result = $connection->post("favorites/destroy/".$pid);
+ $result = $connection->post("favorites/destroy/" . $pid);
break;
}
- logger("statusnet_action '".$action."' send, result: " . print_r($result, true), LOGGER_DEBUG);
+ logger("statusnet_action '" . $action . "' send, result: " . print_r($result, true), LOGGER_DEBUG);
}
-function statusnet_post_hook(&$a,&$b) {
-
+function statusnet_post_hook(App $a, &$b)
+{
/**
* Post to GNU Social
*/
-
- if (!PConfig::get($b["uid"],'statusnet','import')) {
- if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+ if (!PConfig::get($b["uid"], 'statusnet', 'import')) {
+ if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
return;
}
$api = PConfig::get($b["uid"], 'statusnet', 'baseapi');
$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
- if($b['parent'] != $b['id']) {
- logger("statusnet_post_hook: parameter ".print_r($b, true), LOGGER_DATA);
+ if ($b['parent'] != $b['id']) {
+ logger("statusnet_post_hook: parameter " . print_r($b, true), LOGGER_DATA);
// Looking if its a reply to a GNU Social post
$hostlength = strlen($hostname) + 2;
- if ((substr($b["parent-uri"], 0, $hostlength) != $hostname."::") && (substr($b["extid"], 0, $hostlength) != $hostname."::")
- && (substr($b["thr-parent"], 0, $hostlength) != $hostname."::")) {
- logger("statusnet_post_hook: no GNU Social post ".$b["parent"]);
+ if ((substr($b["parent-uri"], 0, $hostlength) != $hostname . "::") && (substr($b["extid"], 0, $hostlength) != $hostname . "::") && (substr($b["thr-parent"], 0, $hostlength) != $hostname . "::")) {
+ logger("statusnet_post_hook: no GNU Social post " . $b["parent"]);
return;
}
$r = q("SELECT `item`.`author-link`, `item`.`uri`, `contact`.`nick` AS contact_nick
FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- WHERE `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1",
- dbesc($b["thr-parent"]),
- intval($b["uid"]));
+ WHERE `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1", dbesc($b["thr-parent"]), intval($b["uid"]));
- if(!count($r)) {
- logger("statusnet_post_hook: no parent found ".$b["thr-parent"]);
+ if (!count($r)) {
+ logger("statusnet_post_hook: no parent found " . $b["thr-parent"]);
return;
} else {
$iscomment = true;
@@ -529,18 +561,18 @@ function statusnet_post_hook(&$a,&$b) {
$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
- $nickname = "@[url=".$orig_post["author-link"]."]".$nick."[/url]";
- $nicknameplain = "@".$nick;
+ $nickname = "@[url=" . $orig_post["author-link"] . "]" . $nick . "[/url]";
+ $nicknameplain = "@" . $nick;
- logger("statusnet_post_hook: comparing ".$nickname." and ".$nicknameplain." with ".$b["body"], LOGGER_DEBUG);
+ logger("statusnet_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"], LOGGER_DEBUG);
if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false))
- $b["body"] = $nickname." ".$b["body"];
+ $b["body"] = $nickname . " " . $b["body"];
- logger("statusnet_post_hook: parent found ".print_r($orig_post, true), LOGGER_DEBUG);
+ logger("statusnet_post_hook: parent found " . print_r($orig_post, true), LOGGER_DEBUG);
} else {
$iscomment = false;
- if($b['private'] || !strstr($b['postopts'],'statusnet'))
+ if ($b['private'] || !strstr($b['postopts'], 'statusnet'))
return;
// Dont't post if the post doesn't belong to us.
@@ -551,11 +583,12 @@ function statusnet_post_hook(&$a,&$b) {
}
}
- if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])
+ if (($b['verb'] == ACTIVITY_POST) && $b['deleted']) {
statusnet_action($a, $b["uid"], substr($orig_post["uri"], $hostlength), "delete");
+ }
- if($b['verb'] == ACTIVITY_LIKE) {
- logger("statusnet_post_hook: parameter 2 ".substr($b["thr-parent"], $hostlength), LOGGER_DEBUG);
+ if ($b['verb'] == ACTIVITY_LIKE) {
+ logger("statusnet_post_hook: parameter 2 " . substr($b["thr-parent"], $hostlength), LOGGER_DEBUG);
if ($b['deleted'])
statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "unlike");
else
@@ -563,15 +596,18 @@ function statusnet_post_hook(&$a,&$b) {
return;
}
- if($b['deleted'] || ($b['created'] !== $b['edited']))
+ if ($b['deleted'] || ($b['created'] !== $b['edited'])) {
return;
+ }
// if posts comes from GNU Social don't send it back
- if($b['extid'] == NETWORK_STATUSNET)
+ if ($b['extid'] == NETWORK_STATUSNET) {
return;
+ }
- if($b['app'] == "StatusNet")
+ if ($b['app'] == "StatusNet") {
return;
+ }
logger('GNU Socialpost invoked');
@@ -583,21 +619,21 @@ function statusnet_post_hook(&$a,&$b) {
$otoken = PConfig::get($b['uid'], 'statusnet', 'oauthtoken');
$osecret = PConfig::get($b['uid'], 'statusnet', 'oauthsecret');
- if($ckey && $csecret && $otoken && $osecret) {
-
+ if ($ckey && $csecret && $otoken && $osecret) {
// If it's a repeated message from GNU Social then do a native retweet and exit
- if (statusnet_is_retweet($a, $b['uid'], $b['body']))
+ if (statusnet_is_retweet($a, $b['uid'], $b['body'])) {
return;
+ }
- require_once('include/bbcode.php');
- $dent = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
+ require_once 'include/bbcode.php';
+ $dent = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
$max_char = $dent->get_maxlength(); // max. length for a dent
PConfig::set($b['uid'], 'statusnet', 'max_char', $max_char);
$tempfile = "";
- require_once("include/plaintext.php");
- require_once("include/network.php");
+ require_once "include/plaintext.php";
+ require_once "include/network.php";
$msgarr = plaintext($a, $b, $max_char, true, 7);
$msg = $msgarr["text"];
@@ -608,104 +644,108 @@ function statusnet_post_hook(&$a,&$b) {
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
if ((strlen($msgarr["url"]) > 20) &&
- ((strlen($msg." \n".$msgarr["url"]) > $max_char)))
- $msg .= " \n".short_link($msgarr["url"]);
- else
- $msg .= " \n".$msgarr["url"];
- } elseif (isset($msgarr["image"]) && ($msgarr["type"] != "video"))
+ ((strlen($msg . " \n" . $msgarr["url"]) > $max_char))) {
+ $msg .= " \n" . short_link($msgarr["url"]);
+ } else {
+ $msg .= " \n" . $msgarr["url"];
+ }
+ } elseif (isset($msgarr["image"]) && ($msgarr["type"] != "video")) {
$image = $msgarr["image"];
+ }
if ($image != "") {
$img_str = fetch_url($image);
$tempfile = tempnam(get_temppath(), "cache");
file_put_contents($tempfile, $img_str);
$postdata = array("status" => $msg, "media[]" => $tempfile);
- } else
- $postdata = array("status"=>$msg);
+ } else {
+ $postdata = array("status" => $msg);
+ }
// and now dent it :-)
- if(strlen($msg)) {
-
+ if (strlen($msg)) {
if ($iscomment) {
$postdata["in_reply_to_status_id"] = substr($orig_post["uri"], $hostlength);
- logger('statusnet_post send reply '.print_r($postdata, true), LOGGER_DEBUG);
+ logger('statusnet_post send reply ' . print_r($postdata, true), LOGGER_DEBUG);
}
// New code that is able to post pictures
- require_once("addon/statusnet/codebird.php");
+ require_once "addon/statusnet/codebird.php";
$cb = \CodebirdSN\CodebirdSN::getInstance();
$cb->setAPIEndpoint($api);
$cb->setConsumerKey($ckey, $csecret);
$cb->setToken($otoken, $osecret);
$result = $cb->statuses_update($postdata);
//$result = $dent->post('statuses/update', $postdata);
- logger('statusnet_post send, result: ' . print_r($result, true).
- "\nmessage: ".$msg, LOGGER_DEBUG."\nOriginal post: ".print_r($b, true)."\nPost Data: ".print_r($postdata, true));
+ logger('statusnet_post send, result: ' . print_r($result, true) .
+ "\nmessage: " . $msg, LOGGER_DEBUG . "\nOriginal post: " . print_r($b, true) . "\nPost Data: " . print_r($postdata, true));
- if ($result->source)
+ if ($result->source) {
PConfig::set($b["uid"], "statusnet", "application_name", strip_tags($result->source));
+ }
if ($result->error) {
- logger('Send to GNU Social failed: "'.$result->error.'"');
+ logger('Send to GNU Social failed: "' . $result->error . '"');
} elseif ($iscomment) {
- logger('statusnet_post: Update extid '.$result->id." for post id ".$b['id']);
+ logger('statusnet_post: Update extid ' . $result->id . " for post id " . $b['id']);
q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d",
- dbesc($hostname."::".$result->id),
+ dbesc($hostname . "::" . $result->id),
dbesc($result->text),
intval($b['id'])
);
}
}
- if ($tempfile != "")
+ if ($tempfile != "") {
unlink($tempfile);
+ }
}
}
-function statusnet_plugin_admin_post(&$a){
-
+function statusnet_plugin_admin_post(App $a)
+{
$sites = array();
- foreach($_POST['sitename'] as $id=>$sitename){
- $sitename=trim($sitename);
- $apiurl=trim($_POST['apiurl'][$id]);
- if (! (substr($apiurl, -1)=='/'))
- $apiurl=$apiurl.'/';
- $secret=trim($_POST['secret'][$id]);
- $key=trim($_POST['key'][$id]);
+ foreach ($_POST['sitename'] as $id => $sitename) {
+ $sitename = trim($sitename);
+ $apiurl = trim($_POST['apiurl'][$id]);
+ if (!(substr($apiurl, -1) == '/')) {
+ $apiurl = $apiurl . '/';
+ }
+ $secret = trim($_POST['secret'][$id]);
+ $key = trim($_POST['key'][$id]);
//$applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'][$id])):'');
- if ($sitename!="" &&
- $apiurl!="" &&
- $secret!="" &&
- $key!="" &&
- !x($_POST['delete'][$id])){
+ if ($sitename != "" &&
+ $apiurl != "" &&
+ $secret != "" &&
+ $key != "" &&
+ !x($_POST['delete'][$id])) {
- $sites[] = Array(
- 'sitename' => $sitename,
- 'apiurl' => $apiurl,
- 'consumersecret' => $secret,
- 'consumerkey' => $key,
- //'applicationname' => $applicationname
- );
+ $sites[] = Array(
+ 'sitename' => $sitename,
+ 'apiurl' => $apiurl,
+ 'consumersecret' => $secret,
+ 'consumerkey' => $key,
+ //'applicationname' => $applicationname
+ );
}
}
- $sites = Config::set('statusnet','sites', $sites);
-
+ $sites = Config::set('statusnet', 'sites', $sites);
}
-function statusnet_plugin_admin(&$a, &$o){
-
- $sites = Config::get('statusnet','sites');
- $sitesform=array();
- if (is_array($sites)){
- foreach($sites as $id=>$s){
+function statusnet_plugin_admin(App $a, &$o)
+{
+ $sites = Config::get('statusnet', 'sites');
+ $sitesform = array();
+ if (is_array($sites)) {
+ foreach ($sites as $id => $s) {
$sitesform[] = Array(
'sitename' => Array("sitename[$id]", "Site name", $s['sitename'], ""),
- 'apiurl' => Array("apiurl[$id]", "Api url", $s['apiurl'], t("Base API Path \x28remember the trailing /\x29") ),
+ 'apiurl' => Array("apiurl[$id]", "Api url", $s['apiurl'], t("Base API Path \x28remember the trailing /\x29")),
'secret' => Array("secret[$id]", "Secret", $s['consumersecret'], ""),
'key' => Array("key[$id]", "Key", $s['consumerkey'], ""),
//'applicationname' => Array("applicationname[$id]", "Application name", $s['applicationname'], ""),
- 'delete' => Array("delete[$id]", "Delete", False , "Check to delete this preset"),
+ 'delete' => Array("delete[$id]", "Delete", False, "Check to delete this preset"),
);
}
}
@@ -713,31 +753,34 @@ function statusnet_plugin_admin(&$a, &$o){
$id++;
$sitesform[] = Array(
'sitename' => Array("sitename[$id]", t("Site name"), "", ""),
- 'apiurl' => Array("apiurl[$id]", "Api url", "", t("Base API Path \x28remember the trailing /\x29") ),
+ 'apiurl' => Array("apiurl[$id]", "Api url", "", t("Base API Path \x28remember the trailing /\x29")),
'secret' => Array("secret[$id]", t("Consumer Secret"), "", ""),
'key' => Array("key[$id]", t("Consumer Key"), "", ""),
//'applicationname' => Array("applicationname[$id]", t("Application name"), "", ""),
);
- $t = get_markup_template( "admin.tpl", "addon/statusnet/" );
+ $t = get_markup_template("admin.tpl", "addon/statusnet/");
$o = replace_macros($t, array(
'$submit' => t('Save Settings'),
'$sites' => $sitesform,
));
}
-function statusnet_prepare_body(&$a,&$b) {
- if ($b["item"]["network"] != NETWORK_STATUSNET)
- return;
+function statusnet_prepare_body(App $a, &$b)
+{
+ if ($b["item"]["network"] != NETWORK_STATUSNET) {
+ return;
+ }
- if ($b["preview"]) {
- $max_char = PConfig::get(local_user(),'statusnet','max_char');
- if (intval($max_char) == 0)
+ if ($b["preview"]) {
+ $max_char = PConfig::get(local_user(), 'statusnet', 'max_char');
+ if (intval($max_char) == 0) {
$max_char = 140;
+ }
- require_once("include/plaintext.php");
- $item = $b["item"];
- $item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
+ require_once "include/plaintext.php";
+ $item = $b["item"];
+ $item["plink"] = $a->get_baseurl() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
$r = q("SELECT `item`.`author-link`, `item`.`uri`, `contact`.`nick` AS contact_nick
FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@@ -745,44 +788,48 @@ function statusnet_prepare_body(&$a,&$b) {
dbesc($item["thr-parent"]),
intval(local_user()));
- if(count($r)) {
- $orig_post = $r[0];
+ if (count($r)) {
+ $orig_post = $r[0];
//$nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]";
//$nicknameplain = "@".$orig_post["contact_nick"];
$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
- $nickname = "@[url=".$orig_post["author-link"]."]".$nick."[/url]";
- $nicknameplain = "@".$nick;
+ $nickname = "@[url=" . $orig_post["author-link"] . "]" . $nick . "[/url]";
+ $nicknameplain = "@" . $nick;
- if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false))
- $item["body"] = $nickname." ".$item["body"];
- }
+ if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false)) {
+ $item["body"] = $nickname . " " . $item["body"];
+ }
+ }
+ $msgarr = plaintext($a, $item, $max_char, true, 7);
+ $msg = $msgarr["text"];
- $msgarr = plaintext($a, $item, $max_char, true, 7);
- $msg = $msgarr["text"];
+ if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
+ $msg .= " " . $msgarr["url"];
+ }
- if (isset($msgarr["url"]) && ($msgarr["type"] != "photo"))
- $msg .= " ".$msgarr["url"];
+ if (isset($msgarr["image"])) {
+ $msg .= " " . $msgarr["image"];
+ }
- if (isset($msgarr["image"]))
- $msg .= " ".$msgarr["image"];
-
- $b['html'] = nl2br(htmlspecialchars($msg));
- }
+ $b['html'] = nl2br(htmlspecialchars($msg));
+ }
}
-function statusnet_cron($a,$b) {
- $last = Config::get('statusnet','last_poll');
+function statusnet_cron(App $a, $b)
+{
+ $last = Config::get('statusnet', 'last_poll');
- $poll_interval = intval(Config::get('statusnet','poll_interval'));
- if(! $poll_interval)
+ $poll_interval = intval(Config::get('statusnet', 'poll_interval'));
+ if (!$poll_interval) {
$poll_interval = STATUSNET_DEFAULT_POLL_INTERVAL;
+ }
- if($last) {
+ if ($last) {
$next = $last + ($poll_interval * 60);
- if($next > time()) {
+ if ($next > time()) {
logger('statusnet: poll intervall not reached');
return;
}
@@ -790,41 +837,43 @@ function statusnet_cron($a,$b) {
logger('statusnet: cron_start');
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'mirror_posts' AND `v` = '1' ORDER BY RAND() ");
- if(count($r)) {
- foreach($r as $rr) {
- logger('statusnet: fetching for user '.$rr['uid']);
+ if (count($r)) {
+ foreach ($r as $rr) {
+ logger('statusnet: fetching for user ' . $rr['uid']);
statusnet_fetchtimeline($a, $rr['uid']);
}
}
- $abandon_days = intval(Config::get('system','account_abandon_days'));
- if ($abandon_days < 1)
+ $abandon_days = intval(Config::get('system', 'account_abandon_days'));
+ if ($abandon_days < 1) {
$abandon_days = 0;
+ }
$abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400);
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'import' AND `v` ORDER BY RAND()");
- if(count($r)) {
- foreach($r as $rr) {
+ if (count($r)) {
+ foreach ($r as $rr) {
if ($abandon_days != 0) {
$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
if (!count($user)) {
- logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
+ logger('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported');
continue;
}
}
- logger('statusnet: importing timeline from user '.$rr['uid']);
+ logger('statusnet: importing timeline from user ' . $rr['uid']);
statusnet_fetchhometimeline($a, $rr["uid"], $rr["v"]);
}
}
logger('statusnet: cron_end');
- Config::set('statusnet','last_poll', time());
+ Config::set('statusnet', 'last_poll', time());
}
-function statusnet_fetchtimeline($a, $uid) {
+function statusnet_fetchtimeline(App $a, $uid)
+{
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
$api = PConfig::get($uid, 'statusnet', 'baseapi');
@@ -832,129 +881,144 @@ function statusnet_fetchtimeline($a, $uid) {
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
$lastid = PConfig::get($uid, 'statusnet', 'lastid');
- require_once('mod/item.php');
- require_once('include/items.php');
+ require_once 'mod/item.php';
+ require_once 'include/items.php';
// get the application name for the SN app
// 1st try personal config, then system config and fallback to the
// hostname of the node if neither one is set.
- $application_name = PConfig::get( $uid, 'statusnet', 'application_name');
- if ($application_name == "")
- $application_name = Config::get('statusnet', 'application_name');
- if ($application_name == "")
+ $application_name = PConfig::get($uid, 'statusnet', 'application_name');
+ if ($application_name == "") {
+ $application_name = Config::get('statusnet', 'application_name');
+ }
+ if ($application_name == "") {
$application_name = $a->get_hostname();
+ }
- $connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
+ $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
$parameters = array("exclude_replies" => true, "trim_user" => true, "contributor_details" => false, "include_rts" => false);
$first_time = ($lastid == "");
- if ($lastid <> "")
+ if ($lastid <> "") {
$parameters["since_id"] = $lastid;
+ }
$items = $connection->get('statuses/user_timeline', $parameters);
- if (!is_array($items))
+ if (!is_array($items)) {
return;
+ }
$posts = array_reverse($items);
if (count($posts)) {
- foreach ($posts as $post) {
- if ($post->id > $lastid)
- $lastid = $post->id;
+ foreach ($posts as $post) {
+ if ($post->id > $lastid)
+ $lastid = $post->id;
- if ($first_time)
- continue;
-
- if ($post->source == "activity")
- continue;
-
- if (is_object($post->retweeted_status))
- continue;
-
- if ($post->in_reply_to_status_id != "")
- continue;
-
- if (!stristr($post->source, $application_name)) {
- $_SESSION["authenticated"] = true;
- $_SESSION["uid"] = $uid;
-
- unset($_REQUEST);
- $_REQUEST["type"] = "wall";
- $_REQUEST["api_source"] = true;
- $_REQUEST["profile_uid"] = $uid;
- //$_REQUEST["source"] = "StatusNet";
- $_REQUEST["source"] = $post->source;
- $_REQUEST["extid"] = NETWORK_STATUSNET;
-
- if (isset($post->id)) {
- $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_STATUSNET.":".$post->id);
+ if ($first_time) {
+ continue;
}
- //$_REQUEST["date"] = $post->created_at;
+ if ($post->source == "activity") {
+ continue;
+ }
- $_REQUEST["title"] = "";
+ if (is_object($post->retweeted_status)) {
+ continue;
+ }
- $_REQUEST["body"] = add_page_info_to_body($post->text, true);
- if (is_string($post->place->name))
- $_REQUEST["location"] = $post->place->name;
+ if ($post->in_reply_to_status_id != "") {
+ continue;
+ }
- if (is_string($post->place->full_name))
- $_REQUEST["location"] = $post->place->full_name;
+ if (!stristr($post->source, $application_name)) {
+ $_SESSION["authenticated"] = true;
+ $_SESSION["uid"] = $uid;
- if (is_array($post->geo->coordinates))
- $_REQUEST["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1];
+ unset($_REQUEST);
+ $_REQUEST["type"] = "wall";
+ $_REQUEST["api_source"] = true;
+ $_REQUEST["profile_uid"] = $uid;
+ //$_REQUEST["source"] = "StatusNet";
+ $_REQUEST["source"] = $post->source;
+ $_REQUEST["extid"] = NETWORK_STATUSNET;
- if (is_array($post->coordinates->coordinates))
- $_REQUEST["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
+ if (isset($post->id)) {
+ $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_STATUSNET . ":" . $post->id);
+ }
- //print_r($_REQUEST);
- if ($_REQUEST["body"] != "") {
- logger('statusnet: posting for user '.$uid);
+ //$_REQUEST["date"] = $post->created_at;
- item_post($a);
+ $_REQUEST["title"] = "";
+
+ $_REQUEST["body"] = add_page_info_to_body($post->text, true);
+ if (is_string($post->place->name)) {
+ $_REQUEST["location"] = $post->place->name;
+ }
+
+ if (is_string($post->place->full_name)) {
+ $_REQUEST["location"] = $post->place->full_name;
+ }
+
+ if (is_array($post->geo->coordinates)) {
+ $_REQUEST["coord"] = $post->geo->coordinates[0] . " " . $post->geo->coordinates[1];
+ }
+
+ if (is_array($post->coordinates->coordinates)) {
+ $_REQUEST["coord"] = $post->coordinates->coordinates[1] . " " . $post->coordinates->coordinates[0];
+ }
+
+ //print_r($_REQUEST);
+ if ($_REQUEST["body"] != "") {
+ logger('statusnet: posting for user ' . $uid);
+
+ item_post($a);
+ }
}
}
- }
}
PConfig::set($uid, 'statusnet', 'lastid', $lastid);
}
-function statusnet_address($contact) {
+function statusnet_address($contact)
+{
$hostname = normalise_link($contact->statusnet_profile_url);
$nickname = $contact->screen_name;
$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $contact->statusnet_profile_url);
- $address = $contact->screen_name."@".$hostname;
+ $address = $contact->screen_name . "@" . $hostname;
- return($address);
+ return $address;
}
-function statusnet_fetch_contact($uid, $contact, $create_user) {
- if ($contact->statusnet_profile_url == "")
- return(-1);
-
- GlobalContact::update(array("url" => $contact->statusnet_profile_url,
- "network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url,
- "name" => $contact->name, "nick" => $contact->screen_name,
- "location" => $contact->location, "about" => $contact->description,
- "addr" => statusnet_address($contact), "generation" => 3));
-
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1",
- intval($uid), dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(NETWORK_STATUSNET));
-
- if(!count($r) && !$create_user)
- return(0);
-
- if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
- logger("statusnet_fetch_contact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
- return(-1);
+function statusnet_fetch_contact($uid, $contact, $create_user)
+{
+ if ($contact->statusnet_profile_url == "") {
+ return -1;
}
- if(!count($r)) {
+ GContact::update(array("url" => $contact->statusnet_profile_url,
+ "network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url,
+ "name" => $contact->name, "nick" => $contact->screen_name,
+ "location" => $contact->location, "about" => $contact->description,
+ "addr" => statusnet_address($contact), "generation" => 3));
+
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1", intval($uid), dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(NETWORK_STATUSNET));
+
+ if (!count($r) && !$create_user) {
+ return 0;
+ }
+
+ if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
+ logger("statusnet_fetch_contact: Contact '" . $r[0]["nick"] . "' is blocked or readonly.", LOGGER_DEBUG);
+ return -1;
+ }
+
+ if (!count($r)) {
// create contact record
q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
`name`, `nick`, `photo`, `network`, `rel`, `priority`,
@@ -984,21 +1048,22 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
intval($uid),
dbesc(NETWORK_STATUSNET));
- if(! count($r))
- return(false);
+ if (!count($r)) {
+ return false;
+ }
- $contact_id = $r[0]['id'];
+ $contact_id = $r[0]['id'];
$g = q("SELECT def_gid FROM user WHERE uid = %d LIMIT 1",
intval($uid)
);
- if($g && intval($g[0]['def_gid'])) {
- require_once('include/group.php');
- group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
+ if ($g && intval($g[0]['def_gid'])) {
+ require_once 'include/group.php';
+ group_add_member($uid, '', $contact_id, $g[0]['def_gid']);
}
- $photos = Photo::importProfilePhoto($contact->profile_image_url,$uid,$contact_id);
+ $photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $contact_id);
q("UPDATE `contact` SET `photo` = '%s',
`thumb` = '%s',
@@ -1013,15 +1078,12 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
);
} else {
// update profile photos once every two weeks as we have no notification of when they change.
-
//$update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -2 days')) ? true : false);
- $update_photo = ($r[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
+ $update_photo = ($r[0]['avatar-date'] < datetime_convert('', '', 'now -12 hours'));
// check that we have all the photos, this has been known to fail on occasion
-
- if((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
-
- logger("statusnet_fetch_contact: Updating contact ".$contact->screen_name, LOGGER_DEBUG);
+ if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
+ logger("statusnet_fetch_contact: Updating contact " . $contact->screen_name, LOGGER_DEBUG);
$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $r[0]['id']);
@@ -1057,17 +1119,18 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
}
}
- return($r[0]["id"]);
+ return $r[0]["id"];
}
-function statusnet_fetchuser($a, $uid, $screen_name = "", $user_id = "") {
+function statusnet_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
+{
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
$api = PConfig::get($uid, 'statusnet', 'baseapi');
$otoken = PConfig::get($uid, 'statusnet', 'oauthtoken');
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
- require_once("addon/statusnet/codebird.php");
+ require_once "addon/statusnet/codebird.php";
$cb = \Codebird\Codebird::getInstance();
$cb->setConsumerKey($ckey, $csecret);
@@ -1076,33 +1139,37 @@ function statusnet_fetchuser($a, $uid, $screen_name = "", $user_id = "") {
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($uid));
- if(count($r)) {
+ if (count($r)) {
$self = $r[0];
- } else
+ } else {
return;
+ }
$parameters = array();
- if ($screen_name != "")
+ if ($screen_name != "") {
$parameters["screen_name"] = $screen_name;
+ }
- if ($user_id != "")
+ if ($user_id != "") {
$parameters["user_id"] = $user_id;
+ }
// Fetching user data
$user = $cb->users_show($parameters);
- if (!is_object($user))
+ if (!is_object($user)) {
return;
+ }
$contact_id = statusnet_fetch_contact($uid, $user, true);
return $contact_id;
}
-function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact) {
-
- require_once("include/html2bbcode.php");
+function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_existing_contact)
+{
+ require_once "include/html2bbcode.php";
logger("statusnet_createpost: start", LOGGER_DEBUG);
@@ -1118,29 +1185,31 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
if (is_object($post->retweeted_status)) {
$content = $post->retweeted_status;
statusnet_fetch_contact($uid, $content->user, false);
- } else
+ } else {
$content = $post;
+ }
- $postarray['uri'] = $hostname."::".$content->id;
+ $postarray['uri'] = $hostname . "::" . $content->id;
$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
dbesc($postarray['uri']),
intval($uid)
- );
+ );
- if (count($r))
- return(array());
+ if (count($r)) {
+ return array();
+ }
$contactid = 0;
if ($content->in_reply_to_status_id != "") {
- $parent = $hostname."::".$content->in_reply_to_status_id;
+ $parent = $hostname . "::" . $content->in_reply_to_status_id;
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($parent),
intval($uid)
- );
+ );
if (count($r)) {
$postarray['thr-parent'] = $r[0]["uri"];
$postarray['parent-uri'] = $r[0]["parent-uri"];
@@ -1150,7 +1219,7 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
dbesc($parent),
intval($uid)
- );
+ );
if (count($r)) {
$postarray['thr-parent'] = $r[0]['uri'];
$postarray['parent-uri'] = $r[0]['parent-uri'];
@@ -1170,14 +1239,15 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($uid));
- if(count($r)) {
+ if (count($r)) {
$contactid = $r[0]["id"];
- $postarray['owner-name'] = $r[0]["name"];
+ $postarray['owner-name'] = $r[0]["name"];
$postarray['owner-link'] = $r[0]["url"];
- $postarray['owner-avatar'] = $r[0]["photo"];
- } else
- return(array());
+ $postarray['owner-avatar'] = $r[0]["photo"];
+ } else {
+ return array();
+ }
}
// Don't create accounts of people who just comment something
$create_user = false;
@@ -1192,10 +1262,11 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
$postarray['owner-link'] = $post->user->statusnet_profile_url;
$postarray['owner-avatar'] = $post->user->profile_image_url;
}
- if(($contactid == 0) && !$only_existing_contact)
+ if (($contactid == 0) && !$only_existing_contact) {
$contactid = $self['id'];
- elseif ($contactid <= 0)
- return(array());
+ } elseif ($contactid <= 0) {
+ return array();
+ }
$postarray['contact-id'] = $contactid;
@@ -1208,7 +1279,7 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
// To-Do: Maybe unreliable? Can the api be entered without trailing "/"?
$hostname = str_replace("/api/", "/notice/", PConfig::get($uid, 'statusnet', 'baseapi'));
- $postarray['plink'] = $hostname.$content->id;
+ $postarray['plink'] = $hostname . $content->id;
$postarray['app'] = strip_tags($content->source);
if ($content->user->protected) {
@@ -1222,98 +1293,91 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
$postarray['body'] = $converted["body"];
$postarray['tag'] = $converted["tags"];
- $postarray['created'] = datetime_convert('UTC','UTC',$content->created_at);
- $postarray['edited'] = datetime_convert('UTC','UTC',$content->created_at);
+ $postarray['created'] = datetime_convert('UTC', 'UTC', $content->created_at);
+ $postarray['edited'] = datetime_convert('UTC', 'UTC', $content->created_at);
- if (is_string($content->place->name))
+ if (is_string($content->place->name)) {
$postarray["location"] = $content->place->name;
+ }
- if (is_string($content->place->full_name))
+ if (is_string($content->place->full_name)) {
$postarray["location"] = $content->place->full_name;
+ }
- if (is_array($content->geo->coordinates))
- $postarray["coord"] = $content->geo->coordinates[0]." ".$content->geo->coordinates[1];
+ if (is_array($content->geo->coordinates)) {
+ $postarray["coord"] = $content->geo->coordinates[0] . " " . $content->geo->coordinates[1];
+ }
- if (is_array($content->coordinates->coordinates))
- $postarray["coord"] = $content->coordinates->coordinates[1]." ".$content->coordinates->coordinates[0];
+ if (is_array($content->coordinates->coordinates)) {
+ $postarray["coord"] = $content->coordinates->coordinates[1] . " " . $content->coordinates->coordinates[0];
+ }
- /*if (is_object($post->retweeted_status)) {
- $postarray['body'] = html2bbcode($post->retweeted_status->statusnet_html);
-
- $converted = statusnet_convertmsg($a, $postarray['body'], false);
- $postarray['body'] = $converted["body"];
- $postarray['tag'] = $converted["tags"];
-
- statusnet_fetch_contact($uid, $post->retweeted_status->user, false);
-
- // Let retweets look like wall-to-wall posts
- $postarray['author-name'] = $post->retweeted_status->user->name;
- $postarray['author-link'] = $post->retweeted_status->user->statusnet_profile_url;
- $postarray['author-avatar'] = $post->retweeted_status->user->profile_image_url;
- }*/
logger("statusnet_createpost: end", LOGGER_DEBUG);
- return($postarray);
+
+ return $postarray;
}
-function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray) {
-
+function statusnet_checknotification(App $a, $uid, $own_url, $top_item, $postarray)
+{
// This function necer worked and need cleanup
-
$user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
intval($uid)
- );
+ );
- if(!count($user))
+ if (!count($user)) {
return;
+ }
// Is it me?
- if (link_compare($user[0]["url"], $postarray['author-link']))
+ if (link_compare($user[0]["url"], $postarray['author-link'])) {
return;
+ }
$own_user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
intval($uid),
dbesc($own_url)
- );
+ );
- if(!count($own_user))
+ if (!count($own_user)) {
return;
+ }
// Is it me from GNU Social?
- if (link_compare($own_user[0]["url"], $postarray['author-link']))
+ if (link_compare($own_user[0]["url"], $postarray['author-link'])) {
return;
+ }
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
dbesc($postarray['parent-uri']),
intval($uid)
- );
+ );
- if(count($myconv)) {
-
- foreach($myconv as $conv) {
+ if (count($myconv)) {
+ foreach ($myconv as $conv) {
// now if we find a match, it means we're in this conversation
-
- if(!link_compare($conv['author-link'],$user[0]["url"]) && !link_compare($conv['author-link'],$own_user[0]["url"]))
+ if (!link_compare($conv['author-link'], $user[0]["url"]) && !link_compare($conv['author-link'], $own_user[0]["url"])) {
continue;
+ }
- require_once('include/enotify.php');
+ require_once 'include/enotify.php';
$conv_parent = $conv['parent'];
notification(array(
- 'type' => NOTIFY_COMMENT,
+ 'type' => NOTIFY_COMMENT,
'notify_flags' => $user[0]['notify-flags'],
- 'language' => $user[0]['language'],
- 'to_name' => $user[0]['username'],
- 'to_email' => $user[0]['email'],
- 'uid' => $user[0]['uid'],
- 'item' => $postarray,
- 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
- 'source_name' => $postarray['author-name'],
- 'source_link' => $postarray['author-link'],
+ 'language' => $user[0]['language'],
+ 'to_name' => $user[0]['username'],
+ 'to_email' => $user[0]['email'],
+ 'uid' => $user[0]['uid'],
+ 'item' => $postarray,
+ 'link' => $a->get_baseurl() . '/display/' . urlencode(get_item_guid($top_item)),
+ 'source_name' => $postarray['author-name'],
+ 'source_link' => $postarray['author-link'],
'source_photo' => $postarray['author-avatar'],
- 'verb' => ACTIVITY_POST,
- 'otype' => 'item',
- 'parent' => $conv_parent,
+ 'verb' => ACTIVITY_POST,
+ 'otype' => 'item',
+ 'parent' => $conv_parent,
));
// only send one notification
@@ -1322,7 +1386,8 @@ function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray)
}
}
-function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
+function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
+{
$conversations = array();
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
@@ -1335,12 +1400,12 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
// "create_user" is deactivated, since currently you cannot add users manually by now
$create_user = true;
- logger("statusnet_fetchhometimeline: Fetching for user ".$uid, LOGGER_DEBUG);
+ logger("statusnet_fetchhometimeline: Fetching for user " . $uid, LOGGER_DEBUG);
- require_once('library/twitteroauth.php');
- require_once('include/items.php');
+ require_once 'library/twitteroauth.php';
+ require_once 'include/items.php';
- $connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
+ $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
$own_contact = statusnet_fetch_own_contact($a, $uid);
@@ -1348,27 +1413,27 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
intval($own_contact),
intval($uid));
- if(count($r)) {
+ if (count($r)) {
$nick = $r[0]["nick"];
} else {
- logger("statusnet_fetchhometimeline: Own GNU Social contact not found for user ".$uid, LOGGER_DEBUG);
+ logger("statusnet_fetchhometimeline: Own GNU Social contact not found for user " . $uid, LOGGER_DEBUG);
return;
}
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($uid));
- if(count($r)) {
+ if (count($r)) {
$self = $r[0];
} else {
- logger("statusnet_fetchhometimeline: Own contact not found for user ".$uid, LOGGER_DEBUG);
+ logger("statusnet_fetchhometimeline: Own contact not found for user " . $uid, LOGGER_DEBUG);
return;
}
$u = q("SELECT * FROM user WHERE uid = %d LIMIT 1",
intval($uid));
- if(!count($u)) {
- logger("statusnet_fetchhometimeline: Own user not found for user ".$uid, LOGGER_DEBUG);
+ if (!count($u)) {
+ logger("statusnet_fetchhometimeline: Own user not found for user " . $uid, LOGGER_DEBUG);
return;
}
@@ -1377,42 +1442,46 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
if ($mode == 1) {
// Fetching timeline
- $lastid = PConfig::get($uid, 'statusnet', 'lasthometimelineid');
+ $lastid = PConfig::get($uid, 'statusnet', 'lasthometimelineid');
//$lastid = 1;
$first_time = ($lastid == "");
- if ($lastid <> "")
+ if ($lastid != "") {
$parameters["since_id"] = $lastid;
+ }
$items = $connection->get('statuses/home_timeline', $parameters);
if (!is_array($items)) {
- if (is_object($items) && isset($items->error))
+ if (is_object($items) && isset($items->error)) {
$errormsg = $items->error;
- elseif (is_object($items))
+ } elseif (is_object($items)) {
$errormsg = print_r($items, true);
- elseif (is_string($items) || is_float($items) || is_int($items))
+ } elseif (is_string($items) || is_float($items) || is_int($items)) {
$errormsg = $items;
- else
+ } else {
$errormsg = "Unknown error";
+ }
- logger("statusnet_fetchhometimeline: Error fetching home timeline: ".$errormsg, LOGGER_DEBUG);
+ logger("statusnet_fetchhometimeline: Error fetching home timeline: " . $errormsg, LOGGER_DEBUG);
return;
}
$posts = array_reverse($items);
- logger("statusnet_fetchhometimeline: Fetching timeline for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
+ logger("statusnet_fetchhometimeline: Fetching timeline for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
if (count($posts)) {
foreach ($posts as $post) {
- if ($post->id > $lastid)
+ if ($post->id > $lastid) {
$lastid = $post->id;
+ }
- if ($first_time)
+ if ($first_time) {
continue;
+ }
if (isset($post->statusnet_conversation_id)) {
if (!isset($conversations[$post->statusnet_conversation_id])) {
@@ -1422,48 +1491,52 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
} else {
$postarray = statusnet_createpost($a, $uid, $post, $self, $create_user, true);
- if (trim($postarray['body']) == "")
+ if (trim($postarray['body']) == "") {
continue;
+ }
$item = item_store($postarray);
$postarray["id"] = $item;
- logger('statusnet_fetchhometimeline: User '.$self["nick"].' posted home timeline item '.$item);
+ logger('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted home timeline item ' . $item);
- if ($item && !function_exists("check_item_notification"))
+ if ($item && !function_exists("check_item_notification")) {
statusnet_checknotification($a, $uid, $nick, $item, $postarray);
+ }
}
-
}
}
PConfig::set($uid, 'statusnet', 'lasthometimelineid', $lastid);
}
// Fetching mentions
- $lastid = PConfig::get($uid, 'statusnet', 'lastmentionid');
+ $lastid = PConfig::get($uid, 'statusnet', 'lastmentionid');
$first_time = ($lastid == "");
- if ($lastid <> "")
+ if ($lastid != "") {
$parameters["since_id"] = $lastid;
+ }
$items = $connection->get('statuses/mentions_timeline', $parameters);
if (!is_array($items)) {
- logger("statusnet_fetchhometimeline: Error fetching mentions: ".print_r($items, true), LOGGER_DEBUG);
+ logger("statusnet_fetchhometimeline: Error fetching mentions: " . print_r($items, true), LOGGER_DEBUG);
return;
}
$posts = array_reverse($items);
- logger("statusnet_fetchhometimeline: Fetching mentions for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
+ logger("statusnet_fetchhometimeline: Fetching mentions for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
if (count($posts)) {
foreach ($posts as $post) {
- if ($post->id > $lastid)
+ if ($post->id > $lastid) {
$lastid = $post->id;
+ }
- if ($first_time)
+ if ($first_time) {
continue;
+ }
$postarray = statusnet_createpost($a, $uid, $post, $self, false, false);
@@ -1473,16 +1546,17 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
$conversations[$post->statusnet_conversation_id] = $post->statusnet_conversation_id;
}
} else {
- if (trim($postarray['body']) != "") {
+ if (trim($postarray['body']) == "") {
continue;
+ }
- $item = item_store($postarray);
- $postarray["id"] = $item;
+ $item = item_store($postarray);
+ $postarray["id"] = $item;
- logger('statusnet_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item);
+ logger('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted mention timeline item ' . $item);
- if ($item && function_exists("check_item_notification"))
- check_item_notification($item, $uid, NOTIFY_TAGSELF);
+ if ($item && function_exists("check_item_notification")) {
+ check_item_notification($item, $uid, NOTIFY_TAGSELF);
}
}
@@ -1496,7 +1570,7 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
}
if (($item != 0) && !function_exists("check_item_notification")) {
- require_once('include/enotify.php');
+ require_once 'include/enotify.php';
notification(array(
'type' => NOTIFY_TAGSELF,
'notify_flags' => $u[0]['notify-flags'],
@@ -1505,7 +1579,7 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
'to_email' => $u[0]['email'],
'uid' => $u[0]['uid'],
'item' => $postarray,
- 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
+ 'link' => $a->get_baseurl() . '/display/' . urlencode(get_item_guid($item)),
'source_name' => $postarray['author-name'],
'source_link' => $postarray['author-link'],
'source_photo' => $postarray['author-avatar'],
@@ -1520,7 +1594,8 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
PConfig::set($uid, 'statusnet', 'lastmentionid', $lastid);
}
-function statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $conversation) {
+function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nick, $conversation)
+{
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
$api = PConfig::get($uid, 'statusnet', 'baseapi');
@@ -1528,44 +1603,45 @@ function statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
$own_url = PConfig::get($uid, 'statusnet', 'own_url');
- require_once('library/twitteroauth.php');
+ require_once 'library/twitteroauth.php';
- $connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
+ $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
$parameters["count"] = 200;
- $items = $connection->get('statusnet/conversation/'.$conversation, $parameters);
+ $items = $connection->get('statusnet/conversation/' . $conversation, $parameters);
if (is_array($items)) {
$posts = array_reverse($items);
- foreach($posts AS $post) {
+ foreach ($posts AS $post) {
$postarray = statusnet_createpost($a, $uid, $post, $self, false, false);
- if (trim($postarray['body']) == "")
+ if (trim($postarray['body']) == "") {
continue;
+ }
- //print_r($postarray);
$item = item_store($postarray);
$postarray["id"] = $item;
- logger('statusnet_complete_conversation: User '.$self["nick"].' posted home timeline item '.$item);
+ logger('statusnet_complete_conversation: User ' . $self["nick"] . ' posted home timeline item ' . $item);
- if ($item && !function_exists("check_item_notification"))
+ if ($item && !function_exists("check_item_notification")) {
statusnet_checknotification($a, $uid, $nick, $item, $postarray);
+ }
}
}
}
-function statusnet_convertmsg($a, $body, $no_tags = false) {
+function statusnet_convertmsg(App $a, $body, $no_tags = false)
+{
+ require_once "include/oembed.php";
+ require_once "include/items.php";
+ require_once "include/network.php";
- require_once("include/oembed.php");
- require_once("include/items.php");
- require_once("include/network.php");
-
- $body = preg_replace("=\[url\=https?://([0-9]*).([0-9]*).([0-9]*).([0-9]*)/([0-9]*)\](.*?)\[\/url\]=ism","$1.$2.$3.$4/$5",$body);
+ $body = preg_replace("=\[url\=https?://([0-9]*).([0-9]*).([0-9]*).([0-9]*)/([0-9]*)\](.*?)\[\/url\]=ism", "$1.$2.$3.$4/$5", $body);
$URLSearchString = "^\[\]";
- $links = preg_match_all("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body,$matches,PREG_SET_ORDER);
+ $links = preg_match_all("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER);
$footer = "";
$footerurl = "";
@@ -1574,32 +1650,34 @@ function statusnet_convertmsg($a, $body, $no_tags = false) {
if ($links) {
foreach ($matches AS $match) {
- $search = "[url=".$match[1]."]".$match[2]."[/url]";
+ $search = "[url=" . $match[1] . "]" . $match[2] . "[/url]";
- logger("statusnet_convertmsg: expanding url ".$match[1], LOGGER_DEBUG);
+ logger("statusnet_convertmsg: expanding url " . $match[1], LOGGER_DEBUG);
$expanded_url = original_url($match[1]);
- logger("statusnet_convertmsg: fetching data for ".$expanded_url, LOGGER_DEBUG);
+ logger("statusnet_convertmsg: fetching data for " . $expanded_url, LOGGER_DEBUG);
$oembed_data = oembed_fetch_url($expanded_url, true);
logger("statusnet_convertmsg: fetching data: done", LOGGER_DEBUG);
- if ($type == "")
+ if ($type == "") {
$type = $oembed_data->type;
+ }
+
if ($oembed_data->type == "video") {
//$body = str_replace($search, "[video]".$expanded_url."[/video]", $body);
$type = $oembed_data->type;
$footerurl = $expanded_url;
- $footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
+ $footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]";
$body = str_replace($search, $footerlink, $body);
- } elseif (($oembed_data->type == "photo") && isset($oembed_data->url) && !$dontincludemedia)
- $body = str_replace($search, "[url=".$expanded_url."][img]".$oembed_data->url."[/img][/url]", $body);
- elseif ($oembed_data->type != "link")
- $body = str_replace($search, "[url=".$expanded_url."]".$expanded_url."[/url]", $body);
- else {
+ } elseif (($oembed_data->type == "photo") && isset($oembed_data->url) && !$dontincludemedia) {
+ $body = str_replace($search, "[url=" . $expanded_url . "][img]" . $oembed_data->url . "[/img][/url]", $body);
+ } elseif ($oembed_data->type != "link") {
+ $body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
+ } else {
$img_str = fetch_url($expanded_url, true, $redirects, 4);
$tempfile = tempnam(get_temppath(), "cache");
@@ -1609,61 +1687,66 @@ function statusnet_convertmsg($a, $body, $no_tags = false) {
if (substr($mime, 0, 6) == "image/") {
$type = "photo";
- $body = str_replace($search, "[img]".$expanded_url."[/img]", $body);
+ $body = str_replace($search, "[img]" . $expanded_url . "[/img]", $body);
} else {
$type = $oembed_data->type;
$footerurl = $expanded_url;
- $footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
+ $footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]";
$body = str_replace($search, $footerlink, $body);
}
}
}
- if ($footerurl != "")
+ if ($footerurl != "") {
$footer = add_page_info($footerurl);
+ }
if (($footerlink != "") && (trim($footer) != "")) {
$removedlink = trim(str_replace($footerlink, "", $body));
- if (($removedlink == "") || strstr($body, $removedlink))
+ if (($removedlink == "") || strstr($body, $removedlink)) {
$body = $removedlink;
+ }
$body .= $footer;
}
}
- if ($no_tags)
- return(array("body" => $body, "tags" => ""));
+ if ($no_tags) {
+ return array("body" => $body, "tags" => "");
+ }
$str_tags = '';
- $cnt = preg_match_all("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",$body,$matches,PREG_SET_ORDER);
- if($cnt) {
- foreach($matches as $mtch) {
- if(strlen($str_tags))
+ $cnt = preg_match_all("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER);
+ if ($cnt) {
+ foreach ($matches as $mtch) {
+ if (strlen($str_tags)) {
$str_tags .= ',';
+ }
if ($mtch[1] == "#") {
// Replacing the hash tags that are directed to the GNU Social server with internal links
- $snhash = "#[url=".$mtch[2]."]".$mtch[3]."[/url]";
- $frdchash = '#[url='.$a->get_baseurl().'/search?tag='.rawurlencode($mtch[3]).']'.$mtch[3].'[/url]';
+ $snhash = "#[url=" . $mtch[2] . "]" . $mtch[3] . "[/url]";
+ $frdchash = '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($mtch[3]) . ']' . $mtch[3] . '[/url]';
$body = str_replace($snhash, $frdchash, $body);
$str_tags .= $frdchash;
- } else
- $str_tags .= "@[url=".$mtch[2]."]".$mtch[3]."[/url]";
- // To-Do:
- // There is a problem with links with to GNU Social groups, so these links are stored with "@" like friendica groups
- //$str_tags .= $mtch[1]."[url=".$mtch[2]."]".$mtch[3]."[/url]";
+ } else {
+ $str_tags .= "@[url=" . $mtch[2] . "]" . $mtch[3] . "[/url]";
+ }
+ // To-Do:
+ // There is a problem with links with to GNU Social groups, so these links are stored with "@" like friendica groups
+ //$str_tags .= $mtch[1]."[url=".$mtch[2]."]".$mtch[3]."[/url]";
}
}
- return(array("body"=>$body, "tags"=>$str_tags));
-
+ return array("body" => $body, "tags" => $str_tags);
}
-function statusnet_fetch_own_contact($a, $uid) {
+function statusnet_fetch_own_contact(App $a, $uid)
+{
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
$api = PConfig::get($uid, 'statusnet', 'baseapi');
@@ -1674,9 +1757,9 @@ function statusnet_fetch_own_contact($a, $uid) {
$contact_id = 0;
if ($own_url == "") {
- require_once('library/twitteroauth.php');
+ require_once 'library/twitteroauth.php';
- $connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
+ $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
// Fetching user data
$user = $connection->get('account/verify_credentials');
@@ -1684,44 +1767,49 @@ function statusnet_fetch_own_contact($a, $uid) {
PConfig::set($uid, 'statusnet', 'own_url', normalise_link($user->statusnet_profile_url));
$contact_id = statusnet_fetch_contact($uid, $user, true);
-
} else {
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
intval($uid), dbesc($own_url));
- if(count($r))
+ if (count($r)) {
$contact_id = $r[0]["id"];
- else
+ } else {
PConfig::delete($uid, 'statusnet', 'own_url');
-
+ }
}
- return($contact_id);
+ return $contact_id;
}
-function statusnet_is_retweet($a, $uid, $body) {
+function statusnet_is_retweet(App $a, $uid, $body)
+{
$body = trim($body);
// Skip if it isn't a pure repeated messages
// Does it start with a share?
- if (strpos($body, "[share") > 0)
- return(false);
+ if (strpos($body, "[share") > 0) {
+ return false;
+ }
// Does it end with a share?
- if (strlen($body) > (strrpos($body, "[/share]") + 8))
- return(false);
+ if (strlen($body) > (strrpos($body, "[/share]") + 8)) {
+ return false;
+ }
- $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
+ $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
// Skip if there is no shared message in there
- if ($body == $attributes)
- return(false);
+ if ($body == $attributes) {
+ return false;
+ }
$link = "";
preg_match("/link='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
+ if ($matches[1] != "") {
$link = $matches[1];
+ }
preg_match('/link="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
+ if ($matches[1] != "") {
$link = $matches[1];
+ }
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
@@ -1730,17 +1818,19 @@ function statusnet_is_retweet($a, $uid, $body) {
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
- $id = preg_replace("=https?://".$hostname."/notice/(.*)=ism", "$1", $link);
+ $id = preg_replace("=https?://" . $hostname . "/notice/(.*)=ism", "$1", $link);
- if ($id == $link)
- return(false);
+ if ($id == $link) {
+ return false;
+ }
- logger('statusnet_is_retweet: Retweeting id '.$id.' for user '.$uid, LOGGER_DEBUG);
+ logger('statusnet_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, LOGGER_DEBUG);
- $connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
+ $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
- $result = $connection->post('statuses/retweet/'.$id);
+ $result = $connection->post('statuses/retweet/' . $id);
- logger('statusnet_is_retweet: result '.print_r($result, true), LOGGER_DEBUG);
- return(isset($result->id));
+ logger('statusnet_is_retweet: result ' . print_r($result, true), LOGGER_DEBUG);
+
+ return isset($result->id);
}
diff --git a/twitter/twitter.php b/twitter/twitter.php
index e8e89031..f88d4542 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1,4 +1,5 @@
setConsumerKey($ckey, $csecret);
@@ -155,32 +159,38 @@ function twitter_follow($a, &$contact) {
FROM `contact` WHERE `uid` = %d AND `nick` = '%s'",
intval($uid),
dbesc($nickname));
- if (count($r))
+ if (count($r)) {
$contact["contact"] = $r[0];
+ }
}
-function twitter_jot_nets(&$a,&$b) {
- if(! local_user())
+function twitter_jot_nets(App $a, &$b)
+{
+ if (!local_user()) {
return;
+ }
- $tw_post = PConfig::get(local_user(),'twitter','post');
- if(intval($tw_post) == 1) {
- $tw_defpost = PConfig::get(local_user(),'twitter','post_by_default');
+ $tw_post = PConfig::get(local_user(), 'twitter', 'post');
+ if (intval($tw_post) == 1) {
+ $tw_defpost = PConfig::get(local_user(), 'twitter', 'post_by_default');
$selected = ((intval($tw_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '
'
. t('Post to Twitter') . '
';
}
}
-function twitter_settings_post($a,$post) {
- if(! local_user())
+function twitter_settings_post(App $a, $post)
+{
+ if (!local_user()) {
return;
+ }
// don't check twitter settings if twitter submit button is not clicked
- if (!x($_POST,'twitter-submit'))
+ if (!x($_POST, 'twitter-submit')) {
return;
+ }
if (isset($_POST['twitter-disconnect'])) {
- /***
+ /* * *
* if the twitter-disconnect checkbox is set, clear the OAuth key/secret pair
* from the user configuration
*/
@@ -196,43 +206,48 @@ function twitter_settings_post($a,$post) {
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 = 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
- 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
- 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 (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 = 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
+ 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
+ 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']))
- PConfig::delete(local_user(),'twitter','lastid');
+ if (!intval($_POST['twitter-mirror'])) {
+ PConfig::delete(local_user(), 'twitter', 'lastid');
+ }
- info(t('Twitter settings updated.') . EOL);
- }}
+ info(t('Twitter settings updated.') . EOL);
+ }
+ }
}
-function twitter_settings(&$a,&$s) {
- if(! local_user())
+
+function twitter_settings(App $a, &$s)
+{
+ if (!local_user()) {
return;
+ }
$a->page['htmlhead'] .= '' . "\r\n";
- /***
+ /* * *
* 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 (280 chars only)
@@ -243,94 +258,94 @@ function twitter_settings(&$a,&$s) {
$osecret = PConfig::get(local_user(), 'twitter', 'oauthsecret' );
$enabled = PConfig::get(local_user(), 'twitter', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $defenabled = PConfig::get(local_user(),'twitter','post_by_default');
+ $defenabled = PConfig::get(local_user(), 'twitter', 'post_by_default');
$defchecked = (($defenabled) ? ' checked="checked" ' : '');
- $mirrorenabled = PConfig::get(local_user(),'twitter','mirror_posts');
+ $mirrorenabled = PConfig::get(local_user(), 'twitter', 'mirror_posts');
$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
- $importenabled = PConfig::get(local_user(),'twitter','import');
+ $importenabled = PConfig::get(local_user(), 'twitter', 'import');
$importchecked = (($importenabled) ? ' checked="checked" ' : '');
- $create_userenabled = PConfig::get(local_user(),'twitter','create_user');
+ $create_userenabled = PConfig::get(local_user(), 'twitter', 'create_user');
$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
$css = (($enabled) ? '' : '-disabled');
$s .= '';
- $s .= '
'. t('Twitter Import/Export/Mirror').'
';
+ $s .= '
' . t('Twitter Import/Export/Mirror') . '
';
$s .= '';
$s .= '
';
$s .= '';
- $s .= '
'. t('Twitter Import/Export/Mirror').'
';
+ $s .= '
' . t('Twitter Import/Export/Mirror') . '
';
$s .= '';
- if ( (!$ckey) && (!$csecret) ) {
- /***
+ if ((!$ckey) && (!$csecret)) {
+ /* * *
* no global consumer keys
* display warning and skip personal config
*/
- $s .= '
'. t('No consumer key pair for Twitter found. Please contact your site administrator.') .'
';
+ $s .= '
' . t('No consumer key pair for Twitter found. Please contact your site administrator.') . '
';
} else {
- /***
+ /* * *
* ok we have a consumer key pair now look into the OAuth stuff
*/
- if ( (!$otoken) && (!$osecret) ) {
- /***
+ if ((!$otoken) && (!$osecret)) {
+ /* * *
* the user has not yet connected the account to twitter...
* get a temporary OAuth key/secret pair and display a button with
* which the user can request a PIN to connect the account to a
* account at Twitter.
*/
- require_once('library/twitteroauth.php');
+ require_once 'library/twitteroauth.php';
$connection = new TwitterOAuth($ckey, $csecret);
$request_token = $connection->getRequestToken();
$token = $request_token['oauth_token'];
- /***
+ /* * *
* make some nice form
*/
- $s .= '
'. t('At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter.') .'
';
- $s .= '';
+ $s .= '
' . t('At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter.') . '
';
+ $s .= '';
} else {
- /***
+ /* * *
* we have an OAuth key / secret pair for the user
* so let's give a chance to disable the postings to Twitter
*/
- require_once('library/twitteroauth.php');
- $connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
+ require_once 'library/twitteroauth.php';
+ $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
$details = $connection->get('account/verify_credentials');
- $s .= '
'. t('If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') .'
' . t('If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') . '
';
if ($a->user['hidewall']) {
- $s .= '
'. t('Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') .'
';
+ $s .= '
' . t('Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '