From 897dbb30cfbf1b7faff81492f9a0f80795bba771 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 17 Oct 2022 20:17:25 +0000 Subject: [PATCH] Remove "notice" with new function --- birdavatar/birdavatar.php | 6 +++--- catavatar/catavatar.php | 6 +++--- curweather/curweather.php | 2 +- forumdirectory/forumdirectory.php | 4 ++-- notifyall/notifyall.php | 4 ++-- pumpio/pumpio.php | 2 +- securemail/securemail.php | 4 ++-- statusnet/statusnet.php | 4 ++-- tumblr/tumblr.php | 2 +- twitter/twitter.php | 8 ++++---- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/birdavatar/birdavatar.php b/birdavatar/birdavatar.php index 79753110..2fe1fa37 100644 --- a/birdavatar/birdavatar.php +++ b/birdavatar/birdavatar.php @@ -73,7 +73,7 @@ function birdavatar_addon_settings_post(App $a, &$s) $self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]); if (!DBA::isResult($self)) { - notice(DI::l10n()->t("The bird has not found itself.")); + DI::sysmsg()->addNotice(DI::l10n()->t("The bird has not found itself.")); return; } @@ -82,7 +82,7 @@ function birdavatar_addon_settings_post(App $a, &$s) $condition = ['uid' => local_user(), 'contact-id' => $self['id']]; $photo = DBA::selectFirst('photo', ['resource-id'], $condition); if (!DBA::isResult($photo)) { - notice(DI::l10n()->t('There was an error, the bird flew away.')); + DI::sysmsg()->addNotice(DI::l10n()->t('There was an error, the bird flew away.')); return; } @@ -98,7 +98,7 @@ function birdavatar_addon_settings_post(App $a, &$s) // Update global directory in background Profile::publishUpdate(local_user()); - info(DI::l10n()->t('Meow!')); + DI::sysmsg()->addInfo(DI::l10n()->t('Meow!')); return; } diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php index ce1fc78b..7a2bdc2e 100644 --- a/catavatar/catavatar.php +++ b/catavatar/catavatar.php @@ -74,7 +74,7 @@ function catavatar_addon_settings_post(App $a, &$s) $self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]); if (!DBA::isResult($self)) { - notice(DI::l10n()->t("The cat hadn't found itself.")); + DI::sysmsg()->addNotice(DI::l10n()->t("The cat hadn't found itself.")); return; } @@ -83,7 +83,7 @@ function catavatar_addon_settings_post(App $a, &$s) $condition = ['uid' => local_user(), 'contact-id' => $self['id']]; $photo = DBA::selectFirst('photo', ['resource-id'], $condition); if (!DBA::isResult($photo)) { - notice(DI::l10n()->t('There was an error, the cat ran away.')); + DI::sysmsg()->addNotice(DI::l10n()->t('There was an error, the cat ran away.')); return; } @@ -99,7 +99,7 @@ function catavatar_addon_settings_post(App $a, &$s) // Update global directory in background Profile::publishUpdate(local_user()); - info(DI::l10n()->t('Meow!')); + DI::sysmsg()->addInfo(DI::l10n()->t('Meow!')); return; } diff --git a/curweather/curweather.php b/curweather/curweather.php index dc634b59..27d6f940 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -44,7 +44,7 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti $res = new SimpleXMLElement(DI::httpClient()->fetch($url)); } catch (Exception $e) { if (empty($_SESSION['curweather_notice_shown'])) { - notice(DI::l10n()->t('Error fetching weather data. Error was: ' . $e->getMessage())); + DI::sysmsg()->addNotice(DI::l10n()->t('Error fetching weather data. Error was: ' . $e->getMessage())); $_SESSION['curweather_notice_shown'] = true; } diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php index 42cc4c54..b04d3a46 100644 --- a/forumdirectory/forumdirectory.php +++ b/forumdirectory/forumdirectory.php @@ -63,7 +63,7 @@ function forumdirectory_content(App $a) global $forumdirectory_search; if ((DI::config()->get('system', 'block_public')) && (!local_user()) && (!remote_user())) { - notice(DI::l10n()->t('Public access denied.') . EOL); + DI::sysmsg()->addNotice(DI::l10n()->t('Public access denied.') . EOL); return; } @@ -135,7 +135,7 @@ function forumdirectory_content(App $a) } DBA::close($r); } else { - notice(DI::l10n()->t("No entries \x28some entries may be hidden\x29.")); + DI::sysmsg()->addNotice(DI::l10n()->t("No entries \x28some entries may be hidden\x29.")); } $tpl = Renderer::getMarkupTemplate('directory_header.tpl'); diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php index ef8e6470..52d75e10 100644 --- a/notifyall/notifyall.php +++ b/notifyall/notifyall.php @@ -51,7 +51,7 @@ function notifyall_post(App $a) $recipients = DBA::p("SELECT DISTINCT `email` FROM `user` WHERE `verified` AND NOT `account_removed` AND NOT `account_expired` $sql_extra"); if (! $recipients) { - notice(DI::l10n()->t('No recipients found.') . EOL); + DI::sysmsg()->addNotice(DI::l10n()->t('No recipients found.') . EOL); return; } @@ -61,7 +61,7 @@ function notifyall_post(App $a) DI::emailer()->send($notifyEmail->withRecipient($recipient['email'])); } - info(DI::l10n()->t('Emails sent')); + DI::sysmsg()->addInfo(DI::l10n()->t('Emails sent')); DI::baseUrl()->redirect('admin'); } diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index a88b0d32..4fbc3de5 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -60,7 +60,7 @@ function pumpio_module() {} function pumpio_content(App $a) { if (!local_user()) { - notice(DI::l10n()->t('Permission denied.') . EOL); + DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.') . EOL); return ''; } diff --git a/securemail/securemail.php b/securemail/securemail.php index 62673eb1..a8a04df1 100644 --- a/securemail/securemail.php +++ b/securemail/securemail.php @@ -90,9 +90,9 @@ function securemail_settings_post(App &$a, array &$b) DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable); if ($res) { - info(DI::l10n()->t('Test email sent') . EOL); + DI::sysmsg()->addInfo(DI::l10n()->t('Test email sent') . EOL); } else { - notice(DI::l10n()->t('There was an error sending the test email') . EOL); + DI::sysmsg()->addNotice(DI::l10n()->t('There was an error sending the test email') . EOL); } } } diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 4f5abfc8..4cf3f77a 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -146,7 +146,7 @@ function statusnet_settings_post(App $a, $post) DI::pConfig()->set(local_user(), 'statusnet', 'baseapi', $asn['apiurl']); //DI::pConfig()->set(local_user(), 'statusnet', 'application_name', $asn['applicationname'] ); } else { - notice(DI::l10n()->t('Please contact your site administrator.
The provided API URL is not valid.') . EOL . $asn['apiurl'] . EOL); + DI::sysmsg()->addNotice(DI::l10n()->t('Please contact your site administrator.
The provided API URL is not valid.') . EOL . $asn['apiurl'] . EOL); } } } @@ -174,7 +174,7 @@ function statusnet_settings_post(App $a, $post) DI::pConfig()->set(local_user(), 'statusnet', 'baseapi', $apibase); } else { // still not the correct API base, let's do noting - notice(DI::l10n()->t('We could not contact the GNU Social API with the Path you entered.') . EOL); + DI::sysmsg()->addNotice(DI::l10n()->t('We could not contact the GNU Social API with the Path you entered.') . EOL); } } } else { diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index de980598..33cc581f 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -39,7 +39,7 @@ function tumblr_module() {} function tumblr_content(App $a) { if (!local_user()) { - notice(DI::l10n()->t('Permission denied.') . EOL); + DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.') . EOL); return ''; } diff --git a/twitter/twitter.php b/twitter/twitter.php index a4acb3f1..d2847a18 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -269,9 +269,9 @@ function twitter_settings_post(App $a) DI::pConfig()->set(local_user(), 'twitter', 'oauthsecret', $token['oauth_token_secret']); DI::pConfig()->set(local_user(), 'twitter', 'post', 1); } catch(Exception $e) { - notice($e->getMessage()); + DI::sysmsg()->addNotice($e->getMessage()); } catch(TwitterOAuthException $e) { - notice($e->getMessage()); + DI::sysmsg()->addNotice($e->getMessage()); } } else { // if no PIN is supplied in the POST variables, the user has changed the setting @@ -551,14 +551,14 @@ function twitter_item_by_link(App $a, array &$hookData) empty(DI::pConfig()->get($hookData['uid'], 'twitter', 'oauthtoken')) || empty(DI::pConfig()->get($hookData['uid'], 'twitter', 'oauthsecret')) ) { - notice(DI::l10n()->t('Please connect a Twitter account in your Social Network settings to import Twitter posts.')); + DI::sysmsg()->addNotice(DI::l10n()->t('Please connect a Twitter account in your Social Network settings to import Twitter posts.')); return; } $status = twitter_statuses_show($matches[1]); if (empty($status->id_str)) { - notice(DI::l10n()->t('Twitter post not found.')); + DI::sysmsg()->addNotice(DI::l10n()->t('Twitter post not found.')); return; } -- 2.39.5