We now use a constant

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

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index e4cc88240e1e07acafa9cb17449f4d2e0219e045..8b28575edb9fc6439a75bc6dae5b28817e1b68ac 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1473,21 +1473,26 @@ class Contact
        /**
         * Return the photo path for a given contact array in the given size
         *
-        * @param array $contact  contact array
-        * @param string $field   Fieldname of the photo in the contact array
-        * @param string $size    Size of the avatar picture
-        * @param string $avatar  Avatar path that is displayed when no photo had been found
+        * @param array $contact    contact array
+        * @param string $field     Fieldname of the photo in the contact array
+        * @param string $size      Size of the avatar picture
+        * @param string $avatar    Avatar path that is displayed when no photo had been found
+        * @param bool  $no_update Don't perfom an update if no cached avatar was found
         * @return string photo path
         */
-       private static function getAvatarPath(array $contact, string $field, string $size, string $avatar)
+       private static function getAvatarPath(array $contact, string $field, string $size, string $avatar, $no_update = false)
        {
                if (!empty($contact)) {
-                       $contact = self::checkAvatarCacheByArray($contact);
+                       $contact = self::checkAvatarCacheByArray($contact, $no_update);
                        if (!empty($contact[$field])) {
                                $avatar = $contact[$field];
                        }
                }
 
+               if ($no_update && empty($avatar) && !empty($contact['avatar'])) {
+                       $avatar = $contact['avatar'];
+               }
+
                if (empty($avatar)) {
                        $avatar = self::getDefaultAvatar([], $size);
                }
@@ -1502,46 +1507,50 @@ class Contact
        /**
         * Return the photo path for a given contact array
         *
-        * @param array $contact Contact array
-        * @param string $avatar  Avatar path that is displayed when no photo had been found
+        * @param array  $contact   Contact array
+        * @param string $avatar    Avatar path that is displayed when no photo had been found
+        * @param bool   $no_update Don't perfom an update if no cached avatar was found
         * @return string photo path
         */
-       public static function getPhoto(array $contact, string $avatar = '')
+       public static function getPhoto(array $contact, string $avatar = '', bool $no_update = false)
        {
-               return self::getAvatarPath($contact, 'photo', Proxy::SIZE_SMALL, $avatar);
+               return self::getAvatarPath($contact, 'photo', Proxy::SIZE_SMALL, $avatar, $no_update);
        }
 
        /**
         * Return the photo path (thumb size) for a given contact array
         *
-        * @param array $contact Contact array
-        * @param string $avatar  Avatar path that is displayed when no photo had been found
+        * @param array  $contact   Contact array
+        * @param string $avatar    Avatar path that is displayed when no photo had been found
+        * @param bool   $no_update Don't perfom an update if no cached avatar was found
         * @return string photo path
         */
-       public static function getThumb(array $contact, string $avatar = '')
+       public static function getThumb(array $contact, string $avatar = '', bool $no_update = false)
        {
-               return self::getAvatarPath($contact, 'thumb', Proxy::SIZE_THUMB, $avatar);
+               return self::getAvatarPath($contact, 'thumb', Proxy::SIZE_THUMB, $avatar, $no_update);
        }
 
        /**
         * Return the photo path (micro size) for a given contact array
         *
-        * @param array $contact Contact array
-        * @param string $avatar  Avatar path that is displayed when no photo had been found
+        * @param array  $contact   Contact array
+        * @param string $avatar    Avatar path that is displayed when no photo had been found
+        * @param bool   $no_update Don't perfom an update if no cached avatar was found
         * @return string photo path
         */
-       public static function getMicro(array $contact, string $avatar = '')
+       public static function getMicro(array $contact, string $avatar = '', bool $no_update = false)
        {
-               return self::getAvatarPath($contact, 'micro', Proxy::SIZE_MICRO, $avatar);
+               return self::getAvatarPath($contact, 'micro', Proxy::SIZE_MICRO, $avatar, $no_update);
        }
 
        /**
         * Check the given contact array for avatar cache fields
         *
         * @param array $contact
+        * @param bool  $no_update Don't perfom an update if no cached avatar was found
         * @return array contact array with avatar cache fields
         */
-       private static function checkAvatarCacheByArray(array $contact)
+       private static function checkAvatarCacheByArray(array $contact, bool $no_update = false)
        {
                $update = false;
                $contact_fields = [];
@@ -1555,7 +1564,7 @@ class Contact
                        }
                }
 
-               if (!$update) {
+               if (!$update || $no_update) {
                        return $contact;
                }
 
@@ -2570,15 +2579,14 @@ class Contact
        public static function updateBirthdays()
        {
                $condition = [
-                       '`bd` != ""
-                       AND `bd` > "0001-01-01"
-                       AND SUBSTRING(`bd`, 1, 4) != `bdyear`
+                       '`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
                ];