From 2a35176588ac215ddb81dc797096d61ba25cffca Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sat, 18 Jan 2020 15:59:01 +0100 Subject: [PATCH 1/5] Move PConfig::load() to DI::pConfig()->load() --- statusnet/statusnet.php | 2 +- twitter/twitter.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 1d8583849..4494d8ecc 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -580,7 +580,7 @@ function statusnet_post_hook(App $a, &$b) Logger::log('GNU Socialpost invoked'); - PConfig::load($b['uid'], 'statusnet'); + DI::pConfig()->load($b['uid'], 'statusnet'); $api = PConfig::get($b['uid'], 'statusnet', 'baseapi'); $ckey = PConfig::get($b['uid'], 'statusnet', 'consumerkey'); diff --git a/twitter/twitter.php b/twitter/twitter.php index 18625f8b8..9acbc34c3 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -588,7 +588,7 @@ function twitter_post_hook(App $a, array &$b) Logger::notice('twitter post invoked', ['id' => $b['id'], 'guid' => $b['guid']]); - PConfig::load($b['uid'], 'twitter'); + DI::pConfig()->load($b['uid'], 'twitter'); $ckey = Config::get('twitter', 'consumerkey'); $csecret = Config::get('twitter', 'consumersecret'); From ea3a9052d83f8ea99cee8438022be0b022a24cc1 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sat, 18 Jan 2020 16:50:56 +0100 Subject: [PATCH 2/5] Move PConfig::get() to DI::pConfig()->get() --- blockem/blockem.php | 10 +- blogger/blogger.php | 24 ++-- buffer/buffer.php | 16 +-- catavatar/catavatar.php | 6 +- curweather/curweather.php | 14 +- diaspora/diaspora.php | 24 ++-- discourse/discourse.php | 5 +- dwpost/dwpost.php | 20 +-- fromapp/fromapp.php | 8 +- geonames/geonames.php | 4 +- gnot/gnot.php | 4 +- group_text/group_text.php | 2 +- ifttt/ifttt.php | 4 +- ijpost/ijpost.php | 20 +-- irc/irc.php | 8 +- jappixmini/jappixmini.php | 52 ++++---- krynn/krynn.php | 4 +- langfilter/langfilter.php | 16 +-- libertree/libertree.php | 20 +-- ljpost/ljpost.php | 24 ++-- mailstream/mailstream.php | 16 +-- markdown/markdown.php | 5 +- mathjax/mathjax.php | 4 +- notimeline/notimeline.php | 2 +- nsfw/nsfw.php | 8 +- numfriends/numfriends.php | 2 +- planets/planets.php | 4 +- pumpio/pumpio.php | 132 +++++++++---------- qcomment/qcomment.php | 2 +- randplace/randplace.php | 4 +- remote_permissions/remote_permissions.php | 4 +- securemail/securemail.php | 8 +- showmore/showmore.php | 8 +- startpage/startpage.php | 4 +- statusnet/statusnet.php | 148 +++++++++++----------- superblock/superblock.php | 8 +- tumblr/tumblr.php | 24 ++-- twitter/twitter.php | 78 ++++++------ widgets/widgets.php | 2 +- windowsphonepush/windowsphonepush.php | 26 ++-- wppost/wppost.php | 36 +++--- xmpp/xmpp.php | 16 +-- 42 files changed, 414 insertions(+), 412 deletions(-) diff --git a/blockem/blockem.php b/blockem/blockem.php index e44ac622c..5bd01e920 100644 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -46,7 +46,7 @@ function blockem_addon_settings (App $a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ DI::page()['htmlhead'] .= '' . "\r\n"; - $words = PConfig::get(local_user(), 'blockem', 'words'); + $words = DI::pConfig()->get(local_user(), 'blockem', 'words'); if (!$words) { $words = ''; @@ -86,7 +86,7 @@ function blockem_addon_settings_post(App $a, array &$b) function blockem_enotify_store(App $a, array &$b) { - $words = PConfig::get($b['uid'], 'blockem', 'words'); + $words = DI::pConfig()->get($b['uid'], 'blockem', 'words'); if ($words) { $arr = explode(',', $words); @@ -123,7 +123,7 @@ function blockem_prepare_body_content_filter(App $a, array &$hook_data) $profiles_string = null; if (local_user()) { - $profiles_string = PConfig::get(local_user(), 'blockem', 'words'); + $profiles_string = DI::pConfig()->get(local_user(), 'blockem', 'words'); } if ($profiles_string) { @@ -159,7 +159,7 @@ function blockem_conversation_start(App $a, array &$b) return; } - $words = PConfig::get(local_user(), 'blockem', 'words'); + $words = DI::pConfig()->get(local_user(), 'blockem', 'words'); if ($words) { $a->data['blockem'] = explode(',', $words); @@ -217,7 +217,7 @@ function blockem_init(App $a) return; } - $words = PConfig::get(local_user(), 'blockem', 'words'); + $words = DI::pConfig()->get(local_user(), 'blockem', 'words'); if (array_key_exists('block', $_GET) && $_GET['block']) { if (strlen($words)) { diff --git a/blogger/blogger.php b/blogger/blogger.php index 070a09656..0458415e6 100644 --- a/blogger/blogger.php +++ b/blogger/blogger.php @@ -48,13 +48,13 @@ function blogger_jot_nets(App $a, array &$jotnets_fields) return; } - if (PConfig::get(local_user(), 'blogger', 'post')) { + if (DI::pConfig()->get(local_user(), 'blogger', 'post')) { $jotnets_fields[] = [ 'type' => 'checkbox', 'field' => [ 'blogger_enable', L10n::t('Post to blogger'), - PConfig::get(local_user(), 'blogger', 'post_by_default') + DI::pConfig()->get(local_user(), 'blogger', 'post_by_default') ] ]; } @@ -73,17 +73,17 @@ function blogger_settings(App $a, &$s) /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(), 'blogger', 'post'); + $enabled = DI::pConfig()->get(local_user(), 'blogger', 'post'); $checked = (($enabled) ? ' checked="checked" ' : ''); $css = (($enabled) ? '' : '-disabled'); - $def_enabled = PConfig::get(local_user(), 'blogger', 'post_by_default'); + $def_enabled = DI::pConfig()->get(local_user(), 'blogger', 'post_by_default'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - $bl_username = PConfig::get(local_user(), 'blogger', 'bl_username'); - $bl_password = PConfig::get(local_user(), 'blogger', 'bl_password'); - $bl_blog = PConfig::get(local_user(), 'blogger', 'bl_blog'); + $bl_username = DI::pConfig()->get(local_user(), 'blogger', 'bl_username'); + $bl_password = DI::pConfig()->get(local_user(), 'blogger', 'bl_password'); + $bl_blog = DI::pConfig()->get(local_user(), 'blogger', 'bl_blog'); /* Add some HTML to the existing form */ $s .= ''; @@ -166,11 +166,11 @@ function blogger_post_local(App $a, array &$b) return; } - $bl_post = intval(PConfig::get(local_user(), 'blogger', 'post')); + $bl_post = intval(DI::pConfig()->get(local_user(), 'blogger', 'post')); $bl_enable = (($bl_post && !empty($_REQUEST['blogger_enable'])) ? intval($_REQUEST['blogger_enable']) : 0); - if ($b['api_source'] && intval(PConfig::get(local_user(), 'blogger', 'post_by_default'))) { + if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'blogger', 'post_by_default'))) { $bl_enable = 1; } @@ -199,9 +199,9 @@ function blogger_send(App $a, array &$b) return; } - $bl_username = XML::escape(PConfig::get($b['uid'], 'blogger', 'bl_username')); - $bl_password = XML::escape(PConfig::get($b['uid'], 'blogger', 'bl_password')); - $bl_blog = PConfig::get($b['uid'], 'blogger', 'bl_blog'); + $bl_username = XML::escape(DI::pConfig()->get($b['uid'], 'blogger', 'bl_username')); + $bl_password = XML::escape(DI::pConfig()->get($b['uid'], 'blogger', 'bl_password')); + $bl_blog = DI::pConfig()->get($b['uid'], 'blogger', 'bl_blog'); if ($bl_username && $bl_password && $bl_blog) { $title = '' . (($b['title']) ? $b['title'] : L10n::t('Post from Friendica')) . ''; diff --git a/buffer/buffer.php b/buffer/buffer.php index 7f460a551..ac2c8b8e7 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -133,13 +133,13 @@ function buffer_jot_nets(App $a, array &$jotnets_fields) return; } - if (PConfig::get(local_user(), 'buffer', 'post')) { + if (DI::pConfig()->get(local_user(), 'buffer', 'post')) { $jotnets_fields[] = [ 'type' => 'checkbox', 'field' => [ 'buffer_enable', L10n::t('Post to Buffer'), - PConfig::get(local_user(), 'buffer', 'post_by_default') + DI::pConfig()->get(local_user(), 'buffer', 'post_by_default') ] ]; } @@ -157,11 +157,11 @@ function buffer_settings(App $a, &$s) /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(),'buffer','post'); + $enabled = DI::pConfig()->get(local_user(),'buffer','post'); $checked = (($enabled) ? ' checked="checked" ' : ''); $css = (($enabled) ? '' : '-disabled'); - $def_enabled = PConfig::get(local_user(),'buffer','post_by_default'); + $def_enabled = DI::pConfig()->get(local_user(),'buffer','post_by_default'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); /* Add some HTML to the existing form */ @@ -176,7 +176,7 @@ function buffer_settings(App $a, &$s) $client_id = Config::get("buffer", "client_id"); $client_secret = Config::get("buffer", "client_secret"); - $access_token = PConfig::get(local_user(), "buffer", "access_token"); + $access_token = DI::pConfig()->get(local_user(), "buffer", "access_token"); $s .= '
'; @@ -252,11 +252,11 @@ function buffer_post_local(App $a, array &$b) return; } - $buffer_post = intval(PConfig::get(local_user(),'buffer','post')); + $buffer_post = intval(DI::pConfig()->get(local_user(),'buffer','post')); $buffer_enable = (($buffer_post && !empty($_REQUEST['buffer_enable'])) ? intval($_REQUEST['buffer_enable']) : 0); - if ($b['api_source'] && intval(PConfig::get(local_user(),'buffer','post_by_default'))) { + if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'buffer','post_by_default'))) { $buffer_enable = 1; } @@ -313,7 +313,7 @@ function buffer_send(App $a, array &$b) $client_id = Config::get("buffer", "client_id"); $client_secret = Config::get("buffer", "client_secret"); - $access_token = PConfig::get($b['uid'], "buffer","access_token"); + $access_token = DI::pConfig()->get($b['uid'], "buffer","access_token"); $callback_url = ""; if ($access_token) { diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php index b345ea4f2..1cdd3b1ee 100644 --- a/catavatar/catavatar.php +++ b/catavatar/catavatar.php @@ -63,7 +63,7 @@ function catavatar_addon_settings(App $a, &$s) '$usecat' => L10n::t('Use Cat as Avatar'), '$morecat' => L10n::t('More Random Cat!'), '$emailcat' => L10n::t('Reset to email Cat'), - '$seed' => PConfig::get(local_user(), 'catavatar', 'seed', false), + '$seed' => DI::pConfig()->get(local_user(), 'catavatar', 'seed', false), '$header' => L10n::t('Cat Avatar Settings'), ]); } @@ -82,7 +82,7 @@ function catavatar_addon_settings_post(App $a, &$s) 'account_expired' => false, 'account_removed' => false]; $user = DBA::selectFirst('user', ['email'], $condition); - $seed = PConfig::get(local_user(), 'catavatar', 'seed', md5(trim(strtolower($user['email'])))); + $seed = DI::pConfig()->get(local_user(), 'catavatar', 'seed', md5(trim(strtolower($user['email'])))); if (!empty($_POST['catavatar-usecat'])) { $url = DI::baseUrl()->get() . '/catavatar/' . local_user() . '?ts=' . time(); @@ -182,7 +182,7 @@ function catavatar_content(App $a) throw new NotFoundException(); } - $seed = PConfig::get($uid, "catavatar", "seed", md5(trim(strtolower($user['email'])))); + $seed = DI::pConfig()->get($uid, "catavatar", "seed", md5(trim(strtolower($user['email'])))); // ...Or start generation ob_start(); diff --git a/curweather/curweather.php b/curweather/curweather.php index c515adce6..c5476efe1 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -43,7 +43,7 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti $now = new DateTime(); if (!is_null($cached)) { - $cdate = PConfig::get(local_user(), 'curweather', 'last'); + $cdate = DI::pConfig()->get(local_user(), 'curweather', 'last'); $cached = unserialize($cached); if ($cdate + $cachetime > $now->getTimestamp()) { @@ -100,7 +100,7 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti function curweather_network_mod_init(App $a, &$b) { - if (!intval(PConfig::get(local_user(), 'curweather', 'curweather_enable'))) { + if (!intval(DI::pConfig()->get(local_user(), 'curweather', 'curweather_enable'))) { return; } @@ -115,11 +115,11 @@ function curweather_network_mod_init(App $a, &$b) // those parameters will be used to get: cloud status, temperature, preassure // and relative humidity for display, also the relevent area of the map is // linked from lat/log of the reply of OWMp - $rpt = PConfig::get(local_user(), 'curweather', 'curweather_loc'); + $rpt = DI::pConfig()->get(local_user(), 'curweather', 'curweather_loc'); // Set the language to the browsers language or default and use metric units $lang = Session::get('language', Config::get('system', 'language')); - $units = PConfig::get( local_user(), 'curweather', 'curweather_units'); + $units = DI::pConfig()->get( local_user(), 'curweather', 'curweather_units'); $appid = Config::get('curweather', 'appid'); $cachetime = intval(Config::get('curweather', 'cachetime')); @@ -184,8 +184,8 @@ function curweather_addon_settings(App $a, &$s) } /* Get the current state of our config variable */ - $curweather_loc = PConfig::get(local_user(), 'curweather', 'curweather_loc'); - $curweather_units = PConfig::get(local_user(), 'curweather', 'curweather_units'); + $curweather_loc = DI::pConfig()->get(local_user(), 'curweather', 'curweather_loc'); + $curweather_units = DI::pConfig()->get(local_user(), 'curweather', 'curweather_units'); $appid = Config::get('curweather', 'appid'); if ($appid == "") { @@ -194,7 +194,7 @@ function curweather_addon_settings(App $a, &$s) $noappidtext = ''; } - $enable = intval(PConfig::get(local_user(), 'curweather', 'curweather_enable')); + $enable = intval(DI::pConfig()->get(local_user(), 'curweather', 'curweather_enable')); $enable_checked = (($enable) ? ' checked="checked" ' : ''); // load template and replace the macros diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index 7393bbb27..781c1d045 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -46,13 +46,13 @@ function diaspora_jot_nets(App $a, array &$jotnets_fields) return; } - if (PConfig::get(local_user(), 'diaspora', 'post')) { + if (DI::pConfig()->get(local_user(), 'diaspora', 'post')) { $jotnets_fields[] = [ 'type' => 'checkbox', 'field' => [ 'diaspora_enable', L10n::t('Post to Diaspora'), - PConfig::get(local_user(), 'diaspora', 'post_by_default') + DI::pConfig()->get(local_user(), 'diaspora', 'post_by_default') ] ]; } @@ -70,17 +70,17 @@ function diaspora_settings(App $a, &$s) /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(),'diaspora','post'); + $enabled = DI::pConfig()->get(local_user(),'diaspora','post'); $checked = (($enabled) ? ' checked="checked" ' : ''); $css = (($enabled) ? '' : '-disabled'); - $def_enabled = PConfig::get(local_user(),'diaspora','post_by_default'); + $def_enabled = DI::pConfig()->get(local_user(),'diaspora','post_by_default'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - $handle = PConfig::get(local_user(), 'diaspora', 'handle'); - $password = PConfig::get(local_user(), 'diaspora', 'password'); - $aspect = PConfig::get(local_user(),'diaspora','aspect'); + $handle = DI::pConfig()->get(local_user(), 'diaspora', 'handle'); + $password = DI::pConfig()->get(local_user(), 'diaspora', 'password'); + $aspect = DI::pConfig()->get(local_user(),'diaspora','aspect'); $status = ""; @@ -211,11 +211,11 @@ function diaspora_post_local(App $a, array &$b) return; } - $diaspora_post = intval(PConfig::get(local_user(),'diaspora','post')); + $diaspora_post = intval(DI::pConfig()->get(local_user(),'diaspora','post')); $diaspora_enable = (($diaspora_post && !empty($_REQUEST['diaspora_enable'])) ? intval($_REQUEST['diaspora_enable']) : 0); - if ($b['api_source'] && intval(PConfig::get(local_user(),'diaspora','post_by_default'))) { + if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'diaspora','post_by_default'))) { $diaspora_enable = 1; } @@ -258,9 +258,9 @@ function diaspora_send(App $a, array &$b) Logger::log('diaspora_send: prepare posting', Logger::DEBUG); - $handle = PConfig::get($b['uid'],'diaspora','handle'); - $password = PConfig::get($b['uid'],'diaspora','password'); - $aspect = PConfig::get($b['uid'],'diaspora','aspect'); + $handle = DI::pConfig()->get($b['uid'],'diaspora','handle'); + $password = DI::pConfig()->get($b['uid'],'diaspora','password'); + $aspect = DI::pConfig()->get($b['uid'],'diaspora','aspect'); if ($handle && $password) { Logger::log('diaspora_send: all values seem to be okay', Logger::DEBUG); diff --git a/discourse/discourse.php b/discourse/discourse.php index 262ee554e..34fa206d2 100644 --- a/discourse/discourse.php +++ b/discourse/discourse.php @@ -15,6 +15,7 @@ use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Core\Protocol; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Util\XML; use Friendica\Content\Text\Markdown; @@ -44,7 +45,7 @@ function discourse_settings(App $a, &$s) return; } - $enabled = intval(PConfig::get(local_user(), 'discourse', 'enabled')); + $enabled = intval(DI::pConfig()->get(local_user(), 'discourse', 'enabled')); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/discourse/'); $s .= Renderer::replaceMacros($t, [ @@ -69,7 +70,7 @@ function discourse_email_getmessage(App $a, &$message) return; } - if (!PConfig::get($message['item']['uid'], 'discourse', 'enabled')) { + if (!DI::pConfig()->get($message['item']['uid'], 'discourse', 'enabled')) { return; } diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php index 336c84e6e..9e2d69e45 100644 --- a/dwpost/dwpost.php +++ b/dwpost/dwpost.php @@ -44,13 +44,13 @@ function dwpost_jot_nets(App $a, array &$jotnets_fields) return; } - if (PConfig::get(local_user(), 'dwpost', 'post')) { + if (DI::pConfig()->get(local_user(), 'dwpost', 'post')) { $jotnets_fields[] = [ 'type' => 'checkbox', 'field' => [ 'dwpost_enable', L10n::t('Post to Dreamwidth'), - PConfig::get(local_user(), 'dwpost', 'post_by_default') + DI::pConfig()->get(local_user(), 'dwpost', 'post_by_default') ] ]; } @@ -67,16 +67,16 @@ function dwpost_settings(App $a, &$s) DI::page()['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(), 'dwpost', 'post'); + $enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post'); $checked = (($enabled) ? ' checked="checked" ' : ''); - $def_enabled = PConfig::get(local_user(), 'dwpost', 'post_by_default'); + $def_enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post_by_default'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - $dw_username = PConfig::get(local_user(), 'dwpost', 'dw_username'); - $dw_password = PConfig::get(local_user(), 'dwpost', 'dw_password'); + $dw_username = DI::pConfig()->get(local_user(), 'dwpost', 'dw_username'); + $dw_password = DI::pConfig()->get(local_user(), 'dwpost', 'dw_password'); /* Add some HTML to the existing form */ $s .= ''; @@ -137,11 +137,11 @@ function dwpost_post_local(App $a, array &$b) return; } - $dw_post = intval(PConfig::get(local_user(),'dwpost','post')); + $dw_post = intval(DI::pConfig()->get(local_user(),'dwpost','post')); $dw_enable = (($dw_post && !empty($_REQUEST['dwpost_enable'])) ? intval($_REQUEST['dwpost_enable']) : 0); - if ($b['api_source'] && intval(PConfig::get(local_user(),'dwpost','post_by_default'))) { + if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'dwpost','post_by_default'))) { $dw_enable = 1; } @@ -185,8 +185,8 @@ function dwpost_send(App $a, array &$b) $tz = $x[0]['timezone']; } - $dw_username = PConfig::get($b['uid'],'dwpost','dw_username'); - $dw_password = PConfig::get($b['uid'],'dwpost','dw_password'); + $dw_username = DI::pConfig()->get($b['uid'],'dwpost','dw_username'); + $dw_password = DI::pConfig()->get($b['uid'],'dwpost','dw_password'); $dw_blog = 'http://www.dreamwidth.org/interface/xmlrpc'; if ($dw_username && $dw_password && $dw_blog) { diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php index 4e8325064..5a18ab555 100644 --- a/fromapp/fromapp.php +++ b/fromapp/fromapp.php @@ -53,9 +53,9 @@ function fromapp_settings(&$a, &$s) /* Get the current state of our config variable */ - $fromapp = PConfig::get(local_user(), 'fromapp', 'app', ''); + $fromapp = DI::pConfig()->get(local_user(), 'fromapp', 'app', ''); - $force = intval(PConfig::get(local_user(), 'fromapp', 'force')); + $force = intval(DI::pConfig()->get(local_user(), 'fromapp', 'force')); $force_enabled = (($force) ? ' checked="checked" ' : ''); @@ -94,8 +94,8 @@ function fromapp_post_hook(&$a, &$item) return; } - $app = PConfig::get(local_user(), 'fromapp', 'app'); - $force = intval(PConfig::get(local_user(), 'fromapp', 'force')); + $app = DI::pConfig()->get(local_user(), 'fromapp', 'app'); + $force = intval(DI::pConfig()->get(local_user(), 'fromapp', 'force')); if (is_null($app) || (! strlen($app))) { return; diff --git a/geonames/geonames.php b/geonames/geonames.php index 03a2e45be..560b5ee88 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -67,7 +67,7 @@ function geonames_post_hook(App $a, array &$item) /* Retrieve our personal config setting */ $geo_account = Config::get('geonames', 'username'); - $active = PConfig::get(local_user(), 'geonames', 'enable'); + $active = DI::pConfig()->get(local_user(), 'geonames', 'enable'); if (!$geo_account || !$active) { return; @@ -140,7 +140,7 @@ function geonames_addon_settings(App $a, &$s) DI::page()->registerStylesheet($stylesheetPath); /* Get the current state of our config variable */ - $enabled = intval(PConfig::get(local_user(), 'geonames', 'enable')); + $enabled = intval(DI::pConfig()->get(local_user(), 'geonames', 'enable')); $t = Renderer::getMarkupTemplate('settings.tpl', __DIR__); $s .= Renderer::replaceMacros($t, [ diff --git a/gnot/gnot.php b/gnot/gnot.php index c89b3aba8..5aa0995b1 100644 --- a/gnot/gnot.php +++ b/gnot/gnot.php @@ -74,7 +74,7 @@ function gnot_settings(&$a,&$s) { /* Get the current state of our config variable */ - $gnot = intval(PConfig::get(local_user(),'gnot','enable')); + $gnot = intval(DI::pConfig()->get(local_user(),'gnot','enable')); $gnot_checked = (($gnot) ? ' checked="checked" ' : '' ); @@ -92,7 +92,7 @@ function gnot_settings(&$a,&$s) { function gnot_enotify_mail(&$a,&$b) { - if((! $b['uid']) || (! intval(PConfig::get($b['uid'], 'gnot','enable')))) + if((! $b['uid']) || (! intval(DI::pConfig()->get($b['uid'], 'gnot','enable')))) return; if($b['type'] == NOTIFY_COMMENT) $b['subject'] = L10n::t('[Friendica:Notify] Comment to conversation #%d', $b['parent']); diff --git a/group_text/group_text.php b/group_text/group_text.php index 3e636091f..0e18ec526 100644 --- a/group_text/group_text.php +++ b/group_text/group_text.php @@ -69,7 +69,7 @@ function group_text_settings(&$a,&$s) { /* Get the current state of our config variable */ - $enabled = PConfig::get(local_user(),'system','groupedit_image_limit'); + $enabled = DI::pConfig()->get(local_user(),'system','groupedit_image_limit'); $checked = (($enabled) ? ' checked="checked" ' : ''); /* Add some HTML to the existing form */ diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index 08be262bd..ac05fcb9a 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -46,7 +46,7 @@ function ifttt_settings(App $a, &$s) return; } - $key = PConfig::get(local_user(), 'ifttt', 'key'); + $key = DI::pConfig()->get(local_user(), 'ifttt', 'key'); if (!$key) { $key = Strings::getRandomHex(20); @@ -119,7 +119,7 @@ function ifttt_post(App $a) $key = $_REQUEST['key']; // Check the key - if ($key != PConfig::get($uid, 'ifttt', 'key')) { + if ($key != DI::pConfig()->get($uid, 'ifttt', 'key')) { Logger::log('Invalid key for user ' . $uid, Logger::DEBUG); return; } diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php index f49fa2143..29fcd0d73 100644 --- a/ijpost/ijpost.php +++ b/ijpost/ijpost.php @@ -42,13 +42,13 @@ function ijpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields) return; } - if (PConfig::get(local_user(), 'ijpost', 'post')) { + if (DI::pConfig()->get(local_user(), 'ijpost', 'post')) { $jotnets_fields[] = [ 'type' => 'checkbox', 'field' => [ 'ijpost_enable', L10n::t('Post to Insanejournal'), - PConfig::get(local_user(), 'ijpost', 'post_by_default') + DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default') ] ]; } @@ -66,16 +66,16 @@ function ijpost_settings(&$a, &$s) /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(), 'ijpost', 'post'); + $enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post'); $checked = (($enabled) ? ' checked="checked" ' : ''); - $def_enabled = PConfig::get(local_user(), 'ijpost', 'post_by_default'); + $def_enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - $ij_username = PConfig::get(local_user(), 'ijpost', 'ij_username'); - $ij_password = PConfig::get(local_user(), 'ijpost', 'ij_password'); + $ij_username = DI::pConfig()->get(local_user(), 'ijpost', 'ij_username'); + $ij_password = DI::pConfig()->get(local_user(), 'ijpost', 'ij_password'); /* Add some HTML to the existing form */ $s .= ''; @@ -136,11 +136,11 @@ function ijpost_post_local(&$a, &$b) return; } - $ij_post = intval(PConfig::get(local_user(), 'ijpost', 'post')); + $ij_post = intval(DI::pConfig()->get(local_user(), 'ijpost', 'post')); $ij_enable = (($ij_post && !empty($_REQUEST['ijpost_enable'])) ? intval($_REQUEST['ijpost_enable']) : 0); - if ($b['api_source'] && intval(PConfig::get(local_user(), 'ijpost', 'post_by_default'))) { + if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default'))) { $ij_enable = 1; } @@ -183,8 +183,8 @@ function ijpost_send(&$a, &$b) $tz = $x[0]['timezone']; } - $ij_username = PConfig::get($b['uid'], 'ijpost', 'ij_username'); - $ij_password = PConfig::get($b['uid'], 'ijpost', 'ij_password'); + $ij_username = DI::pConfig()->get($b['uid'], 'ijpost', 'ij_username'); + $ij_password = DI::pConfig()->get($b['uid'], 'ijpost', 'ij_password'); $ij_blog = 'http://www.insanejournal.com/interface/xmlrpc'; if ($ij_username && $ij_password && $ij_blog) { diff --git a/irc/irc.php b/irc/irc.php index 528189eda..96f4a888b 100644 --- a/irc/irc.php +++ b/irc/irc.php @@ -36,8 +36,8 @@ function irc_addon_settings(&$a,&$s) { // DI::page()['htmlhead'] .= '' . "\r\n"; /* setting popular channels, auto connect channels */ - $sitechats = PConfig::get( local_user(), 'irc','sitechats'); /* popular channels */ - $autochans = PConfig::get( local_user(), 'irc','autochans'); /* auto connect chans */ + $sitechats = DI::pConfig()->get( local_user(), 'irc','sitechats'); /* popular channels */ + $autochans = DI::pConfig()->get( local_user(), 'irc','autochans'); /* auto connect chans */ $t = Renderer::getMarkupTemplate( "settings.tpl", "addon/irc/" ); $s .= Renderer::replaceMacros($t, [ @@ -86,7 +86,7 @@ function irc_content(&$a) { /* set the list of popular channels */ if (local_user()) { - $sitechats = PConfig::get( local_user(), 'irc', 'sitechats'); + $sitechats = DI::pConfig()->get( local_user(), 'irc', 'sitechats'); if (!$sitechats) $sitechats = Config::get('irc', 'sitechats'); } else { @@ -106,7 +106,7 @@ function irc_content(&$a) { /* setting the channel(s) to auto connect */ if (local_user()) { - $autochans = PConfig::get(local_user(), 'irc', 'autochans'); + $autochans = DI::pConfig()->get(local_user(), 'irc', 'autochans'); if (!$autochans) $autochans = Config::get('irc','autochans'); } else { diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index ad758167b..1c67c9d78 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -237,15 +237,15 @@ function jappixmini_init() } // do not return an address if user deactivated addon - $activated = PConfig::get($uid, 'jappixmini', 'activate'); + $activated = DI::pConfig()->get($uid, 'jappixmini', 'activate'); if (!$activated) { exit(); } // return the requested Jabber address try { - $username = PConfig::get($uid, 'jappixmini', 'username'); - $server = PConfig::get($uid, 'jappixmini', 'server'); + $username = DI::pConfig()->get($uid, 'jappixmini', 'username'); + $server = DI::pConfig()->get($uid, 'jappixmini', 'server'); $address = "$username@$server"; $encrypted_address = ""; @@ -269,9 +269,9 @@ function jappixmini_init() function jappixmini_settings(App $a, &$s) { // addon settings for a user - $activate = PConfig::get(local_user(), 'jappixmini', 'activate'); + $activate = DI::pConfig()->get(local_user(), 'jappixmini', 'activate'); $activate = intval($activate) ? ' checked="checked"' : ''; - $dontinsertchat = PConfig::get(local_user(), 'jappixmini', 'dontinsertchat'); + $dontinsertchat = DI::pConfig()->get(local_user(), 'jappixmini', 'dontinsertchat'); $insertchat = !(intval($dontinsertchat) ? ' checked="checked"' : ''); $defaultbosh = Config::get("jappixmini", "bosh_address"); @@ -280,18 +280,18 @@ function jappixmini_settings(App $a, &$s) PConfig::set(local_user(), 'jappixmini', 'bosh', $defaultbosh); } - $username = PConfig::get(local_user(), 'jappixmini', 'username'); + $username = DI::pConfig()->get(local_user(), 'jappixmini', 'username'); $username = htmlentities($username); - $server = PConfig::get(local_user(), 'jappixmini', 'server'); + $server = DI::pConfig()->get(local_user(), 'jappixmini', 'server'); $server = htmlentities($server); - $bosh = PConfig::get(local_user(), 'jappixmini', 'bosh'); + $bosh = DI::pConfig()->get(local_user(), 'jappixmini', 'bosh'); $bosh = htmlentities($bosh); - $password = PConfig::get(local_user(), 'jappixmini', 'password'); - $autosubscribe = PConfig::get(local_user(), 'jappixmini', 'autosubscribe'); + $password = DI::pConfig()->get(local_user(), 'jappixmini', 'password'); + $autosubscribe = DI::pConfig()->get(local_user(), 'jappixmini', 'autosubscribe'); $autosubscribe = intval($autosubscribe) ? ' checked="checked"' : ''; - $autoapprove = PConfig::get(local_user(), 'jappixmini', 'autoapprove'); + $autoapprove = DI::pConfig()->get(local_user(), 'jappixmini', 'autoapprove'); $autoapprove = intval($autoapprove) ? ' checked="checked"' : ''; - $encrypt = intval(PConfig::get(local_user(), 'jappixmini', 'encrypt')); + $encrypt = intval(DI::pConfig()->get(local_user(), 'jappixmini', 'encrypt')); $encrypt_checked = $encrypt ? ' checked="checked"' : ''; $encrypt_disabled = $encrypt ? '' : ' disabled="disabled"'; @@ -445,13 +445,13 @@ function jappixmini_settings_post(App $a, &$b) $purge = intval($b['jappixmini-purge']); $username = trim($b['jappixmini-username']); - $old_username = PConfig::get($uid, 'jappixmini', 'username'); + $old_username = DI::pConfig()->get($uid, 'jappixmini', 'username'); if ($username != $old_username) { $purge = 1; } $server = trim($b['jappixmini-server']); - $old_server = PConfig::get($uid, 'jappixmini', 'server'); + $old_server = DI::pConfig()->get($uid, 'jappixmini', 'server'); if ($server != $old_server) { $purge = 1; } @@ -485,8 +485,8 @@ function jappixmini_script(App $a) return; } - $activate = PConfig::get(local_user(), 'jappixmini', 'activate'); - $dontinsertchat = PConfig::get(local_user(), 'jappixmini', 'dontinsertchat'); + $activate = DI::pConfig()->get(local_user(), 'jappixmini', 'activate'); + $dontinsertchat = DI::pConfig()->get(local_user(), 'jappixmini', 'dontinsertchat'); if (!$activate || $dontinsertchat) { return; } @@ -496,20 +496,20 @@ function jappixmini_script(App $a) DI::page()['htmlhead'] .= '' . "\r\n"; - $username = PConfig::get(local_user(), 'jappixmini', 'username'); + $username = DI::pConfig()->get(local_user(), 'jappixmini', 'username'); $username = str_replace("'", "\\'", $username); - $server = PConfig::get(local_user(), 'jappixmini', 'server'); + $server = DI::pConfig()->get(local_user(), 'jappixmini', 'server'); $server = str_replace("'", "\\'", $server); - $bosh = PConfig::get(local_user(), 'jappixmini', 'bosh'); + $bosh = DI::pConfig()->get(local_user(), 'jappixmini', 'bosh'); $bosh = str_replace("'", "\\'", $bosh); - $encrypt = PConfig::get(local_user(), 'jappixmini', 'encrypt'); + $encrypt = DI::pConfig()->get(local_user(), 'jappixmini', 'encrypt'); $encrypt = intval($encrypt); - $password = PConfig::get(local_user(), 'jappixmini', 'password'); + $password = DI::pConfig()->get(local_user(), 'jappixmini', 'password'); $password = str_replace("'", "\\'", $password); - $autoapprove = PConfig::get(local_user(), 'jappixmini', 'autoapprove'); + $autoapprove = DI::pConfig()->get(local_user(), 'jappixmini', 'autoapprove'); $autoapprove = intval($autoapprove); - $autosubscribe = PConfig::get(local_user(), 'jappixmini', 'autosubscribe'); + $autosubscribe = DI::pConfig()->get(local_user(), 'jappixmini', 'autosubscribe'); $autosubscribe = intval($autosubscribe); // set proxy if necessary @@ -619,7 +619,7 @@ function jappixmini_cron(App $a, $d) } // check if jabber address already present - $present = PConfig::get($uid, "jappixmini", "id:" . $dfrn_id); + $present = DI::pConfig()->get($uid, "jappixmini", "id:" . $dfrn_id); $now = intval(time()); if ($present) { // $present has format "timestamp:jabber_address" @@ -642,11 +642,11 @@ function jappixmini_cron(App $a, $d) $base = substr($request, 0, $pos) . "/jappixmini?role=$role"; // construct own address - $username = PConfig::get($uid, 'jappixmini', 'username'); + $username = DI::pConfig()->get($uid, 'jappixmini', 'username'); if (!$username) { continue; } - $server = PConfig::get($uid, 'jappixmini', 'server'); + $server = DI::pConfig()->get($uid, 'jappixmini', 'server'); if (!$server) { continue; } diff --git a/krynn/krynn.php b/krynn/krynn.php index 2a941580e..c16ccefb5 100644 --- a/krynn/krynn.php +++ b/krynn/krynn.php @@ -85,7 +85,7 @@ function krynn_post_hook($a, &$item) { /* Retrieve our personal config setting */ - $active = PConfig::get(local_user(), 'krynn', 'enable'); + $active = DI::pConfig()->get(local_user(), 'krynn', 'enable'); if(! $active) return; @@ -147,7 +147,7 @@ function krynn_settings(&$a,&$s) { /* Get the current state of our config variable */ - $enabled = PConfig::get(local_user(),'krynn','enable'); + $enabled = DI::pConfig()->get(local_user(),'krynn','enable'); $checked = (($enabled) ? ' checked="checked" ' : ''); diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index f4728c772..cb580888e 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -47,10 +47,10 @@ function langfilter_addon_settings(App $a, &$s) return; } - $enable_checked = (intval(PConfig::get(local_user(), 'langfilter', 'disable')) ? '' : ' checked="checked" '); - $languages = PConfig::get(local_user(), 'langfilter', 'languages'); - $minconfidence = PConfig::get(local_user(), 'langfilter', 'minconfidence') * 100; - $minlength = PConfig::get(local_user(), 'langfilter', 'minlength'); + $enable_checked = (intval(DI::pConfig()->get(local_user(), 'langfilter', 'disable')) ? '' : ' checked="checked" '); + $languages = DI::pConfig()->get(local_user(), 'langfilter', 'languages'); + $minconfidence = DI::pConfig()->get(local_user(), 'langfilter', 'minconfidence') * 100; + $minlength = DI::pConfig()->get(local_user(), 'langfilter', 'minlength'); $t = Renderer::getMarkupTemplate("settings.tpl", "addon/langfilter/"); $s .= Renderer::replaceMacros($t, [ @@ -129,14 +129,14 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data) } // Don't filter if language filter is disabled - if (PConfig::get($logged_user, 'langfilter', 'disable')) { + if (DI::pConfig()->get($logged_user, 'langfilter', 'disable')) { return; } $naked_body = BBCode::toPlaintext($hook_data['item']['body'], false); // Don't filter if body lenght is below minimum - $minlen = PConfig::get(local_user(), 'langfilter', 'minlength', 32); + $minlen = DI::pConfig()->get(local_user(), 'langfilter', 'minlength', 32); if (!$minlen) { $minlen = 32; } @@ -145,8 +145,8 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data) return; } - $read_languages_string = PConfig::get(local_user(), 'langfilter', 'languages'); - $minconfidence = PConfig::get(local_user(), 'langfilter', 'minconfidence'); + $read_languages_string = DI::pConfig()->get(local_user(), 'langfilter', 'languages'); + $minconfidence = DI::pConfig()->get(local_user(), 'langfilter', 'minconfidence'); // Don't filter if no spoken languages are configured if (!$read_languages_string) { diff --git a/libertree/libertree.php b/libertree/libertree.php index 442fa90b5..88163fd88 100644 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -42,13 +42,13 @@ function libertree_jot_nets(App &$a, array &$jotnets_fields) return; } - if (PConfig::get(local_user(), 'libertree', 'post')) { + if (DI::pConfig()->get(local_user(), 'libertree', 'post')) { $jotnets_fields[] = [ 'type' => 'checkbox', 'field' => [ 'libertree_enable', L10n::t('Post to libertree'), - PConfig::get(local_user(), 'libertree', 'post_by_default') + DI::pConfig()->get(local_user(), 'libertree', 'post_by_default') ] ]; } @@ -66,16 +66,16 @@ function libertree_settings(&$a,&$s) { /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(),'libertree','post'); + $enabled = DI::pConfig()->get(local_user(),'libertree','post'); $checked = (($enabled) ? ' checked="checked" ' : ''); $css = (($enabled) ? '' : '-disabled'); - $def_enabled = PConfig::get(local_user(),'libertree','post_by_default'); + $def_enabled = DI::pConfig()->get(local_user(),'libertree','post_by_default'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - $ltree_api_token = PConfig::get(local_user(), 'libertree', 'libertree_api_token'); - $ltree_url = PConfig::get(local_user(), 'libertree', 'libertree_url'); + $ltree_api_token = DI::pConfig()->get(local_user(), 'libertree', 'libertree_api_token'); + $ltree_url = DI::pConfig()->get(local_user(), 'libertree', 'libertree_url'); /* Add some HTML to the existing form */ @@ -159,11 +159,11 @@ function libertree_post_local(&$a,&$b) { return; } - $ltree_post = intval(PConfig::get(local_user(),'libertree','post')); + $ltree_post = intval(DI::pConfig()->get(local_user(),'libertree','post')); $ltree_enable = (($ltree_post && !empty($_REQUEST['libertree_enable'])) ? intval($_REQUEST['libertree_enable']) : 0); - if ($b['api_source'] && intval(PConfig::get(local_user(),'libertree','post_by_default'))) { + if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'libertree','post_by_default'))) { $ltree_enable = 1; } @@ -204,8 +204,8 @@ function libertree_send(&$a,&$b) { return; } - $ltree_api_token = PConfig::get($b['uid'],'libertree','libertree_api_token'); - $ltree_url = PConfig::get($b['uid'],'libertree','libertree_url'); + $ltree_api_token = DI::pConfig()->get($b['uid'],'libertree','libertree_api_token'); + $ltree_url = DI::pConfig()->get($b['uid'],'libertree','libertree_url'); $ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token"; $ltree_source = DI::baseUrl()->getHostname(); diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php index e8732de66..f6ac37edc 100644 --- a/ljpost/ljpost.php +++ b/ljpost/ljpost.php @@ -42,13 +42,13 @@ function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields) return; } - if (PConfig::get(local_user(),'ljpost','post')) { + if (DI::pConfig()->get(local_user(),'ljpost','post')) { $jotnets_fields[] = [ 'type' => 'checkbox', 'field' => [ 'ljpost_enable', L10n::t('Post to LiveJournal'), - PConfig::get(local_user(),'ljpost','post_by_default') + DI::pConfig()->get(local_user(),'ljpost','post_by_default') ] ]; } @@ -66,16 +66,16 @@ function ljpost_settings(&$a,&$s) { /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(),'ljpost','post'); + $enabled = DI::pConfig()->get(local_user(),'ljpost','post'); $checked = (($enabled) ? ' checked="checked" ' : ''); - $def_enabled = PConfig::get(local_user(),'ljpost','post_by_default'); + $def_enabled = DI::pConfig()->get(local_user(),'ljpost','post_by_default'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - $lj_username = PConfig::get(local_user(), 'ljpost', 'lj_username'); - $lj_password = PConfig::get(local_user(), 'ljpost', 'lj_password'); + $lj_username = DI::pConfig()->get(local_user(), 'ljpost', 'lj_username'); + $lj_password = DI::pConfig()->get(local_user(), 'ljpost', 'lj_password'); /* Add some HTML to the existing form */ @@ -135,11 +135,11 @@ function ljpost_post_local(&$a,&$b) { if($b['private'] || $b['parent']) return; - $lj_post = intval(PConfig::get(local_user(),'ljpost','post')); + $lj_post = intval(DI::pConfig()->get(local_user(),'ljpost','post')); $lj_enable = (($lj_post && !empty($_REQUEST['ljpost_enable'])) ? intval($_REQUEST['ljpost_enable']) : 0); - if($b['api_source'] && intval(PConfig::get(local_user(),'ljpost','post_by_default'))) + if($b['api_source'] && intval(DI::pConfig()->get(local_user(),'ljpost','post_by_default'))) $lj_enable = 1; if(! $lj_enable) @@ -176,13 +176,13 @@ function ljpost_send(&$a,&$b) { if($x && strlen($x[0]['timezone'])) $tz = $x[0]['timezone']; - $lj_username = XML::escape(PConfig::get($b['uid'],'ljpost','lj_username')); - $lj_password = XML::escape(PConfig::get($b['uid'],'ljpost','lj_password')); - $lj_journal = XML::escape(PConfig::get($b['uid'],'ljpost','lj_journal')); + $lj_username = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_username')); + $lj_password = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_password')); + $lj_journal = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_journal')); // if(! $lj_journal) // $lj_journal = $lj_username; - $lj_blog = XML::escape(PConfig::get($b['uid'],'ljpost','lj_blog')); + $lj_blog = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_blog')); if(! strlen($lj_blog)) $lj_blog = XML::escape('http://www.livejournal.com/interface/xmlrpc'); diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index 1afde8675..39a848d77 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -103,7 +103,7 @@ function mailstream_generate_id($a, $uri) { } function mailstream_post_hook(&$a, &$item) { - if (!PConfig::get($item['uid'], 'mailstream', 'enabled')) { + if (!DI::pConfig()->get($item['uid'], 'mailstream', 'enabled')) { Logger::debug('mailstream: not enabled for item ' . $item['id']); return; } @@ -123,7 +123,7 @@ function mailstream_post_hook(&$a, &$item) { Logger::debug('mailstream: no plink for item ' . $item['id']); return; } - if (PConfig::get($item['uid'], 'mailstream', 'nolikes')) { + if (DI::pConfig()->get($item['uid'], 'mailstream', 'nolikes')) { if ($item['verb'] == Activity::LIKE) { Logger::debug('mailstream: like item ' . $item['id']); return; @@ -159,7 +159,7 @@ function mailstream_get_user($uid) { } function mailstream_do_images($a, &$item, &$attachments) { - if (!PConfig::get($item['uid'], 'mailstream', 'attachimg')) { + if (!DI::pConfig()->get($item['uid'], 'mailstream', 'attachimg')) { return; } $attachments = []; @@ -282,7 +282,7 @@ function mailstream_send(\Friendica\App $a, $message_id, $item, $user) { if ($frommail == "") { $frommail = 'friendica@localhost.local'; } - $address = PConfig::get($item['uid'], 'mailstream', 'address'); + $address = DI::pConfig()->get($item['uid'], 'mailstream', 'address'); if (!$address) { $address = $user['email']; } @@ -369,10 +369,10 @@ function mailstream_cron($a, $b) { } function mailstream_addon_settings(&$a,&$s) { - $enabled = PConfig::get(local_user(), 'mailstream', 'enabled'); - $address = PConfig::get(local_user(), 'mailstream', 'address'); - $nolikes = PConfig::get(local_user(), 'mailstream', 'nolikes'); - $attachimg= PConfig::get(local_user(), 'mailstream', 'attachimg'); + $enabled = DI::pConfig()->get(local_user(), 'mailstream', 'enabled'); + $address = DI::pConfig()->get(local_user(), 'mailstream', 'address'); + $nolikes = DI::pConfig()->get(local_user(), 'mailstream', 'nolikes'); + $attachimg= DI::pConfig()->get(local_user(), 'mailstream', 'attachimg'); $template = Renderer::getMarkupTemplate('settings.tpl', 'addon/mailstream/'); $s .= Renderer::replaceMacros($template, [ '$enabled' => [ diff --git a/markdown/markdown.php b/markdown/markdown.php index 740f2030b..302a603cd 100644 --- a/markdown/markdown.php +++ b/markdown/markdown.php @@ -12,6 +12,7 @@ use Friendica\Content\Text\Markdown; use Friendica\Core\Renderer; use Friendica\Core\PConfig; use Friendica\Core\L10n; +use Friendica\DI; function markdown_install() { Hook::register('post_local_start', __FILE__, 'markdown_post_local_start'); @@ -25,7 +26,7 @@ function markdown_addon_settings(App $a, &$s) return; } - $enabled = intval(PConfig::get(local_user(), 'markdown', 'enabled')); + $enabled = intval(DI::pConfig()->get(local_user(), 'markdown', 'enabled')); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/markdown/'); $s .= Renderer::replaceMacros($t, [ @@ -45,7 +46,7 @@ function markdown_addon_settings_post(App $a, &$b) } function markdown_post_local_start(App $a, &$request) { - if (empty($request['body']) || !PConfig::get(local_user(), 'markdown', 'enabled')) { + if (empty($request['body']) || !DI::pConfig()->get(local_user(), 'markdown', 'enabled')) { return; } diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php index 2974f762d..dbdfbccc6 100644 --- a/mathjax/mathjax.php +++ b/mathjax/mathjax.php @@ -49,7 +49,7 @@ function mathjax_settings(App $a, &$s) return; } - $use = PConfig::get(local_user(), 'mathjax', 'use', false); + $use = DI::pConfig()->get(local_user(), 'mathjax', 'use', false); $tpl = Renderer::getMarkupTemplate('settings.tpl', __DIR__); $s .= Renderer::replaceMacros($tpl, [ @@ -64,7 +64,7 @@ function mathjax_footer(App $a, &$b) { // if the visitor of the page is not a local_user, use MathJax // otherwise check the users settings. - if (!local_user() || PConfig::get(local_user(), 'mathjax', 'use', false)) { + if (!local_user() || DI::pConfig()->get(local_user(), 'mathjax', 'use', false)) { DI::page()->registerFooterScript(__DIR__ . '/asset/MathJax.js?config=TeX-MML-AM_CHTML'); DI::page()->registerFooterScript(__DIR__ . '/mathjax.js'); } diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php index ea5521fdf..8887b5427 100644 --- a/notimeline/notimeline.php +++ b/notimeline/notimeline.php @@ -46,7 +46,7 @@ function notimeline_settings(&$a, &$s) /* Get the current state of our config variable */ - $notimeline = PConfig::get(local_user(), 'system', 'no_wall_archive_widget', false); + $notimeline = DI::pConfig()->get(local_user(), 'system', 'no_wall_archive_widget', false); $notimeline_checked = (($notimeline) ? ' checked="checked" ' : ''); diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index ba59f007c..32c95acbd 100644 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -68,8 +68,8 @@ function nsfw_addon_settings(&$a, &$s) DI::page()['htmlhead'] .= '' . "\r\n"; - $enable_checked = (intval(PConfig::get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" '); - $words = PConfig::get(local_user(), 'nsfw', 'words'); + $enable_checked = (intval(DI::pConfig()->get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" '); + $words = DI::pConfig()->get(local_user(), 'nsfw', 'words'); if (!$words) { $words = 'nsfw,'; } @@ -114,12 +114,12 @@ function nsfw_addon_settings_post(&$a, &$b) function nsfw_prepare_body_content_filter(\Friendica\App $a, &$hook_data) { $words = null; - if (PConfig::get(local_user(), 'nsfw', 'disable')) { + if (DI::pConfig()->get(local_user(), 'nsfw', 'disable')) { return; } if (local_user()) { - $words = PConfig::get(local_user(), 'nsfw', 'words'); + $words = DI::pConfig()->get(local_user(), 'nsfw', 'words'); } if ($words) { diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php index 5fa40e504..be0aa9325 100644 --- a/numfriends/numfriends.php +++ b/numfriends/numfriends.php @@ -64,7 +64,7 @@ function numfriends_settings(&$a, &$s) /* Get the current state of our config variable */ - $numfriends = PConfig::get(local_user(), 'system', 'display_friend_count', 24); + $numfriends = DI::pConfig()->get(local_user(), 'system', 'display_friend_count', 24); /* Add some HTML to the existing form */ diff --git a/planets/planets.php b/planets/planets.php index 2453ffeeb..aedfc8892 100644 --- a/planets/planets.php +++ b/planets/planets.php @@ -82,7 +82,7 @@ function planets_post_hook($a, &$item) { /* Retrieve our personal config setting */ - $active = PConfig::get(local_user(), 'planets', 'enable'); + $active = DI::pConfig()->get(local_user(), 'planets', 'enable'); if(! $active) return; @@ -144,7 +144,7 @@ function planets_settings(&$a,&$s) { /* Get the current state of our config variable */ - $enabled = PConfig::get(local_user(),'planets','enable'); + $enabled = DI::pConfig()->get(local_user(),'planets','enable'); $checked = (($enabled) ? ' checked="checked" ' : ''); diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 5b1d2aa00..68f3e8d77 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -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 .= '
'; 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 .= '
'; 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:///api//shares?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); diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php index 6e2218ecf..541afabbe 100644 --- a/qcomment/qcomment.php +++ b/qcomment/qcomment.php @@ -45,7 +45,7 @@ function qcomment_addon_settings(&$a, &$s) DI::page()['htmlhead'] .= '' . "\r\n"; - $words = PConfig::get(local_user(), 'qcomment', 'words', L10n::t(':-)') . "\n" . L10n::t(':-(') . "\n" . L10n::t('lol')); + $words = DI::pConfig()->get(local_user(), 'qcomment', 'words', L10n::t(':-)') . "\n" . L10n::t(':-(') . "\n" . L10n::t('lol')); $s .= '
'; $s .= '

' . L10n::t('Quick Comment Settings') . '

'; diff --git a/randplace/randplace.php b/randplace/randplace.php index af41405f2..b4c9d5947 100644 --- a/randplace/randplace.php +++ b/randplace/randplace.php @@ -94,7 +94,7 @@ function randplace_post_hook($a, &$item) { /* Retrieve our personal config setting */ - $active = PConfig::get(local_user(), 'randplace', 'enable'); + $active = DI::pConfig()->get(local_user(), 'randplace', 'enable'); if(! $active) return; @@ -163,7 +163,7 @@ function randplace_settings(&$a,&$s) { /* Get the current state of our config variable */ - $enabled = PConfig::get(local_user(),'randplace','enable'); + $enabled = DI::pConfig()->get(local_user(),'randplace','enable'); $checked = (($enabled) ? ' checked="checked" ' : ''); diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php index 8011d5c38..5e1612ba6 100644 --- a/remote_permissions/remote_permissions.php +++ b/remote_permissions/remote_permissions.php @@ -43,7 +43,7 @@ function remote_permissions_settings(&$a,&$o) { /* Get the current state of our config variable */ - $remote_perms = PConfig::get(local_user(),'remote_perms','show'); + $remote_perms = DI::pConfig()->get(local_user(),'remote_perms','show'); /* Add some HTML to the existing form */ @@ -94,7 +94,7 @@ function remote_permissions_content($a, $item_copy) { if(! $r) return; - if(PConfig::get($r[0]['uid'],'remote_perms','show') == 0) + if(DI::pConfig()->get($r[0]['uid'],'remote_perms','show') == 0) return; } diff --git a/securemail/securemail.php b/securemail/securemail.php index 029e040ac..6fa59a7aa 100644 --- a/securemail/securemail.php +++ b/securemail/securemail.php @@ -54,8 +54,8 @@ function securemail_settings(App &$a, &$s) return; } - $enable = intval(PConfig::get(local_user(), 'securemail', 'enable')); - $publickey = PConfig::get(local_user(), 'securemail', 'pkey'); + $enable = intval(DI::pConfig()->get(local_user(), 'securemail', 'enable')); + $publickey = DI::pConfig()->get(local_user(), 'securemail', 'pkey'); $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/securemail/'); @@ -151,12 +151,12 @@ function securemail_emailer_send_prepare(App &$a, array &$b) $uid = $b['uid']; - $enable_checked = PConfig::get($uid, 'securemail', 'enable'); + $enable_checked = DI::pConfig()->get($uid, 'securemail', 'enable'); if (!$enable_checked) { return; } - $public_key_ascii = PConfig::get($uid, 'securemail', 'pkey'); + $public_key_ascii = DI::pConfig()->get($uid, 'securemail', 'pkey'); preg_match('/-----BEGIN ([A-Za-z ]+)-----/', $public_key_ascii, $matches); $marker = empty($matches[1]) ? 'MESSAGE' : $matches[1]; diff --git a/showmore/showmore.php b/showmore/showmore.php index dcc9e2f91..98224f068 100644 --- a/showmore/showmore.php +++ b/showmore/showmore.php @@ -37,8 +37,8 @@ function showmore_addon_settings(&$a, &$s) DI::page()['htmlhead'] .= ''."\r\n"; - $enable_checked = (intval(PConfig::get(local_user(), 'showmore', 'disable')) ? '' : ' checked="checked"'); - $chars = PConfig::get(local_user(), 'showmore', 'chars', 1100); + $enable_checked = (intval(DI::pConfig()->get(local_user(), 'showmore', 'disable')) ? '' : ' checked="checked"'); + $chars = DI::pConfig()->get(local_user(), 'showmore', 'chars', 1100); $s .= ''; $s .= '

' . L10n::t('"Show more" Settings').'

'; @@ -119,11 +119,11 @@ function showmore_prepare_body(\Friendica\App $a, &$hook_data) return; } - if (PConfig::get(local_user(), 'showmore', 'disable')) { + if (DI::pConfig()->get(local_user(), 'showmore', 'disable')) { return; } - $chars = (int) PConfig::get(local_user(), 'showmore', 'chars', 1100); + $chars = (int) DI::pConfig()->get(local_user(), 'showmore', 'chars', 1100); if (get_body_length($hook_data['html']) > $chars) { $found = true; diff --git a/startpage/startpage.php b/startpage/startpage.php index 11633d408..21adae4be 100644 --- a/startpage/startpage.php +++ b/startpage/startpage.php @@ -31,7 +31,7 @@ function startpage_home_init($a, $b) return; } - $page = PConfig::get(local_user(), 'startpage', 'startpage'); + $page = DI::pConfig()->get(local_user(), 'startpage', 'startpage'); if (strlen($page)) { DI::baseUrl()->redirect($page); } @@ -76,7 +76,7 @@ function startpage_settings(&$a, &$s) /* Get the current state of our config variable */ - $page = PConfig::get(local_user(), 'startpage', 'startpage'); + $page = DI::pConfig()->get(local_user(), 'startpage', 'startpage'); /* Add some HTML to the existing form */ diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 4494d8ecc..0d3162eff 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -97,8 +97,8 @@ function statusnet_uninstall() function statusnet_check_item_notification(App $a, &$notification_data) { - if (PConfig::get($notification_data["uid"], 'statusnet', 'post')) { - $notification_data["profiles"][] = PConfig::get($notification_data["uid"], 'statusnet', 'own_url'); + if (DI::pConfig()->get($notification_data["uid"], 'statusnet', 'post')) { + $notification_data["profiles"][] = DI::pConfig()->get($notification_data["uid"], 'statusnet', 'own_url'); } } @@ -108,13 +108,13 @@ function statusnet_jot_nets(App $a, array &$jotnets_fields) return; } - if (PConfig::get(local_user(), 'statusnet', 'post')) { + if (DI::pConfig()->get(local_user(), 'statusnet', 'post')) { $jotnets_fields[] = [ 'type' => 'checkbox', 'field' => [ 'statusnet_enable', L10n::t('Post to GNU Social'), - PConfig::get(local_user(), 'statusnet', 'post_by_default') + DI::pConfig()->get(local_user(), 'statusnet', 'post_by_default') ] ]; } @@ -200,9 +200,9 @@ function statusnet_settings_post(App $a, $post) } else { if (isset($_POST['statusnet-pin'])) { // if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen - $api = PConfig::get(local_user(), 'statusnet', 'baseapi'); - $ckey = PConfig::get(local_user(), 'statusnet', 'consumerkey'); - $csecret = PConfig::get(local_user(), 'statusnet', 'consumersecret'); + $api = DI::pConfig()->get(local_user(), 'statusnet', 'baseapi'); + $ckey = DI::pConfig()->get(local_user(), 'statusnet', 'consumerkey'); + $csecret = DI::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 @@ -246,23 +246,23 @@ function statusnet_settings(App $a, &$s) * allow the user to cancel the connection process at this step * 3) Checkbox for "Send public notices (respect size limitation) */ - $api = PConfig::get(local_user(), 'statusnet', 'baseapi'); - $ckey = PConfig::get(local_user(), 'statusnet', 'consumerkey'); - $csecret = PConfig::get(local_user(), 'statusnet', 'consumersecret'); - $otoken = PConfig::get(local_user(), 'statusnet', 'oauthtoken'); - $osecret = PConfig::get(local_user(), 'statusnet', 'oauthsecret'); - $enabled = PConfig::get(local_user(), 'statusnet', 'post'); + $api = DI::pConfig()->get(local_user(), 'statusnet', 'baseapi'); + $ckey = DI::pConfig()->get(local_user(), 'statusnet', 'consumerkey'); + $csecret = DI::pConfig()->get(local_user(), 'statusnet', 'consumersecret'); + $otoken = DI::pConfig()->get(local_user(), 'statusnet', 'oauthtoken'); + $osecret = DI::pConfig()->get(local_user(), 'statusnet', 'oauthsecret'); + $enabled = DI::pConfig()->get(local_user(), 'statusnet', 'post'); $checked = (($enabled) ? ' checked="checked" ' : ''); - $defenabled = PConfig::get(local_user(), 'statusnet', 'post_by_default'); + $defenabled = DI::pConfig()->get(local_user(), 'statusnet', 'post_by_default'); $defchecked = (($defenabled) ? ' checked="checked" ' : ''); - $mirrorenabled = PConfig::get(local_user(), 'statusnet', 'mirror_posts'); + $mirrorenabled = DI::pConfig()->get(local_user(), 'statusnet', 'mirror_posts'); $mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : ''); - $import = PConfig::get(local_user(), 'statusnet', 'import'); + $import = DI::pConfig()->get(local_user(), 'statusnet', 'import'); $importselected = ["", "", ""]; $importselected[$import] = ' selected="selected"'; - //$importenabled = PConfig::get(local_user(),'statusnet','import'); + //$importenabled = DI::pConfig()->get(local_user(),'statusnet','import'); //$importchecked = (($importenabled) ? ' checked="checked" ' : ''); - $create_userenabled = PConfig::get(local_user(), 'statusnet', 'create_user'); + $create_userenabled = DI::pConfig()->get(local_user(), 'statusnet', 'create_user'); $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : ''); $css = (($enabled) ? '' : '-disabled'); @@ -423,7 +423,7 @@ function statusnet_hook_fork(App $a, array &$b) return; } - if (PConfig::get($post['uid'], 'statusnet', 'import')) { + if (DI::pConfig()->get($post['uid'], 'statusnet', 'import')) { // Don't fork if it isn't a reply to a GNU Social post if (($post['parent'] != $post['id']) && !Item::exists(['id' => $post['parent'], 'network' => Protocol::STATUSNET])) { Logger::log('No GNU Social parent found for item ' . $post['id']); @@ -449,11 +449,11 @@ function statusnet_post_local(App $a, &$b) return; } - $statusnet_post = PConfig::get(local_user(), 'statusnet', 'post'); + $statusnet_post = DI::pConfig()->get(local_user(), 'statusnet', 'post'); $statusnet_enable = (($statusnet_post && !empty($_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(DI::pConfig()->get(local_user(), 'statusnet', 'post_by_default'))) { $statusnet_enable = 1; } @@ -470,11 +470,11 @@ function statusnet_post_local(App $a, &$b) 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'); - $osecret = PConfig::get($uid, 'statusnet', 'oauthsecret'); + $api = DI::pConfig()->get($uid, 'statusnet', 'baseapi'); + $ckey = DI::pConfig()->get($uid, 'statusnet', 'consumerkey'); + $csecret = DI::pConfig()->get($uid, 'statusnet', 'consumersecret'); + $otoken = DI::pConfig()->get($uid, 'statusnet', 'oauthtoken'); + $osecret = DI::pConfig()->get($uid, 'statusnet', 'oauthsecret'); $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret); @@ -499,12 +499,12 @@ function statusnet_post_hook(App $a, &$b) /** * Post to GNU Social */ - if (!PConfig::get($b["uid"], 'statusnet', 'import')) { + if (!DI::pConfig()->get($b["uid"], 'statusnet', 'import')) { if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) return; } - $api = PConfig::get($b["uid"], 'statusnet', 'baseapi'); + $api = DI::pConfig()->get($b["uid"], 'statusnet', 'baseapi'); $hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api); if ($b['parent'] != $b['id']) { @@ -582,11 +582,11 @@ function statusnet_post_hook(App $a, &$b) DI::pConfig()->load($b['uid'], 'statusnet'); - $api = PConfig::get($b['uid'], 'statusnet', 'baseapi'); - $ckey = PConfig::get($b['uid'], 'statusnet', 'consumerkey'); - $csecret = PConfig::get($b['uid'], 'statusnet', 'consumersecret'); - $otoken = PConfig::get($b['uid'], 'statusnet', 'oauthtoken'); - $osecret = PConfig::get($b['uid'], 'statusnet', 'oauthsecret'); + $api = DI::pConfig()->get($b['uid'], 'statusnet', 'baseapi'); + $ckey = DI::pConfig()->get($b['uid'], 'statusnet', 'consumerkey'); + $csecret = DI::pConfig()->get($b['uid'], 'statusnet', 'consumersecret'); + $otoken = DI::pConfig()->get($b['uid'], 'statusnet', 'oauthtoken'); + $osecret = DI::pConfig()->get($b['uid'], 'statusnet', 'oauthsecret'); if ($ckey && $csecret && $otoken && $osecret) { // If it's a repeated message from GNU Social then do a native retweet and exit @@ -730,7 +730,7 @@ function statusnet_prepare_body(App $a, &$b) } if ($b["preview"]) { - $max_char = PConfig::get(local_user(), 'statusnet', 'max_char'); + $max_char = DI::pConfig()->get(local_user(), 'statusnet', 'max_char'); if (intval($max_char) == 0) { $max_char = 140; } @@ -822,18 +822,18 @@ function statusnet_cron(App $a, $b) function statusnet_fetchtimeline(App $a, $uid) { - $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'); - $lastid = PConfig::get($uid, 'statusnet', 'lastid'); + $ckey = DI::pConfig()->get($uid, 'statusnet', 'consumerkey'); + $csecret = DI::pConfig()->get($uid, 'statusnet', 'consumersecret'); + $api = DI::pConfig()->get($uid, 'statusnet', 'baseapi'); + $otoken = DI::pConfig()->get($uid, 'statusnet', 'oauthtoken'); + $osecret = DI::pConfig()->get($uid, 'statusnet', 'oauthsecret'); + $lastid = DI::pConfig()->get($uid, 'statusnet', 'lastid'); require_once 'mod/item.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'); + $application_name = DI::pConfig()->get($uid, 'statusnet', 'application_name'); if ($application_name == "") { $application_name = Config::get('statusnet', 'application_name'); } @@ -1056,11 +1056,11 @@ function statusnet_fetch_contact($uid, $contact, $create_user) 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'); + $ckey = DI::pConfig()->get($uid, 'statusnet', 'consumerkey'); + $csecret = DI::pConfig()->get($uid, 'statusnet', 'consumersecret'); + $api = DI::pConfig()->get($uid, 'statusnet', 'baseapi'); + $otoken = DI::pConfig()->get($uid, 'statusnet', 'oauthtoken'); + $osecret = DI::pConfig()->get($uid, 'statusnet', 'oauthsecret'); require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'codebirdsn.php'; @@ -1103,7 +1103,7 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex { Logger::log("statusnet_createpost: start", Logger::DEBUG); - $api = PConfig::get($uid, 'statusnet', 'baseapi'); + $api = DI::pConfig()->get($uid, 'statusnet', 'baseapi'); $hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api); $postarray = []; @@ -1149,7 +1149,7 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex } // Is it me? - $own_url = PConfig::get($uid, 'statusnet', 'own_url'); + $own_url = DI::pConfig()->get($uid, 'statusnet', 'own_url'); if ($content->user->id == $own_url) { $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", @@ -1193,7 +1193,7 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex $postarray['author-avatar'] = $content->user->profile_image_url; // To-Do: Maybe unreliable? Can the api be entered without trailing "/"? - $hostname = str_replace("/api/", "/notice/", PConfig::get($uid, 'statusnet', 'baseapi')); + $hostname = str_replace("/api/", "/notice/", DI::pConfig()->get($uid, 'statusnet', 'baseapi')); $postarray['plink'] = $hostname . $content->id; $postarray['app'] = strip_tags($content->source); @@ -1237,12 +1237,12 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1) { $conversations = []; - $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'); - $create_user = PConfig::get($uid, 'statusnet', 'create_user'); + $ckey = DI::pConfig()->get($uid, 'statusnet', 'consumerkey'); + $csecret = DI::pConfig()->get($uid, 'statusnet', 'consumersecret'); + $api = DI::pConfig()->get($uid, 'statusnet', 'baseapi'); + $otoken = DI::pConfig()->get($uid, 'statusnet', 'oauthtoken'); + $osecret = DI::pConfig()->get($uid, 'statusnet', 'oauthsecret'); + $create_user = DI::pConfig()->get($uid, 'statusnet', 'create_user'); // "create_user" is deactivated, since currently you cannot add users manually by now $create_user = true; @@ -1290,7 +1290,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1) if ($mode == 1) { // Fetching timeline - $lastid = PConfig::get($uid, 'statusnet', 'lasthometimelineid'); + $lastid = DI::pConfig()->get($uid, 'statusnet', 'lasthometimelineid'); //$lastid = 1; $first_time = ($lastid == ""); @@ -1354,7 +1354,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1) } // Fetching mentions - $lastid = PConfig::get($uid, 'statusnet', 'lastmentionid'); + $lastid = DI::pConfig()->get($uid, 'statusnet', 'lastmentionid'); $first_time = ($lastid == ""); if ($lastid != "") { @@ -1406,12 +1406,12 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1) 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'); - $otoken = PConfig::get($uid, 'statusnet', 'oauthtoken'); - $osecret = PConfig::get($uid, 'statusnet', 'oauthsecret'); - $own_url = PConfig::get($uid, 'statusnet', 'own_url'); + $ckey = DI::pConfig()->get($uid, 'statusnet', 'consumerkey'); + $csecret = DI::pConfig()->get($uid, 'statusnet', 'consumersecret'); + $api = DI::pConfig()->get($uid, 'statusnet', 'baseapi'); + $otoken = DI::pConfig()->get($uid, 'statusnet', 'oauthtoken'); + $osecret = DI::pConfig()->get($uid, 'statusnet', 'oauthsecret'); + $own_url = DI::pConfig()->get($uid, 'statusnet', 'own_url'); $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret); @@ -1547,12 +1547,12 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false) 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'); - $otoken = PConfig::get($uid, 'statusnet', 'oauthtoken'); - $osecret = PConfig::get($uid, 'statusnet', 'oauthsecret'); - $own_url = PConfig::get($uid, 'statusnet', 'own_url'); + $ckey = DI::pConfig()->get($uid, 'statusnet', 'consumerkey'); + $csecret = DI::pConfig()->get($uid, 'statusnet', 'consumersecret'); + $api = DI::pConfig()->get($uid, 'statusnet', 'baseapi'); + $otoken = DI::pConfig()->get($uid, 'statusnet', 'oauthtoken'); + $osecret = DI::pConfig()->get($uid, 'statusnet', 'oauthsecret'); + $own_url = DI::pConfig()->get($uid, 'statusnet', 'own_url'); $contact_id = 0; @@ -1613,11 +1613,11 @@ function statusnet_is_retweet(App $a, $uid, $body) $link = $matches[1]; } - $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'); + $ckey = DI::pConfig()->get($uid, 'statusnet', 'consumerkey'); + $csecret = DI::pConfig()->get($uid, 'statusnet', 'consumersecret'); + $api = DI::pConfig()->get($uid, 'statusnet', 'baseapi'); + $otoken = DI::pConfig()->get($uid, 'statusnet', 'oauthtoken'); + $osecret = DI::pConfig()->get($uid, 'statusnet', 'oauthsecret'); $hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api); $id = preg_replace("=https?://" . $hostname . "/notice/(.*)=ism", "$1", $link); diff --git a/superblock/superblock.php b/superblock/superblock.php index aae1b1324..2783c5bb7 100644 --- a/superblock/superblock.php +++ b/superblock/superblock.php @@ -40,7 +40,7 @@ function superblock_addon_settings(&$a, &$s) DI::page()['htmlhead'] .= '' . "\r\n"; - $words = PConfig::get(local_user(), 'system', 'blocked'); + $words = DI::pConfig()->get(local_user(), 'system', 'blocked'); if (!$words) { $words = ''; } @@ -76,7 +76,7 @@ function superblock_addon_settings_post(&$a, &$b) function superblock_enotify_store(&$a,&$b) { - $words = PConfig::get($b['uid'], 'system', 'blocked'); + $words = DI::pConfig()->get($b['uid'], 'system', 'blocked'); if ($words) { $arr = explode(',', $words); } else { @@ -108,7 +108,7 @@ function superblock_conversation_start(&$a, &$b) return; } - $words = PConfig::get(local_user(), 'system', 'blocked'); + $words = DI::pConfig()->get(local_user(), 'system', 'blocked'); if ($words) { $a->data['superblock'] = explode(',', $words); } @@ -155,7 +155,7 @@ function superblock_init(&$a) return; } - $words = PConfig::get(local_user(), 'system', 'blocked'); + $words = DI::pConfig()->get(local_user(), 'system', 'blocked'); if (array_key_exists('block', $_GET) && $_GET['block']) { if (strlen($words)) diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index 9e0753610..493f37158 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -200,13 +200,13 @@ function tumblr_jot_nets(App $a, array &$jotnets_fields) return; } - if (PConfig::get(local_user(),'tumblr','post')) { + if (DI::pConfig()->get(local_user(),'tumblr','post')) { $jotnets_fields[] = [ 'type' => 'checkbox', 'field' => [ 'tumblr_enable', L10n::t('Post to Tumblr'), - PConfig::get(local_user(),'tumblr','post_by_default') + DI::pConfig()->get(local_user(),'tumblr','post_by_default') ] ]; } @@ -224,11 +224,11 @@ function tumblr_settings(App $a, &$s) /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(), 'tumblr', 'post'); + $enabled = DI::pConfig()->get(local_user(), 'tumblr', 'post'); $checked = (($enabled) ? ' checked="checked" ' : ''); $css = (($enabled) ? '' : '-disabled'); - $def_enabled = PConfig::get(local_user(), 'tumblr', 'post_by_default'); + $def_enabled = DI::pConfig()->get(local_user(), 'tumblr', 'post_by_default'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); @@ -258,13 +258,13 @@ function tumblr_settings(App $a, &$s) $s .= ''; $s .= '
'; - $oauth_token = PConfig::get(local_user(), "tumblr", "oauth_token"); - $oauth_token_secret = PConfig::get(local_user(), "tumblr", "oauth_token_secret"); + $oauth_token = DI::pConfig()->get(local_user(), "tumblr", "oauth_token"); + $oauth_token_secret = DI::pConfig()->get(local_user(), "tumblr", "oauth_token_secret"); $s .= '
'; if (($oauth_token != "") && ($oauth_token_secret != "")) { - $page = PConfig::get(local_user(), 'tumblr', 'page'); + $page = DI::pConfig()->get(local_user(), 'tumblr', 'page'); $consumer_key = Config::get('tumblr', 'consumer_key'); $consumer_secret = Config::get('tumblr', 'consumer_secret'); @@ -337,11 +337,11 @@ function tumblr_post_local(App $a, array &$b) return; } - $tmbl_post = intval(PConfig::get(local_user(), 'tumblr', 'post')); + $tmbl_post = intval(DI::pConfig()->get(local_user(), 'tumblr', 'post')); $tmbl_enable = (($tmbl_post && !empty($_REQUEST['tumblr_enable'])) ? intval($_REQUEST['tumblr_enable']) : 0); - if ($b['api_source'] && intval(PConfig::get(local_user(), 'tumblr', 'post_by_default'))) { + if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'tumblr', 'post_by_default'))) { $tmbl_enable = 1; } @@ -380,9 +380,9 @@ function tumblr_send(App $a, array &$b) { return; } - $oauth_token = PConfig::get($b['uid'], "tumblr", "oauth_token"); - $oauth_token_secret = PConfig::get($b['uid'], "tumblr", "oauth_token_secret"); - $page = PConfig::get($b['uid'], "tumblr", "page"); + $oauth_token = DI::pConfig()->get($b['uid'], "tumblr", "oauth_token"); + $oauth_token_secret = DI::pConfig()->get($b['uid'], "tumblr", "oauth_token_secret"); + $page = DI::pConfig()->get($b['uid'], "tumblr", "page"); $tmbl_blog = 'blog/' . $page . '/post'; if ($oauth_token && $oauth_token_secret && $tmbl_blog) { diff --git a/twitter/twitter.php b/twitter/twitter.php index 9acbc34c3..e5ce967e2 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -142,7 +142,7 @@ function twitter_load_config(App $a, ConfigFileLoader $loader) function twitter_check_item_notification(App $a, array &$notification_data) { - $own_id = PConfig::get($notification_data["uid"], 'twitter', 'own_id'); + $own_id = DI::pConfig()->get($notification_data["uid"], 'twitter', 'own_id'); $own_user = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", intval($notification_data["uid"]), @@ -170,8 +170,8 @@ function twitter_follow(App $a, array &$contact) $ckey = Config::get('twitter', 'consumerkey'); $csecret = Config::get('twitter', 'consumersecret'); - $otoken = PConfig::get($uid, 'twitter', 'oauthtoken'); - $osecret = PConfig::get($uid, 'twitter', 'oauthsecret'); + $otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken'); + $osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret'); // If the addon is not configured (general or for this user) quit here if (empty($ckey) || empty($csecret) || empty($otoken) || empty($osecret)) { @@ -199,13 +199,13 @@ function twitter_jot_nets(App $a, array &$jotnets_fields) return; } - if (PConfig::get(local_user(), 'twitter', 'post')) { + if (DI::pConfig()->get(local_user(), 'twitter', 'post')) { $jotnets_fields[] = [ 'type' => 'checkbox', 'field' => [ 'twitter_enable', L10n::t('Post to Twitter'), - PConfig::get(local_user(), 'twitter', 'post_by_default') + DI::pConfig()->get(local_user(), 'twitter', 'post_by_default') ] ]; } @@ -296,14 +296,14 @@ function twitter_settings(App $a, &$s) */ $ckey = Config::get('twitter', 'consumerkey'); $csecret = Config::get('twitter', 'consumersecret'); - $otoken = PConfig::get(local_user(), 'twitter', 'oauthtoken'); - $osecret = PConfig::get(local_user(), 'twitter', 'oauthsecret'); + $otoken = DI::pConfig()->get(local_user(), 'twitter', 'oauthtoken'); + $osecret = DI::pConfig()->get(local_user(), 'twitter', 'oauthsecret'); - $enabled = intval(PConfig::get(local_user(), 'twitter', 'post')); - $defenabled = intval(PConfig::get(local_user(), 'twitter', 'post_by_default')); - $mirrorenabled = intval(PConfig::get(local_user(), 'twitter', 'mirror_posts')); - $importenabled = intval(PConfig::get(local_user(), 'twitter', 'import')); - $create_userenabled = intval(PConfig::get(local_user(), 'twitter', 'create_user')); + $enabled = intval(DI::pConfig()->get(local_user(), 'twitter', 'post')); + $defenabled = intval(DI::pConfig()->get(local_user(), 'twitter', 'post_by_default')); + $mirrorenabled = intval(DI::pConfig()->get(local_user(), 'twitter', 'mirror_posts')); + $importenabled = intval(DI::pConfig()->get(local_user(), 'twitter', 'import')); + $create_userenabled = intval(DI::pConfig()->get(local_user(), 'twitter', 'create_user')); $css = (($enabled) ? '' : '-disabled'); @@ -427,7 +427,7 @@ function twitter_hook_fork(App $a, array &$b) return; } - if (PConfig::get($post['uid'], 'twitter', 'import')) { + if (DI::pConfig()->get($post['uid'], 'twitter', 'import')) { // Don't fork if it isn't a reply to a twitter post if (($post['parent'] != $post['id']) && !Item::exists(['id' => $post['parent'], 'network' => Protocol::TWITTER])) { Logger::notice('No twitter parent found', ['item' => $post['id']]); @@ -453,11 +453,11 @@ function twitter_post_local(App $a, array &$b) return; } - $twitter_post = intval(PConfig::get(local_user(), 'twitter', 'post')); + $twitter_post = intval(DI::pConfig()->get(local_user(), 'twitter', 'post')); $twitter_enable = (($twitter_post && !empty($_REQUEST['twitter_enable'])) ? intval($_REQUEST['twitter_enable']) : 0); // if API is used, default to the chosen settings - if ($b['api_source'] && intval(PConfig::get(local_user(), 'twitter', 'post_by_default'))) { + if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'twitter', 'post_by_default'))) { $twitter_enable = 1; } @@ -476,8 +476,8 @@ function twitter_action(App $a, $uid, $pid, $action) { $ckey = Config::get('twitter', 'consumerkey'); $csecret = Config::get('twitter', 'consumersecret'); - $otoken = PConfig::get($uid, 'twitter', 'oauthtoken'); - $osecret = PConfig::get($uid, 'twitter', 'oauthsecret'); + $otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken'); + $osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret'); $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret); @@ -506,7 +506,7 @@ function twitter_action(App $a, $uid, $pid, $action) function twitter_post_hook(App $a, array &$b) { // Post to Twitter - if (!PConfig::get($b["uid"], 'twitter', 'import') + if (!DI::pConfig()->get($b["uid"], 'twitter', 'import') && ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))) { return; } @@ -592,8 +592,8 @@ function twitter_post_hook(App $a, array &$b) $ckey = Config::get('twitter', 'consumerkey'); $csecret = Config::get('twitter', 'consumersecret'); - $otoken = PConfig::get($b['uid'], 'twitter', 'oauthtoken'); - $osecret = PConfig::get($b['uid'], 'twitter', 'oauthsecret'); + $otoken = DI::pConfig()->get($b['uid'], 'twitter', 'oauthtoken'); + $osecret = DI::pConfig()->get($b['uid'], 'twitter', 'oauthsecret'); if ($ckey && $csecret && $otoken && $osecret) { Logger::log('twitter: we have customer key and oauth stuff, going to send.', Logger::DEBUG); @@ -784,7 +784,7 @@ function twitter_cron(App $a) /* // To-Do // 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 @@ -933,9 +933,9 @@ function twitter_fetchtimeline(App $a, $uid) { $ckey = Config::get('twitter', 'consumerkey'); $csecret = Config::get('twitter', 'consumersecret'); - $otoken = PConfig::get($uid, 'twitter', 'oauthtoken'); - $osecret = PConfig::get($uid, 'twitter', 'oauthsecret'); - $lastid = PConfig::get($uid, 'twitter', 'lastid'); + $otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken'); + $osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret'); + $lastid = DI::pConfig()->get($uid, 'twitter', 'lastid'); $application_name = Config::get('twitter', 'application_name'); @@ -1099,8 +1099,8 @@ function twitter_fetchuser(App $a, $uid, $screen_name = "", $user_id = "") { $ckey = Config::get('twitter', 'consumerkey'); $csecret = Config::get('twitter', 'consumersecret'); - $otoken = PConfig::get($uid, 'twitter', 'oauthtoken'); - $osecret = PConfig::get($uid, 'twitter', 'oauthsecret'); + $otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken'); + $osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret'); $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", intval($uid)); @@ -1421,7 +1421,7 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl } // Is it me? - $own_id = PConfig::get($uid, 'twitter', 'own_id'); + $own_id = DI::pConfig()->get($uid, 'twitter', 'own_id'); if ($post->user->id_str == $own_id) { $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", @@ -1604,7 +1604,7 @@ function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection, if (!empty($posts)) { foreach ($posts as $post) { - $postarray = twitter_createpost($a, $uid, $post, $self, false, !PConfig::get($uid, 'twitter', 'create_user'), false); + $postarray = twitter_createpost($a, $uid, $post, $self, false, !DI::pConfig()->get($uid, 'twitter', 'create_user'), false); if (empty($postarray['body'])) { continue; @@ -1623,10 +1623,10 @@ function twitter_fetchhometimeline(App $a, $uid) { $ckey = Config::get('twitter', 'consumerkey'); $csecret = Config::get('twitter', 'consumersecret'); - $otoken = PConfig::get($uid, 'twitter', 'oauthtoken'); - $osecret = PConfig::get($uid, 'twitter', 'oauthsecret'); - $create_user = PConfig::get($uid, 'twitter', 'create_user'); - $mirror_posts = PConfig::get($uid, 'twitter', 'mirror_posts'); + $otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken'); + $osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret'); + $create_user = DI::pConfig()->get($uid, 'twitter', 'create_user'); + $mirror_posts = DI::pConfig()->get($uid, 'twitter', 'mirror_posts'); Logger::log("Fetching timeline for user " . $uid, Logger::DEBUG); @@ -1665,7 +1665,7 @@ function twitter_fetchhometimeline(App $a, $uid) $parameters = ["exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended", "include_ext_alt_text" => true]; //$parameters["count"] = 200; // Fetching timeline - $lastid = PConfig::get($uid, 'twitter', 'lasthometimelineid'); + $lastid = DI::pConfig()->get($uid, 'twitter', 'lasthometimelineid'); $first_time = ($lastid == ""); @@ -1748,7 +1748,7 @@ function twitter_fetchhometimeline(App $a, $uid) Logger::log('Last timeline ID for user ' . $uid . ' is now ' . $lastid, Logger::DEBUG); // Fetching mentions - $lastid = PConfig::get($uid, 'twitter', 'lastmentionid'); + $lastid = DI::pConfig()->get($uid, 'twitter', 'lastmentionid'); $first_time = ($lastid == ""); @@ -1807,10 +1807,10 @@ function twitter_fetch_own_contact(App $a, $uid) { $ckey = Config::get('twitter', 'consumerkey'); $csecret = Config::get('twitter', 'consumersecret'); - $otoken = PConfig::get($uid, 'twitter', 'oauthtoken'); - $osecret = PConfig::get($uid, 'twitter', 'oauthsecret'); + $otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken'); + $osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret'); - $own_id = PConfig::get($uid, 'twitter', 'own_id'); + $own_id = DI::pConfig()->get($uid, 'twitter', 'own_id'); $contact_id = 0; @@ -1882,8 +1882,8 @@ function twitter_is_retweet(App $a, $uid, $body) $ckey = Config::get('twitter', 'consumerkey'); $csecret = Config::get('twitter', 'consumersecret'); - $otoken = PConfig::get($uid, 'twitter', 'oauthtoken'); - $osecret = PConfig::get($uid, 'twitter', 'oauthsecret'); + $otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken'); + $osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret'); $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret); $result = $connection->post('statuses/retweet/' . $id); diff --git a/widgets/widgets.php b/widgets/widgets.php index dd623afd4..c3e1b2ede 100644 --- a/widgets/widgets.php +++ b/widgets/widgets.php @@ -40,7 +40,7 @@ function widgets_settings(&$a,&$o) { return; - $key = PConfig::get(local_user(), 'widgets', 'key' ); + $key = DI::pConfig()->get(local_user(), 'widgets', 'key' ); if ($key=='') { $key = mt_rand(); PConfig::set(local_user(), 'widgets', 'key', $key); } $widgets = []; diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php index e74ee635a..3e574586a 100644 --- a/windowsphonepush/windowsphonepush.php +++ b/windowsphonepush/windowsphonepush.php @@ -110,13 +110,13 @@ function windowsphonepush_settings(&$a, &$s) DI::page()['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(), 'windowsphonepush', 'enable'); + $enabled = DI::pConfig()->get(local_user(), 'windowsphonepush', 'enable'); $checked_enabled = (($enabled) ? ' checked="checked" ' : ''); - $senditemtext = PConfig::get(local_user(), 'windowsphonepush', 'senditemtext'); + $senditemtext = DI::pConfig()->get(local_user(), 'windowsphonepush', 'senditemtext'); $checked_senditemtext = (($senditemtext) ? ' checked="checked" ' : ''); - $device_url = PConfig::get(local_user(), 'windowsphonepush', 'device_url'); + $device_url = DI::pConfig()->get(local_user(), 'windowsphonepush', 'device_url'); /* Add some HTML to the existing form */ $s .= '
'; @@ -154,8 +154,8 @@ function windowsphonepush_cron() if (count($r)) { foreach ($r as $rr) { // load stored information for the user-id of the current loop - $device_url = PConfig::get($rr['uid'], 'windowsphonepush', 'device_url'); - $lastpushid = PConfig::get($rr['uid'], 'windowsphonepush', 'lastpushid'); + $device_url = DI::pConfig()->get($rr['uid'], 'windowsphonepush', 'device_url'); + $lastpushid = DI::pConfig()->get($rr['uid'], 'windowsphonepush', 'lastpushid'); // pushing only possible if device_url (the URI on Microsoft server) is available or not "NA" (which will be sent // by app if user has switched the server setting in app - sending blank not possible as this would return an update error) @@ -197,7 +197,7 @@ function windowsphonepush_cron() if (intval($count[0]['max']) > intval($lastpushid)) { // user can define if he wants to see the text of the item in the push notification // this has been implemented as the device_url is not a https uri (not so secure) - $senditemtext = PConfig::get($rr['uid'], 'windowsphonepush', 'senditemtext'); + $senditemtext = DI::pConfig()->get($rr['uid'], 'windowsphonepush', 'senditemtext'); if ($senditemtext == 1) { // load item with the max id $item = Item::selectFirst(['author-name', 'body'], ['id' => $count[0]['max']]); @@ -365,11 +365,11 @@ function windowsphonepush_showsettings() return; } - $enable = PConfig::get(local_user(), 'windowsphonepush', 'enable'); - $device_url = PConfig::get(local_user(), 'windowsphonepush', 'device_url'); - $senditemtext = PConfig::get(local_user(), 'windowsphonepush', 'senditemtext'); - $lastpushid = PConfig::get(local_user(), 'windowsphonepush', 'lastpushid'); - $counterunseen = PConfig::get(local_user(), 'windowsphonepush', 'counterunseen'); + $enable = DI::pConfig()->get(local_user(), 'windowsphonepush', 'enable'); + $device_url = DI::pConfig()->get(local_user(), 'windowsphonepush', 'device_url'); + $senditemtext = DI::pConfig()->get(local_user(), 'windowsphonepush', 'senditemtext'); + $lastpushid = DI::pConfig()->get(local_user(), 'windowsphonepush', 'lastpushid'); + $counterunseen = DI::pConfig()->get(local_user(), 'windowsphonepush', 'counterunseen'); $addonversion = "2.0"; if (!$device_url) { @@ -400,7 +400,7 @@ function windowsphonepush_updatesettings() } // no updating if user hasn't enabled the addon - $enable = PConfig::get(local_user(), 'windowsphonepush', 'enable'); + $enable = DI::pConfig()->get(local_user(), 'windowsphonepush', 'enable'); if (!$enable) { return "Plug-in not enabled"; } @@ -441,7 +441,7 @@ function windowsphonepush_updatecounterunseen() } // no updating if user hasn't enabled the addon - $enable = PConfig::get(local_user(), 'windowsphonepush', 'enable'); + $enable = DI::pConfig()->get(local_user(), 'windowsphonepush', 'enable'); if (!$enable) { return "Plug-in not enabled"; } diff --git a/wppost/wppost.php b/wppost/wppost.php index 81e6efff1..2a0222f75 100644 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -50,13 +50,13 @@ function wppost_jot_nets(\Friendica\App &$a, array &$jotnets_fields) return; } - if (PConfig::get(local_user(),'wppost','post')) { + if (DI::pConfig()->get(local_user(),'wppost','post')) { $jotnets_fields[] = [ 'type' => 'checkbox', 'field' => [ 'wppost_enable', L10n::t('Post to Wordpress'), - PConfig::get(local_user(),'wppost','post_by_default') + DI::pConfig()->get(local_user(),'wppost','post_by_default') ] ]; } @@ -74,23 +74,23 @@ function wppost_settings(&$a,&$s) { /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(),'wppost','post'); + $enabled = DI::pConfig()->get(local_user(),'wppost','post'); $checked = (($enabled) ? ' checked="checked" ' : ''); $css = (($enabled) ? '' : '-disabled'); - $def_enabled = PConfig::get(local_user(),'wppost','post_by_default'); - $back_enabled = PConfig::get(local_user(),'wppost','backlink'); - $shortcheck_enabled = PConfig::get(local_user(),'wppost','shortcheck'); + $def_enabled = DI::pConfig()->get(local_user(),'wppost','post_by_default'); + $back_enabled = DI::pConfig()->get(local_user(),'wppost','backlink'); + $shortcheck_enabled = DI::pConfig()->get(local_user(),'wppost','shortcheck'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); $back_checked = (($back_enabled) ? ' checked="checked" ' : ''); $shortcheck_checked = (($shortcheck_enabled) ? ' checked="checked" ' : ''); - $wp_username = PConfig::get(local_user(), 'wppost', 'wp_username'); - $wp_password = PConfig::get(local_user(), 'wppost', 'wp_password'); - $wp_blog = PConfig::get(local_user(), 'wppost', 'wp_blog'); - $wp_backlink_text = PConfig::get(local_user(), 'wppost', 'wp_backlink_text'); + $wp_username = DI::pConfig()->get(local_user(), 'wppost', 'wp_username'); + $wp_password = DI::pConfig()->get(local_user(), 'wppost', 'wp_password'); + $wp_blog = DI::pConfig()->get(local_user(), 'wppost', 'wp_blog'); + $wp_backlink_text = DI::pConfig()->get(local_user(), 'wppost', 'wp_backlink_text'); /* Add some HTML to the existing form */ @@ -197,11 +197,11 @@ function wppost_post_local(&$a, &$b) { return; } - $wp_post = intval(PConfig::get(local_user(),'wppost','post')); + $wp_post = intval(DI::pConfig()->get(local_user(),'wppost','post')); $wp_enable = (($wp_post && !empty($_REQUEST['wppost_enable'])) ? intval($_REQUEST['wppost_enable']) : 0); - if ($b['api_source'] && intval(PConfig::get(local_user(),'wppost','post_by_default'))) { + if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'wppost','post_by_default'))) { $wp_enable = 1; } @@ -240,10 +240,10 @@ function wppost_send(&$a, &$b) return; } - $wp_username = XML::escape(PConfig::get($b['uid'], 'wppost', 'wp_username')); - $wp_password = XML::escape(PConfig::get($b['uid'], 'wppost', 'wp_password')); - $wp_blog = PConfig::get($b['uid'],'wppost','wp_blog'); - $wp_backlink_text = PConfig::get($b['uid'],'wppost','wp_backlink_text'); + $wp_username = XML::escape(DI::pConfig()->get($b['uid'], 'wppost', 'wp_username')); + $wp_password = XML::escape(DI::pConfig()->get($b['uid'], 'wppost', 'wp_password')); + $wp_blog = DI::pConfig()->get($b['uid'],'wppost','wp_blog'); + $wp_backlink_text = DI::pConfig()->get($b['uid'],'wppost','wp_backlink_text'); if ($wp_backlink_text == '') { $wp_backlink_text = L10n::t('Read the orig­i­nal post and com­ment stream on Friendica'); } @@ -251,7 +251,7 @@ function wppost_send(&$a, &$b) if ($wp_username && $wp_password && $wp_blog) { $wptitle = trim($b['title']); - if (intval(PConfig::get($b['uid'], 'wppost', 'shortcheck'))) { + if (intval(DI::pConfig()->get($b['uid'], 'wppost', 'shortcheck'))) { // Checking, if its a post that is worth a blog post $postentry = false; $siteinfo = BBCode::getAttachedData($b["body"]); @@ -312,7 +312,7 @@ function wppost_send(&$a, &$b) $post = $title.$post; - $wp_backlink = intval(PConfig::get($b['uid'],'wppost','backlink')); + $wp_backlink = intval(DI::pConfig()->get($b['uid'],'wppost','backlink')); if($wp_backlink && $b['plink']) { $post .= EOL . EOL . '' . $wp_backlink_text . '' . EOL . EOL; diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php index a2a1e17db..ce31822d1 100644 --- a/xmpp/xmpp.php +++ b/xmpp/xmpp.php @@ -57,13 +57,13 @@ function xmpp_addon_settings(App $a, &$s) /* Get the current state of our config variable */ - $enabled = intval(PConfig::get(local_user(), 'xmpp', 'enabled')); + $enabled = intval(DI::pConfig()->get(local_user(), 'xmpp', 'enabled')); $enabled_checked = (($enabled) ? ' checked="checked" ' : ''); - $individual = intval(PConfig::get(local_user(), 'xmpp', 'individual')); + $individual = intval(DI::pConfig()->get(local_user(), 'xmpp', 'individual')); $individual_checked = (($individual) ? ' checked="checked" ' : ''); - $bosh_proxy = PConfig::get(local_user(), "xmpp", "bosh_proxy"); + $bosh_proxy = DI::pConfig()->get(local_user(), "xmpp", "bosh_proxy"); /* Add some HTML to the existing form */ $s .= ''; @@ -85,7 +85,7 @@ function xmpp_addon_settings(App $a, &$s) $s .= '
'; } - if (!Config::get("xmpp", "central_userbase") || PConfig::get(local_user(), "xmpp", "individual")) { + if (!Config::get("xmpp", "central_userbase") || DI::pConfig()->get(local_user(), "xmpp", "individual")) { $s .= ''; $s .= ' '; $s .= '
'; @@ -147,7 +147,7 @@ function xmpp_converse(App $a) return; } - if (!PConfig::get(local_user(), "xmpp", "enabled")) { + if (!DI::pConfig()->get(local_user(), "xmpp", "enabled")) { return; } @@ -158,10 +158,10 @@ function xmpp_converse(App $a) DI::page()['htmlhead'] .= '' . "\n"; DI::page()['htmlhead'] .= '' . "\n"; - if (Config::get("xmpp", "central_userbase") && !PConfig::get(local_user(), "xmpp", "individual")) { + if (Config::get("xmpp", "central_userbase") && !DI::pConfig()->get(local_user(), "xmpp", "individual")) { $bosh_proxy = Config::get("xmpp", "bosh_proxy"); - $password = PConfig::get(local_user(), "xmpp", "password", '', true); + $password = DI::pConfig()->get(local_user(), "xmpp", "password", '', true); if ($password == "") { $password = Strings::getRandomHex(16); @@ -176,7 +176,7 @@ function xmpp_converse(App $a) password: '$password', allow_logout: false,"; } else { - $bosh_proxy = PConfig::get(local_user(), "xmpp", "bosh_proxy"); + $bosh_proxy = DI::pConfig()->get(local_user(), "xmpp", "bosh_proxy"); $auto_login = ""; } From febc835a2d90509a54a41dca07dba1d8e3ed6d07 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sat, 18 Jan 2020 16:54:49 +0100 Subject: [PATCH 3/5] Move PConfig::set() to DI::pConfig()->set() --- blockem/blockem.php | 4 +- blogger/blogger.php | 10 ++-- buffer/buffer.php | 12 ++--- catavatar/catavatar.php | 2 +- curweather/curweather.php | 8 ++-- diaspora/diaspora.php | 10 ++-- discourse/discourse.php | 2 +- dwpost/dwpost.php | 8 ++-- fromapp/fromapp.php | 4 +- geonames/geonames.php | 2 +- gnot/gnot.php | 2 +- group_text/group_text.php | 2 +- ifttt/ifttt.php | 2 +- ijpost/ijpost.php | 8 ++-- irc/irc.php | 4 +- jappixmini/jappixmini.php | 24 +++++----- krynn/krynn.php | 2 +- langfilter/langfilter.php | 8 ++-- libertree/libertree.php | 8 ++-- ljpost/ljpost.php | 8 ++-- mailstream/mailstream.php | 8 ++-- markdown/markdown.php | 2 +- mathjax/mathjax.php | 2 +- notimeline/notimeline.php | 2 +- nsfw/nsfw.php | 4 +- numfriends/numfriends.php | 2 +- planets/planets.php | 2 +- pumpio/pumpio.php | 56 +++++++++++------------ qcomment/qcomment.php | 2 +- randplace/randplace.php | 2 +- remote_permissions/remote_permissions.php | 2 +- securemail/securemail.php | 8 ++-- showmore/showmore.php | 4 +- startpage/startpage.php | 2 +- statusnet/statusnet.php | 52 ++++++++++----------- superblock/superblock.php | 4 +- tumblr/tumblr.php | 10 ++-- twitter/twitter.php | 30 ++++++------ widgets/widgets.php | 2 +- windowsphonepush/windowsphonepush.php | 18 ++++---- wppost/wppost.php | 16 +++---- xmpp/xmpp.php | 10 ++-- 42 files changed, 185 insertions(+), 185 deletions(-) diff --git a/blockem/blockem.php b/blockem/blockem.php index 5bd01e920..80bf83854 100644 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -79,7 +79,7 @@ function blockem_addon_settings_post(App $a, array &$b) } if (!empty($_POST['blockem-submit'])) { - PConfig::set(local_user(), 'blockem', 'words', trim($_POST['blockem-words'])); + DI::pConfig()->set(local_user(), 'blockem', 'words', trim($_POST['blockem-words'])); info(L10n::t('BLOCKEM Settings saved.') . EOL); } } @@ -242,7 +242,7 @@ function blockem_init(App $a) $words = implode(',', $newarr); } - PConfig::set(local_user(), 'blockem', 'words', $words); + DI::pConfig()->set(local_user(), 'blockem', 'words', $words); info(L10n::t('blockem settings updated') . EOL); exit(); } diff --git a/blogger/blogger.php b/blogger/blogger.php index 0458415e6..847bcea89 100644 --- a/blogger/blogger.php +++ b/blogger/blogger.php @@ -127,11 +127,11 @@ function blogger_settings(App $a, &$s) function blogger_settings_post(App $a, array &$b) { if (!empty($_POST['blogger-submit'])) { - PConfig::set(local_user(), 'blogger', 'post', $_POST['blogger'] ?? false); - PConfig::set(local_user(), 'blogger', 'post_by_default', $_POST['bl_bydefault'] ?? false); - PConfig::set(local_user(), 'blogger', 'bl_username', trim($_POST['bl_username'])); - PConfig::set(local_user(), 'blogger', 'bl_password', trim($_POST['bl_password'])); - PConfig::set(local_user(), 'blogger', 'bl_blog', trim($_POST['bl_blog'])); + DI::pConfig()->set(local_user(), 'blogger', 'post', $_POST['blogger'] ?? false); + DI::pConfig()->set(local_user(), 'blogger', 'post_by_default', $_POST['bl_bydefault'] ?? false); + DI::pConfig()->set(local_user(), 'blogger', 'bl_username', trim($_POST['bl_username'])); + DI::pConfig()->set(local_user(), 'blogger', 'bl_password', trim($_POST['bl_password'])); + DI::pConfig()->set(local_user(), 'blogger', 'bl_blog', trim($_POST['bl_blog'])); } } diff --git a/buffer/buffer.php b/buffer/buffer.php index ac2c8b8e7..2e2970752 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -121,7 +121,7 @@ function buffer_connect(App $a) Logger::log("buffer_connect: authenticated"); $o = L10n::t("You are now authenticated to buffer. "); $o .= '
' . L10n::t("return to the connector page") . ''; - PConfig::set(local_user(), 'buffer','access_token', $buffer->access_token); + DI::pConfig()->set(local_user(), 'buffer','access_token', $buffer->access_token); } return $o; @@ -236,12 +236,12 @@ function buffer_settings_post(App $a, array &$b) { if (!empty($_POST['buffer-submit'])) { if (!empty($_POST['buffer_delete'])) { - PConfig::set(local_user(), 'buffer', 'access_token' , ''); - PConfig::set(local_user(), 'buffer', 'post' , false); - PConfig::set(local_user(), 'buffer', 'post_by_default', false); + DI::pConfig()->set(local_user(), 'buffer', 'access_token' , ''); + DI::pConfig()->set(local_user(), 'buffer', 'post' , false); + DI::pConfig()->set(local_user(), 'buffer', 'post_by_default', false); } else { - PConfig::set(local_user(), 'buffer', 'post' , intval($_POST['buffer'] ?? false)); - PConfig::set(local_user(), 'buffer', 'post_by_default', intval($_POST['buffer_bydefault'] ?? false)); + DI::pConfig()->set(local_user(), 'buffer', 'post' , intval($_POST['buffer'] ?? false)); + DI::pConfig()->set(local_user(), 'buffer', 'post_by_default', intval($_POST['buffer_bydefault'] ?? false)); } } } diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php index 1cdd3b1ee..184064901 100644 --- a/catavatar/catavatar.php +++ b/catavatar/catavatar.php @@ -124,7 +124,7 @@ function catavatar_addon_settings_post(App $a, &$s) } if (!empty($_POST['catavatar-morecat'])) { - PConfig::set(local_user(), 'catavatar', 'seed', time()); + DI::pConfig()->set(local_user(), 'catavatar', 'seed', time()); } if (!empty($_POST['catavatar-emailcat'])) { diff --git a/curweather/curweather.php b/curweather/curweather.php index c5476efe1..460a148f5 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -92,7 +92,7 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti 'icon' => (string) $res->weather['icon'], ]; - PConfig::set(local_user(), 'curweather', 'last', $now->getTimestamp()); + DI::pConfig()->set(local_user(), 'curweather', 'last', $now->getTimestamp()); Cache::set('curweather'.md5($url), serialize($r), Cache::HOUR); return $r; @@ -170,9 +170,9 @@ function curweather_addon_settings_post(App $a, $post) return; } - PConfig::set(local_user(), 'curweather', 'curweather_loc' , trim($_POST['curweather_loc'])); - PConfig::set(local_user(), 'curweather', 'curweather_enable', intval($_POST['curweather_enable'])); - PConfig::set(local_user(), 'curweather', 'curweather_units' , trim($_POST['curweather_units'])); + DI::pConfig()->set(local_user(), 'curweather', 'curweather_loc' , trim($_POST['curweather_loc'])); + DI::pConfig()->set(local_user(), 'curweather', 'curweather_enable', intval($_POST['curweather_enable'])); + DI::pConfig()->set(local_user(), 'curweather', 'curweather_units' , trim($_POST['curweather_units'])); info(L10n::t('Current Weather settings updated.') . EOL); } diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index 781c1d045..e33b7fde8 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -174,11 +174,11 @@ function diaspora_settings(App $a, &$s) function diaspora_settings_post(App $a, &$b) { if (!empty($_POST['diaspora-submit'])) { - PConfig::set(local_user(),'diaspora', 'post' , intval($_POST['diaspora'])); - PConfig::set(local_user(),'diaspora', 'post_by_default', intval($_POST['diaspora_bydefault'])); - PConfig::set(local_user(),'diaspora', 'handle' , trim($_POST['handle'])); - PConfig::set(local_user(),'diaspora', 'password' , trim($_POST['password'])); - PConfig::set(local_user(),'diaspora', 'aspect' , trim($_POST['aspect'])); + DI::pConfig()->set(local_user(),'diaspora', 'post' , intval($_POST['diaspora'])); + DI::pConfig()->set(local_user(),'diaspora', 'post_by_default', intval($_POST['diaspora_bydefault'])); + DI::pConfig()->set(local_user(),'diaspora', 'handle' , trim($_POST['handle'])); + DI::pConfig()->set(local_user(),'diaspora', 'password' , trim($_POST['password'])); + DI::pConfig()->set(local_user(),'diaspora', 'aspect' , trim($_POST['aspect'])); } } diff --git a/discourse/discourse.php b/discourse/discourse.php index 34fa206d2..7bb75edae 100644 --- a/discourse/discourse.php +++ b/discourse/discourse.php @@ -61,7 +61,7 @@ function discourse_settings_post(App $a) return; } - PConfig::set(local_user(), 'discourse', 'enabled', intval($_POST['enabled'])); + DI::pConfig()->set(local_user(), 'discourse', 'enabled', intval($_POST['enabled'])); } function discourse_email_getmessage(App $a, &$message) diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php index 9e2d69e45..875676652 100644 --- a/dwpost/dwpost.php +++ b/dwpost/dwpost.php @@ -115,10 +115,10 @@ function dwpost_settings(App $a, &$s) function dwpost_settings_post(App $a, array &$b) { if (!empty($_POST['dwpost-submit'])) { - PConfig::set(local_user(), 'dwpost', 'post', intval($_POST['dwpost'])); - PConfig::set(local_user(), 'dwpost', 'post_by_default', intval($_POST['dw_bydefault'])); - PConfig::set(local_user(), 'dwpost', 'dw_username', trim($_POST['dw_username'])); - PConfig::set(local_user(), 'dwpost', 'dw_password', trim($_POST['dw_password'])); + DI::pConfig()->set(local_user(), 'dwpost', 'post', intval($_POST['dwpost'])); + DI::pConfig()->set(local_user(), 'dwpost', 'post_by_default', intval($_POST['dw_bydefault'])); + DI::pConfig()->set(local_user(), 'dwpost', 'dw_username', trim($_POST['dw_username'])); + DI::pConfig()->set(local_user(), 'dwpost', 'dw_password', trim($_POST['dw_password'])); } } diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php index 5a18ab555..49a3bacf2 100644 --- a/fromapp/fromapp.php +++ b/fromapp/fromapp.php @@ -35,8 +35,8 @@ function fromapp_settings_post($a, $post) return; } - PConfig::set(local_user(), 'fromapp', 'app', $_POST['fromapp-input']); - PConfig::set(local_user(), 'fromapp', 'force', intval($_POST['fromapp-force'])); + DI::pConfig()->set(local_user(), 'fromapp', 'app', $_POST['fromapp-input']); + DI::pConfig()->set(local_user(), 'fromapp', 'force', intval($_POST['fromapp-force'])); info(L10n::t('Fromapp settings updated.') . EOL); } diff --git a/geonames/geonames.php b/geonames/geonames.php index 560b5ee88..15e3339d7 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -110,7 +110,7 @@ function geonames_addon_settings_post(App $a, array $post) return; } - PConfig::set(local_user(), 'geonames', 'enable', intval($_POST['geonames-enable'])); + DI::pConfig()->set(local_user(), 'geonames', 'enable', intval($_POST['geonames-enable'])); info(L10n::t('Geonames settings updated.')); } diff --git a/gnot/gnot.php b/gnot/gnot.php index 5aa0995b1..a3323fdde 100644 --- a/gnot/gnot.php +++ b/gnot/gnot.php @@ -49,7 +49,7 @@ function gnot_settings_post($a,$post) { if(! local_user() || empty($_POST['gnot-submit'])) return; - PConfig::set(local_user(),'gnot','enable',intval($_POST['gnot'])); + DI::pConfig()->set(local_user(),'gnot','enable',intval($_POST['gnot'])); info(L10n::t('Gnot settings updated.') . EOL); } diff --git a/group_text/group_text.php b/group_text/group_text.php index 0e18ec526..b82c751b2 100644 --- a/group_text/group_text.php +++ b/group_text/group_text.php @@ -43,7 +43,7 @@ function group_text_uninstall() { function group_text_settings_post($a,$post) { if(! local_user() || empty($_POST['group_text-submit'])) return; - PConfig::set(local_user(),'system','groupedit_image_limit',intval($_POST['group_text'])); + DI::pConfig()->set(local_user(),'system','groupedit_image_limit',intval($_POST['group_text'])); info(L10n::t('Group Text settings updated.') . EOL); } diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index ac05fcb9a..2be43de20 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -50,7 +50,7 @@ function ifttt_settings(App $a, &$s) if (!$key) { $key = Strings::getRandomHex(20); - PConfig::set(local_user(), 'ifttt', 'key', $key); + DI::pConfig()->set(local_user(), 'ifttt', 'key', $key); } $s .= ''; diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php index 29fcd0d73..603c0969a 100644 --- a/ijpost/ijpost.php +++ b/ijpost/ijpost.php @@ -113,10 +113,10 @@ function ijpost_settings(&$a, &$s) function ijpost_settings_post(&$a, &$b) { if (!empty($_POST['ijpost-submit'])) { - PConfig::set(local_user(), 'ijpost', 'post', intval($_POST['ijpost'])); - PConfig::set(local_user(), 'ijpost', 'post_by_default', intval($_POST['ij_bydefault'])); - PConfig::set(local_user(), 'ijpost', 'ij_username', trim($_POST['ij_username'])); - PConfig::set(local_user(), 'ijpost', 'ij_password', trim($_POST['ij_password'])); + DI::pConfig()->set(local_user(), 'ijpost', 'post', intval($_POST['ijpost'])); + DI::pConfig()->set(local_user(), 'ijpost', 'post_by_default', intval($_POST['ij_bydefault'])); + DI::pConfig()->set(local_user(), 'ijpost', 'ij_username', trim($_POST['ij_username'])); + DI::pConfig()->set(local_user(), 'ijpost', 'ij_password', trim($_POST['ij_password'])); } } diff --git a/irc/irc.php b/irc/irc.php index 96f4a888b..ad4164cbf 100644 --- a/irc/irc.php +++ b/irc/irc.php @@ -59,10 +59,10 @@ function irc_addon_settings_post(&$a, &$b) { if(!empty($_POST['irc-submit'])) { if (isset($_POST['autochans'])) { - PConfig::set(local_user(), 'irc', 'autochans', trim(($_POST['autochans']))); + DI::pConfig()->set(local_user(), 'irc', 'autochans', trim(($_POST['autochans']))); } if (isset($_POST['sitechats'])) { - PConfig::set(local_user(), 'irc', 'sitechats', trim($_POST['sitechats'])); + DI::pConfig()->set(local_user(), 'irc', 'sitechats', trim($_POST['sitechats'])); } /* upid pop-up thing */ info(L10n::t('IRC settings saved.') . EOL); diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index 1c67c9d78..d3c79c771 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -231,7 +231,7 @@ function jappixmini_init() $decrypt_func($signed_address, $trusted_address, $key); $now = intval(time()); - PConfig::set($uid, "jappixmini", "id:$dfrn_id", "$now:$trusted_address"); + DI::pConfig()->set($uid, "jappixmini", "id:$dfrn_id", "$now:$trusted_address"); } catch (Exception $e) { } @@ -277,7 +277,7 @@ function jappixmini_settings(App $a, &$s) $defaultbosh = Config::get("jappixmini", "bosh_address"); if ($defaultbosh != "") { - PConfig::set(local_user(), 'jappixmini', 'bosh', $defaultbosh); + DI::pConfig()->set(local_user(), 'jappixmini', 'bosh', $defaultbosh); } $username = DI::pConfig()->get(local_user(), 'jappixmini', 'username'); @@ -456,15 +456,15 @@ function jappixmini_settings_post(App $a, &$b) $purge = 1; } - PConfig::set($uid, 'jappixmini', 'username' , $username); - PConfig::set($uid, 'jappixmini', 'server' , $server); - PConfig::set($uid, 'jappixmini', 'bosh' , trim($b['jappixmini-bosh'])); - PConfig::set($uid, 'jappixmini', 'password' , trim($b['jappixmini-encrypted-password'])); - PConfig::set($uid, 'jappixmini', 'autosubscribe' , intval($b['jappixmini-autosubscribe'])); - PConfig::set($uid, 'jappixmini', 'autoapprove' , intval($b['jappixmini-autoapprove'])); - PConfig::set($uid, 'jappixmini', 'activate' , intval($b['jappixmini-activate'])); - PConfig::set($uid, 'jappixmini', 'dontinsertchat', intval($b['jappixmini-dont-insertchat'])); - PConfig::set($uid, 'jappixmini', 'encrypt' , $encrypt); + DI::pConfig()->set($uid, 'jappixmini', 'username' , $username); + DI::pConfig()->set($uid, 'jappixmini', 'server' , $server); + DI::pConfig()->set($uid, 'jappixmini', 'bosh' , trim($b['jappixmini-bosh'])); + DI::pConfig()->set($uid, 'jappixmini', 'password' , trim($b['jappixmini-encrypted-password'])); + DI::pConfig()->set($uid, 'jappixmini', 'autosubscribe' , intval($b['jappixmini-autosubscribe'])); + DI::pConfig()->set($uid, 'jappixmini', 'autoapprove' , intval($b['jappixmini-autoapprove'])); + DI::pConfig()->set($uid, 'jappixmini', 'activate' , intval($b['jappixmini-activate'])); + DI::pConfig()->set($uid, 'jappixmini', 'dontinsertchat', intval($b['jappixmini-dont-insertchat'])); + DI::pConfig()->set($uid, 'jappixmini', 'encrypt' , $encrypt); info('Jappix Mini settings saved.'); if ($purge) { @@ -692,7 +692,7 @@ function jappixmini_cron(App $a, $d) } // save address - PConfig::set($uid, "jappixmini", "id:$dfrn_id", "$now:$decrypted_address"); + DI::pConfig()->set($uid, "jappixmini", "id:$dfrn_id", "$now:$decrypted_address"); } } } diff --git a/krynn/krynn.php b/krynn/krynn.php index c16ccefb5..62959bb62 100644 --- a/krynn/krynn.php +++ b/krynn/krynn.php @@ -123,7 +123,7 @@ function krynn_settings_post($a,$post) { if(! local_user()) return; if($_POST['krynn-submit']) - PConfig::set(local_user(),'krynn','enable',intval($_POST['krynn'])); + DI::pConfig()->set(local_user(),'krynn','enable',intval($_POST['krynn'])); } diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index cb580888e..0ddd85484 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -79,10 +79,10 @@ function langfilter_addon_settings_post(App $a, &$b) } if (!empty($_POST['langfilter-settings-submit'])) { - PConfig::set(local_user(), 'langfilter', 'languages', trim($_POST['langfilter_languages'])); + DI::pConfig()->set(local_user(), 'langfilter', 'languages', trim($_POST['langfilter_languages'])); $enable = (!empty($_POST['langfilter_enable']) ? intval($_POST['langfilter_enable']) : 0); $disable = 1 - $enable; - PConfig::set(local_user(), 'langfilter', 'disable', $disable); + DI::pConfig()->set(local_user(), 'langfilter', 'disable', $disable); $minconfidence = 0 + $_POST['langfilter_minconfidence']; if (!$minconfidence) { $minconfidence = 0; @@ -91,7 +91,7 @@ function langfilter_addon_settings_post(App $a, &$b) } elseif ($minconfidence > 100) { $minconfidence = 100; } - PConfig::set(local_user(), 'langfilter', 'minconfidence', $minconfidence / 100.0); + DI::pConfig()->set(local_user(), 'langfilter', 'minconfidence', $minconfidence / 100.0); $minlength = 0 + $_POST['langfilter_minlength']; if (!$minlength) { @@ -99,7 +99,7 @@ function langfilter_addon_settings_post(App $a, &$b) } elseif ($minlength < 0) { $minlength = 32; } - PConfig::set(local_user(), 'langfilter', 'minlength', $minlength); + DI::pConfig()->set(local_user(), 'langfilter', 'minlength', $minlength); info(L10n::t('Language Filter Settings saved.') . EOL); } diff --git a/libertree/libertree.php b/libertree/libertree.php index 88163fd88..a98419e36 100644 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -119,10 +119,10 @@ function libertree_settings_post(&$a,&$b) { if(!empty($_POST['libertree-submit'])) { - PConfig::set(local_user(),'libertree','post',intval($_POST['libertree'])); - PConfig::set(local_user(),'libertree','post_by_default',intval($_POST['libertree_bydefault'])); - PConfig::set(local_user(),'libertree','libertree_api_token',trim($_POST['libertree_api_token'])); - PConfig::set(local_user(),'libertree','libertree_url',trim($_POST['libertree_url'])); + DI::pConfig()->set(local_user(),'libertree','post',intval($_POST['libertree'])); + DI::pConfig()->set(local_user(),'libertree','post_by_default',intval($_POST['libertree_bydefault'])); + DI::pConfig()->set(local_user(),'libertree','libertree_api_token',trim($_POST['libertree_api_token'])); + DI::pConfig()->set(local_user(),'libertree','libertree_url',trim($_POST['libertree_url'])); } diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php index f6ac37edc..ab47416f9 100644 --- a/ljpost/ljpost.php +++ b/ljpost/ljpost.php @@ -113,10 +113,10 @@ function ljpost_settings_post(&$a,&$b) { if(!empty($_POST['ljpost-submit'])) { - PConfig::set(local_user(),'ljpost','post',intval($_POST['ljpost'])); - PConfig::set(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault'])); - PConfig::set(local_user(),'ljpost','lj_username',trim($_POST['lj_username'])); - PConfig::set(local_user(),'ljpost','lj_password',trim($_POST['lj_password'])); + DI::pConfig()->set(local_user(),'ljpost','post',intval($_POST['ljpost'])); + DI::pConfig()->set(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault'])); + DI::pConfig()->set(local_user(),'ljpost','lj_username',trim($_POST['lj_username'])); + DI::pConfig()->set(local_user(),'ljpost','lj_password',trim($_POST['lj_password'])); } diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index 39a848d77..4aad1d225 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -400,25 +400,25 @@ function mailstream_addon_settings(&$a,&$s) { function mailstream_addon_settings_post($a,$post) { if ($_POST['mailstream_address'] != "") { - PConfig::set(local_user(), 'mailstream', 'address', $_POST['mailstream_address']); + DI::pConfig()->set(local_user(), 'mailstream', 'address', $_POST['mailstream_address']); } else { PConfig::delete(local_user(), 'mailstream', 'address'); } if ($_POST['mailstream_nolikes']) { - PConfig::set(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']); + DI::pConfig()->set(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']); } else { PConfig::delete(local_user(), 'mailstream', 'nolikes'); } if ($_POST['mailstream_enabled']) { - PConfig::set(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']); + DI::pConfig()->set(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']); } else { PConfig::delete(local_user(), 'mailstream', 'enabled'); } if ($_POST['mailstream_attachimg']) { - PConfig::set(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']); + DI::pConfig()->set(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']); } else { PConfig::delete(local_user(), 'mailstream', 'attachimg'); diff --git a/markdown/markdown.php b/markdown/markdown.php index 302a603cd..854bc6898 100644 --- a/markdown/markdown.php +++ b/markdown/markdown.php @@ -42,7 +42,7 @@ function markdown_addon_settings_post(App $a, &$b) return; } - PConfig::set(local_user(), 'markdown', 'enabled', intval($_POST['enabled'])); + DI::pConfig()->set(local_user(), 'markdown', 'enabled', intval($_POST['enabled'])); } function markdown_post_local_start(App $a, &$request) { diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php index dbdfbccc6..718a62faf 100644 --- a/mathjax/mathjax.php +++ b/mathjax/mathjax.php @@ -40,7 +40,7 @@ function mathjax_settings_post($a) return; } - PConfig::set(local_user(), 'mathjax', 'use', intval($_POST['mathjax_use'])); + DI::pConfig()->set(local_user(), 'mathjax', 'use', intval($_POST['mathjax_use'])); } function mathjax_settings(App $a, &$s) diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php index 8887b5427..d090b7441 100644 --- a/notimeline/notimeline.php +++ b/notimeline/notimeline.php @@ -30,7 +30,7 @@ function notimeline_settings_post($a, $post) return; } - PConfig::set(local_user(), 'system', 'no_wall_archive_widget', intval($_POST['notimeline'])); + DI::pConfig()->set(local_user(), 'system', 'no_wall_archive_widget', intval($_POST['notimeline'])); info(L10n::t('No Timeline settings updated.') . EOL); } diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index 32c95acbd..4369df408 100644 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -103,10 +103,10 @@ function nsfw_addon_settings_post(&$a, &$b) } if (!empty($_POST['nsfw-submit'])) { - PConfig::set(local_user(), 'nsfw', 'words', trim($_POST['nsfw-words'])); + DI::pConfig()->set(local_user(), 'nsfw', 'words', trim($_POST['nsfw-words'])); $enable = (!empty($_POST['nsfw-enable']) ? intval($_POST['nsfw-enable']) : 0); $disable = 1 - $enable; - PConfig::set(local_user(), 'nsfw', 'disable', $disable); + DI::pConfig()->set(local_user(), 'nsfw', 'disable', $disable); info(L10n::t('NSFW Settings saved.') . EOL); } } diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php index be0aa9325..773cc6501 100644 --- a/numfriends/numfriends.php +++ b/numfriends/numfriends.php @@ -41,7 +41,7 @@ function numfriends_settings_post($a,$post) { if(! local_user() || empty($_POST['numfriends-submit'])) return; - PConfig::set(local_user(),'system','display_friend_count',intval($_POST['numfriends'])); + DI::pConfig()->set(local_user(),'system','display_friend_count',intval($_POST['numfriends'])); info( L10n::t('Numfriends settings updated.') . EOL); } diff --git a/planets/planets.php b/planets/planets.php index aedfc8892..e7a1e9b88 100644 --- a/planets/planets.php +++ b/planets/planets.php @@ -120,7 +120,7 @@ function planets_settings_post($a,$post) { if(! local_user()) return; if($_POST['planets-submit']) - PConfig::set(local_user(),'planets','enable',intval($_POST['planets'])); + DI::pConfig()->set(local_user(),'planets','enable',intval($_POST['planets'])); } diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 68f3e8d77..70352adce 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -150,8 +150,8 @@ function pumpio_connect(App $a) if ((($consumer_key == "") || ($consumer_secret == "")) && ($hostname != "")) { Logger::log("pumpio_connect: register client"); $clientdata = pumpio_registerclient($a, $hostname); - PConfig::set(local_user(), 'pumpio', 'consumer_key', $clientdata->client_id); - PConfig::set(local_user(), 'pumpio', 'consumer_secret', $clientdata->client_secret); + DI::pConfig()->set(local_user(), 'pumpio', 'consumer_key', $clientdata->client_id); + DI::pConfig()->set(local_user(), 'pumpio', 'consumer_secret', $clientdata->client_secret); $consumer_key = DI::pConfig()->get(local_user(), 'pumpio', 'consumer_key'); $consumer_secret = DI::pConfig()->get(local_user(), 'pumpio', 'consumer_secret'); @@ -191,8 +191,8 @@ function pumpio_connect(App $a) if (($success = $client->Process())) { if (strlen($client->access_token)) { Logger::log("pumpio_connect: otoken: ".$client->access_token." osecrect: ".$client->access_token_secret, Logger::DEBUG); - PConfig::set(local_user(), "pumpio", "oauth_token", $client->access_token); - PConfig::set(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret); + DI::pConfig()->set(local_user(), "pumpio", "oauth_token", $client->access_token); + DI::pConfig()->set(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret); } } $success = $client->Finalize($success); @@ -335,19 +335,19 @@ function pumpio_settings_post(App $a, array &$b) { if (!empty($_POST['pumpio-submit'])) { if (!empty($_POST['pumpio_delete'])) { - 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' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'consumer_key' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'consumer_secret' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'oauth_token' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'oauth_token_secret', ''); + DI::pConfig()->set(local_user(), 'pumpio', 'post' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'import' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'host' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'user' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'public' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'mirror' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'post_by_default' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'lastdate' , 0); + DI::pConfig()->set(local_user(), 'pumpio', 'last_id' , ''); } else { // filtering the username if it is filled wrong $user = $_POST['pumpio_user']; @@ -364,13 +364,13 @@ function pumpio_settings_post(App $a, array &$b) $host = trim($host); $host = str_replace(["https://", "http://"], ["", ""], $host); - PConfig::set(local_user(), 'pumpio', 'post' , $_POST['pumpio'] ?? false); - PConfig::set(local_user(), 'pumpio', 'import' , $_POST['pumpio_import'] ?? false); - PConfig::set(local_user(), 'pumpio', 'host' , $host); - PConfig::set(local_user(), 'pumpio', 'user' , $user); - PConfig::set(local_user(), 'pumpio', 'public' , $_POST['pumpio_public'] ?? false); - PConfig::set(local_user(), 'pumpio', 'mirror' , $_POST['pumpio_mirror'] ?? false); - PConfig::set(local_user(), 'pumpio', 'post_by_default', $_POST['pumpio_bydefault'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'post' , $_POST['pumpio'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'import' , $_POST['pumpio_import'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'host' , $host); + DI::pConfig()->set(local_user(), 'pumpio', 'user' , $user); + DI::pConfig()->set(local_user(), 'pumpio', 'public' , $_POST['pumpio_public'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'mirror' , $_POST['pumpio_mirror'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'post_by_default', $_POST['pumpio_bydefault'] ?? false); if (!empty($_POST['pumpio_mirror'])) { PConfig::delete(local_user(), 'pumpio', 'lastdate'); @@ -597,7 +597,7 @@ function pumpio_send(App $a, array &$b) if ($success) { if ($user->generator->displayName) { - PConfig::set($b["uid"], "pumpio", "application_name", $user->generator->displayName); + DI::pConfig()->set($b["uid"], "pumpio", "application_name", $user->generator->displayName); } $post_id = $user->object->id; @@ -740,7 +740,7 @@ function pumpio_sync(App $a) if ($next_contact_check <= time()) { pumpio_getallusers($a, $rr["uid"]); - PConfig::set($rr['uid'], 'pumpio', 'contact_check', time()); + DI::pConfig()->set($rr['uid'], 'pumpio', 'contact_check', time()); } } } @@ -882,7 +882,7 @@ function pumpio_fetchtimeline(App $a, $uid) } if ($lastdate != 0) { - PConfig::set($uid, 'pumpio', 'lastdate', $lastdate); + DI::pConfig()->set($uid, 'pumpio', 'lastdate', $lastdate); } } @@ -1372,7 +1372,7 @@ function pumpio_fetchinbox(App $a, $uid) pumpio_fetchallcomments($a, $uid, $item["uri"]); } - PConfig::set($uid, 'pumpio', 'last_id', $last_id); + DI::pConfig()->set($uid, 'pumpio', 'last_id', $last_id); } function pumpio_getallusers(App &$a, $uid) diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php index 541afabbe..b4190e2ef 100644 --- a/qcomment/qcomment.php +++ b/qcomment/qcomment.php @@ -68,7 +68,7 @@ function qcomment_addon_settings_post(&$a, &$b) } if ($_POST['qcomment-submit']) { - PConfig::set(local_user(), 'qcomment', 'words', XML::escape($_POST['qcomment-words'])); + DI::pConfig()->set(local_user(), 'qcomment', 'words', XML::escape($_POST['qcomment-words'])); info(L10n::t('Quick Comment settings saved.') . EOL); } } diff --git a/randplace/randplace.php b/randplace/randplace.php index b4c9d5947..f08f85b32 100644 --- a/randplace/randplace.php +++ b/randplace/randplace.php @@ -139,7 +139,7 @@ function randplace_settings_post($a,$post) { if(! local_user()) return; if($_POST['randplace-submit']) - PConfig::set(local_user(),'randplace','enable',intval($_POST['randplace'])); + DI::pConfig()->set(local_user(),'randplace','enable',intval($_POST['randplace'])); } diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php index 5e1612ba6..1a457872b 100644 --- a/remote_permissions/remote_permissions.php +++ b/remote_permissions/remote_permissions.php @@ -62,7 +62,7 @@ function remote_permissions_settings_post($a,$post) { if(! local_user() || empty($_POST['remote-perms-submit'])) return; - PConfig::set(local_user(),'remote_perms','show',intval($_POST['remote-perms'])); + DI::pConfig()->set(local_user(),'remote_perms','show',intval($_POST['remote-perms'])); info(L10n::t('Remote Permissions settings updated.') . EOL); } diff --git a/securemail/securemail.php b/securemail/securemail.php index 6fa59a7aa..37e4eef04 100644 --- a/securemail/securemail.php +++ b/securemail/securemail.php @@ -85,9 +85,9 @@ function securemail_settings_post(App &$a, array &$b) } if ($_POST['securemail-submit']) { - PConfig::set(local_user(), 'securemail', 'pkey', trim($_POST['securemail-pkey'])); + DI::pConfig()->set(local_user(), 'securemail', 'pkey', trim($_POST['securemail-pkey'])); $enable = (!empty($_POST['securemail-enable']) ? 1 : 0); - PConfig::set(local_user(), 'securemail', 'enable', $enable); + DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable); info(L10n::t('Secure Mail Settings saved.') . EOL); if ($_POST['securemail-submit'] == L10n::t('Save and send test')) { @@ -117,12 +117,12 @@ function securemail_settings_post(App &$a, array &$b) ]; // enable addon for test - PConfig::set(local_user(), 'securemail', 'enable', 1); + DI::pConfig()->set(local_user(), 'securemail', 'enable', 1); $res = Emailer::send($params); // revert to saved value - PConfig::set(local_user(), 'securemail', 'enable', $enable); + DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable); if ($res) { info(L10n::t('Test email sent') . EOL); diff --git a/showmore/showmore.php b/showmore/showmore.php index 98224f068..acd8e33db 100644 --- a/showmore/showmore.php +++ b/showmore/showmore.php @@ -71,10 +71,10 @@ function showmore_addon_settings_post(&$a, &$b) } if (!empty($_POST['showmore-submit'])) { - PConfig::set(local_user(), 'showmore', 'chars', trim($_POST['showmore-chars'])); + DI::pConfig()->set(local_user(), 'showmore', 'chars', trim($_POST['showmore-chars'])); $enable = (!empty($_POST['showmore-enable']) ? intval($_POST['showmore-enable']) : 0); $disable = 1-$enable; - PConfig::set(local_user(), 'showmore', 'disable', $disable); + DI::pConfig()->set(local_user(), 'showmore', 'disable', $disable); info(L10n::t('Show More Settings saved.') . EOL); } } diff --git a/startpage/startpage.php b/startpage/startpage.php index 21adae4be..8feb63128 100644 --- a/startpage/startpage.php +++ b/startpage/startpage.php @@ -54,7 +54,7 @@ function startpage_settings_post($a, $post) } if (!empty($_POST['startpage-submit'])) { - PConfig::set(local_user(), 'startpage', 'startpage', strip_tags(trim($_POST['startpage']))); + DI::pConfig()->set(local_user(), 'startpage', 'startpage', strip_tags(trim($_POST['startpage']))); } } diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 0d3162eff..e19b7e3fc 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -159,10 +159,10 @@ function statusnet_settings_post(App $a, $post) $apibase = $asn['apiurl']; $c = Network::fetchUrl($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'] ); + DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey']); + DI::pConfig()->set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret']); + DI::pConfig()->set(local_user(), 'statusnet', 'baseapi', $asn['apiurl']); + //DI::pConfig()->set(local_user(), 'statusnet', 'application_name', $asn['applicationname'] ); } else { notice(L10n::t('Please contact your site administrator.
The provided API URL is not valid.') . EOL . $asn['apiurl'] . EOL); } @@ -178,19 +178,19 @@ function statusnet_settings_post(App $a, $post) $c = Network::fetchUrl($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'] ); + DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); + DI::pConfig()->set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']); + DI::pConfig()->set(local_user(), 'statusnet', 'baseapi', $apibase); + //DI::pConfig()->set(local_user(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] ); } else { // the API path is not correct, maybe missing trailing / ? $apibase = $apibase . '/'; $c = Network::fetchUrl($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); + DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); + DI::pConfig()->set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']); + DI::pConfig()->set(local_user(), 'statusnet', 'baseapi', $apibase); } else { // still not the correct API base, let's do noting notice(L10n::t('We could not contact the GNU Social API with the Path you entered.') . EOL); @@ -209,20 +209,20 @@ function statusnet_settings_post(App $a, $post) $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); + DI::pConfig()->set(local_user(), 'statusnet', 'oauthtoken', $token['oauth_token']); + DI::pConfig()->set(local_user(), 'statusnet', 'oauthsecret', $token['oauth_token_secret']); + DI::pConfig()->set(local_user(), 'statusnet', 'post', 1); + DI::pConfig()->set(local_user(), 'statusnet', 'post_taglinks', 1); // reload the Addon Settings page, if we don't do it see Bug #42 DI::baseUrl()->redirect('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'])); + DI::pConfig()->set(local_user(), 'statusnet', 'post', intval($_POST['statusnet-enable'])); + DI::pConfig()->set(local_user(), 'statusnet', 'post_by_default', intval($_POST['statusnet-default'])); + DI::pConfig()->set(local_user(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror'])); + DI::pConfig()->set(local_user(), 'statusnet', 'import', intval($_POST['statusnet-import'])); + DI::pConfig()->set(local_user(), 'statusnet', 'create_user', intval($_POST['statusnet-create_user'])); if (!intval($_POST['statusnet-mirror'])) PConfig::delete(local_user(), 'statusnet', 'lastid'); @@ -597,7 +597,7 @@ function statusnet_post_hook(App $a, &$b) $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); + DI::pConfig()->set($b['uid'], 'statusnet', 'max_char', $max_char); $tempfile = ""; $msgarr = ItemContent::getPlaintextPost($b, $max_char, true, 7); @@ -642,7 +642,7 @@ function statusnet_post_hook(App $a, &$b) "\nmessage: " . $msg . "\nOriginal post: " . print_r($b, true) . "\nPost Data: " . print_r($postdata, true), Logger::DEBUG); if (!empty($result->source)) { - PConfig::set($b["uid"], "statusnet", "application_name", strip_tags($result->source)); + DI::pConfig()->set($b["uid"], "statusnet", "application_name", strip_tags($result->source)); } if (!empty($result->error)) { @@ -925,7 +925,7 @@ function statusnet_fetchtimeline(App $a, $uid) } } } - PConfig::set($uid, 'statusnet', 'lastid', $lastid); + DI::pConfig()->set($uid, 'statusnet', 'lastid', $lastid); } function statusnet_address($contact) @@ -1350,7 +1350,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1) } } } - PConfig::set($uid, 'statusnet', 'lasthometimelineid', $lastid); + DI::pConfig()->set($uid, 'statusnet', 'lasthometimelineid', $lastid); } // Fetching mentions @@ -1401,7 +1401,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1) } } - PConfig::set($uid, 'statusnet', 'lastmentionid', $lastid); + DI::pConfig()->set($uid, 'statusnet', 'lastmentionid', $lastid); } function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nick, $conversation) @@ -1566,7 +1566,7 @@ function statusnet_fetch_own_contact(App $a, $uid) return false; } - PConfig::set($uid, 'statusnet', 'own_url', Strings::normaliseLink($user->statusnet_profile_url)); + DI::pConfig()->set($uid, 'statusnet', 'own_url', Strings::normaliseLink($user->statusnet_profile_url)); $contact_id = statusnet_fetch_contact($uid, $user, true); } else { diff --git a/superblock/superblock.php b/superblock/superblock.php index 2783c5bb7..6b7dae22e 100644 --- a/superblock/superblock.php +++ b/superblock/superblock.php @@ -69,7 +69,7 @@ function superblock_addon_settings_post(&$a, &$b) } if (!empty($_POST['superblock-submit'])) { - PConfig::set(local_user(), 'system', 'blocked',trim($_POST['superblock-words'])); + DI::pConfig()->set(local_user(), 'system', 'blocked',trim($_POST['superblock-words'])); info(L10n::t('SUPERBLOCK Settings saved.') . EOL); } } @@ -163,7 +163,7 @@ function superblock_init(&$a) $words .= trim($_GET['block']); } - PConfig::set(local_user(), 'system', 'blocked', $words); + DI::pConfig()->set(local_user(), 'system', 'blocked', $words); info(L10n::t('superblock settings updated') . EOL ); exit(); } diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index 493f37158..038237e41 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -185,8 +185,8 @@ function tumblr_callback(App $a) } // What's next? Now that we have an Access Token and Secret, we can make an API call. - PConfig::set(local_user(), "tumblr", "oauth_token", $access_token['oauth_token']); - PConfig::set(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']); + DI::pConfig()->set(local_user(), "tumblr", "oauth_token", $access_token['oauth_token']); + DI::pConfig()->set(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']); $o = L10n::t("You are now authenticated to tumblr."); $o .= '
' . L10n::t("return to the connector page") . ''; @@ -300,9 +300,9 @@ function tumblr_settings(App $a, &$s) function tumblr_settings_post(App $a, array &$b) { if (!empty($_POST['tumblr-submit'])) { - PConfig::set(local_user(), 'tumblr', 'post', intval($_POST['tumblr'])); - PConfig::set(local_user(), 'tumblr', 'page', $_POST['tumblr_page']); - PConfig::set(local_user(), 'tumblr', 'post_by_default', intval($_POST['tumblr_bydefault'])); + DI::pConfig()->set(local_user(), 'tumblr', 'post', intval($_POST['tumblr'])); + DI::pConfig()->set(local_user(), 'tumblr', 'page', $_POST['tumblr_page']); + DI::pConfig()->set(local_user(), 'tumblr', 'post_by_default', intval($_POST['tumblr_bydefault'])); } } diff --git a/twitter/twitter.php b/twitter/twitter.php index e5ce967e2..fe66886f2 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -255,9 +255,9 @@ function twitter_settings_post(App $a) $connection = new TwitterOAuth($ckey, $csecret, $_POST['twitter-token'], $_POST['twitter-token2']); $token = $connection->oauth("oauth/access_token", ["oauth_verifier" => $_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); + DI::pConfig()->set(local_user(), 'twitter', 'oauthtoken', $token['oauth_token']); + DI::pConfig()->set(local_user(), 'twitter', 'oauthsecret', $token['oauth_token_secret']); + DI::pConfig()->set(local_user(), 'twitter', 'post', 1); } catch(Exception $e) { info($e->getMessage()); } catch(TwitterOAuthException $e) { @@ -268,11 +268,11 @@ function twitter_settings_post(App $a) } 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'])); + DI::pConfig()->set(local_user(), 'twitter', 'post', intval($_POST['twitter-enable'])); + DI::pConfig()->set(local_user(), 'twitter', 'post_by_default', intval($_POST['twitter-default'])); + DI::pConfig()->set(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror'])); + DI::pConfig()->set(local_user(), 'twitter', 'import', intval($_POST['twitter-import'])); + DI::pConfig()->set(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user'])); if (!intval($_POST['twitter-mirror'])) { PConfig::delete(local_user(), 'twitter', 'lastid'); @@ -792,7 +792,7 @@ function twitter_cron(App $a) if($next_contact_check <= time()) { pumpio_getallusers($a, $rr["uid"]); - PConfig::set($rr['uid'],'pumpio','contact_check',time()); + DI::pConfig()->set($rr['uid'],'pumpio','contact_check',time()); } */ } @@ -978,7 +978,7 @@ function twitter_fetchtimeline(App $a, $uid) foreach ($posts as $post) { if ($post->id_str > $lastid) { $lastid = $post->id_str; - PConfig::set($uid, 'twitter', 'lastid', $lastid); + DI::pConfig()->set($uid, 'twitter', 'lastid', $lastid); } if ($first_time) { @@ -1003,7 +1003,7 @@ function twitter_fetchtimeline(App $a, $uid) } } } - PConfig::set($uid, 'twitter', 'lastid', $lastid); + DI::pConfig()->set($uid, 'twitter', 'lastid', $lastid); Logger::log('Last ID for user ' . $uid . ' is now ' . $lastid, Logger::DEBUG); } @@ -1698,7 +1698,7 @@ function twitter_fetchhometimeline(App $a, $uid) foreach ($posts as $post) { if ($post->id_str > $lastid) { $lastid = $post->id_str; - PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid); + DI::pConfig()->set($uid, 'twitter', 'lasthometimelineid', $lastid); } if ($first_time) { @@ -1743,7 +1743,7 @@ function twitter_fetchhometimeline(App $a, $uid) Logger::log('User ' . $uid . ' posted home timeline item ' . $item); } } - PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid); + DI::pConfig()->set($uid, 'twitter', 'lasthometimelineid', $lastid); Logger::log('Last timeline ID for user ' . $uid . ' is now ' . $lastid, Logger::DEBUG); @@ -1798,7 +1798,7 @@ function twitter_fetchhometimeline(App $a, $uid) } } - PConfig::set($uid, 'twitter', 'lastmentionid', $lastid); + DI::pConfig()->set($uid, 'twitter', 'lastmentionid', $lastid); Logger::log('Last mentions ID for user ' . $uid . ' is now ' . $lastid, Logger::DEBUG); } @@ -1824,7 +1824,7 @@ function twitter_fetch_own_contact(App $a, $uid) return false; } - PConfig::set($uid, 'twitter', 'own_id', $user->id_str); + DI::pConfig()->set($uid, 'twitter', 'own_id', $user->id_str); $contact_id = twitter_fetch_contact($uid, $user, true); } else { diff --git a/widgets/widgets.php b/widgets/widgets.php index c3e1b2ede..0d8d2a703 100644 --- a/widgets/widgets.php +++ b/widgets/widgets.php @@ -41,7 +41,7 @@ function widgets_settings(&$a,&$o) { $key = DI::pConfig()->get(local_user(), 'widgets', 'key' ); - if ($key=='') { $key = mt_rand(); PConfig::set(local_user(), 'widgets', 'key', $key); } + if ($key=='') { $key = mt_rand(); DI::pConfig()->set(local_user(), 'widgets', 'key', $key); } $widgets = []; $d = dir(dirname(__file__)); diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php index 3e574586a..efae2f2e7 100644 --- a/windowsphonepush/windowsphonepush.php +++ b/windowsphonepush/windowsphonepush.php @@ -86,13 +86,13 @@ function windowsphonepush_settings_post($a, $post) return; } $enable = intval($_POST['windowsphonepush']); - PConfig::set(local_user(), 'windowsphonepush', 'enable', $enable); + DI::pConfig()->set(local_user(), 'windowsphonepush', 'enable', $enable); if ($enable) { - PConfig::set(local_user(), 'windowsphonepush', 'counterunseen', 0); + DI::pConfig()->set(local_user(), 'windowsphonepush', 'counterunseen', 0); } - PConfig::set(local_user(), 'windowsphonepush', 'senditemtext', intval($_POST['windowsphonepush-senditemtext'])); + DI::pConfig()->set(local_user(), 'windowsphonepush', 'senditemtext', intval($_POST['windowsphonepush-senditemtext'])); info(L10n::t('WindowsPhonePush settings updated.') . EOL); } @@ -174,7 +174,7 @@ function windowsphonepush_cron() switch (trim($res_tile)) { case "Received": // ok, count has been pushed, let's save it in personal settings - PConfig::set($rr['uid'], 'windowsphonepush', 'counterunseen', $count[0]['count']); + DI::pConfig()->set($rr['uid'], 'windowsphonepush', 'counterunseen', $count[0]['count']); break; case "QueueFull": // maximum of 30 messages reached, server rejects any further push notification until device reconnects @@ -232,7 +232,7 @@ function windowsphonepush_cron() // further log information done on count pushing with send_tile (see above) $res_toast = send_toast($device_url, $author, $body); if (trim($res_toast) === 'Received') { - PConfig::set($rr['uid'], 'windowsphonepush', 'lastpushid', $count[0]['max']); + DI::pConfig()->set($rr['uid'], 'windowsphonepush', 'lastpushid', $count[0]['max']); } } } @@ -306,7 +306,7 @@ function send_push($device_url, $headers, $msg) // and log this fact $subscriptionStatus = get_header_value($output, 'X-SubscriptionStatus'); if ($subscriptionStatus == "Expired") { - PConfig::set(local_user(), 'windowsphonepush', 'device_url', ""); + DI::pConfig()->set(local_user(), 'windowsphonepush', 'device_url', ""); Logger::log("ERROR: the stored Device-URL " . $device_url . "returned an 'Expired' error, it has been deleted now."); } @@ -422,12 +422,12 @@ function windowsphonepush_updatesettings() `v` = '" . $device_url . "'"); if (count($r)) { foreach ($r as $rr) { - PConfig::set($rr['uid'], 'windowsphonepush', 'device_url', ''); + DI::pConfig()->set($rr['uid'], 'windowsphonepush', 'device_url', ''); Logger::log("WARN: the sent URL was already registered with user '" . $rr['uid'] . "'. Deleted for this user as we expect to be correct now for user '" . local_user() . "'."); } } - PConfig::set(local_user(), 'windowsphonepush', 'device_url', $device_url); + DI::pConfig()->set(local_user(), 'windowsphonepush', 'device_url', $device_url); // output the successfull update of the device URL to the logger for error analysis if necessary Logger::log("INFO: Device-URL for user '" . local_user() . "' has been updated with '" . $device_url . "'"); return "Device-URL updated successfully!"; @@ -446,7 +446,7 @@ function windowsphonepush_updatecounterunseen() return "Plug-in not enabled"; } - PConfig::set(local_user(), 'windowsphonepush', 'counterunseen', 0); + DI::pConfig()->set(local_user(), 'windowsphonepush', 'counterunseen', 0); return "Counter set to zero"; } diff --git a/wppost/wppost.php b/wppost/wppost.php index 2a0222f75..12fc19b80 100644 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -151,17 +151,17 @@ function wppost_settings(&$a,&$s) { function wppost_settings_post(&$a,&$b) { if(!empty($_POST['wppost-submit'])) { - PConfig::set(local_user(),'wppost','post',intval($_POST['wppost'])); - PConfig::set(local_user(),'wppost','post_by_default',intval($_POST['wp_bydefault'] ?? false)); - PConfig::set(local_user(),'wppost','wp_username',trim($_POST['wp_username'])); - PConfig::set(local_user(),'wppost','wp_password',trim($_POST['wp_password'])); - PConfig::set(local_user(),'wppost','wp_blog',trim($_POST['wp_blog'])); - PConfig::set(local_user(),'wppost','backlink',trim($_POST['wp_backlink'] ?? '')); - PConfig::set(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck'])); + DI::pConfig()->set(local_user(),'wppost','post',intval($_POST['wppost'])); + DI::pConfig()->set(local_user(),'wppost','post_by_default',intval($_POST['wp_bydefault'] ?? false)); + DI::pConfig()->set(local_user(),'wppost','wp_username',trim($_POST['wp_username'])); + DI::pConfig()->set(local_user(),'wppost','wp_password',trim($_POST['wp_password'])); + DI::pConfig()->set(local_user(),'wppost','wp_blog',trim($_POST['wp_blog'])); + DI::pConfig()->set(local_user(),'wppost','backlink',trim($_POST['wp_backlink'] ?? '')); + DI::pConfig()->set(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck'])); $wp_backlink_text = Strings::escapeTags(trim($_POST['wp_backlink_text'])); $wp_backlink_text = BBCode::convert($wp_backlink_text, false, 8); $wp_backlink_text = HTML::toPlaintext($wp_backlink_text, 0, true); - PConfig::set(local_user(),'wppost','wp_backlink_text', $wp_backlink_text); + DI::pConfig()->set(local_user(),'wppost','wp_backlink_text', $wp_backlink_text); } } diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php index ce31822d1..6b962c78b 100644 --- a/xmpp/xmpp.php +++ b/xmpp/xmpp.php @@ -38,9 +38,9 @@ function xmpp_addon_settings_post() return; } - PConfig::set(local_user(), 'xmpp', 'enabled', $_POST['xmpp_enabled'] ?? false); - PConfig::set(local_user(), 'xmpp', 'individual', $_POST['xmpp_individual'] ?? false); - PConfig::set(local_user(), 'xmpp', 'bosh_proxy', $_POST['xmpp_bosh_proxy'] ?? ''); + DI::pConfig()->set(local_user(), 'xmpp', 'enabled', $_POST['xmpp_enabled'] ?? false); + DI::pConfig()->set(local_user(), 'xmpp', 'individual', $_POST['xmpp_individual'] ?? false); + DI::pConfig()->set(local_user(), 'xmpp', 'bosh_proxy', $_POST['xmpp_bosh_proxy'] ?? ''); info(L10n::t('XMPP settings updated.') . EOL); } @@ -102,7 +102,7 @@ function xmpp_login() { if (empty($_SESSION['allow_api'])) { $password = Strings::getRandomHex(16); - PConfig::set(local_user(), 'xmpp', 'password', $password); + DI::pConfig()->set(local_user(), 'xmpp', 'password', $password); } } @@ -165,7 +165,7 @@ function xmpp_converse(App $a) if ($password == "") { $password = Strings::getRandomHex(16); - PConfig::set(local_user(), "xmpp", "password", $password); + DI::pConfig()->set(local_user(), "xmpp", "password", $password); } $jid = $a->user["nickname"] . "@" . DI::baseUrl()->getHostname() . "/converse-" . Strings::getRandomHex(5); From 346bf125a70141f8999beb9cc73866919c232b02 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sat, 18 Jan 2020 16:56:45 +0100 Subject: [PATCH 4/5] Move PConfig::delete() to DI::pConfig()->delete() --- catavatar/catavatar.php | 2 +- ifttt/ifttt.php | 2 +- mailstream/mailstream.php | 8 ++++---- pumpio/pumpio.php | 2 +- statusnet/statusnet.php | 28 ++++++++++++++-------------- twitter/twitter.php | 26 +++++++++++++------------- widgets/widgets.php | 2 +- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php index 184064901..8baf04579 100644 --- a/catavatar/catavatar.php +++ b/catavatar/catavatar.php @@ -128,7 +128,7 @@ function catavatar_addon_settings_post(App $a, &$s) } if (!empty($_POST['catavatar-emailcat'])) { - PConfig::delete(local_user(), 'catavatar', 'seed'); + DI::pConfig()->delete(local_user(), 'catavatar', 'seed'); } } diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index 2be43de20..44c58739f 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -89,7 +89,7 @@ function ifttt_settings(App $a, &$s) function ifttt_settings_post() { if (!empty($_POST['ifttt-submit']) && isset($_POST['ifttt-rekey'])) { - PConfig::delete(local_user(), 'ifttt', 'key'); + DI::pConfig()->delete(local_user(), 'ifttt', 'key'); } } diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index 4aad1d225..3513d5813 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -403,25 +403,25 @@ function mailstream_addon_settings_post($a,$post) { DI::pConfig()->set(local_user(), 'mailstream', 'address', $_POST['mailstream_address']); } else { - PConfig::delete(local_user(), 'mailstream', 'address'); + DI::pConfig()->delete(local_user(), 'mailstream', 'address'); } if ($_POST['mailstream_nolikes']) { DI::pConfig()->set(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']); } else { - PConfig::delete(local_user(), 'mailstream', 'nolikes'); + DI::pConfig()->delete(local_user(), 'mailstream', 'nolikes'); } if ($_POST['mailstream_enabled']) { DI::pConfig()->set(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']); } else { - PConfig::delete(local_user(), 'mailstream', 'enabled'); + DI::pConfig()->delete(local_user(), 'mailstream', 'enabled'); } if ($_POST['mailstream_attachimg']) { DI::pConfig()->set(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']); } else { - PConfig::delete(local_user(), 'mailstream', 'attachimg'); + DI::pConfig()->delete(local_user(), 'mailstream', 'attachimg'); } } diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 70352adce..08a1696bc 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -373,7 +373,7 @@ function pumpio_settings_post(App $a, array &$b) DI::pConfig()->set(local_user(), 'pumpio', 'post_by_default', $_POST['pumpio_bydefault'] ?? false); if (!empty($_POST['pumpio_mirror'])) { - PConfig::delete(local_user(), 'pumpio', 'lastdate'); + DI::pConfig()->delete(local_user(), 'pumpio', 'lastdate'); } } } diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index e19b7e3fc..5eaffc3d9 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -134,18 +134,18 @@ function statusnet_settings_post(App $a, $post) /* * * * if the GNU Social-disconnect checkbox is set, clear the GNU Social configuration */ - PConfig::delete(local_user(), 'statusnet', 'consumerkey'); - PConfig::delete(local_user(), 'statusnet', 'consumersecret'); - PConfig::delete(local_user(), 'statusnet', 'post'); - PConfig::delete(local_user(), 'statusnet', 'post_by_default'); - PConfig::delete(local_user(), 'statusnet', 'oauthtoken'); - PConfig::delete(local_user(), 'statusnet', 'oauthsecret'); - PConfig::delete(local_user(), 'statusnet', 'baseapi'); - PConfig::delete(local_user(), 'statusnet', 'lastid'); - PConfig::delete(local_user(), 'statusnet', 'mirror_posts'); - PConfig::delete(local_user(), 'statusnet', 'import'); - PConfig::delete(local_user(), 'statusnet', 'create_user'); - PConfig::delete(local_user(), 'statusnet', 'own_url'); + DI::pConfig()->delete(local_user(), 'statusnet', 'consumerkey'); + DI::pConfig()->delete(local_user(), 'statusnet', 'consumersecret'); + DI::pConfig()->delete(local_user(), 'statusnet', 'post'); + DI::pConfig()->delete(local_user(), 'statusnet', 'post_by_default'); + DI::pConfig()->delete(local_user(), 'statusnet', 'oauthtoken'); + DI::pConfig()->delete(local_user(), 'statusnet', 'oauthsecret'); + DI::pConfig()->delete(local_user(), 'statusnet', 'baseapi'); + DI::pConfig()->delete(local_user(), 'statusnet', 'lastid'); + DI::pConfig()->delete(local_user(), 'statusnet', 'mirror_posts'); + DI::pConfig()->delete(local_user(), 'statusnet', 'import'); + DI::pConfig()->delete(local_user(), 'statusnet', 'create_user'); + DI::pConfig()->delete(local_user(), 'statusnet', 'own_url'); } else { if (isset($_POST['statusnet-preconf-apiurl'])) { /* * * @@ -225,7 +225,7 @@ function statusnet_settings_post(App $a, $post) DI::pConfig()->set(local_user(), 'statusnet', 'create_user', intval($_POST['statusnet-create_user'])); if (!intval($_POST['statusnet-mirror'])) - PConfig::delete(local_user(), 'statusnet', 'lastid'); + DI::pConfig()->delete(local_user(), 'statusnet', 'lastid'); info(L10n::t('GNU Social settings updated.') . EOL); } @@ -1575,7 +1575,7 @@ function statusnet_fetch_own_contact(App $a, $uid) if (DBA::isResult($r)) { $contact_id = $r[0]["id"]; } else { - PConfig::delete($uid, 'statusnet', 'own_url'); + DI::pConfig()->delete($uid, 'statusnet', 'own_url'); } } return $contact_id; diff --git a/twitter/twitter.php b/twitter/twitter.php index fe66886f2..25c48a95f 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -227,17 +227,17 @@ function twitter_settings_post(App $a) * if the twitter-disconnect checkbox is set, clear the OAuth key/secret pair * from the user configuration */ - PConfig::delete(local_user(), 'twitter', 'consumerkey'); - PConfig::delete(local_user(), 'twitter', 'consumersecret'); - PConfig::delete(local_user(), 'twitter', 'oauthtoken'); - PConfig::delete(local_user(), 'twitter', 'oauthsecret'); - PConfig::delete(local_user(), 'twitter', 'post'); - PConfig::delete(local_user(), 'twitter', 'post_by_default'); - PConfig::delete(local_user(), 'twitter', 'lastid'); - PConfig::delete(local_user(), 'twitter', 'mirror_posts'); - PConfig::delete(local_user(), 'twitter', 'import'); - PConfig::delete(local_user(), 'twitter', 'create_user'); - PConfig::delete(local_user(), 'twitter', 'own_id'); + DI::pConfig()->delete(local_user(), 'twitter', 'consumerkey'); + DI::pConfig()->delete(local_user(), 'twitter', 'consumersecret'); + DI::pConfig()->delete(local_user(), 'twitter', 'oauthtoken'); + DI::pConfig()->delete(local_user(), 'twitter', 'oauthsecret'); + DI::pConfig()->delete(local_user(), 'twitter', 'post'); + DI::pConfig()->delete(local_user(), 'twitter', 'post_by_default'); + DI::pConfig()->delete(local_user(), 'twitter', 'lastid'); + DI::pConfig()->delete(local_user(), 'twitter', 'mirror_posts'); + DI::pConfig()->delete(local_user(), 'twitter', 'import'); + DI::pConfig()->delete(local_user(), 'twitter', 'create_user'); + DI::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 @@ -275,7 +275,7 @@ function twitter_settings_post(App $a) DI::pConfig()->set(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user'])); if (!intval($_POST['twitter-mirror'])) { - PConfig::delete(local_user(), 'twitter', 'lastid'); + DI::pConfig()->delete(local_user(), 'twitter', 'lastid'); } info(L10n::t('Twitter settings updated.') . EOL); @@ -1834,7 +1834,7 @@ function twitter_fetch_own_contact(App $a, $uid) if (DBA::isResult($r)) { $contact_id = $r[0]["id"]; } else { - PConfig::delete($uid, 'twitter', 'own_id'); + DI::pConfig()->delete($uid, 'twitter', 'own_id'); } } diff --git a/widgets/widgets.php b/widgets/widgets.php index 0d8d2a703..35dbfa5e1 100644 --- a/widgets/widgets.php +++ b/widgets/widgets.php @@ -30,7 +30,7 @@ function widgets_settings_post(){ if(! local_user()) return; if (isset($_POST['widgets-submit'])){ - PConfig::delete(local_user(), 'widgets', 'key'); + DI::pConfig()->delete(local_user(), 'widgets', 'key'); } } From a26bfe79e97813ebe4c27fa3cb65c32669a9f2e5 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sat, 18 Jan 2020 17:02:59 +0100 Subject: [PATCH 5/5] Remove unused `use` statements & remove PConfig class --- blockem/blockem.php | 1 - blogger/blogger.php | 1 - buffer/buffer.php | 1 - catavatar/catavatar.php | 1 - curweather/curweather.php | 2 -- diaspora/diaspora.php | 2 -- discourse/discourse.php | 2 -- dwpost/dwpost.php | 1 - fromapp/fromapp.php | 1 - geonames/geonames.php | 1 - gnot/gnot.php | 1 - group_text/group_text.php | 1 - ifttt/ifttt.php | 1 - ijpost/ijpost.php | 1 - irc/irc.php | 1 - jappixmini/jappixmini.php | 1 - krynn/krynn.php | 1 - langfilter/langfilter.php | 1 - libertree/libertree.php | 1 - ljpost/ljpost.php | 1 - mailstream/mailstream.php | 1 - markdown/markdown.php | 2 -- mathjax/mathjax.php | 1 - notimeline/notimeline.php | 1 - nsfw/nsfw.php | 1 - numfriends/numfriends.php | 1 - planets/planets.php | 1 - pumpio/pumpio.php | 1 - qcomment/qcomment.php | 1 - randplace/randplace.php | 1 - remote_permissions/remote_permissions.php | 1 - securemail/securemail.php | 1 - showmore/showmore.php | 1 - startpage/startpage.php | 2 -- statusnet/statusnet.php | 1 - superblock/superblock.php | 1 - tumblr/tumblr.php | 1 - twitter/twitter.php | 1 - widgets/widgets.php | 1 - windowsphonepush/windowsphonepush.php | 1 - wppost/wppost.php | 1 - xmpp/xmpp.php | 1 - 42 files changed, 47 deletions(-) diff --git a/blockem/blockem.php b/blockem/blockem.php index 80bf83854..235381fa8 100644 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -10,7 +10,6 @@ use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig; use Friendica\DI; use Friendica\Util\Strings; diff --git a/blogger/blogger.php b/blogger/blogger.php index 847bcea89..18a1b8eac 100644 --- a/blogger/blogger.php +++ b/blogger/blogger.php @@ -11,7 +11,6 @@ use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\DI; use Friendica\Util\Network; use Friendica\Util\XML; diff --git a/buffer/buffer.php b/buffer/buffer.php index 2e2970752..667eac309 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -13,7 +13,6 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\Database\DBA; diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php index 8baf04579..49c6cc423 100644 --- a/catavatar/catavatar.php +++ b/catavatar/catavatar.php @@ -11,7 +11,6 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Core\Worker; use Friendica\Database\DBA; diff --git a/curweather/curweather.php b/curweather/curweather.php index 460a148f5..6b6f8e902 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -10,11 +10,9 @@ */ use Friendica\App; -use Friendica\Core\Cache; use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Core\Session; use Friendica\DI; diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index e33b7fde8..bf3cae2b9 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -14,8 +14,6 @@ use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; -use Friendica\Core\Protocol; use Friendica\Database\DBA; use Friendica\Core\Worker; use Friendica\DI; diff --git a/discourse/discourse.php b/discourse/discourse.php index 7bb75edae..f53db17cf 100644 --- a/discourse/discourse.php +++ b/discourse/discourse.php @@ -11,13 +11,11 @@ use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Core\Protocol; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Util\XML; use Friendica\Content\Text\Markdown; use Friendica\Util\Network; use Friendica\Util\Strings; diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php index 875676652..975d703ed 100644 --- a/dwpost/dwpost.php +++ b/dwpost/dwpost.php @@ -13,7 +13,6 @@ use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Util\DateTimeFormat; diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php index 49a3bacf2..a796920d6 100644 --- a/fromapp/fromapp.php +++ b/fromapp/fromapp.php @@ -9,7 +9,6 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\DI; function fromapp_install() diff --git a/geonames/geonames.php b/geonames/geonames.php index 15e3339d7..6e2ee95ec 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -11,7 +11,6 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Util\ConfigFileLoader; diff --git a/gnot/gnot.php b/gnot/gnot.php index a3323fdde..128b37dd7 100644 --- a/gnot/gnot.php +++ b/gnot/gnot.php @@ -10,7 +10,6 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\DI; diff --git a/group_text/group_text.php b/group_text/group_text.php index b82c751b2..07ad8102d 100644 --- a/group_text/group_text.php +++ b/group_text/group_text.php @@ -8,7 +8,6 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\DI; function group_text_install() { diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index 44c58739f..58ba1cf9e 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -11,7 +11,6 @@ use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Database\DBA; use Friendica\DI; diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php index 603c0969a..02770ce06 100644 --- a/ijpost/ijpost.php +++ b/ijpost/ijpost.php @@ -12,7 +12,6 @@ use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\DI; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; diff --git a/irc/irc.php b/irc/irc.php index ad4164cbf..bc26ff499 100644 --- a/irc/irc.php +++ b/irc/irc.php @@ -10,7 +10,6 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\DI; diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index d3c79c771..84c890645 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -67,7 +67,6 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Database\DBA; use Friendica\DI; diff --git a/krynn/krynn.php b/krynn/krynn.php index 62959bb62..63418ebf2 100644 --- a/krynn/krynn.php +++ b/krynn/krynn.php @@ -12,7 +12,6 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\DI; function krynn_install() { diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index 0ddd85484..0293e119c 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -11,7 +11,6 @@ use Friendica\App; use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\DI; diff --git a/libertree/libertree.php b/libertree/libertree.php index a98419e36..3fa5f90dc 100644 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -11,7 +11,6 @@ use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Util\Network; diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php index ab47416f9..457343fc1 100644 --- a/ljpost/ljpost.php +++ b/ljpost/ljpost.php @@ -12,7 +12,6 @@ use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\DI; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index 3513d5813..d2a31e427 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -11,7 +11,6 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; diff --git a/markdown/markdown.php b/markdown/markdown.php index 854bc6898..ce7553e05 100644 --- a/markdown/markdown.php +++ b/markdown/markdown.php @@ -7,10 +7,8 @@ */ use Friendica\App; use Friendica\Core\Hook; -use Friendica\Core\Logger; use Friendica\Content\Text\Markdown; use Friendica\Core\Renderer; -use Friendica\Core\PConfig; use Friendica\Core\L10n; use Friendica\DI; diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php index 718a62faf..685a53b29 100644 --- a/mathjax/mathjax.php +++ b/mathjax/mathjax.php @@ -11,7 +11,6 @@ use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\DI; diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php index d090b7441..afb30fb5a 100644 --- a/notimeline/notimeline.php +++ b/notimeline/notimeline.php @@ -9,7 +9,6 @@ */ use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig; use Friendica\DI; function notimeline_install() diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index 4369df408..70a18416a 100644 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -9,7 +9,6 @@ */ use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig; use Friendica\DI; function nsfw_install() diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php index 773cc6501..1e0609bd7 100644 --- a/numfriends/numfriends.php +++ b/numfriends/numfriends.php @@ -8,7 +8,6 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\DI; function numfriends_install() { diff --git a/planets/planets.php b/planets/planets.php index e7a1e9b88..18515694b 100644 --- a/planets/planets.php +++ b/planets/planets.php @@ -9,7 +9,6 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\DI; function planets_install() { diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 08a1696bc..92132a98a 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -13,7 +13,6 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Core\Worker; use Friendica\Database\DBA; diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php index b4190e2ef..8b67914ce 100644 --- a/qcomment/qcomment.php +++ b/qcomment/qcomment.php @@ -19,7 +19,6 @@ */ use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig; use Friendica\DI; use Friendica\Util\XML; diff --git a/randplace/randplace.php b/randplace/randplace.php index f08f85b32..2ffe167ef 100644 --- a/randplace/randplace.php +++ b/randplace/randplace.php @@ -21,7 +21,6 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\DI; function randplace_install() { diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php index 1a457872b..163cdee52 100644 --- a/remote_permissions/remote_permissions.php +++ b/remote_permissions/remote_permissions.php @@ -10,7 +10,6 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; diff --git a/securemail/securemail.php b/securemail/securemail.php index 37e4eef04..fd074b720 100644 --- a/securemail/securemail.php +++ b/securemail/securemail.php @@ -11,7 +11,6 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Util\Emailer; diff --git a/showmore/showmore.php b/showmore/showmore.php index acd8e33db..9fe3497fa 100644 --- a/showmore/showmore.php +++ b/showmore/showmore.php @@ -9,7 +9,6 @@ */ use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig; use Friendica\DI; use Friendica\Util\Strings; diff --git a/startpage/startpage.php b/startpage/startpage.php index 8feb63128..2d1ffd3c8 100644 --- a/startpage/startpage.php +++ b/startpage/startpage.php @@ -8,8 +8,6 @@ */ use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig; -use Friendica\Core\System; use Friendica\DI; function startpage_install() { diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 5eaffc3d9..31dbd3fb6 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -46,7 +46,6 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\Database\DBA; diff --git a/superblock/superblock.php b/superblock/superblock.php index 6b7dae22e..b5a0ea0cf 100644 --- a/superblock/superblock.php +++ b/superblock/superblock.php @@ -8,7 +8,6 @@ */ use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig; use Friendica\DI; use Friendica\Util\Strings; diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index 038237e41..1b618a7ae 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -15,7 +15,6 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; diff --git a/twitter/twitter.php b/twitter/twitter.php index 25c48a95f..7fe8bd844 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -73,7 +73,6 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\Core\Worker; diff --git a/widgets/widgets.php b/widgets/widgets.php index 35dbfa5e1..d9ecb890c 100644 --- a/widgets/widgets.php +++ b/widgets/widgets.php @@ -10,7 +10,6 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php index efae2f2e7..1d9dd27d9 100644 --- a/windowsphonepush/windowsphonepush.php +++ b/windowsphonepush/windowsphonepush.php @@ -32,7 +32,6 @@ use Friendica\Content\Text\HTML; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Item; diff --git a/wppost/wppost.php b/wppost/wppost.php index 12fc19b80..d8d2431f1 100644 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -11,7 +11,6 @@ use Friendica\Content\Text\HTML; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Util\Network; diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php index 6b962c78b..552f5f9e5 100644 --- a/xmpp/xmpp.php +++ b/xmpp/xmpp.php @@ -11,7 +11,6 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Util\Strings;