Merge pull request #10860 from nupplaphil/feat/depository_profilefield

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

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 4e984baa6f9ab52f3bbc917706c120a3dbd0230c..d089ada3cd172f87908412237ad2fc42f057bc99 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -38,10 +38,11 @@ use Friendica\DI;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\Diaspora;
+use Friendica\Security\PermissionSet\Entity\PermissionSet;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
-use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Proxy;
 use Friendica\Util\Strings;
 
 class Profile
@@ -441,7 +442,7 @@ class Profile
                        $p['address'] = BBCode::convertForUriId($profile['uri-id'] ?? 0, $p['address']);
                }
 
-               $p['photo'] = Contact::getAvatarUrlForId($cid, ProxyUtils::SIZE_SMALL);
+               $p['photo'] = Contact::getAvatarUrlForId($cid, Proxy::SIZE_SMALL);
 
                $p['url'] = Contact::magicLinkById($cid, $profile['url']);
 
@@ -555,7 +556,7 @@ class Profile
 
                                        $rr['link'] = Contact::magicLinkById($rr['cid']);
                                        $rr['title'] = $rr['name'];
-                                       $rr['date'] = DI::l10n()->getDay(DateTimeFormat::convert($rr['start'], $a->getTimeZone(), 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . DI::l10n()->t('[today]') : '');
+                                       $rr['date'] = DI::l10n()->getDay(DateTimeFormat::local($rr['start'], $bd_short)) . (($today) ? ' ' . DI::l10n()->t('[today]') : '');
                                        $rr['startime'] = null;
                                        $rr['today'] = $today;
                                }
@@ -614,8 +615,8 @@ class Profile
                                        $total++;
                                }
 
-                               $strt = DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->getTimeZone() : 'UTC', 'UTC', 'Y-m-d');
-                               if ($strt === DateTimeFormat::timezoneNow($a->getTimeZone(), 'Y-m-d')) {
+                               $strt = DateTimeFormat::local($rr['start'], 'Y-m-d');
+                               if ($strt === DateTimeFormat::localNow('Y-m-d')) {
                                        $istoday = true;
                                }
 
@@ -630,17 +631,17 @@ class Profile
                                        $description = DI::l10n()->t('[No description]');
                                }
 
-                               $strt = DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->getTimeZone() : 'UTC');
+                               $strt = DateTimeFormat::local($rr['start']);
 
-                               if (substr($strt, 0, 10) < DateTimeFormat::timezoneNow($a->getTimeZone(), 'Y-m-d')) {
+                               if (substr($strt, 0, 10) < DateTimeFormat::localNow('Y-m-d')) {
                                        continue;
                                }
 
-                               $today = ((substr($strt, 0, 10) === DateTimeFormat::timezoneNow($a->getTimeZone(), 'Y-m-d')) ? true : false);
+                               $today = substr($strt, 0, 10) === DateTimeFormat::localNow('Y-m-d');
 
                                $rr['title'] = $title;
                                $rr['description'] = $description;
-                               $rr['date'] = DI::l10n()->getDay(DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->getTimeZone() : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . DI::l10n()->t('[today]') : '');
+                               $rr['date'] = DI::l10n()->getDay(DateTimeFormat::local($rr['start'], $bd_format)) . (($today) ? ' ' . DI::l10n()->t('[today]') : '');
                                $rr['startime'] = $strt;
                                $rr['today'] = $today;
 
@@ -936,4 +937,86 @@ class Profile
 
                return ['total' => $total, 'entries' => $profiles];
        }
+
+       /**
+        * Migrates a legacy profile to the new slimmer profile with extra custom fields.
+        * Multi profiles are converted to ACl-protected custom fields and deleted.
+        *
+        * @param array $profile One profile array
+        * @throws \Exception
+        */
+       public static function migrate(array $profile)
+       {
+               // Already processed, aborting
+               if ($profile['is-default'] === null) {
+                       return;
+               }
+
+               $contacts = [];
+
+               if (!$profile['is-default']) {
+                       $contacts = Contact::selectToArray(['id'], [
+                               'uid'        => $profile['uid'],
+                               'profile-id' => $profile['id']
+                       ]);
+                       if (!count($contacts)) {
+                               // No contact visibility selected defaults to user-only permission
+                               $contacts = Contact::selectToArray(['id'], ['uid' => $profile['uid'], 'self' => true]);
+                       }
+               }
+
+               $permissionSet = DI::permissionSet()->selectOrCreate(
+                       new PermissionSet(
+                               $profile['uid'],
+                               array_column($contacts, 'id') ?? []
+                       )
+               );
+
+               $order = 1;
+
+               $custom_fields = [
+                       'hometown'  => DI::l10n()->t('Hometown:'),
+                       'marital'   => DI::l10n()->t('Marital Status:'),
+                       'with'      => DI::l10n()->t('With:'),
+                       'howlong'   => DI::l10n()->t('Since:'),
+                       'sexual'    => DI::l10n()->t('Sexual Preference:'),
+                       'politic'   => DI::l10n()->t('Political Views:'),
+                       'religion'  => DI::l10n()->t('Religious Views:'),
+                       'likes'     => DI::l10n()->t('Likes:'),
+                       'dislikes'  => DI::l10n()->t('Dislikes:'),
+                       'pdesc'     => DI::l10n()->t('Title/Description:'),
+                       'summary'   => DI::l10n()->t('Summary'),
+                       'music'     => DI::l10n()->t('Musical interests'),
+                       'book'      => DI::l10n()->t('Books, literature'),
+                       'tv'        => DI::l10n()->t('Television'),
+                       'film'      => DI::l10n()->t('Film/dance/culture/entertainment'),
+                       'interest'  => DI::l10n()->t('Hobbies/Interests'),
+                       'romance'   => DI::l10n()->t('Love/romance'),
+                       'work'      => DI::l10n()->t('Work/employment'),
+                       'education' => DI::l10n()->t('School/education'),
+                       'contact'   => DI::l10n()->t('Contact information and Social Networks'),
+               ];
+
+               foreach ($custom_fields as $field => $label) {
+                       if (!empty($profile[$field]) && $profile[$field] > DBA::NULL_DATE && $profile[$field] > DBA::NULL_DATETIME) {
+                               DI::profileField()->save(DI::profileFieldFactory()->createFromValues(
+                                       $profile['uid'],
+                                       $order,
+                                       trim($label, ':'),
+                                       $profile[$field],
+                                       $permissionSet
+                               ));
+                       }
+
+                       $profile[$field] = null;
+               }
+
+               if ($profile['is-default']) {
+                       $profile['profile-name'] = null;
+                       $profile['is-default']   = null;
+                       DBA::update('profile', $profile, ['id' => $profile['id']]);
+               } else if (!empty($profile['id'])) {
+                       DBA::delete('profile', ['id' => $profile['id']]);
+               }
+       }
 }