X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=bec09e2d07978c870ea391e02bec983550a85f45;hb=bac60164e759141144d6d39431dc3f65c61854e8;hp=eb17f34dbf6c532fef54c88ed9dc008a7524aad3;hpb=2f0da29c753b870866d90e229237ace7e864769c;p=friendica.git
diff --git a/mod/profiles.php b/mod/profiles.php
index eb17f34dbf..bec09e2d07 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -2,20 +2,28 @@
/**
* @file mod/profiles.php
*/
+
use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\ContactSelector;
+use Friendica\Content\Feature;
+use Friendica\Content\Nav;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
-use Friendica\Model\GlobalContact;
+use Friendica\Model\GContact;
+use Friendica\Model\Item;
+use Friendica\Model\Profile;
use Friendica\Network\Probe;
-use Friendica\Object\Profile;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
function profiles_init(App $a) {
- nav_set_selected('profiles');
+ Nav::setSelected('profiles');
if (! local_user()) {
return;
@@ -27,7 +35,7 @@ function profiles_init(App $a) {
intval(local_user())
);
if (! DBM::is_result($r)) {
- notice( t('Profile not found.') . EOL);
+ notice(L10n::t('Profile not found.') . EOL);
goaway('profiles');
return; // NOTREACHED
}
@@ -46,7 +54,7 @@ function profiles_init(App $a) {
intval(local_user())
);
if (DBM::is_result($r)) {
- info(t('Profile deleted.').EOL);
+ info(L10n::t('Profile deleted.').EOL);
}
goaway('profiles');
@@ -62,7 +70,7 @@ function profiles_init(App $a) {
$num_profiles = (DBM::is_result($r0) ? count($r0) : 0);
- $name = t('Profile-') . ($num_profiles + 1);
+ $name = L10n::t('Profile-') . ($num_profiles + 1);
$r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
intval(local_user()));
@@ -81,7 +89,7 @@ function profiles_init(App $a) {
dbesc($name)
);
- info( t('New profile created.') . EOL);
+ info(L10n::t('New profile created.') . EOL);
if (DBM::is_result($r3) && count($r3) == 1) {
goaway('profiles/' . $r3[0]['id']);
}
@@ -98,13 +106,13 @@ function profiles_init(App $a) {
$num_profiles = (DBM::is_result($r0) ? count($r0) : 0);
- $name = t('Profile-') . ($num_profiles + 1);
+ $name = L10n::t('Profile-') . ($num_profiles + 1);
$r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
intval(local_user()),
intval($a->argv[2])
);
if(! DBM::is_result($r1)) {
- notice( t('Profile unavailable to clone.') . EOL);
+ notice(L10n::t('Profile unavailable to clone.') . EOL);
killme();
return;
}
@@ -120,7 +128,7 @@ function profiles_init(App $a) {
intval(local_user()),
dbesc($name)
);
- info( t('New profile created.') . EOL);
+ info(L10n::t('New profile created.') . EOL);
if ((DBM::is_result($r3)) && (count($r3) == 1)) {
goaway('profiles/'.$r3[0]['id']);
}
@@ -137,12 +145,12 @@ function profiles_init(App $a) {
intval(local_user())
);
if (! DBM::is_result($r)) {
- notice( t('Profile not found.') . EOL);
+ notice(L10n::t('Profile not found.') . EOL);
killme();
return;
}
- profile_load($a,$a->user['nickname'], $r[0]['id']);
+ Profile::load($a, $a->user['nickname'], $r[0]['id']);
}
@@ -153,7 +161,7 @@ function profile_clean_keywords($keywords) {
$keywords = str_replace(",", " ", $keywords);
$keywords = explode(" ", $keywords);
- $cleaned = array();
+ $cleaned = [];
foreach ($keywords as $keyword) {
$keyword = trim(strtolower($keyword));
$keyword = trim($keyword, "#");
@@ -170,13 +178,13 @@ function profile_clean_keywords($keywords) {
function profiles_post(App $a) {
if (! local_user()) {
- notice( t('Permission denied.') . EOL);
+ notice(L10n::t('Permission denied.') . EOL);
return;
}
$namechanged = false;
- call_hooks('profile_post', $_POST);
+ Addon::callHooks('profile_post', $_POST);
if (($a->argc > 1) && ($a->argv[1] !== "new") && intval($a->argv[1])) {
$orig = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -184,7 +192,7 @@ function profiles_post(App $a) {
intval(local_user())
);
if (! DBM::is_result($orig)) {
- notice( t('Profile not found.') . EOL);
+ notice(L10n::t('Profile not found.') . EOL);
return;
}
@@ -194,11 +202,11 @@ function profiles_post(App $a) {
$profile_name = notags(trim($_POST['profile_name']));
if (! strlen($profile_name)) {
- notice( t('Profile Name is required.') . EOL);
+ notice(L10n::t('Profile Name is required.') . EOL);
return;
}
- $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0001-01-01'; // FIXME: Needs to be validated?
+ $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00';
$y = substr($dob, 0, 4);
if ((! ctype_digit($y)) || ($y < 1900)) {
@@ -206,15 +214,16 @@ function profiles_post(App $a) {
} else {
$ignore_year = false;
}
- if (!in_array($dob, array('0000-00-00', '0001-01-01'))) {
+ if (!in_array($dob, ['0000-00-00', '0001-01-01'])) {
if (strpos($dob, '0000-') === 0 || strpos($dob, '0001-') === 0) {
$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 = '0001-' . $dob;
+ $dob = '0000-' . DateTimeFormat::utc('1900-' . $dob, 'm-d');
+ } else {
+ $dob = DateTimeFormat::utc($dob, 'Y-m-d');
}
}
@@ -245,7 +254,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
@@ -330,65 +339,65 @@ function profiles_post(App $a) {
PConfig::set(local_user(), 'system', 'detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0));
- $changes = array();
+ $changes = [];
$value = '';
if ($is_default) {
if ($marital != $orig[0]['marital']) {
- $changes[] = '[color=#ff0000]♥[/color] ' . t('Marital Status');
+ $changes[] = '[color=#ff0000]♥[/color] ' . L10n::t('Marital Status');
$value = $marital;
}
if ($withchanged) {
- $changes[] = '[color=#ff0000]♥[/color] ' . t('Romantic Partner');
+ $changes[] = '[color=#ff0000]♥[/color] ' . L10n::t('Romantic Partner');
$value = strip_tags($with);
}
if ($likes != $orig[0]['likes']) {
- $changes[] = t('Likes');
+ $changes[] = L10n::t('Likes');
$value = $likes;
}
if ($dislikes != $orig[0]['dislikes']) {
- $changes[] = t('Dislikes');
+ $changes[] = L10n::t('Dislikes');
$value = $dislikes;
}
if ($work != $orig[0]['work']) {
- $changes[] = t('Work/Employment');
+ $changes[] = L10n::t('Work/Employment');
}
if ($religion != $orig[0]['religion']) {
- $changes[] = t('Religion');
+ $changes[] = L10n::t('Religion');
$value = $religion;
}
if ($politic != $orig[0]['politic']) {
- $changes[] = t('Political Views');
+ $changes[] = L10n::t('Political Views');
$value = $politic;
}
if ($gender != $orig[0]['gender']) {
- $changes[] = t('Gender');
+ $changes[] = L10n::t('Gender');
$value = $gender;
}
if ($sexual != $orig[0]['sexual']) {
- $changes[] = t('Sexual Preference');
+ $changes[] = L10n::t('Sexual Preference');
$value = $sexual;
}
if ($xmpp != $orig[0]['xmpp']) {
- $changes[] = t('XMPP');
+ $changes[] = L10n::t('XMPP');
$value = $xmpp;
}
if ($homepage != $orig[0]['homepage']) {
- $changes[] = t('Homepage');
+ $changes[] = L10n::t('Homepage');
$value = $homepage;
}
if ($interest != $orig[0]['interest']) {
- $changes[] = t('Interests');
+ $changes[] = L10n::t('Interests');
$value = $interest;
}
if ($address != $orig[0]['address']) {
- $changes[] = t('Address');
+ $changes[] = L10n::t('Address');
// New address not sent in notifications, potential privacy issues
// in case this leaks to unintended recipients. Yes, it's in the public
// profile but that doesn't mean we have to broadcast it to everybody.
}
if ($locality != $orig[0]['locality'] || $region != $orig[0]['region']
|| $country_name != $orig[0]['country-name']) {
- $changes[] = t('Location');
+ $changes[] = L10n::t('Location');
$comma1 = ((($locality) && ($region || $country_name)) ? ', ' : ' ');
$comma2 = (($region && $country_name) ? ', ' : '');
$value = $locality . $comma1 . $region . $comma2 . $country_name;
@@ -473,32 +482,18 @@ function profiles_post(App $a) {
);
if ($r) {
- info(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())
- );
+ info(L10n::t('Profile updated.') . EOL);
}
if ($is_default) {
- $location = Profile::formatLocation(array("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'];
@@ -509,7 +504,7 @@ function profiles_post(App $a) {
Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
// Update the global contact for the user
- GlobalContact::updateForUser(local_user());
+ GContact::updateForUser(local_user());
}
}
}
@@ -540,7 +535,7 @@ function profile_activity($changed, $value) {
return;
}
- $arr = array();
+ $arr = [];
$arr['guid'] = get_guid(32);
$arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), local_user());
@@ -565,7 +560,7 @@ function profile_activity($changed, $value) {
foreach ($changed as $ch) {
if (strlen($changes)) {
if ($z == ($t - 1)) {
- $changes .= t(' and ');
+ $changes .= L10n::t(' and ');
} else {
$changes .= ', ';
}
@@ -574,13 +569,13 @@ function profile_activity($changed, $value) {
$changes .= $ch;
}
- $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';
+ $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . L10n::t('public profile') . '[/url]';
if ($t == 1 && strlen($value)) {
- $message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value);
- $message .= "\n\n" . sprintf( t(' - Visit %1$s\'s %2$s'), $A, $prof);
+ $message = L10n::t('%1$s changed %2$s to “%3$s”', $A, $changes, $value);
+ $message .= "\n\n" . L10n::t(' - Visit %1$s\'s %2$s', $A, $prof);
} else {
- $message = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
+ $message = L10n::t('%1$s has an updated %2$s, changing %3$s.', $A, $prof, $changes);
}
@@ -591,14 +586,13 @@ function profile_activity($changed, $value) {
$arr['object'] .= '' . xmlify('' . "\n");
$arr['object'] .= xmlify('' . "\n");
$arr['object'] .= '' . "\n";
- $arr['last-child'] = 1;
$arr['allow_cid'] = $a->user['allow_cid'];
$arr['allow_gid'] = $a->user['allow_gid'];
$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);
}
@@ -608,7 +602,7 @@ function profile_activity($changed, $value) {
function profiles_content(App $a) {
if (! local_user()) {
- notice( t('Permission denied.') . EOL);
+ notice(L10n::t('Permission denied.') . EOL);
return;
}
@@ -620,142 +614,134 @@ function profiles_content(App $a) {
intval(local_user())
);
if (! DBM::is_result($r)) {
- notice( t('Profile not found.') . EOL);
+ notice(L10n::t('Profile not found.') . EOL);
return;
}
- require_once 'include/profile_selectors.php';
-
-
- $a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(
+ $a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), [
'$baseurl' => System::baseUrl(true),
- ));
- $a->page['end'] .= replace_macros(get_markup_template('profed_end.tpl'), array(
+ ]);
+ $a->page['end'] .= replace_macros(get_markup_template('profed_end.tpl'), [
'$baseurl' => System::baseUrl(true),
- ));
+ ]);
$opt_tpl = get_markup_template("profile-hide-friends.tpl");
- $hide_friends = replace_macros($opt_tpl,array(
- '$yesno' => array(
+ $hide_friends = replace_macros($opt_tpl,[
+ '$yesno' => [
'hide-friends', //Name
- t('Hide contacts and friends:'), //Label
+ L10n::t('Hide contacts and friends:'), //Label
!!$r[0]['hide-friends'], //Value
'', //Help string
- array(t('No'), t('Yes')) //Off - On strings
- ),
- '$desc' => t('Hide your contact/friend list from viewers of this profile?'),
- '$yes_str' => t('Yes'),
- '$no_str' => t('No'),
+ [L10n::t('No'), L10n::t('Yes')] //Off - On strings
+ ],
+ '$desc' => L10n::t('Hide your contact/friend list from viewers of this profile?'),
+ '$yes_str' => L10n::t('Yes'),
+ '$no_str' => L10n::t('No'),
'$yes_selected' => (($r[0]['hide-friends']) ? " checked=\"checked\" " : ""),
'$no_selected' => (($r[0]['hide-friends'] == 0) ? " checked=\"checked\" " : "")
- ));
+ ]);
$personal_account = !(in_array($a->user["page-flags"],
- array(PAGE_COMMUNITY, PAGE_PRVGROUP)));
+ [PAGE_COMMUNITY, PAGE_PRVGROUP]));
$detailled_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account);
- $f = Config::get('system', 'birthday_input_format');
- if (! $f) {
- $f = 'ymd';
- }
-
$is_default = (($r[0]['is-default']) ? 1 : 0);
$tpl = get_markup_template("profile_edit.tpl");
- $o .= replace_macros($tpl, array(
+ $o .= replace_macros($tpl, [
'$personal_account' => $personal_account,
'$detailled_profile' => $detailled_profile,
- '$details' => array(
+ '$details' => [
'detailled_profile', //Name
- t('Show more profile fields:'), //Label
+ L10n::t('Show more profile fields:'), //Label
$detailled_profile, //Value
'', //Help string
- array(t('No'), t('Yes')) //Off - On strings
- ),
+ [L10n::t('No'), L10n::t('Yes')] //Off - On strings
+ ],
- '$multi_profiles' => Features::isEnabled(local_user(), 'multi_profiles'),
+ '$multi_profiles' => Feature::isEnabled(local_user(), 'multi_profiles'),
'$form_security_token' => get_form_security_token("profile_edit"),
'$form_security_token_photo' => get_form_security_token("profile_photo"),
- '$profile_clone_link' => ((Features::isEnabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
+ '$profile_clone_link' => ((Feature::isEnabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
'$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
- '$profile_action' => t('Profile Actions'),
- '$banner' => t('Edit Profile Details'),
- '$submit' => t('Submit'),
- '$profpic' => t('Change Profile Photo'),
- '$viewprof' => t('View this profile'),
- '$editvis' => t('Edit visibility'),
- '$cr_prof' => t('Create a new profile using these settings'),
- '$cl_prof' => t('Clone this profile'),
- '$del_prof' => t('Delete this profile'),
-
- '$lbl_basic_section' => t('Basic information'),
- '$lbl_picture_section' => t('Profile picture'),
- '$lbl_location_section' => t('Location'),
- '$lbl_preferences_section' => t('Preferences'),
- '$lbl_status_section' => t('Status information'),
- '$lbl_about_section' => t('Additional information'),
- '$lbl_interests_section' => t('Interests'),
- '$lbl_personal_section' => t('Personal'),
- '$lbl_relation_section' => t('Relation'),
- '$lbl_miscellaneous_section' => t('Miscellaneous'),
-
- '$lbl_profile_photo' => t('Upload Profile Photo'),
- '$lbl_gender' => t('Your Gender:'),
- '$lbl_marital' => t('♥ Marital Status:'),
- '$lbl_sexual' => t('Sexual Preference:'),
- '$lbl_ex2' => t('Example: fishing photography software'),
+ '$profile_action' => L10n::t('Profile Actions'),
+ '$banner' => L10n::t('Edit Profile Details'),
+ '$submit' => L10n::t('Submit'),
+ '$profpic' => L10n::t('Change Profile Photo'),
+ '$viewprof' => L10n::t('View this profile'),
+ '$editvis' => L10n::t('Edit visibility'),
+ '$cr_prof' => L10n::t('Create a new profile using these settings'),
+ '$cl_prof' => L10n::t('Clone this profile'),
+ '$del_prof' => L10n::t('Delete this profile'),
+
+ '$lbl_basic_section' => L10n::t('Basic information'),
+ '$lbl_picture_section' => L10n::t('Profile picture'),
+ '$lbl_location_section' => L10n::t('Location'),
+ '$lbl_preferences_section' => L10n::t('Preferences'),
+ '$lbl_status_section' => L10n::t('Status information'),
+ '$lbl_about_section' => L10n::t('Additional information'),
+ '$lbl_interests_section' => L10n::t('Interests'),
+ '$lbl_personal_section' => L10n::t('Personal'),
+ '$lbl_relation_section' => L10n::t('Relation'),
+ '$lbl_miscellaneous_section' => L10n::t('Miscellaneous'),
+
+ '$lbl_profile_photo' => L10n::t('Upload Profile Photo'),
+ '$lbl_gender' => L10n::t('Your Gender:'),
+ '$lbl_marital' => L10n::t('♥ Marital Status:'),
+ '$lbl_sexual' => L10n::t('Sexual Preference:'),
+ '$lbl_ex2' => L10n::t('Example: fishing photography software'),
'$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
'$baseurl' => System::baseUrl(true),
'$profile_id' => $r[0]['id'],
- '$profile_name' => array('profile_name', t('Profile Name:'), $r[0]['profile-name'], t('Required'), '*'),
+ '$profile_name' => ['profile_name', L10n::t('Profile Name:'), $r[0]['profile-name'], L10n::t('Required'), '*'],
'$is_default' => $is_default,
- '$default' => (($is_default) ? '' . t('This is your public profile.
It may be visible to anybody using the internet.') . '
' : ""),
- '$name' => array('name', t('Your Full Name:'), $r[0]['name']),
- '$pdesc' => array('pdesc', t('Title/Description:'), $r[0]['pdesc']),
- '$dob' => dob($r[0]['dob']),
+ '$default' => (($is_default) ? '' . L10n::t('This is your public profile.
It may be visible to anybody using the internet.') . '
' : ""),
+ '$name' => ['name', L10n::t('Your Full Name:'), $r[0]['name']],
+ '$pdesc' => ['pdesc', L10n::t('Title/Description:'), $r[0]['pdesc']],
+ '$dob' => Temporal::getDateofBirthField($r[0]['dob']),
'$hide_friends' => $hide_friends,
- '$address' => array('address', t('Street Address:'), $r[0]['address']),
- '$locality' => array('locality', t('Locality/City:'), $r[0]['locality']),
- '$region' => array('region', t('Region/State:'), $r[0]['region']),
- '$postal_code' => array('postal_code', t('Postal/Zip Code:'), $r[0]['postal-code']),
- '$country_name' => array('country_name', t('Country:'), $r[0]['country-name']),
- '$age' => ((intval($r[0]['dob'])) ? '(' . t('Age: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
- '$gender' => gender_selector($r[0]['gender']),
- '$marital' => marital_selector($r[0]['marital']),
- '$with' => array('with', t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), t('Examples: cathy123, Cathy Williams, cathy@example.com')),
- '$howlong' => array('howlong', t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))),
- '$sexual' => sexpref_selector($r[0]['sexual']),
- '$about' => array('about', t('Tell us about yourself...'), $r[0]['about']),
- '$xmpp' => array('xmpp', t('XMPP (Jabber) address:'), $r[0]['xmpp'], t("The XMPP address will be propagated to your contacts so that they can follow you.")),
- '$homepage' => array('homepage', t('Homepage URL:'), $r[0]['homepage']),
- '$hometown' => array('hometown', t('Hometown:'), $r[0]['hometown']),
- '$politic' => array('politic', t('Political Views:'), $r[0]['politic']),
- '$religion' => array('religion', t('Religious Views:'), $r[0]['religion']),
- '$pub_keywords' => array('pub_keywords', t('Public Keywords:'), $r[0]['pub_keywords'], t("\x28Used for suggesting potential friends, can be seen by others\x29")),
- '$prv_keywords' => array('prv_keywords', t('Private Keywords:'), $r[0]['prv_keywords'], t("\x28Used for searching profiles, never shown to others\x29")),
- '$likes' => array('likes', t('Likes:'), $r[0]['likes']),
- '$dislikes' => array('dislikes', t('Dislikes:'), $r[0]['dislikes']),
- '$music' => array('music', t('Musical interests'), $r[0]['music']),
- '$book' => array('book', t('Books, literature'), $r[0]['book']),
- '$tv' => array('tv', t('Television'), $r[0]['tv']),
- '$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']),
- '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']),
- '$romance' => array('romance', t('Love/romance'), $r[0]['romance']),
- '$work' => array('work', t('Work/employment'), $r[0]['work']),
- '$education' => array('education', t('School/education'), $r[0]['education']),
- '$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']),
- ));
-
- $arr = array('profile' => $r[0], 'entry' => $o);
- call_hooks('profile_edit', $arr);
+ '$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: ') . 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 ? '' : 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 \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']],
+ '$religion' => ['religion', L10n::t('Religious Views:'), $r[0]['religion']],
+ '$pub_keywords' => ['pub_keywords', L10n::t('Public Keywords:'), $r[0]['pub_keywords'], L10n::t("\x28Used for suggesting potential friends, can be seen by others\x29")],
+ '$prv_keywords' => ['prv_keywords', L10n::t('Private Keywords:'), $r[0]['prv_keywords'], L10n::t("\x28Used for searching profiles, never shown to others\x29")],
+ '$likes' => ['likes', L10n::t('Likes:'), $r[0]['likes']],
+ '$dislikes' => ['dislikes', L10n::t('Dislikes:'), $r[0]['dislikes']],
+ '$music' => ['music', L10n::t('Musical interests'), $r[0]['music']],
+ '$book' => ['book', L10n::t('Books, literature'), $r[0]['book']],
+ '$tv' => ['tv', L10n::t('Television'), $r[0]['tv']],
+ '$film' => ['film', L10n::t('Film/dance/culture/entertainment'), $r[0]['film']],
+ '$interest' => ['interest', L10n::t('Hobbies/Interests'), $r[0]['interest']],
+ '$romance' => ['romance', L10n::t('Love/romance'), $r[0]['romance']],
+ '$work' => ['work', L10n::t('Work/employment'), $r[0]['work']],
+ '$education' => ['education', L10n::t('School/education'), $r[0]['education']],
+ '$contact' => ['contact', L10n::t('Contact information and Social Networks'), $r[0]['contact']],
+ ]);
+
+ $arr = ['profile' => $r[0], 'entry' => $o];
+ Addon::callHooks('profile_edit', $arr);
return $o;
} else {
// If we don't support multi profiles, don't display this list.
- if (!Features::isEnabled(local_user(), 'multi_profiles')) {
+ if (!Feature::isEnabled(local_user(), 'multi_profiles')) {
$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
local_user()
);
@@ -774,24 +760,24 @@ function profiles_content(App $a) {
$profiles = '';
foreach ($r as $rr) {
- $profiles .= replace_macros($tpl, array(
+ $profiles .= replace_macros($tpl, [
'$photo' => $a->remove_baseurl($rr['thumb']),
'$id' => $rr['id'],
- '$alt' => t('Profile Image'),
+ '$alt' => L10n::t('Profile Image'),
'$profile_name' => $rr['profile-name'],
- '$visible' => (($rr['is-default']) ? '' . t('visible to everybody') . ''
- : '' . t('Edit visibility') . '')
- ));
+ '$visible' => (($rr['is-default']) ? '' . L10n::t('visible to everybody') . ''
+ : '' . L10n::t('Edit visibility') . '')
+ ]);
}
$tpl_header = get_markup_template('profile_listing_header.tpl');
- $o .= replace_macros($tpl_header,array(
- '$header' => t('Edit/Manage Profiles'),
- '$chg_photo' => t('Change profile photo'),
- '$cr_new' => t('Create New Profile'),
+ $o .= replace_macros($tpl_header,[
+ '$header' => L10n::t('Edit/Manage Profiles'),
+ '$chg_photo' => L10n::t('Change profile photo'),
+ '$cr_new' => L10n::t('Create New Profile'),
'$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"),
'$profiles' => $profiles
- ));
+ ]);
}
return $o;
}