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 = ""; }