[various] Use new centralized admin account retrieval methods

diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 270557c4bec24748f72af292d0bf0bd23c21f82e..ee05407bca3b53d68a1678c55014362506119925 100644 (file)
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -40,15 +40,17 @@ function notifyall_post(App $a)
                return;
        }
 
+       $condition = ['account_removed' => false, 'account_expired' => false];
+
        // if this is a test, send it only to the admin(s)
        // admin_email might be a comma separated list, but we need "a@b','c@d','e@f
        if (intval($_REQUEST['test'])) {
-               $email = DI::config()->get('config', 'admin_email');
-               $email = "'" . str_replace([" ",","], ["","','"], $email) . "'";
+               $adminEmails = \Friendica\Model\User::getAdminListForEmailing(['email']);
+
+               $condition['email'] = array_column($adminEmails, 'email');
        }
-       $sql_extra = ((intval($_REQUEST['test'])) ? sprintf(" AND `email` in ( %s )", $email) : '');
 
-       $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`" . DBA::buildCondition($condition));
 
        if (! $recipients) {
                DI::sysmsg()->addNotice(DI::l10n()->t('No recipients found.'));

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 903450c232fa76c8e43e911f4743a5cc3f6769cf..4928b5e4b7b17465663a61197d678750a8a8e55e 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -99,10 +99,10 @@ function pumpio_registerclient(App $a, $host)
                $application_name = DI::baseUrl()->getHostname();
        }
 
-       $adminlist = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email')));
+       $firstAdmin = User::getFirstAdmin(['email']);
 
        $params['type'] = 'client_associate';
-       $params['contacts'] = $adminlist[0];
+       $params['contacts'] = $firstAdmin['email'];
        $params['application_type'] = 'native';
        $params['application_name'] = $application_name;
        $params['logo_url'] = DI::baseUrl()->get() . '/images/friendica-256.png';