From f56e7651582ea9bf943d9a0c16460c1341c3bc87 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 7 Sep 2020 10:17:42 +0000
Subject: [PATCH] Issue 9153 Use "info" instead of "notice" on successful
operations
---
src/Module/Admin/Blocklist/Contact.php | 4 ++--
src/Module/Admin/Users.php | 10 +++++-----
src/Module/Group.php | 2 +-
src/Module/Invite.php | 2 +-
src/Module/Security/TwoFactor/Recovery.php | 2 +-
src/Module/Settings/Profile/Photo/Crop.php | 2 +-
src/Module/Settings/TwoFactor/AppSpecific.php | 6 +++---
src/Module/Settings/TwoFactor/Index.php | 2 +-
src/Module/Settings/TwoFactor/Recovery.php | 2 +-
src/Module/Settings/TwoFactor/Verify.php | 2 +-
10 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/Module/Admin/Blocklist/Contact.php b/src/Module/Admin/Blocklist/Contact.php
index 8893623234..fd65d4db27 100644
--- a/src/Module/Admin/Blocklist/Contact.php
+++ b/src/Module/Admin/Blocklist/Contact.php
@@ -44,7 +44,7 @@ class Contact extends BaseAdmin
$contact_id = Model\Contact::getIdForURL($contact_url);
if ($contact_id) {
Model\Contact::block($contact_id, $block_reason);
- notice(DI::l10n()->t('The contact has been blocked from the node'));
+ info(DI::l10n()->t('The contact has been blocked from the node'));
} else {
notice(DI::l10n()->t('Could not find any contact entry for this URL (%s)', $contact_url));
}
@@ -54,7 +54,7 @@ class Contact extends BaseAdmin
foreach ($contacts as $uid) {
Model\Contact::unblock($uid);
}
- notice(DI::l10n()->tt('%s contact unblocked', '%s contacts unblocked', count($contacts)));
+ info(DI::l10n()->tt('%s contact unblocked', '%s contacts unblocked', count($contacts)));
}
DI::baseUrl()->redirect('admin/blocklist/contact');
diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php
index 41a691b0b7..84571d8c9a 100644
--- a/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@ -58,14 +58,14 @@ class Users extends BaseAdmin
foreach ($users as $uid) {
User::block($uid);
}
- notice(DI::l10n()->tt('%s user blocked', '%s users blocked', count($users)));
+ info(DI::l10n()->tt('%s user blocked', '%s users blocked', count($users)));
}
if (!empty($_POST['page_users_unblock'])) {
foreach ($users as $uid) {
User::block($uid, false);
}
- notice(DI::l10n()->tt('%s user unblocked', '%s users unblocked', count($users)));
+ info(DI::l10n()->tt('%s user unblocked', '%s users unblocked', count($users)));
}
if (!empty($_POST['page_users_delete'])) {
@@ -77,21 +77,21 @@ class Users extends BaseAdmin
}
}
- notice(DI::l10n()->tt('%s user deleted', '%s users deleted', count($users)));
+ info(DI::l10n()->tt('%s user deleted', '%s users deleted', count($users)));
}
if (!empty($_POST['page_users_approve'])) {
foreach ($pending as $hash) {
User::allow($hash);
}
- notice(DI::l10n()->tt('%s user approved', '%s users approved', count($pending)));
+ info(DI::l10n()->tt('%s user approved', '%s users approved', count($pending)));
}
if (!empty($_POST['page_users_deny'])) {
foreach ($pending as $hash) {
User::deny($hash);
}
- notice(DI::l10n()->tt('%s registration revoked', '%s registrations revoked', count($pending)));
+ info(DI::l10n()->tt('%s registration revoked', '%s registrations revoked', count($pending)));
}
DI::baseUrl()->redirect('admin/users');
diff --git a/src/Module/Group.php b/src/Module/Group.php
index d9caac32da..e22163ecc3 100644
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -131,7 +131,7 @@ class Group extends BaseModule
throw new \Exception(DI::l10n()->t('Bad request.'), 400);
}
- notice($message);
+ info($message);
System::jsonExit(['status' => 'OK', 'message' => $message]);
} catch (\Exception $e) {
notice($e->getMessage());
diff --git a/src/Module/Invite.php b/src/Module/Invite.php
index cb944a3fd3..287478954c 100644
--- a/src/Module/Invite.php
+++ b/src/Module/Invite.php
@@ -119,7 +119,7 @@ class Invite extends BaseModule
}
}
- notice(DI::l10n()->tt('%d message sent.', '%d messages sent.', $total));
+ info(DI::l10n()->tt('%d message sent.', '%d messages sent.', $total));
}
public static function content(array $parameters = [])
diff --git a/src/Module/Security/TwoFactor/Recovery.php b/src/Module/Security/TwoFactor/Recovery.php
index 5168f3b67d..7af1b6ac01 100644
--- a/src/Module/Security/TwoFactor/Recovery.php
+++ b/src/Module/Security/TwoFactor/Recovery.php
@@ -57,7 +57,7 @@ class Recovery extends BaseModule
if (RecoveryCode::existsForUser(local_user(), $recovery_code)) {
RecoveryCode::markUsedForUser(local_user(), $recovery_code);
Session::set('2fa', true);
- notice(DI::l10n()->t('Remaining recovery codes: %d', RecoveryCode::countValidForUser(local_user())));
+ info(DI::l10n()->t('Remaining recovery codes: %d', RecoveryCode::countValidForUser(local_user())));
DI::auth()->setForUser($a, $a->user, true, true);
} else {
diff --git a/src/Module/Settings/Profile/Photo/Crop.php b/src/Module/Settings/Profile/Photo/Crop.php
index 00657b9a30..53676eca27 100644
--- a/src/Module/Settings/Profile/Photo/Crop.php
+++ b/src/Module/Settings/Profile/Photo/Crop.php
@@ -187,7 +187,7 @@ class Crop extends BaseSettings
Worker::add(PRIORITY_LOW, 'Directory', Session::get('my_url'));
}
- notice(DI::l10n()->t('Profile picture successfully updated.'));
+ info(DI::l10n()->t('Profile picture successfully updated.'));
DI::baseUrl()->redirect('profile/' . DI::app()->user['nickname']);
}
diff --git a/src/Module/Settings/TwoFactor/AppSpecific.php b/src/Module/Settings/TwoFactor/AppSpecific.php
index a654fe3573..db094a8855 100644
--- a/src/Module/Settings/TwoFactor/AppSpecific.php
+++ b/src/Module/Settings/TwoFactor/AppSpecific.php
@@ -74,13 +74,13 @@ class AppSpecific extends BaseSettings
DI::baseUrl()->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
} else {
self::$appSpecificPassword = AppSpecificPassword::generateForUser(local_user(), $_POST['description'] ?? '');
- notice(DI::l10n()->t('New app-specific password generated.'));
+ info(DI::l10n()->t('New app-specific password generated.'));
}
break;
case 'revoke_all' :
AppSpecificPassword::deleteAllForUser(local_user());
- notice(DI::l10n()->t('App-specific passwords successfully revoked.'));
+ info(DI::l10n()->t('App-specific passwords successfully revoked.'));
DI::baseUrl()->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
break;
}
@@ -90,7 +90,7 @@ class AppSpecific extends BaseSettings
self::checkFormSecurityTokenRedirectOnError('settings/2fa/app_specific', 'settings_2fa_app_specific');
if (AppSpecificPassword::deleteForUser(local_user(), $_POST['revoke_id'])) {
- notice(DI::l10n()->t('App-specific password successfully revoked.'));
+ info(DI::l10n()->t('App-specific password successfully revoked.'));
}
DI::baseUrl()->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
diff --git a/src/Module/Settings/TwoFactor/Index.php b/src/Module/Settings/TwoFactor/Index.php
index 60cfb516e1..37d78c995a 100644
--- a/src/Module/Settings/TwoFactor/Index.php
+++ b/src/Module/Settings/TwoFactor/Index.php
@@ -64,7 +64,7 @@ class Index extends BaseSettings
DI::pConfig()->delete(local_user(), '2fa', 'verified');
Session::remove('2fa');
- notice(DI::l10n()->t('Two-factor authentication successfully disabled.'));
+ info(DI::l10n()->t('Two-factor authentication successfully disabled.'));
DI::baseUrl()->redirect('settings/2fa');
}
break;
diff --git a/src/Module/Settings/TwoFactor/Recovery.php b/src/Module/Settings/TwoFactor/Recovery.php
index b5420be892..7b0d28534f 100644
--- a/src/Module/Settings/TwoFactor/Recovery.php
+++ b/src/Module/Settings/TwoFactor/Recovery.php
@@ -63,7 +63,7 @@ class Recovery extends BaseSettings
if ($_POST['action'] == 'regenerate') {
RecoveryCode::regenerateForUser(local_user());
- notice(DI::l10n()->t('New recovery codes successfully generated.'));
+ info(DI::l10n()->t('New recovery codes successfully generated.'));
DI::baseUrl()->redirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password'));
}
}
diff --git a/src/Module/Settings/TwoFactor/Verify.php b/src/Module/Settings/TwoFactor/Verify.php
index 2ea0eb4b85..27683f3fbb 100644
--- a/src/Module/Settings/TwoFactor/Verify.php
+++ b/src/Module/Settings/TwoFactor/Verify.php
@@ -75,7 +75,7 @@ class Verify extends BaseSettings
DI::pConfig()->set(local_user(), '2fa', 'verified', true);
Session::set('2fa', true);
- notice(DI::l10n()->t('Two-factor authentication successfully activated.'));
+ info(DI::l10n()->t('Two-factor authentication successfully activated.'));
DI::baseUrl()->redirect('settings/2fa');
} else {