Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 05:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
nupplaPhil 2020-01-18 16:50:57 +01:00
parent 6e2880c679
commit 9e9429b56d
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
61 changed files with 190 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Filer/SaveTag.php
View file

@ -41,7 +41,7 @@ class SaveTag extends BaseModule
}
// return filer dialog
$filetags = PConfig::get(local_user(), 'system', 'filetags', '');
$filetags = DI::pConfig()->get(local_user(), 'system', 'filetags', '');
$filetags = Model\FileTag::fileToArray($filetags);
$tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");

2
src/Module/Group.php
View file

@ -146,7 +146,7 @@ class Group extends BaseModule
}
// Switch to text mode interface if we have more than 'n' contacts or group members
$switchtotext = PConfig::get(local_user(), 'system', 'groupedit_image_limit');
$switchtotext = DI::pConfig()->get(local_user(), 'system', 'groupedit_image_limit');
if (is_null($switchtotext)) {
$switchtotext = Config::get('system', 'groupedit_image_limit', 200);
}

6
src/Module/Invite.php
View file

@ -33,7 +33,7 @@ class Invite extends BaseModule
$max_invites = 50;
}
$current_invites = intval(PConfig::get(local_user(), 'system', 'sent_invites'));
$current_invites = intval(DI::pConfig()->get(local_user(), 'system', 'sent_invites'));
if ($current_invites > $max_invites) {
throw new HTTPException\ForbiddenException(L10n::t('Total invitation limit exceeded.'));
}
@ -48,7 +48,7 @@ class Invite extends BaseModule
if ($config->get('system', 'invitation_only')) {
$invitation_only = true;
$invites_remaining = PConfig::get(local_user(), 'system', 'invites_remaining');
$invites_remaining = DI::pConfig()->get(local_user(), 'system', 'invites_remaining');
if ((!$invites_remaining) && (!is_site_admin())) {
throw new HTTPException\ForbiddenException();
}
@ -118,7 +118,7 @@ class Invite extends BaseModule
if ($config->get('system', 'invitation_only')) {
$inviteOnly = true;
$x = PConfig::get(local_user(), 'system', 'invites_remaining');
$x = DI::pConfig()->get(local_user(), 'system', 'invites_remaining');
if ((!$x) && (!is_site_admin())) {
throw new HTTPException\ForbiddenException(L10n::t('You have no more invitations available'));
}

4
src/Module/Profile.php
View file

@ -293,9 +293,9 @@ class Profile extends BaseModule
// check if we serve a mobile device and get the user settings
// accordingly
if (DI::mode()->isMobile()) {
$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network', 10);
$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', 10);
} else {
$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network', 20);
$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network', 20);
}
// now that we have the user settings, see if the theme forces

2
src/Module/Security/TwoFactor/Verify.php
View file

@ -33,7 +33,7 @@ class Verify extends BaseModule
$code = $_POST['verify_code'] ?? '';
$valid = (new Google2FA())->verifyKey(PConfig::get(local_user(), '2fa', 'secret'), $code);
$valid = (new Google2FA())->verifyKey(DI::pConfig()->get(local_user(), '2fa', 'secret'), $code);
// The same code can't be used twice even if it's valid
if ($valid && Session::get('2fa') !== $code) {

2
src/Module/Settings/TwoFactor/AppSpecific.php
View file

@ -27,7 +27,7 @@ class AppSpecific extends BaseSettingsModule
return;
}
$verified = PConfig::get(local_user(), '2fa', 'verified');
$verified = DI::pConfig()->get(local_user(), '2fa', 'verified');
if (!$verified) {
DI::baseUrl()->redirect('settings/2fa');

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

@ -29,8 +29,8 @@ class Index extends BaseSettingsModule
try {
User::getIdFromPasswordAuthentication(local_user(), $_POST['password'] ?? '');
$has_secret = (bool) PConfig::get(local_user(), '2fa', 'secret');
$verified = PConfig::get(local_user(), '2fa', 'verified');
$has_secret = (bool) DI::pConfig()->get(local_user(), '2fa', 'secret');
$verified = DI::pConfig()->get(local_user(), '2fa', 'verified');
switch ($_POST['action'] ?? '') {
case 'enable':
@ -82,8 +82,8 @@ class Index extends BaseSettingsModule
parent::content($parameters);
$has_secret = (bool) PConfig::get(local_user(), '2fa', 'secret');
$verified = PConfig::get(local_user(), '2fa', 'verified');
$has_secret = (bool) DI::pConfig()->get(local_user(), '2fa', 'secret');
$verified = DI::pConfig()->get(local_user(), '2fa', 'verified');
return Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/twofactor/index.tpl'), [
'$form_security_token' => self::getFormSecurityToken('settings_2fa'),

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

@ -25,7 +25,7 @@ class Recovery extends BaseSettingsModule
return;
}
$secret = PConfig::get(local_user(), '2fa', 'secret');
$secret = DI::pConfig()->get(local_user(), '2fa', 'secret');
if (!$secret) {
DI::baseUrl()->redirect('settings/2fa');
@ -68,7 +68,7 @@ class Recovery extends BaseSettingsModule
$recoveryCodes = RecoveryCode::getListForUser(local_user());
$verified = PConfig::get(local_user(), '2fa', 'verified');
$verified = DI::pConfig()->get(local_user(), '2fa', 'verified');
return Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/twofactor/recovery.tpl'), [
'$form_security_token' => self::getFormSecurityToken('settings_2fa_recovery'),

8
src/Module/Settings/TwoFactor/Verify.php
View file

@ -31,8 +31,8 @@ class Verify extends BaseSettingsModule
return;
}
$secret = PConfig::get(local_user(), '2fa', 'secret');
$verified = PConfig::get(local_user(), '2fa', 'verified');
$secret = DI::pConfig()->get(local_user(), '2fa', 'secret');
$verified = DI::pConfig()->get(local_user(), '2fa', 'verified');
if ($secret && $verified) {
DI::baseUrl()->redirect('settings/2fa');
@ -55,7 +55,7 @@ class Verify extends BaseSettingsModule
$google2fa = new Google2FA();
$valid = $google2fa->verifyKey(PConfig::get(local_user(), '2fa', 'secret'), $_POST['verify_code'] ?? '');
$valid = $google2fa->verifyKey(DI::pConfig()->get(local_user(), '2fa', 'secret'), $_POST['verify_code'] ?? '');
if ($valid) {
PConfig::set(local_user(), '2fa', 'verified', true);
@ -80,7 +80,7 @@ class Verify extends BaseSettingsModule
$company = 'Friendica';
$holder = Session::get('my_address');
$secret = PConfig::get(local_user(), '2fa', 'secret');
$secret = DI::pConfig()->get(local_user(), '2fa', 'secret');
$otpauthUrl = (new Google2FA())->getQRCodeUrl($company, $holder, $secret);