haheute/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge pull request #1289 from annando/notice

Browse source 
Remove "notice" with new function
This commit is contained in:
Hypolite Petovan 2022-10-17 16:24:44 -04:00 committed by GitHub
commit bca0943e19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
birdavatar/birdavatar.php
View file

@ -73,7 +73,7 @@ function birdavatar_addon_settings_post(App $a, &$s)
$self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]); $self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
if (!DBA::isResult($self)) { 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; return;
} }
@ -82,7 +82,7 @@ function birdavatar_addon_settings_post(App $a, &$s)
$condition = ['uid' => local_user(), 'contact-id' => $self['id']]; $condition = ['uid' => local_user(), 'contact-id' => $self['id']];
$photo = DBA::selectFirst('photo', ['resource-id'], $condition); $photo = DBA::selectFirst('photo', ['resource-id'], $condition);
if (!DBA::isResult($photo)) { 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; return;
} }
@ -98,7 +98,7 @@ function birdavatar_addon_settings_post(App $a, &$s)
// Update global directory in background // Update global directory in background
Profile::publishUpdate(local_user()); Profile::publishUpdate(local_user());
info(DI::l10n()->t('Meow!')); DI::sysmsg()->addInfo(DI::l10n()->t('Meow!'));
return; return;
} }

6
catavatar/catavatar.php
View file

@ -74,7 +74,7 @@ function catavatar_addon_settings_post(App $a, &$s)
$self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]); $self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
if (!DBA::isResult($self)) { 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; return;
} }
@ -83,7 +83,7 @@ function catavatar_addon_settings_post(App $a, &$s)
$condition = ['uid' => local_user(), 'contact-id' => $self['id']]; $condition = ['uid' => local_user(), 'contact-id' => $self['id']];
$photo = DBA::selectFirst('photo', ['resource-id'], $condition); $photo = DBA::selectFirst('photo', ['resource-id'], $condition);
if (!DBA::isResult($photo)) { 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; return;
} }
@ -99,7 +99,7 @@ function catavatar_addon_settings_post(App $a, &$s)
// Update global directory in background // Update global directory in background
Profile::publishUpdate(local_user()); Profile::publishUpdate(local_user());
info(DI::l10n()->t('Meow!')); DI::sysmsg()->addInfo(DI::l10n()->t('Meow!'));
return; return;
} }

2
curweather/curweather.php
View file

@ -44,7 +44,7 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
$res = new SimpleXMLElement(DI::httpClient()->fetch($url)); $res = new SimpleXMLElement(DI::httpClient()->fetch($url));
} catch (Exception $e) { } catch (Exception $e) {
if (empty($_SESSION['curweather_notice_shown'])) { 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; $_SESSION['curweather_notice_shown'] = true;
} }

4
forumdirectory/forumdirectory.php
View file

@ -63,7 +63,7 @@ function forumdirectory_content(App $a)
global $forumdirectory_search; global $forumdirectory_search;
if ((DI::config()->get('system', 'block_public')) && (!local_user()) && (!remote_user())) { 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; return;
} }
@ -135,7 +135,7 @@ function forumdirectory_content(App $a)
} }
DBA::close($r); DBA::close($r);
} else { } 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'); $tpl = Renderer::getMarkupTemplate('directory_header.tpl');

4
notifyall/notifyall.php
View file

@ -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"); $recipients = DBA::p("SELECT DISTINCT `email` FROM `user` WHERE `verified` AND NOT `account_removed` AND NOT `account_expired` $sql_extra");
if (! $recipients) { if (! $recipients) {
notice(DI::l10n()->t('No recipients found.') . EOL); DI::sysmsg()->addNotice(DI::l10n()->t('No recipients found.') . EOL);
return; return;
} }
@ -61,7 +61,7 @@ function notifyall_post(App $a)
DI::emailer()->send($notifyEmail->withRecipient($recipient['email'])); 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'); DI::baseUrl()->redirect('admin');
} }

2
pumpio/pumpio.php
View file

@ -60,7 +60,7 @@ function pumpio_module() {}
function pumpio_content(App $a) function pumpio_content(App $a)
{ {
if (!local_user()) { if (!local_user()) {
notice(DI::l10n()->t('Permission denied.') . EOL); DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.') . EOL);
return ''; return '';
} }

4
securemail/securemail.php
View file

@ -90,9 +90,9 @@ function securemail_settings_post(App &$a, array &$b)
DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable); DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable);
if ($res) { if ($res) {
info(DI::l10n()->t('Test email sent') . EOL); DI::sysmsg()->addInfo(DI::l10n()->t('Test email sent') . EOL);
} else { } 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);
} }
} }
} }

4
statusnet/statusnet.php
View file

@ -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', 'baseapi', $asn['apiurl']);
//DI::pConfig()->set(local_user(), 'statusnet', 'application_name', $asn['applicationname'] ); //DI::pConfig()->set(local_user(), 'statusnet', 'application_name', $asn['applicationname'] );
} else { } else {
notice(DI::l10n()->t('Please contact your site administrator.<br />The provided API URL is not valid.') . EOL . $asn['apiurl'] . EOL); DI::sysmsg()->addNotice(DI::l10n()->t('Please contact your site administrator.<br />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); DI::pConfig()->set(local_user(), 'statusnet', 'baseapi', $apibase);
} else { } else {
// still not the correct API base, let's do noting // 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 { } else {

2
tumblr/tumblr.php
View file

@ -39,7 +39,7 @@ function tumblr_module() {}
function tumblr_content(App $a) function tumblr_content(App $a)
{ {
if (!local_user()) { if (!local_user()) {
notice(DI::l10n()->t('Permission denied.') . EOL); DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.') . EOL);
return ''; return '';
} }

8
twitter/twitter.php
View file

@ -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', 'oauthsecret', $token['oauth_token_secret']);
DI::pConfig()->set(local_user(), 'twitter', 'post', 1); DI::pConfig()->set(local_user(), 'twitter', 'post', 1);
} catch(Exception $e) { } catch(Exception $e) {
notice($e->getMessage()); DI::sysmsg()->addNotice($e->getMessage());
} catch(TwitterOAuthException $e) { } catch(TwitterOAuthException $e) {
notice($e->getMessage()); DI::sysmsg()->addNotice($e->getMessage());
} }
} else { } else {
// if no PIN is supplied in the POST variables, the user has changed the setting // 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', 'oauthtoken'))
|| empty(DI::pConfig()->get($hookData['uid'], 'twitter', 'oauthsecret')) || 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; return;
} }
$status = twitter_statuses_show($matches[1]); $status = twitter_statuses_show($matches[1]);
if (empty($status->id_str)) { if (empty($status->id_str)) {
notice(DI::l10n()->t('Twitter post not found.')); DI::sysmsg()->addNotice(DI::l10n()->t('Twitter post not found.'));
return; return;
} }