* Version: 0.2
* Author: Michael Vogel <http://pirati.ca/profile/heluecht>
*/
+
+use Friendica\Core\Worker;
+
require('addon/pumpio/oauth/http.php');
require('addon/pumpio/oauth/oauth_client.php');
require_once('include/enotify.php');
require_once("include/Photo.php");
require_once("mod/share.php");
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+
define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes
function pumpio_install() {
}
function pumpio_check_item_notification($a, &$notification_data) {
- $hostname = get_pconfig($notification_data["uid"], 'pumpio','host');
- $username = get_pconfig($notification_data["uid"], "pumpio", "user");
+ $hostname = PConfig::get($notification_data["uid"], 'pumpio','host');
+ $username = PConfig::get($notification_data["uid"], "pumpio", "user");
$notification_data["profiles"][] = "https://".$hostname."/".$username;
}
$params = array();
- $application_name = get_config('pumpio', 'application_name');
+ $application_name = Config::get('pumpio', 'application_name');
if ($application_name == "")
$application_name = $a->get_hostname();
session_start();
// Define the needed keys
- $consumer_key = get_pconfig(local_user(), 'pumpio','consumer_key');
- $consumer_secret = get_pconfig(local_user(), 'pumpio','consumer_secret');
- $hostname = get_pconfig(local_user(), 'pumpio','host');
+ $consumer_key = PConfig::get(local_user(), 'pumpio','consumer_key');
+ $consumer_secret = PConfig::get(local_user(), 'pumpio','consumer_secret');
+ $hostname = PConfig::get(local_user(), 'pumpio','host');
- if ((($consumer_key == "") OR ($consumer_secret == "")) AND ($hostname != "")) {
+ if ((($consumer_key == "") || ($consumer_secret == "")) && ($hostname != "")) {
logger("pumpio_connect: register client");
$clientdata = pumpio_registerclient($a, $hostname);
- set_pconfig(local_user(), 'pumpio','consumer_key', $clientdata->client_id);
- set_pconfig(local_user(), 'pumpio','consumer_secret', $clientdata->client_secret);
+ PConfig::set(local_user(), 'pumpio','consumer_key', $clientdata->client_id);
+ PConfig::set(local_user(), 'pumpio','consumer_secret', $clientdata->client_secret);
- $consumer_key = get_pconfig(local_user(), 'pumpio','consumer_key');
- $consumer_secret = get_pconfig(local_user(), 'pumpio','consumer_secret');
+ $consumer_key = PConfig::get(local_user(), 'pumpio','consumer_key');
+ $consumer_secret = PConfig::get(local_user(), 'pumpio','consumer_secret');
logger("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, LOGGER_DEBUG);
}
- if (($consumer_key == "") OR ($consumer_secret == "")) {
+ if (($consumer_key == "") || ($consumer_secret == "")) {
logger("pumpio_connect: ".sprintf("Unable to register the client at the pump.io server '%s'.", $hostname));
$o .= sprintf(t("Unable to register the client at the pump.io server '%s'."), $hostname);
if (($success = $client->Process())) {
if (strlen($client->access_token)) {
logger("pumpio_connect: otoken: ".$client->access_token." osecrect: ".$client->access_token_secret, LOGGER_DEBUG);
- set_pconfig(local_user(), "pumpio", "oauth_token", $client->access_token);
- set_pconfig(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret);
+ PConfig::set(local_user(), "pumpio", "oauth_token", $client->access_token);
+ PConfig::set(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret);
}
}
$success = $client->Finalize($success);
if(! local_user())
return;
- $pumpio_post = get_pconfig(local_user(),'pumpio','post');
+ $pumpio_post = PConfig::get(local_user(),'pumpio','post');
if(intval($pumpio_post) == 1) {
- $pumpio_defpost = get_pconfig(local_user(),'pumpio','post_by_default');
+ $pumpio_defpost = PConfig::get(local_user(),'pumpio','post_by_default');
$selected = ((intval($pumpio_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="pumpio_enable"' . $selected . ' value="1" /> '
. t('Post to pumpio') . '</div>';
/* Get the current state of our config variables */
- $import_enabled = get_pconfig(local_user(),'pumpio','import');
+ $import_enabled = PConfig::get(local_user(),'pumpio','import');
$import_checked = (($import_enabled) ? ' checked="checked" ' : '');
- $enabled = get_pconfig(local_user(),'pumpio','post');
+ $enabled = PConfig::get(local_user(),'pumpio','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
$css = (($enabled) ? '' : '-disabled');
- $def_enabled = get_pconfig(local_user(),'pumpio','post_by_default');
+ $def_enabled = PConfig::get(local_user(),'pumpio','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $public_enabled = get_pconfig(local_user(),'pumpio','public');
+ $public_enabled = PConfig::get(local_user(),'pumpio','public');
$public_checked = (($public_enabled) ? ' checked="checked" ' : '');
- $mirror_enabled = get_pconfig(local_user(),'pumpio','mirror');
+ $mirror_enabled = PConfig::get(local_user(),'pumpio','mirror');
$mirror_checked = (($mirror_enabled) ? ' checked="checked" ' : '');
- $servername = get_pconfig(local_user(), "pumpio", "host");
- $username = get_pconfig(local_user(), "pumpio", "user");
+ $servername = PConfig::get(local_user(), "pumpio", "host");
+ $username = PConfig::get(local_user(), "pumpio", "user");
/* Add some HTML to the existing form */
$s .= '<input id="pumpio-servername" type="text" name="pumpio_host" value="'.$servername.'" />';
$s .= '</div><div class="clear"></div>';
- if (($username != '') AND ($servername != '')) {
+ if (($username != '') && ($servername != '')) {
- $oauth_token = get_pconfig(local_user(), "pumpio", "oauth_token");
- $oauth_token_secret = get_pconfig(local_user(), "pumpio", "oauth_token_secret");
+ $oauth_token = PConfig::get(local_user(), "pumpio", "oauth_token");
+ $oauth_token_secret = PConfig::get(local_user(), "pumpio", "oauth_token_secret");
$s .= '<div id="pumpio-password-wrapper">';
- if (($oauth_token == "") OR ($oauth_token_secret == "")) {
+ if (($oauth_token == "") || ($oauth_token_secret == "")) {
$s .= '<div id="pumpio-authenticate-wrapper">';
$s .= '<a href="'.$a->get_baseurl().'/pumpio/connect">'.t("Authenticate your pump.io connection").'</a>';
$s .= '</div><div class="clear"></div>';
if(x($_POST,'pumpio-submit')) {
if(x($_POST,'pumpio_delete')) {
- set_pconfig(local_user(),'pumpio','consumer_key','');
- set_pconfig(local_user(),'pumpio','consumer_secret','');
- set_pconfig(local_user(),'pumpio','oauth_token','');
- set_pconfig(local_user(),'pumpio','oauth_token_secret','');
- set_pconfig(local_user(),'pumpio','post',false);
- set_pconfig(local_user(),'pumpio','import',false);
- set_pconfig(local_user(),'pumpio','host','');
- set_pconfig(local_user(),'pumpio','user','');
- set_pconfig(local_user(),'pumpio','public',false);
- set_pconfig(local_user(),'pumpio','mirror',false);
- set_pconfig(local_user(),'pumpio','post_by_default',false);
- set_pconfig(local_user(),'pumpio','lastdate', 0);
- set_pconfig(local_user(),'pumpio','last_id', '');
+ PConfig::set(local_user(),'pumpio','consumer_key','');
+ PConfig::set(local_user(),'pumpio','consumer_secret','');
+ PConfig::set(local_user(),'pumpio','oauth_token','');
+ PConfig::set(local_user(),'pumpio','oauth_token_secret','');
+ PConfig::set(local_user(),'pumpio','post',false);
+ PConfig::set(local_user(),'pumpio','import',false);
+ PConfig::set(local_user(),'pumpio','host','');
+ PConfig::set(local_user(),'pumpio','user','');
+ PConfig::set(local_user(),'pumpio','public',false);
+ PConfig::set(local_user(),'pumpio','mirror',false);
+ PConfig::set(local_user(),'pumpio','post_by_default',false);
+ PConfig::set(local_user(),'pumpio','lastdate', 0);
+ PConfig::set(local_user(),'pumpio','last_id', '');
} else {
// filtering the username if it is filled wrong
$user = $_POST['pumpio_user'];
$host = trim($host);
$host = str_replace(array("https://", "http://"), array("", ""), $host);
- set_pconfig(local_user(),'pumpio','post',intval($_POST['pumpio']));
- set_pconfig(local_user(),'pumpio','import',$_POST['pumpio_import']);
- set_pconfig(local_user(),'pumpio','host',$host);
- set_pconfig(local_user(),'pumpio','user',$user);
- set_pconfig(local_user(),'pumpio','public',$_POST['pumpio_public']);
- set_pconfig(local_user(),'pumpio','mirror',$_POST['pumpio_mirror']);
- set_pconfig(local_user(),'pumpio','post_by_default',intval($_POST['pumpio_bydefault']));
+ PConfig::set(local_user(),'pumpio','post',intval($_POST['pumpio']));
+ PConfig::set(local_user(),'pumpio','import',$_POST['pumpio_import']);
+ PConfig::set(local_user(),'pumpio','host',$host);
+ PConfig::set(local_user(),'pumpio','user',$user);
+ PConfig::set(local_user(),'pumpio','public',$_POST['pumpio_public']);
+ PConfig::set(local_user(),'pumpio','mirror',$_POST['pumpio_mirror']);
+ PConfig::set(local_user(),'pumpio','post_by_default',intval($_POST['pumpio_bydefault']));
if (!$_POST['pumpio_mirror'])
del_pconfig(local_user(),'pumpio','lastdate');
}
}
-function pumpio_post_local(&$a,&$b) {
+function pumpio_post_local(&$a, &$b) {
- if((! local_user()) || (local_user() != $b['uid']))
+ if (!local_user() || (local_user() != $b['uid'])) {
return;
+ }
- $pumpio_post = intval(get_pconfig(local_user(),'pumpio','post'));
+ $pumpio_post = intval(PConfig::get(local_user(), 'pumpio', 'post'));
$pumpio_enable = (($pumpio_post && x($_REQUEST,'pumpio_enable')) ? intval($_REQUEST['pumpio_enable']) : 0);
- if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'pumpio','post_by_default')))
+ if ($b['api_source'] && intval(PConfig::get(local_user(), 'pumpio', 'post_by_default'))) {
$pumpio_enable = 1;
+ }
- if(! $pumpio_enable)
+ if (!$pumpio_enable) {
return;
+ }
- if(strlen($b['postopts']))
+ if (strlen($b['postopts'])) {
$b['postopts'] .= ',';
+ }
$b['postopts'] .= 'pumpio';
}
function pumpio_send(&$a,&$b) {
- if (!get_pconfig($b["uid"],'pumpio','import')) {
+ if (!PConfig::get($b["uid"],'pumpio','import')) {
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
return;
}
logger("pumpio_send: receiver ".print_r($receiver, true));
- if (!count($receiver) AND ($b['private'] OR !strstr($b['postopts'],'pumpio')))
+ if (!count($receiver) && ($b['private'] || !strstr($b['postopts'],'pumpio')))
return;
}
if($b['verb'] == ACTIVITY_DISLIKE)
return;
- if (($b['verb'] == ACTIVITY_POST) AND ($b['created'] !== $b['edited']) AND !$b['deleted'])
+ if (($b['verb'] == ACTIVITY_POST) && ($b['created'] !== $b['edited']) && !$b['deleted'])
pumpio_action($a, $b["uid"], $b["uri"], "update", $b["body"]);
- if (($b['verb'] == ACTIVITY_POST) AND $b['deleted'])
+ if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])
pumpio_action($a, $b["uid"], $b["uri"], "delete");
if($b['deleted'] || ($b['created'] !== $b['edited']))
// Support for native shares
// http://<hostname>/api/<type>/shares?id=<the-object-id>
- $oauth_token = get_pconfig($b['uid'], "pumpio", "oauth_token");
- $oauth_token_secret = get_pconfig($b['uid'], "pumpio", "oauth_token_secret");
- $consumer_key = get_pconfig($b['uid'], "pumpio","consumer_key");
- $consumer_secret = get_pconfig($b['uid'], "pumpio","consumer_secret");
+ $oauth_token = PConfig::get($b['uid'], "pumpio", "oauth_token");
+ $oauth_token_secret = PConfig::get($b['uid'], "pumpio", "oauth_token_secret");
+ $consumer_key = PConfig::get($b['uid'], "pumpio","consumer_key");
+ $consumer_secret = PConfig::get($b['uid'], "pumpio","consumer_secret");
- $host = get_pconfig($b['uid'], "pumpio", "host");
- $user = get_pconfig($b['uid'], "pumpio", "user");
- $public = get_pconfig($b['uid'], "pumpio", "public");
+ $host = PConfig::get($b['uid'], "pumpio", "host");
+ $user = PConfig::get($b['uid'], "pumpio", "user");
+ $public = PConfig::get($b['uid'], "pumpio", "public");
if($oauth_token && $oauth_token_secret) {
$inReplyTo = array("id" => $orig_post["uri"],
"objectType" => "note");
- if (($orig_post["object-type"] != "") AND (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA)))
+ if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA)))
$inReplyTo["objectType"] = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]);
$params["object"] = array(
if($success) {
if ($user->generator->displayName)
- set_pconfig($b["uid"], "pumpio", "application_name", $user->generator->displayName);
+ PConfig::set($b["uid"], "pumpio", "application_name", $user->generator->displayName);
$post_id = $user->object->id;
logger('pumpio_send '.$username.': success '.$post_id);
- if($post_id AND $iscomment) {
+ if($post_id && $iscomment) {
logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']);
q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
dbesc($post_id),
function pumpio_action(&$a, $uid, $uri, $action, $content = "") {
// Don't do likes and other stuff if you don't import the timeline
- if (!get_pconfig($uid,'pumpio','import'))
+ if (!PConfig::get($uid,'pumpio','import'))
return;
- $ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
- $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
- $otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
- $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
- $hostname = get_pconfig($uid, 'pumpio','host');
- $username = get_pconfig($uid, "pumpio", "user");
+ $ckey = PConfig::get($uid, 'pumpio', 'consumer_key');
+ $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret');
+ $otoken = PConfig::get($uid, 'pumpio', 'oauth_token');
+ $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+ $hostname = PConfig::get($uid, 'pumpio','host');
+ $username = PConfig::get($uid, "pumpio", "user");
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($uri),
$orig_post = $r[0];
- if ($orig_post["extid"] AND !strstr($orig_post["extid"], "/proxy/"))
+ if ($orig_post["extid"] && !strstr($orig_post["extid"], "/proxy/"))
$uri = $orig_post["extid"];
else
$uri = $orig_post["uri"];
- if (($orig_post["object-type"] != "") AND (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA)))
+ if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA)))
$objectType = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]);
elseif (strstr($uri, "/api/comment/"))
$objectType = "comment";
if (!count($r))
return;
- $last = get_config('pumpio','last_poll');
+ $last = Config::get('pumpio','last_poll');
- $poll_interval = intval(get_config('pumpio','poll_interval'));
+ $poll_interval = intval(Config::get('pumpio','poll_interval'));
if(! $poll_interval)
$poll_interval = PUMPIO_DEFAULT_POLL_INTERVAL;
}
}
- $abandon_days = intval(get_config('system','account_abandon_days'));
+ $abandon_days = intval(Config::get('system','account_abandon_days'));
if ($abandon_days < 1)
$abandon_days = 0;
pumpio_fetchinbox($a, $rr['uid']);
// check for new contacts once a day
- $last_contact_check = get_pconfig($rr['uid'],'pumpio','contact_check');
+ $last_contact_check = PConfig::get($rr['uid'],'pumpio','contact_check');
if($last_contact_check)
$next_contact_check = $last_contact_check + 86400;
else
if($next_contact_check <= time()) {
pumpio_getallusers($a, $rr["uid"]);
- set_pconfig($rr['uid'],'pumpio','contact_check',time());
+ PConfig::set($rr['uid'],'pumpio','contact_check',time());
}
}
}
logger('pumpio: cron_end');
- set_config('pumpio','last_poll', time());
+ Config::set('pumpio','last_poll', time());
}
function pumpio_cron(&$a,$b) {
- //pumpio_sync($a);
- proc_run("php","addon/pumpio/pumpio_sync.php");
+ Worker::add(PRIORITY_MEDIUM,"addon/pumpio/pumpio_sync.php");
}
function pumpio_fetchtimeline(&$a, $uid) {
- $ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
- $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
- $otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
- $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
- $lastdate = get_pconfig($uid, 'pumpio', 'lastdate');
- $hostname = get_pconfig($uid, 'pumpio','host');
- $username = get_pconfig($uid, "pumpio", "user");
+ $ckey = PConfig::get($uid, 'pumpio', 'consumer_key');
+ $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret');
+ $otoken = PConfig::get($uid, 'pumpio', 'oauth_token');
+ $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+ $lastdate = PConfig::get($uid, 'pumpio', 'lastdate');
+ $hostname = PConfig::get($uid, 'pumpio','host');
+ $username = PConfig::get($uid, "pumpio", "user");
// get the application name for the pump.io app
// 1st try personal config, then system config and fallback to the
// hostname of the node if neither one is set.
- $application_name = get_pconfig( $uid, 'pumpio', 'application_name');
+ $application_name = PConfig::get( $uid, 'pumpio', 'application_name');
if ($application_name == "")
- $application_name = get_config('pumpio', 'application_name');
+ $application_name = Config::get('pumpio', 'application_name');
if ($application_name == "")
$application_name = $a->get_hostname();
if ($receiver->id == "http://activityschema.org/collection/public")
$public = true;
- if ($public AND !stristr($post->generator->displayName, $application_name)) {
+ if ($public && !stristr($post->generator->displayName, $application_name)) {
require_once('include/html2bbcode.php');
$_SESSION["authenticated"] = true;
}
if ($lastdate != 0)
- set_pconfig($uid,'pumpio','lastdate', $lastdate);
+ PConfig::set($uid,'pumpio','lastdate', $lastdate);
}
function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) {
if(link_compare($post->actor->url, $own_id)) {
$contactid = $self[0]['id'];
} else {
- $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
- dbesc($post->actor->url),
+ $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+ dbesc(normalise_link($post->actor->url)),
intval($uid)
);
function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = true) {
require_once('include/items.php');
+ if ($post->object->id == "") {
+ logger('Got empty like: '.print_r($post, true), LOGGER_DEBUG);
+ return;
+ }
+
// Searching for the liked post
// Two queries for speed issues
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1",
$post->actor->url = $self[0]['url'];
$post->actor->image->url = $self[0]['photo'];
} else {
- $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
- dbesc($post->actor->url),
+ $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+ dbesc(normalise_link($post->actor->url)),
intval($uid)
);
function pumpio_get_contact($uid, $contact, $no_insert = false) {
- if (function_exists("update_gcontact")) {
- update_gcontact(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
- "photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true,
- "nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
- "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));
-
- $cid = get_contact($contact->url, $uid);
- } else {
- // Old Code
- $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
- dbesc(normalise_link($contact->url)));
-
- if (count($r) == 0)
- q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
- dbesc(normalise_link($contact->url)),
- dbesc($contact->displayName),
- dbesc($contact->preferredUsername),
- dbesc($contact->image->url));
- else
- q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
- dbesc($contact->displayName),
- dbesc($contact->preferredUsername),
- dbesc($contact->image->url),
- dbesc(normalise_link($contact->url)));
-
- if (DB_UPDATE_VERSION >= "1177")
- q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
- dbesc($contact->location->displayName),
- dbesc($contact->summary),
- dbesc(normalise_link($contact->url)));
-
- $cid = 0;
- }
+ update_gcontact(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
+ "photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true,
+ "nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
+ "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));
+ $cid = get_contact($contact->url, $uid);
if ($no_insert)
return($cid);
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
- intval($uid), dbesc($contact->url));
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
+ intval($uid), dbesc(normalise_link($contact->url)));
- if(!count($r)) {
+ if (!count($r)) {
// create contact record
- q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
+ q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
`name`, `nick`, `photo`, `network`, `rel`, `priority`,
- `writable`, `blocked`, `readonly`, `pending` )
- VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+ `location`, `about`, `writable`, `blocked`, `readonly`, `pending` )
+ VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
intval($uid),
dbesc(datetime_convert()),
dbesc($contact->url),
dbesc(NETWORK_PUMPIO),
intval(CONTACT_IS_FRIEND),
intval(1),
+ dbesc($contact->location->displayName),
+ dbesc($contact->summary),
intval(1)
);
- $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($contact->url),
+ $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc(normalise_link($contact->url)),
intval($uid)
);
- if(! count($r))
+ 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)
require_once('include/group.php');
group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
}
-
- if (DB_UPDATE_VERSION >= "1177")
- q("UPDATE `contact` SET `location` = '%s',
- `about` = '%s'
- WHERE `id` = %d",
- dbesc($contact->location->displayName),
- dbesc($contact->summary),
- intval($contact_id)
- );
} else {
$contact_id = $r[0]["id"];
require_once('include/items.php');
require_once('include/html2bbcode.php');
- if (($post->verb == "like") OR ($post->verb == "favorite"))
+ if (($post->verb == "like") || ($post->verb == "favorite"))
return pumpio_dolike($a, $uid, $self, $post, $own_id);
- if (($post->verb == "unlike") OR ($post->verb == "unfavorite"))
+ if (($post->verb == "unlike") || ($post->verb == "unfavorite"))
return pumpio_dounlike($a, $uid, $self, $post, $own_id);
if ($post->verb == "delete")
$post->actor->image->url = $self[0]['photo'];
} elseif ($contact_id == 0) {
// Take an existing contact, the contact of the note or - as a fallback - the id of the user
- $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
- dbesc($post->actor->url),
+ $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+ dbesc(normalise_link($post->actor->url)),
intval($uid)
);
if(count($r))
$contact_id = $r[0]['id'];
else {
- $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
- dbesc($post->actor->url),
+ $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+ dbesc(normalise_link($post->actor->url)),
intval($uid)
);
$postarray['edited'] = $postarray['created'];
if ($post->verb == "share") {
- if (!intval(get_config('system','wall-to-wall_share'))) {
- if (isset($post->object->author->displayName) AND ($post->object->author->displayName != ""))
+ if (!intval(Config::get('system','wall-to-wall_share'))) {
+ if (isset($post->object->author->displayName) && ($post->object->author->displayName != ""))
$share_author = $post->object->author->displayName;
- elseif (isset($post->object->author->preferredUsername) AND ($post->object->author->preferredUsername != ""))
+ elseif (isset($post->object->author->preferredUsername) && ($post->object->author->preferredUsername != ""))
$share_author = $post->object->author->preferredUsername;
else
$share_author = $post->object->author->url;
$top_item = item_store($postarray);
$postarray["id"] = $top_item;
- if (($top_item == 0) AND ($post->verb == "update")) {
+ if (($top_item == 0) && ($post->verb == "update")) {
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s' , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
dbesc($postarray["title"]),
dbesc($postarray["body"]),
foreach($myconv as $conv) {
// now if we find a match, it means we're in this conversation
- if(!link_compare($conv['author-link'],$importer_url) AND !link_compare($conv['author-link'],$own_id))
+ if(!link_compare($conv['author-link'],$importer_url) && !link_compare($conv['author-link'],$own_id))
continue;
require_once('include/enotify.php');
function pumpio_fetchinbox(&$a, $uid) {
- $ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
- $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
- $otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
- $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
- $lastdate = get_pconfig($uid, 'pumpio', 'lastdate');
- $hostname = get_pconfig($uid, 'pumpio','host');
- $username = get_pconfig($uid, "pumpio", "user");
+ $ckey = PConfig::get($uid, 'pumpio', 'consumer_key');
+ $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret');
+ $otoken = PConfig::get($uid, 'pumpio', 'oauth_token');
+ $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+ $lastdate = PConfig::get($uid, 'pumpio', 'lastdate');
+ $hostname = PConfig::get($uid, 'pumpio','host');
+ $username = PConfig::get($uid, "pumpio", "user");
$own_id = "https://".$hostname."/".$username;
$client->access_token = $otoken;
$client->access_token_secret = $osecret;
- $last_id = get_pconfig($uid,'pumpio','last_id');
+ $last_id = PConfig::get($uid,'pumpio','last_id');
$url = 'https://'.$hostname.'/api/user/'.$username.'/inbox';
foreach ($lastitems AS $item)
pumpio_fetchallcomments($a, $uid, $item["uri"]);
- set_pconfig($uid,'pumpio','last_id', $last_id);
+ PConfig::set($uid,'pumpio','last_id', $last_id);
}
function pumpio_getallusers(&$a, $uid) {
- $ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
- $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
- $otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
- $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
- $hostname = get_pconfig($uid, 'pumpio','host');
- $username = get_pconfig($uid, "pumpio", "user");
+ $ckey = PConfig::get($uid, 'pumpio', 'consumer_key');
+ $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret');
+ $otoken = PConfig::get($uid, 'pumpio', 'oauth_token');
+ $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+ $hostname = PConfig::get($uid, 'pumpio','host');
+ $username = PConfig::get($uid, "pumpio", "user");
$client = new oauth_client_class;
$client->oauth_version = '1.0a';
$success = false;
}
- foreach ($users->items AS $user)
- pumpio_get_contact($uid, $user);
+ if (is_array($users->items)) {
+ foreach ($users->items AS $user) {
+ pumpio_get_contact($uid, $user);
+ }
+ }
}
function pumpio_queue_hook(&$a,&$b) {
logger('pumpio_queue: run');
- $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid`
+ $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
intval($x['cid'])
);
//logger('pumpio_queue: fetching userdata '.print_r($userdata, true));
- $oauth_token = get_pconfig($userdata['uid'], "pumpio", "oauth_token");
- $oauth_token_secret = get_pconfig($userdata['uid'], "pumpio", "oauth_token_secret");
- $consumer_key = get_pconfig($userdata['uid'], "pumpio","consumer_key");
- $consumer_secret = get_pconfig($userdata['uid'], "pumpio","consumer_secret");
+ $oauth_token = PConfig::get($userdata['uid'], "pumpio", "oauth_token");
+ $oauth_token_secret = PConfig::get($userdata['uid'], "pumpio", "oauth_token_secret");
+ $consumer_key = PConfig::get($userdata['uid'], "pumpio","consumer_key");
+ $consumer_secret = PConfig::get($userdata['uid'], "pumpio","consumer_secret");
- $host = get_pconfig($userdata['uid'], "pumpio", "host");
- $user = get_pconfig($userdata['uid'], "pumpio", "user");
+ $host = PConfig::get($userdata['uid'], "pumpio", "host");
+ $user = PConfig::get($userdata['uid'], "pumpio", "user");
$success = false;
- if ($oauth_token AND $oauth_token_secret AND
- $consumer_key AND $consumer_secret) {
+ if ($oauth_token && $oauth_token_secret &&
+ $consumer_key && $consumer_secret) {
$username = $user.'@'.$host;
logger('pumpio_queue: able to post for user '.$username);
if($success) {
$post_id = $user->object->id;
logger('pumpio_queue: send '.$username.': success '.$post_id);
- if($post_id AND $iscomment) {
+ if($post_id && $iscomment) {
logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$z['item']);
q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
dbesc($post_id),
if(! strstr($b['postopts'],'pumpio'))
return $receiver;
- $public = get_pconfig($b['uid'], "pumpio", "public");
+ $public = PConfig::get($b['uid'], "pumpio", "public");
if ($public)
$receiver["to"][] = Array(
}
function pumpio_fetchallcomments(&$a, $uid, $id) {
- $ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
- $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
- $otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
- $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
- $hostname = get_pconfig($uid, 'pumpio','host');
- $username = get_pconfig($uid, "pumpio", "user");
+ $ckey = PConfig::get($uid, 'pumpio', 'consumer_key');
+ $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret');
+ $otoken = PConfig::get($uid, 'pumpio', 'oauth_token');
+ $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+ $hostname = PConfig::get($uid, 'pumpio','host');
+ $username = PConfig::get($uid, "pumpio", "user");
logger("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id);
projects / friendica-addons.git / blobdiff