X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=8b1cc5a30d043a89eb83da4a42950ad3e29d22a5;hb=6c36fd9e01510a14fea9de766b4afe6760912a2e;hp=6a32fbee5a75e916d0143b4b880ce35552d41b97;hpb=5e60fa8210b502797209de770780d6d7ba81b86c;p=friendica.git
diff --git a/mod/profiles.php b/mod/profiles.php
index 6a32fbee5a..8b1cc5a30d 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -8,18 +8,17 @@ use Friendica\BaseModule;
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\Hook;
use Friendica\Core\Renderer;
-use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Model\Profile;
-use Friendica\Module\Login;
+use Friendica\Model\User;
+use Friendica\Module\Security\Login;
use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
@@ -39,8 +38,8 @@ function profiles_init(App $a) {
intval(local_user())
);
if (! DBA::isResult($r)) {
- notice(L10n::t('Profile not found.') . EOL);
- $a->internalRedirect('profiles');
+ notice(DI::l10n()->t('Profile not found.') . EOL);
+ DI::baseUrl()->redirect('profiles');
return; // NOTREACHED
}
@@ -48,20 +47,20 @@ function profiles_init(App $a) {
// move every contact using this profile as their default to the user default
- $r = q("UPDATE `contact` SET `profile-id` = (SELECT `profile`.`id` AS `profile-id` FROM `profile` WHERE `profile`.`is-default` = 1 AND `profile`.`uid` = %d LIMIT 1) WHERE `profile-id` = %d AND `uid` = %d ",
+ q("UPDATE `contact` SET `profile-id` = (SELECT `profile`.`id` AS `profile-id` FROM `profile` WHERE `profile`.`is-default` = 1 AND `profile`.`uid` = %d LIMIT 1) WHERE `profile-id` = %d AND `uid` = %d ",
intval(local_user()),
intval($a->argv[2]),
intval(local_user())
);
- $r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d",
+ q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d",
intval($a->argv[2]),
intval(local_user())
);
if (DBA::isResult($r)) {
- info(L10n::t('Profile deleted.').EOL);
+ info(DI::l10n()->t('Profile deleted.').EOL);
}
- $a->internalRedirect('profiles');
+ DI::baseUrl()->redirect('profiles');
return; // NOTREACHED
}
@@ -74,12 +73,12 @@ function profiles_init(App $a) {
$num_profiles = (DBA::isResult($r0) ? count($r0) : 0);
- $name = L10n::t('Profile-') . ($num_profiles + 1);
+ $name = DI::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()));
- $r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`)
+ q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`)
VALUES ( %d, '%s', '%s', '%s', '%s' )",
intval(local_user()),
DBA::escape($name),
@@ -93,12 +92,12 @@ function profiles_init(App $a) {
DBA::escape($name)
);
- info(L10n::t('New profile created.') . EOL);
+ info(DI::l10n()->t('New profile created.') . EOL);
if (DBA::isResult($r3) && count($r3) == 1) {
- $a->internalRedirect('profiles/' . $r3[0]['id']);
+ DI::baseUrl()->redirect('profiles/' . $r3[0]['id']);
}
- $a->internalRedirect('profiles');
+ DI::baseUrl()->redirect('profiles');
}
if (($a->argc > 2) && ($a->argv[1] === 'clone')) {
@@ -110,15 +109,14 @@ function profiles_init(App $a) {
$num_profiles = (DBA::isResult($r0) ? count($r0) : 0);
- $name = L10n::t('Profile-') . ($num_profiles + 1);
+ $name = DI::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(! DBA::isResult($r1)) {
- notice(L10n::t('Profile unavailable to clone.') . EOL);
- killme();
- return;
+ notice(DI::l10n()->t('Profile unavailable to clone.') . EOL);
+ exit();
}
unset($r1[0]['id']);
$r1[0]['is-default'] = 0;
@@ -132,12 +130,12 @@ function profiles_init(App $a) {
intval(local_user()),
DBA::escape($name)
);
- info(L10n::t('New profile created.') . EOL);
+ info(DI::l10n()->t('New profile created.') . EOL);
if ((DBA::isResult($r3)) && (count($r3) == 1)) {
- $a->internalRedirect('profiles/'.$r3[0]['id']);
+ DI::baseUrl()->redirect('profiles/'.$r3[0]['id']);
}
- $a->internalRedirect('profiles');
+ DI::baseUrl()->redirect('profiles');
return; // NOTREACHED
}
@@ -149,9 +147,8 @@ function profiles_init(App $a) {
intval(local_user())
);
if (! DBA::isResult($r)) {
- notice(L10n::t('Profile not found.') . EOL);
- killme();
- return;
+ notice(DI::l10n()->t('Profile not found.') . EOL);
+ exit();
}
Profile::load($a, $a->user['nickname'], $r[0]['id']);
@@ -180,13 +177,13 @@ function profile_clean_keywords($keywords)
function profiles_post(App $a) {
if (! local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return;
}
$namechanged = false;
- Addon::callHooks('profile_post', $_POST);
+ Hook::callAll('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",
@@ -194,7 +191,7 @@ function profiles_post(App $a) {
intval(local_user())
);
if (! DBA::isResult($orig)) {
- notice(L10n::t('Profile not found.') . EOL);
+ notice(DI::l10n()->t('Profile not found.') . EOL);
return;
}
@@ -204,11 +201,11 @@ function profiles_post(App $a) {
$profile_name = Strings::escapeTags(trim($_POST['profile_name']));
if (! strlen($profile_name)) {
- notice(L10n::t('Profile Name is required.') . EOL);
+ notice(DI::l10n()->t('Profile Name is required.') . EOL);
return;
}
- $dob = $_POST['dob'] ? Strings::escapeHtml(trim($_POST['dob'])) : '0000-00-00';
+ $dob = !empty($_POST['dob']) ? Strings::escapeHtml(trim($_POST['dob'])) : '0000-00-00';
$y = substr($dob, 0, 4);
if ((! ctype_digit($y)) || ($y < 1900)) {
@@ -239,17 +236,17 @@ function profiles_post(App $a) {
$namechanged = true;
}
- $pdesc = Strings::escapeTags(trim($_POST['pdesc']));
- $gender = Strings::escapeTags(trim($_POST['gender']));
- $address = Strings::escapeTags(trim($_POST['address']));
- $locality = Strings::escapeTags(trim($_POST['locality']));
- $region = Strings::escapeTags(trim($_POST['region']));
- $postal_code = Strings::escapeTags(trim($_POST['postal_code']));
- $country_name = Strings::escapeTags(trim($_POST['country_name']));
- $pub_keywords = profile_clean_keywords(Strings::escapeTags(trim($_POST['pub_keywords'])));
- $prv_keywords = profile_clean_keywords(Strings::escapeTags(trim($_POST['prv_keywords'])));
- $marital = Strings::escapeTags(trim($_POST['marital']));
- $howlong = Strings::escapeTags(trim($_POST['howlong']));
+ $pdesc = Strings::escapeTags(trim($_POST['pdesc'] ?? ''));
+ $gender = Strings::escapeTags(trim($_POST['gender'] ?? ''));
+ $address = Strings::escapeTags(trim($_POST['address'] ?? ''));
+ $locality = Strings::escapeTags(trim($_POST['locality'] ?? ''));
+ $region = Strings::escapeTags(trim($_POST['region'] ?? ''));
+ $postal_code = Strings::escapeTags(trim($_POST['postal_code'] ?? ''));
+ $country_name = Strings::escapeTags(trim($_POST['country_name'] ?? ''));
+ $pub_keywords = profile_clean_keywords(Strings::escapeTags(trim($_POST['pub_keywords'] ?? '')));
+ $prv_keywords = profile_clean_keywords(Strings::escapeTags(trim($_POST['prv_keywords'] ?? '')));
+ $marital = Strings::escapeTags(trim($_POST['marital'] ?? ''));
+ $howlong = Strings::escapeTags(trim($_POST['howlong'] ?? ''));
$with = (!empty($_POST['with']) ? Strings::escapeTags(trim($_POST['with'])) : '');
@@ -339,70 +336,55 @@ function profiles_post(App $a) {
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
- PConfig::set(local_user(), 'system', 'detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0));
+ DI::pConfig()->set(local_user(), 'system', 'detailled_profile', !empty($_POST['detailed_profile']) ? 1: 0);
$changes = [];
- $value = '';
if ($is_default) {
if ($marital != $orig[0]['marital']) {
- $changes[] = '[color=#ff0000]♥[/color] ' . L10n::t('Marital Status');
- $value = $marital;
+ $changes[] = '[color=#ff0000]♥[/color] ' . DI::l10n()->t('Marital Status');
}
if ($withchanged) {
- $changes[] = '[color=#ff0000]♥[/color] ' . L10n::t('Romantic Partner');
- $value = strip_tags($with);
+ $changes[] = '[color=#ff0000]♥[/color] ' . DI::l10n()->t('Romantic Partner');
}
if ($likes != $orig[0]['likes']) {
- $changes[] = L10n::t('Likes');
- $value = $likes;
+ $changes[] = DI::l10n()->t('Likes');
}
if ($dislikes != $orig[0]['dislikes']) {
- $changes[] = L10n::t('Dislikes');
- $value = $dislikes;
+ $changes[] = DI::l10n()->t('Dislikes');
}
if ($work != $orig[0]['work']) {
- $changes[] = L10n::t('Work/Employment');
+ $changes[] = DI::l10n()->t('Work/Employment');
}
if ($religion != $orig[0]['religion']) {
- $changes[] = L10n::t('Religion');
- $value = $religion;
+ $changes[] = DI::l10n()->t('Religion');
}
if ($politic != $orig[0]['politic']) {
- $changes[] = L10n::t('Political Views');
- $value = $politic;
+ $changes[] = DI::l10n()->t('Political Views');
}
if ($gender != $orig[0]['gender']) {
- $changes[] = L10n::t('Gender');
- $value = $gender;
+ $changes[] = DI::l10n()->t('Gender');
}
if ($sexual != $orig[0]['sexual']) {
- $changes[] = L10n::t('Sexual Preference');
- $value = $sexual;
+ $changes[] = DI::l10n()->t('Sexual Preference');
}
if ($xmpp != $orig[0]['xmpp']) {
- $changes[] = L10n::t('XMPP');
- $value = $xmpp;
+ $changes[] = DI::l10n()->t('XMPP');
}
if ($homepage != $orig[0]['homepage']) {
- $changes[] = L10n::t('Homepage');
- $value = $homepage;
+ $changes[] = DI::l10n()->t('Homepage');
}
if ($interest != $orig[0]['interest']) {
- $changes[] = L10n::t('Interests');
- $value = $interest;
+ $changes[] = DI::l10n()->t('Interests');
}
if ($address != $orig[0]['address']) {
- $changes[] = L10n::t('Address');
+ $changes[] = DI::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[] = L10n::t('Location');
- $comma1 = ((($locality) && ($region || $country_name)) ? ', ' : ' ');
- $comma2 = (($region && $country_name) ? ', ' : '');
- $value = $locality . $comma1 . $region . $comma2 . $country_name;
+ $changes[] = DI::l10n()->t('Location');
}
}
@@ -482,12 +464,12 @@ function profiles_post(App $a) {
/// @TODO decide to use DBA::isResult() here and check $r
if ($r) {
- info(L10n::t('Profile updated.') . EOL);
+ info(DI::l10n()->t('Profile updated.') . EOL);
}
if ($is_default) {
if ($namechanged) {
- $r = q("UPDATE `user` set `username` = '%s' where `uid` = %d",
+ q("UPDATE `user` set `username` = '%s' where `uid` = %d",
DBA::escape($name),
intval(local_user())
);
@@ -497,7 +479,7 @@ function profiles_post(App $a) {
// Update global directory in background
$url = $_SESSION['my_url'];
- if ($url && strlen(Config::get('system', 'directory'))) {
+ if ($url && strlen(DI::config()->get('system', 'directory'))) {
Worker::add(PRIORITY_LOW, "Directory", $url);
}
@@ -512,7 +494,7 @@ function profiles_post(App $a) {
function profiles_content(App $a) {
if (! local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return Login::form();
}
@@ -524,47 +506,47 @@ function profiles_content(App $a) {
intval(local_user())
);
if (! DBA::isResult($r)) {
- notice(L10n::t('Profile not found.') . EOL);
+ notice(DI::l10n()->t('Profile not found.') . EOL);
return;
}
- $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('profed_head.tpl'), [
- '$baseurl' => System::baseUrl(true),
+ DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('profed_head.tpl'), [
+ '$baseurl' => DI::baseUrl()->get(true),
]);
$opt_tpl = Renderer::getMarkupTemplate("profile-hide-friends.tpl");
$hide_friends = Renderer::replaceMacros($opt_tpl,[
'$yesno' => [
'hide-friends', //Name
- L10n::t('Hide contacts and friends:'), //Label
+ DI::l10n()->t('Hide contacts and friends:'), //Label
!!$r[0]['hide-friends'], //Value
'', //Help string
- [L10n::t('No'), L10n::t('Yes')] //Off - On strings
+ [DI::l10n()->t('No'), DI::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'),
+ '$desc' => DI::l10n()->t('Hide your contact/friend list from viewers of this profile?'),
+ '$yes_str' => DI::l10n()->t('Yes'),
+ '$no_str' => DI::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"],
- [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP]));
+ [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]));
- $detailled_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account);
+ $detailed_profile = (DI::pConfig()->get(local_user(), 'system', 'detailled_profile') AND $personal_account);
$is_default = (($r[0]['is-default']) ? 1 : 0);
$tpl = Renderer::getMarkupTemplate("profile_edit.tpl");
$o .= Renderer::replaceMacros($tpl, [
'$personal_account' => $personal_account,
- '$detailled_profile' => $detailled_profile,
+ '$detailled_profile' => $detailed_profile,
'$details' => [
- 'detailled_profile', //Name
- L10n::t('Show more profile fields:'), //Label
- $detailled_profile, //Value
+ 'detailed_profile', //Name
+ DI::l10n()->t('Show more profile fields:'), //Label
+ $detailed_profile, //Value
'', //Help string
- [L10n::t('No'), L10n::t('Yes')] //Off - On strings
+ [DI::l10n()->t('No'), DI::l10n()->t('Yes')] //Off - On strings
],
'$multi_profiles' => Feature::isEnabled(local_user(), 'multi_profiles'),
@@ -573,79 +555,79 @@ function profiles_content(App $a) {
'$profile_clone_link' => ((Feature::isEnabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . BaseModule::getFormSecurityToken("profile_clone") : ""),
'$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . BaseModule::getFormSecurityToken("profile_drop"),
- '$profile_action' => L10n::t('Profile Actions'),
- '$banner' => L10n::t('Edit Profile Details'),
- '$submit' => L10n::t('Submit'),
- '$profpic' => L10n::t('Change Profile Photo'),
+ '$profile_action' => DI::l10n()->t('Profile Actions'),
+ '$banner' => DI::l10n()->t('Edit Profile Details'),
+ '$submit' => DI::l10n()->t('Submit'),
+ '$profpic' => DI::l10n()->t('Change Profile Photo'),
'$profpiclink' => '/photos/' . $a->user['nickname'],
- '$viewprof' => L10n::t('View this profile'),
- '$viewallprof' => L10n::t('View all profiles'),
- '$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'),
+ '$viewprof' => DI::l10n()->t('View this profile'),
+ '$viewallprof' => DI::l10n()->t('View all profiles'),
+ '$editvis' => DI::l10n()->t('Edit visibility'),
+ '$cr_prof' => DI::l10n()->t('Create a new profile using these settings'),
+ '$cl_prof' => DI::l10n()->t('Clone this profile'),
+ '$del_prof' => DI::l10n()->t('Delete this profile'),
+
+ '$lbl_basic_section' => DI::l10n()->t('Basic information'),
+ '$lbl_picture_section' => DI::l10n()->t('Profile picture'),
+ '$lbl_location_section' => DI::l10n()->t('Location'),
+ '$lbl_preferences_section' => DI::l10n()->t('Preferences'),
+ '$lbl_status_section' => DI::l10n()->t('Status information'),
+ '$lbl_about_section' => DI::l10n()->t('Additional information'),
+ '$lbl_interests_section' => DI::l10n()->t('Interests'),
+ '$lbl_personal_section' => DI::l10n()->t('Personal'),
+ '$lbl_relation_section' => DI::l10n()->t('Relation'),
+ '$lbl_miscellaneous_section' => DI::l10n()->t('Miscellaneous'),
+
+ '$lbl_profile_photo' => DI::l10n()->t('Upload Profile Photo'),
+ '$lbl_gender' => DI::l10n()->t('Your Gender:'),
+ '$lbl_marital' => DI::l10n()->t('♥ Marital Status:'),
+ '$lbl_sexual' => DI::l10n()->t('Sexual Preference:'),
+ '$lbl_ex2' => DI::l10n()->t('Example: fishing photography software'),
'$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
- '$baseurl' => System::baseUrl(true),
+ '$baseurl' => DI::baseUrl()->get(true),
'$profile_id' => $r[0]['id'],
- '$profile_name' => ['profile_name', L10n::t('Profile Name:'), $r[0]['profile-name'], L10n::t('Required'), '*'],
+ '$profile_name' => ['profile_name', DI::l10n()->t('Profile Name:'), $r[0]['profile-name'], DI::l10n()->t('Required'), '*'],
'$is_default' => $is_default,
- '$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']),
+ '$default' => (($is_default) ? '' . DI::l10n()->t('This is your public profile.
It may be visible to anybody using the internet.') . '
' : ""),
+ '$name' => ['name', DI::l10n()->t('Your Full Name:'), $r[0]['name']],
+ '$pdesc' => ['pdesc', DI::l10n()->t('Title/Description:'), $r[0]['pdesc']],
+ '$dob' => Temporal::getDateofBirthField($r[0]['dob'], $a->user['timezone']),
'$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: ') . Temporal::getAgeByTimezone($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
- '$gender' => ContactSelector::gender($r[0]['gender']),
- '$marital' => ['selector' => ContactSelector::maritalStatus($r[0]['marital']), 'value' => $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'] <= DBA::NULL_DATETIME ? '' : DateTimeFormat::local($r[0]['howlong']))],
- '$sexual' => ['selector' => ContactSelector::sexualPreference($r[0]['sexual']), 'value' => $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']],
+ '$address' => ['address', DI::l10n()->t('Street Address:'), $r[0]['address']],
+ '$locality' => ['locality', DI::l10n()->t('Locality/City:'), $r[0]['locality']],
+ '$region' => ['region', DI::l10n()->t('Region/State:'), $r[0]['region']],
+ '$postal_code' => ['postal_code', DI::l10n()->t('Postal/Zip Code:'), $r[0]['postal-code']],
+ '$country_name' => ['country_name', DI::l10n()->t('Country:'), $r[0]['country-name']],
+ '$age' => ((intval($r[0]['dob'])) ? '(' . DI::l10n()->t('Age: ') . Temporal::getAgeByTimezone($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
+ '$gender' => DI::l10n()->t(ContactSelector::gender($r[0]['gender'])),
+ '$marital' => ['selector' => ContactSelector::maritalStatus($r[0]['marital']), 'value' => DI::l10n()->t($r[0]['marital'])],
+ '$with' => ['with', DI::l10n()->t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), DI::l10n()->t('Examples: cathy123, Cathy Williams, cathy@example.com')],
+ '$howlong' => ['howlong', DI::l10n()->t('Since [date]:'), ($r[0]['howlong'] <= DBA::NULL_DATETIME ? '' : DateTimeFormat::local($r[0]['howlong']))],
+ '$sexual' => ['selector' => ContactSelector::sexualPreference($r[0]['sexual']), 'value' => DI::l10n()->t($r[0]['sexual'])],
+ '$about' => ['about', DI::l10n()->t('Tell us about yourself...'), $r[0]['about']],
+ '$xmpp' => ['xmpp', DI::l10n()->t("XMPP \x28Jabber\x29 address:"), $r[0]['xmpp'], DI::l10n()->t("The XMPP address will be propagated to your contacts so that they can follow you.")],
+ '$homepage' => ['homepage', DI::l10n()->t('Homepage URL:'), $r[0]['homepage']],
+ '$hometown' => ['hometown', DI::l10n()->t('Hometown:'), $r[0]['hometown']],
+ '$politic' => ['politic', DI::l10n()->t('Political Views:'), $r[0]['politic']],
+ '$religion' => ['religion', DI::l10n()->t('Religious Views:'), $r[0]['religion']],
+ '$pub_keywords' => ['pub_keywords', DI::l10n()->t('Public Keywords:'), $r[0]['pub_keywords'], DI::l10n()->t("\x28Used for suggesting potential friends, can be seen by others\x29")],
+ '$prv_keywords' => ['prv_keywords', DI::l10n()->t('Private Keywords:'), $r[0]['prv_keywords'], DI::l10n()->t("\x28Used for searching profiles, never shown to others\x29")],
+ '$likes' => ['likes', DI::l10n()->t('Likes:'), $r[0]['likes']],
+ '$dislikes' => ['dislikes', DI::l10n()->t('Dislikes:'), $r[0]['dislikes']],
+ '$music' => ['music', DI::l10n()->t('Musical interests'), $r[0]['music']],
+ '$book' => ['book', DI::l10n()->t('Books, literature'), $r[0]['book']],
+ '$tv' => ['tv', DI::l10n()->t('Television'), $r[0]['tv']],
+ '$film' => ['film', DI::l10n()->t('Film/dance/culture/entertainment'), $r[0]['film']],
+ '$interest' => ['interest', DI::l10n()->t('Hobbies/Interests'), $r[0]['interest']],
+ '$romance' => ['romance', DI::l10n()->t('Love/romance'), $r[0]['romance']],
+ '$work' => ['work', DI::l10n()->t('Work/employment'), $r[0]['work']],
+ '$education' => ['education', DI::l10n()->t('School/education'), $r[0]['education']],
+ '$contact' => ['contact', DI::l10n()->t('Contact information and Social Networks'), $r[0]['contact']],
]);
$arr = ['profile' => $r[0], 'entry' => $o];
- Addon::callHooks('profile_edit', $arr);
+ Hook::callAll('profile_edit', $arr);
return $o;
} else {
@@ -656,7 +638,7 @@ function profiles_content(App $a) {
);
if (DBA::isResult($r)) {
//Go to the default profile.
- $a->internalRedirect('profiles/' . $r[0]['id']);
+ DI::baseUrl()->redirect('profiles/' . $r[0]['id']);
}
}
@@ -670,20 +652,20 @@ function profiles_content(App $a) {
$profiles = '';
foreach ($r as $rr) {
$profiles .= Renderer::replaceMacros($tpl, [
- '$photo' => $a->removeBaseURL($rr['thumb']),
+ '$photo' => DI::baseUrl()->remove($rr['thumb']),
'$id' => $rr['id'],
- '$alt' => L10n::t('Profile Image'),
+ '$alt' => DI::l10n()->t('Profile Image'),
'$profile_name' => $rr['profile-name'],
- '$visible' => (($rr['is-default']) ? '' . L10n::t('visible to everybody') . ''
- : '' . L10n::t('Edit visibility') . '')
+ '$visible' => (($rr['is-default']) ? '' . DI::l10n()->t('visible to everybody') . ''
+ : '' . DI::l10n()->t('Edit visibility') . '')
]);
}
$tpl_header = Renderer::getMarkupTemplate('profile_listing_header.tpl');
$o .= Renderer::replaceMacros($tpl_header,[
- '$header' => L10n::t('Edit/Manage Profiles'),
- '$chg_photo' => L10n::t('Change profile photo'),
- '$cr_new' => L10n::t('Create New Profile'),
+ '$header' => DI::l10n()->t('Edit/Manage Profiles'),
+ '$chg_photo' => DI::l10n()->t('Change profile photo'),
+ '$cr_new' => DI::l10n()->t('Create New Profile'),
'$cr_new_link' => 'profiles/new?t=' . BaseModule::getFormSecurityToken("profile_new"),
'$profiles' => $profiles
]);