Merge pull request #10133 from annando/notice

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index e68ae4769d34671b0e1c38ac78bcd81612afbb97..411cf333ef5820e1e080b02e0a138f077b6ca9c7 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -571,7 +571,8 @@ class Contact
                        return true;
                }
 
-               $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'pubkey', 'prvkey'], ['uid' => $uid]);
+               $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'pubkey', 'prvkey'],
+                       ['uid' => $uid, 'account_expired' => false]);
                if (!DBA::isResult($user)) {
                        return false;
                }
@@ -624,7 +625,7 @@ class Contact
                }
 
                $fields = ['nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey'];
-               $user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
+               $user = DBA::selectFirst('user', $fields, ['uid' => $uid, 'account_expired' => false]);
                if (!DBA::isResult($user)) {
                        return;
                }
@@ -2579,13 +2580,14 @@ class Contact
        public static function updateBirthdays()
        {
                $condition = [
-                       '`bd` > "0001-01-01"
+                       '`bd` > ?
                        AND (`contact`.`rel` = ? OR `contact`.`rel` = ?)
                        AND NOT `contact`.`pending`
                        AND NOT `contact`.`hidden`
                        AND NOT `contact`.`blocked`
                        AND NOT `contact`.`archive`
                        AND NOT `contact`.`deleted`',
+                       DBA::NULL_DATE,
                        self::SHARING,
                        self::FRIEND
                ];
@@ -2819,6 +2821,9 @@ class Contact
                $count = 0;
 
                foreach ($urls as $url) {
+                       if (empty($url) || !is_string($url)) {
+                               continue;
+                       }
                        $contact = self::getByURL($url, false, ['id', 'updated']);
                        if (empty($contact['id'])) {
                                Worker::add(PRIORITY_LOW, 'AddContact', 0, $url);