Docs: add a note on adding `use` on theme.php

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index 87081a4daf1665596e5609d859bf0584f404eba2..8bb09aa6dd76d52379fcc7b9f723b1df17ba93ab 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -2,6 +2,7 @@
 /**
  * @file mod/profiles.php
  */
+
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
@@ -13,9 +14,13 @@ 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\Item;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 
 function profiles_init(App $a) {
 
@@ -215,10 +220,11 @@ function profiles_post(App $a) {
                                $ignore_year = true;
                                $dob = substr($dob, 5);
                        }
-                       $dob = datetime_convert('UTC', 'UTC', (($ignore_year) ? '1900-' . $dob : $dob), (($ignore_year) ? 'm-d' : 'Y-m-d'));
 
                        if ($ignore_year) {
-                               $dob = '0000-' . $dob;
+                               $dob = '0000-' . DateTimeFormat::utc('1900-' . $dob, 'm-d');
+                       } else {
+                               $dob = DateTimeFormat::utc($dob, 'Y-m-d');
                        }
                }
 
@@ -249,7 +255,7 @@ function profiles_post(App $a) {
                if (! strlen($howlong)) {
                        $howlong = NULL_DATE;
                } else {
-                       $howlong = datetime_convert(date_default_timezone_get(), 'UTC', $howlong);
+                       $howlong = DateTimeFormat::convert($howlong, 'UTC', date_default_timezone_get());
                }
                // linkify the relationship target if applicable
 
@@ -480,29 +486,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(datetime_convert()),
-                               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]);
-
-                       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())
-                       );
+                       if ($namechanged) {
+                               $r = q("UPDATE `user` set `username` = '%s' where `uid` = %d",
+                                       dbesc($name),
+                                       intval(local_user())
+                               );
+                       }
+
+                       Contact::updateSelfFromUserID(local_user());
 
                        // Update global directory in background
                        $url = $_SESSION['my_url'];
@@ -601,7 +593,7 @@ function profile_activity($changed, $value) {
        $arr['deny_cid']  = $a->user['deny_cid'];
        $arr['deny_gid']  = $a->user['deny_gid'];
 
-       $i = item_store($arr);
+       $i = Item::insert($arr);
        if ($i) {
                Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i);
        }
@@ -710,21 +702,21 @@ function profiles_content(App $a) {
                        '$default' => (($is_default) ? '<p id="profile-edit-default-desc">' . L10n::t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""),
                        '$name' => ['name', L10n::t('Your Full Name:'), $r[0]['name']],
                        '$pdesc' => ['pdesc', L10n::t('Title/Description:'), $r[0]['pdesc']],
-                       '$dob' => dob($r[0]['dob']),
+                       '$dob' => Temporal::getDateofBirthField($r[0]['dob']),
                        '$hide_friends' => $hide_friends,
                        '$address' => ['address', L10n::t('Street Address:'), $r[0]['address']],
                        '$locality' => ['locality', L10n::t('Locality/City:'), $r[0]['locality']],
                        '$region' => ['region', L10n::t('Region/State:'), $r[0]['region']],
                        '$postal_code' => ['postal_code', L10n::t('Postal/Zip Code:'), $r[0]['postal-code']],
                        '$country_name' => ['country_name', L10n::t('Country:'), $r[0]['country-name']],
-                       '$age' => ((intval($r[0]['dob'])) ? '(' . L10n::t('Age: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
+                       '$age' => ((intval($r[0]['dob'])) ? '(' . L10n::t('Age: ') . Temporal::getAgeByTimezone($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
                        '$gender' => ContactSelector::gender($r[0]['gender']),
                        '$marital' => ContactSelector::maritalStatus($r[0]['marital']),
                        '$with' => ['with', L10n::t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), L10n::t('Examples: cathy123, Cathy Williams, cathy@example.com')],
-                       '$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))],
+                       '$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : DateTimeFormat::local($r[0]['howlong']))],
                        '$sexual' => ContactSelector::sexualPreference($r[0]['sexual']),
                        '$about' => ['about', L10n::t('Tell us about yourself...'), $r[0]['about']],
-                       '$xmpp' => ['xmpp', L10n::t('XMPP (Jabber) address:'), $r[0]['xmpp'], L10n::t("The XMPP address will be propagated to your contacts so that they can follow you.")],
+                       '$xmpp' => ['xmpp', L10n::t("XMPP \x28Jabber\x29 address:"), $r[0]['xmpp'], L10n::t("The XMPP address will be propagated to your contacts so that they can follow you.")],
                        '$homepage' => ['homepage', L10n::t('Homepage URL:'), $r[0]['homepage']],
                        '$hometown' => ['hometown', L10n::t('Hometown:'), $r[0]['hometown']],
                        '$politic' => ['politic', L10n::t('Political Views:'), $r[0]['politic']],