bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move PConfig::delete() to DI::pConfig()->delete()

Browse source
This commit is contained in:
Philipp Holzer 2020-01-18 16:56:46 +01:00
parent 88bb66371c
commit b5c0df439f
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
4 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mod/ostatus_subscribe.php
View file

@ -29,14 +29,14 @@ function ostatus_subscribe_content(App $a)
if (DI::pConfig()->get($uid, 'ostatus', 'legacy_friends') == '') { if (DI::pConfig()->get($uid, 'ostatus', 'legacy_friends') == '') {
if ($_REQUEST['url'] == '') { if ($_REQUEST['url'] == '') {
PConfig::delete($uid, 'ostatus', 'legacy_contact'); DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
return $o . L10n::t('No contact provided.'); return $o . L10n::t('No contact provided.');
} }
$contact = Probe::uri($_REQUEST['url']); $contact = Probe::uri($_REQUEST['url']);
if (!$contact) { if (!$contact) {
PConfig::delete($uid, 'ostatus', 'legacy_contact'); DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
return $o . L10n::t('Couldn\'t fetch information for contact.'); return $o . L10n::t('Couldn\'t fetch information for contact.');
} }
@ -46,7 +46,7 @@ function ostatus_subscribe_content(App $a)
$curlResult = Network::curl($api . 'statuses/friends.json?screen_name=' . $contact['nick']); $curlResult = Network::curl($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
if (!$curlResult->isSuccess()) { if (!$curlResult->isSuccess()) {
PConfig::delete($uid, 'ostatus', 'legacy_contact'); DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
return $o . L10n::t('Couldn\'t fetch friends for contact.'); return $o . L10n::t('Couldn\'t fetch friends for contact.');
} }
@ -63,8 +63,8 @@ function ostatus_subscribe_content(App $a)
if ($counter >= $total) { if ($counter >= $total) {
DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . DI::baseUrl() . '/settings/connectors">'; DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . DI::baseUrl() . '/settings/connectors">';
PConfig::delete($uid, 'ostatus', 'legacy_friends'); DI::pConfig()->delete($uid, 'ostatus', 'legacy_friends');
PConfig::delete($uid, 'ostatus', 'legacy_contact'); DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
$o .= L10n::t('Done'); $o .= L10n::t('Done');
return $o; return $o;
} }

13
src/Core/PConfig.php
View file

@ -19,17 +19,4 @@ use Friendica\DI;
*/ */
class PConfig class PConfig
{ {
/**
* @brief Deletes the given key from the users's configuration.
*
* @param int $uid The user_id
* @param string $cat The category of the configuration value
* @param string $key The configuration key to delete
*
* @return bool
*/
public static function delete(int $uid, string $cat, string $key)
{
return DI::pConfig()->delete($uid, $cat, $key);
}
} }

4
src/Module/Settings/TwoFactor/Index.php
View file

@ -45,8 +45,8 @@ class Index extends BaseSettingsModule
case 'disable': case 'disable':
if ($has_secret) { if ($has_secret) {
RecoveryCode::deleteForUser(local_user()); RecoveryCode::deleteForUser(local_user());
PConfig::delete(local_user(), '2fa', 'secret'); DI::pConfig()->delete(local_user(), '2fa', 'secret');
PConfig::delete(local_user(), '2fa', 'verified'); DI::pConfig()->delete(local_user(), '2fa', 'verified');
Session::remove('2fa'); Session::remove('2fa');
notice(L10n::t('Two-factor authentication successfully disabled.')); notice(L10n::t('Two-factor authentication successfully disabled.'));

6
update.php
View file

@ -135,7 +135,7 @@ function update_1191()
$value = $rr['v']; $value = $rr['v'];
if ($key === 'randomise') { if ($key === 'randomise') {
PConfig::delete($uid, $family, $key); DI::pConfig()->delete($uid, $family, $key);
} }
if ($key === 'show_on_profile') { if ($key === 'show_on_profile') {
@ -143,7 +143,7 @@ function update_1191()
DI::pConfig()->set($uid, feature, forumlist_profile, $value); DI::pConfig()->set($uid, feature, forumlist_profile, $value);
} }
PConfig::delete($uid, $family, $key); DI::pConfig()->delete($uid, $family, $key);
} }
if ($key === 'show_on_network') { if ($key === 'show_on_network') {
@ -151,7 +151,7 @@ function update_1191()
DI::pConfig()->set($uid, feature, forumlist_widget, $value); DI::pConfig()->set($uid, feature, forumlist_widget, $value);
} }
PConfig::delete($uid, $family, $key); DI::pConfig()->delete($uid, $family, $key);
} }
} }
} }