diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 80bdfa534..1a80b539d 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -9,6 +9,7 @@ use Friendica\Core\L10n; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Model\Photo; use Friendica\Model\Profile; use Friendica\Object\Image; @@ -105,18 +106,11 @@ function profile_photo_post(App $a) { // If setting for the default profile, unset the profile photo flag from any other photos I own - if($is_default_profile) { + if ($is_default_profile) { $r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d", dbesc($base_image['resource-id']), intval(local_user()) ); - - $r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `self` AND `uid` = %d", - dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()), - dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()), - dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-6.' . $Image->getExt()), - intval(local_user()) - ); } else { $r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d", dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()), @@ -126,13 +120,7 @@ function profile_photo_post(App $a) { ); } - // we'll set the updated profile-photo timestamp even if it isn't the default profile, - // so that browsers will do a cache update unconditionally - - $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d", - dbesc(DateTimeFormat::utcNow()), - intval(local_user()) - ); + Contact::updateSelfFromUserID(local_user(), true); info(L10n::t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL); // Update global directory in background @@ -229,10 +217,7 @@ function profile_photo_content(App $a) { dbesc($resource_id) ); - $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d", - dbesc(DateTimeFormat::utcNow()), - intval(local_user()) - ); + Contact::updateSelfFromUserID(local_user(), true); // Update global directory in background $url = $_SESSION['my_url']; diff --git a/mod/profiles.php b/mod/profiles.php index ce71f0c74..bec09e2d0 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -485,29 +485,15 @@ function profiles_post(App $a) { info(L10n::t('Profile updated.') . EOL); } - - if ($namechanged && $is_default) { - $r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `self` = 1 AND `uid` = %d", - dbesc($name), - dbesc(DateTimeFormat::utcNow()), - intval(local_user()) - ); - $r = q("UPDATE `user` set `username` = '%s' where `uid` = %d", - dbesc($name), - intval(local_user()) - ); - } - if ($is_default) { - $location = Profile::formatLocation(["locality" => $locality, "region" => $region, "country-name" => $country_name]); + if ($namechanged) { + $r = q("UPDATE `user` set `username` = '%s' where `uid` = %d", + dbesc($name), + intval(local_user()) + ); + } - q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d", - dbesc($about), - dbesc($location), - dbesc($pub_keywords), - dbesc($gender), - intval(local_user()) - ); + Contact::updateSelfFromUserID(local_user()); // Update global directory in background $url = $_SESSION['my_url']; diff --git a/mod/settings.php b/mod/settings.php index 8def780a5..f4ad58412 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -14,6 +14,7 @@ use Friendica\Core\PConfig; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Model\GContact; use Friendica\Model\Group; use Friendica\Model\User; @@ -490,10 +491,7 @@ function settings_post(App $a) $err = ''; - $name_change = false; - if ($username != $a->user['username']) { - $name_change = true; if (strlen($username) > 40) { $err .= L10n::t(' Please use a shorter name.'); } @@ -633,14 +631,7 @@ function settings_post(App $a) intval(local_user()) ); - - if ($name_change) { - q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self`", - dbesc($username), - dbesc(DateTimeFormat::utcNow()), - intval(local_user()) - ); - } + Contact::updateSelfFromUserID(local_user()); if (($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) { // Update global directory in background diff --git a/src/Model/Contact.php b/src/Model/Contact.php index b5fef04b3..d184dacdb 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -22,6 +22,7 @@ use Friendica\Protocol\PortableContact; use Friendica\Protocol\Salmon; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; +use Friendica\Object\Image; use dba; require_once 'boot.php'; @@ -138,6 +139,84 @@ class Contact extends BaseObject return $return; } + /** + * Updates the self-contact for the provided user id + * + * @param int $uid + * @param boolean $update_avatar Force the avatar update + */ + public static function updateSelfFromUserID($uid, $update_avatar = false) + { + $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar', + 'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'nurl']; + $self = dba::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]); + if (!DBM::is_result($self)) { + return; + } + + $fields = ['nickname', 'page-flags', 'account-type']; + $user = dba::selectFirst('user', $fields, ['uid' => $uid]); + if (!DBM::is_result($user)) { + return; + } + + $fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region', + 'country-name', 'gender', 'pub_keywords', 'xmpp']; + $profile = dba::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]); + if (!DBM::is_result($profile)) { + return; + } + + $avatar = dba::selectFirst('photo', ['resource-id', 'type'], ['uid' => $uid, 'profile' => true]); + + $fields = ['name' => $profile['name'], 'nick' => $user['nickname'], + 'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile), + 'about' => $profile['about'], 'keywords' => $profile['pub_keywords'], + 'gender' => $profile['gender'], 'avatar' => $profile['photo'], + 'contact-type' => $user['account-type'], 'xmpp' => $profile['xmpp']]; + + if ($update_avatar) { + $fields['avatar-date'] = DateTimeFormat::utcNow(); + } + + // Creating the path to the avatar, beginning with the file suffix + $types = Image::supportedTypes(); + if (isset($types[$avatar['type']])) { + $file_suffix = $types[$avatar['type']]; + } else { + $file_suffix = 'jpg'; + } + + // We are adding a timestamp value so that other systems won't use cached content + $timestamp = strtotime($fields['avatar-date']); + + $prefix = System::baseUrl() . '/photo/' .$avatar['resource-id'] . '-'; + $suffix = '.' . $file_suffix . '?ts=' . $timestamp; + + $fields['photo'] = $prefix . '4' . $suffix; + $fields['thumb'] = $prefix . '5' . $suffix; + $fields['micro'] = $prefix . '6' . $suffix; + + $fields['forum'] = $user['page-flags'] == PAGE_COMMUNITY; + $fields['prv'] = $user['page-flags'] == PAGE_PRVGROUP; + + $update = false; + + foreach ($fields as $field => $content) { + if ($self[$field] != $content) { + $update = true; + } + } + + if ($update) { + $fields['name-date'] = DateTimeFormat::utcNow(); + dba::update('contact', $fields, ['id' => $self['id']]); + + // Update the public contact as well + dba::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]); + } + } + /** * @brief Marks a contact for removal *