clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6790 from annando/issue-6788 

Sent update mails to administrators only once
This commit is contained in:
Hypolite Petovan 2019-03-02 09:35:59 -05:00 committed by GitHub
parent b01efc3ada 9427d7f628
commit 062c41f626
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Core/Update.php
View File

@ -209,7 +209,8 @@ class Update
*/ */
private static function updateFailed($update_id, $error_message) { private static function updateFailed($update_id, $error_message) {
//send the administrators an e-mail //send the administrators an e-mail
$adminlist = DBA::select('user', ['uid', 'language', 'email'], ['email' => explode(",", str_replace(" ", "", Config::get('config', 'admin_email')))]); $condition = ['email' => explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))), 'parent-uid' => 0];
$adminlist = DBA::select('user', ['uid', 'language', 'email'], $condition, ['order' => ['uid']]);
// No valid result? // No valid result?
if (!DBA::isResult($adminlist)) { if (!DBA::isResult($adminlist)) {
@ -219,8 +220,15 @@ class Update
return; return;
} }
$sent = [];
// every admin could had different language // every admin could had different language
foreach ($adminlist as $admin) { while ($admin = DBA::fetch($adminlist)) {
if (in_array($admin['email'], $sent)) {
continue;
}
$sent[] = $admin['email'];
$lang = (($admin['language'])?$admin['language']:'en'); $lang = (($admin['language'])?$admin['language']:'en');
L10n::pushLang($lang); L10n::pushLang($lang);
@ -250,11 +258,19 @@ class Update
private static function updateSuccessfull($from_build, $to_build) private static function updateSuccessfull($from_build, $to_build)
{ {
//send the administrators an e-mail //send the administrators an e-mail
$adminlist = DBA::select('user', ['uid', 'language', 'email'], ['email' => explode(",", str_replace(" ", "", Config::get('config', 'admin_email')))]); $condition = ['email' => explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))), 'parent-uid' => 0];
$adminlist = DBA::select('user', ['uid', 'language', 'email'], $condition, ['order' => ['uid']]);
if (DBA::isResult($adminlist)) { if (DBA::isResult($adminlist)) {
$sent = [];
// every admin could had different language // every admin could had different language
foreach ($adminlist as $admin) { while ($admin = DBA::fetch($adminlist)) {
if (in_array($admin['email'], $sent)) {
continue;
}
$sent[] = $admin['email'];
$lang = (($admin['language']) ? $admin['language'] : 'en'); $lang = (($admin['language']) ? $admin['language'] : 'en');
L10n::pushLang($lang); L10n::pushLang($lang);