mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2025-07-12 19:38:49 +00:00
Move PConfig::get() to DI::pConfig()->get()
This commit is contained in:
nupplaPhil
parent
2a35176588
commit
ea3a9052d8
42 changed files with 414 additions and 412 deletions
|
|
@ -91,8 +91,8 @@ function pumpio_content(App $a)
|
|||
|
||||
function pumpio_check_item_notification($a, &$notification_data)
|
||||
{
|
||||
$hostname = PConfig::get($notification_data["uid"], 'pumpio', 'host');
|
||||
$username = PConfig::get($notification_data["uid"], "pumpio", "user");
|
||||
$hostname = DI::pConfig()->get($notification_data["uid"], 'pumpio', 'host');
|
||||
$username = DI::pConfig()->get($notification_data["uid"], "pumpio", "user");
|
||||
|
||||
$notification_data["profiles"][] = "https://".$hostname."/".$username;
|
||||
}
|
||||
|
|
@ -143,9 +143,9 @@ function pumpio_registerclient(App $a, $host)
|
|||
function pumpio_connect(App $a)
|
||||
{
|
||||
// Define the needed keys
|
||||
$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');
|
||||
$consumer_key = DI::pConfig()->get(local_user(), 'pumpio', 'consumer_key');
|
||||
$consumer_secret = DI::pConfig()->get(local_user(), 'pumpio', 'consumer_secret');
|
||||
$hostname = DI::pConfig()->get(local_user(), 'pumpio', 'host');
|
||||
|
||||
if ((($consumer_key == "") || ($consumer_secret == "")) && ($hostname != "")) {
|
||||
Logger::log("pumpio_connect: register client");
|
||||
|
|
@ -153,8 +153,8 @@ function pumpio_connect(App $a)
|
|||
PConfig::set(local_user(), 'pumpio', 'consumer_key', $clientdata->client_id);
|
||||
PConfig::set(local_user(), 'pumpio', 'consumer_secret', $clientdata->client_secret);
|
||||
|
||||
$consumer_key = PConfig::get(local_user(), 'pumpio', 'consumer_key');
|
||||
$consumer_secret = PConfig::get(local_user(), 'pumpio', 'consumer_secret');
|
||||
$consumer_key = DI::pConfig()->get(local_user(), 'pumpio', 'consumer_key');
|
||||
$consumer_secret = DI::pConfig()->get(local_user(), 'pumpio', 'consumer_secret');
|
||||
|
||||
Logger::log("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, Logger::DEBUG);
|
||||
}
|
||||
|
|
@ -219,13 +219,13 @@ function pumpio_jot_nets(App $a, array &$jotnets_fields)
|
|||
return;
|
||||
}
|
||||
|
||||
if (PConfig::get(local_user(), 'pumpio', 'post')) {
|
||||
if (DI::pConfig()->get(local_user(), 'pumpio', 'post')) {
|
||||
$jotnets_fields[] = [
|
||||
'type' => 'checkbox',
|
||||
'field' => [
|
||||
'pumpio_enable',
|
||||
L10n::t('Post to pumpio'),
|
||||
PConfig::get(local_user(), 'pumpio', 'post_by_default')
|
||||
DI::pConfig()->get(local_user(), 'pumpio', 'post_by_default')
|
||||
]
|
||||
];
|
||||
}
|
||||
|
|
@ -243,24 +243,24 @@ function pumpio_settings(App $a, &$s)
|
|||
|
||||
/* Get the current state of our config variables */
|
||||
|
||||
$import_enabled = PConfig::get(local_user(), 'pumpio', 'import');
|
||||
$import_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'import');
|
||||
$import_checked = (($import_enabled) ? ' checked="checked" ' : '');
|
||||
|
||||
$enabled = PConfig::get(local_user(), 'pumpio', 'post');
|
||||
$enabled = DI::pConfig()->get(local_user(), 'pumpio', 'post');
|
||||
$checked = (($enabled) ? ' checked="checked" ' : '');
|
||||
$css = (($enabled) ? '' : '-disabled');
|
||||
|
||||
$def_enabled = PConfig::get(local_user(), 'pumpio', 'post_by_default');
|
||||
$def_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'post_by_default');
|
||||
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
|
||||
|
||||
$public_enabled = PConfig::get(local_user(), 'pumpio', 'public');
|
||||
$public_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'public');
|
||||
$public_checked = (($public_enabled) ? ' checked="checked" ' : '');
|
||||
|
||||
$mirror_enabled = PConfig::get(local_user(), 'pumpio', 'mirror');
|
||||
$mirror_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'mirror');
|
||||
$mirror_checked = (($mirror_enabled) ? ' checked="checked" ' : '');
|
||||
|
||||
$servername = PConfig::get(local_user(), "pumpio", "host");
|
||||
$username = PConfig::get(local_user(), "pumpio", "user");
|
||||
$servername = DI::pConfig()->get(local_user(), "pumpio", "host");
|
||||
$username = DI::pConfig()->get(local_user(), "pumpio", "user");
|
||||
|
||||
/* Add some HTML to the existing form */
|
||||
|
||||
|
|
@ -283,8 +283,8 @@ function pumpio_settings(App $a, &$s)
|
|||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
if (($username != '') && ($servername != '')) {
|
||||
$oauth_token = PConfig::get(local_user(), "pumpio", "oauth_token");
|
||||
$oauth_token_secret = PConfig::get(local_user(), "pumpio", "oauth_token_secret");
|
||||
$oauth_token = DI::pConfig()->get(local_user(), "pumpio", "oauth_token");
|
||||
$oauth_token_secret = DI::pConfig()->get(local_user(), "pumpio", "oauth_token_secret");
|
||||
|
||||
$s .= '<div id="pumpio-password-wrapper">';
|
||||
if (($oauth_token == "") || ($oauth_token_secret == "")) {
|
||||
|
|
@ -404,7 +404,7 @@ function pumpio_hook_fork(App $a, array &$b)
|
|||
return;
|
||||
}
|
||||
|
||||
if (PConfig::get($post['uid'], 'pumpio', 'import')) {
|
||||
if (DI::pConfig()->get($post['uid'], 'pumpio', 'import')) {
|
||||
// Don't fork if it isn't a reply to a pump.io post
|
||||
if (($post['parent'] != $post['id']) && !Item::exists(['id' => $post['parent'], 'network' => Protocol::PUMPIO])) {
|
||||
Logger::log('No pump.io parent found for item ' . $post['id']);
|
||||
|
|
@ -426,11 +426,11 @@ function pumpio_post_local(App $a, array &$b)
|
|||
return;
|
||||
}
|
||||
|
||||
$pumpio_post = intval(PConfig::get(local_user(), 'pumpio', 'post'));
|
||||
$pumpio_post = intval(DI::pConfig()->get(local_user(), 'pumpio', 'post'));
|
||||
|
||||
$pumpio_enable = (($pumpio_post && !empty($_REQUEST['pumpio_enable'])) ? intval($_REQUEST['pumpio_enable']) : 0);
|
||||
|
||||
if ($b['api_source'] && intval(PConfig::get(local_user(), 'pumpio', 'post_by_default'))) {
|
||||
if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'pumpio', 'post_by_default'))) {
|
||||
$pumpio_enable = 1;
|
||||
}
|
||||
|
||||
|
|
@ -447,7 +447,7 @@ function pumpio_post_local(App $a, array &$b)
|
|||
|
||||
function pumpio_send(App $a, array &$b)
|
||||
{
|
||||
if (!PConfig::get($b["uid"], 'pumpio', 'import') && ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))) {
|
||||
if (!DI::pConfig()->get($b["uid"], 'pumpio', 'import') && ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -517,14 +517,14 @@ function pumpio_send(App $a, array &$b)
|
|||
// Support for native shares
|
||||
// http://<hostname>/api/<type>/shares?id=<the-object-id>
|
||||
|
||||
$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");
|
||||
$oauth_token = DI::pConfig()->get($b['uid'], "pumpio", "oauth_token");
|
||||
$oauth_token_secret = DI::pConfig()->get($b['uid'], "pumpio", "oauth_token_secret");
|
||||
$consumer_key = DI::pConfig()->get($b['uid'], "pumpio","consumer_key");
|
||||
$consumer_secret = DI::pConfig()->get($b['uid'], "pumpio","consumer_secret");
|
||||
|
||||
$host = PConfig::get($b['uid'], "pumpio", "host");
|
||||
$user = PConfig::get($b['uid'], "pumpio", "user");
|
||||
$public = PConfig::get($b['uid'], "pumpio", "public");
|
||||
$host = DI::pConfig()->get($b['uid'], "pumpio", "host");
|
||||
$user = DI::pConfig()->get($b['uid'], "pumpio", "user");
|
||||
$public = DI::pConfig()->get($b['uid'], "pumpio", "public");
|
||||
|
||||
if ($oauth_token && $oauth_token_secret) {
|
||||
$title = trim($b['title']);
|
||||
|
|
@ -616,16 +616,16 @@ function pumpio_send(App $a, array &$b)
|
|||
function pumpio_action(App $a, $uid, $uri, $action, $content = "")
|
||||
{
|
||||
// Don't do likes and other stuff if you don't import the timeline
|
||||
if (!PConfig::get($uid, 'pumpio', 'import')) {
|
||||
if (!DI::pConfig()->get($uid, 'pumpio', 'import')) {
|
||||
return;
|
||||
}
|
||||
|
||||
$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");
|
||||
$ckey = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
|
||||
$csecret = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
|
||||
$otoken = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
|
||||
$osecret = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
|
||||
$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
|
||||
$username = DI::pConfig()->get($uid, "pumpio", "user");
|
||||
|
||||
$orig_post = Item::selectFirst([], ['uri' => $uri, 'uid' => $uid]);
|
||||
|
||||
|
|
@ -731,7 +731,7 @@ function pumpio_sync(App $a)
|
|||
pumpio_fetchinbox($a, $rr['uid']);
|
||||
|
||||
// check for new contacts once a day
|
||||
$last_contact_check = PConfig::get($rr['uid'], 'pumpio', 'contact_check');
|
||||
$last_contact_check = DI::pConfig()->get($rr['uid'], 'pumpio', 'contact_check');
|
||||
if ($last_contact_check) {
|
||||
$next_contact_check = $last_contact_check + 86400;
|
||||
} else {
|
||||
|
|
@ -757,18 +757,18 @@ function pumpio_cron(App $a, $b)
|
|||
|
||||
function pumpio_fetchtimeline(App $a, $uid)
|
||||
{
|
||||
$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");
|
||||
$ckey = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
|
||||
$csecret = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
|
||||
$otoken = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
|
||||
$osecret = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
|
||||
$lastdate = DI::pConfig()->get($uid, 'pumpio', 'lastdate');
|
||||
$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
|
||||
$username = DI::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 = PConfig::get($uid, 'pumpio', 'application_name');
|
||||
$application_name = DI::pConfig()->get($uid, 'pumpio', 'application_name');
|
||||
if ($application_name == "") {
|
||||
$application_name = Config::get('pumpio', 'application_name');
|
||||
}
|
||||
|
|
@ -1308,13 +1308,13 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
|
|||
|
||||
function pumpio_fetchinbox(App $a, $uid)
|
||||
{
|
||||
$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");
|
||||
$ckey = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
|
||||
$csecret = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
|
||||
$otoken = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
|
||||
$osecret = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
|
||||
$lastdate = DI::pConfig()->get($uid, 'pumpio', 'lastdate');
|
||||
$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
|
||||
$username = DI::pConfig()->get($uid, "pumpio", "user");
|
||||
|
||||
$own_id = "https://".$hostname."/".$username;
|
||||
|
||||
|
|
@ -1339,7 +1339,7 @@ function pumpio_fetchinbox(App $a, $uid)
|
|||
$client->access_token = $otoken;
|
||||
$client->access_token_secret = $osecret;
|
||||
|
||||
$last_id = PConfig::get($uid, 'pumpio', 'last_id');
|
||||
$last_id = DI::pConfig()->get($uid, 'pumpio', 'last_id');
|
||||
|
||||
$url = 'https://'.$hostname.'/api/user/'.$username.'/inbox';
|
||||
|
||||
|
|
@ -1377,12 +1377,12 @@ function pumpio_fetchinbox(App $a, $uid)
|
|||
|
||||
function pumpio_getallusers(App &$a, $uid)
|
||||
{
|
||||
$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");
|
||||
$ckey = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
|
||||
$csecret = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
|
||||
$otoken = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
|
||||
$osecret = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
|
||||
$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
|
||||
$username = DI::pConfig()->get($uid, "pumpio", "user");
|
||||
|
||||
$client = new oauth_client_class;
|
||||
$client->oauth_version = '1.0a';
|
||||
|
|
@ -1432,7 +1432,7 @@ function pumpio_getreceiver(App $a, array $b)
|
|||
return $receiver;
|
||||
}
|
||||
|
||||
$public = PConfig::get($b['uid'], "pumpio", "public");
|
||||
$public = DI::pConfig()->get($b['uid'], "pumpio", "public");
|
||||
|
||||
if ($public) {
|
||||
$receiver["to"][] = [
|
||||
|
|
@ -1510,12 +1510,12 @@ function pumpio_getreceiver(App $a, array $b)
|
|||
|
||||
function pumpio_fetchallcomments(App $a, $uid, $id)
|
||||
{
|
||||
$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");
|
||||
$ckey = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
|
||||
$csecret = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
|
||||
$otoken = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
|
||||
$osecret = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
|
||||
$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
|
||||
$username = DI::pConfig()->get($uid, "pumpio", "user");
|
||||
|
||||
Logger::log("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue