X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=8b1cc5a30d043a89eb83da4a42950ad3e29d22a5;hb=6c36fd9e01510a14fea9de766b4afe6760912a2e;hp=18fe636d3d5ee229e553cd2f939c88e0937ef0e5;hpb=03038e7a3bb74bdab497d26b7f829a5c3036d1c2;p=friendica.git diff --git a/mod/profiles.php b/mod/profiles.php index 18fe636d3d..8b1cc5a30d 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -10,10 +10,7 @@ use Friendica\Content\Feature; use Friendica\Content\Nav; use Friendica\Core\Config; use Friendica\Core\Hook; -use Friendica\Core\L10n; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; @@ -41,7 +38,7 @@ function profiles_init(App $a) { intval(local_user()) ); if (! DBA::isResult($r)) { - notice(L10n::t('Profile not found.') . EOL); + notice(DI::l10n()->t('Profile not found.') . EOL); DI::baseUrl()->redirect('profiles'); return; // NOTREACHED } @@ -60,7 +57,7 @@ function profiles_init(App $a) { intval(local_user()) ); if (DBA::isResult($r)) { - info(L10n::t('Profile deleted.').EOL); + info(DI::l10n()->t('Profile deleted.').EOL); } DI::baseUrl()->redirect('profiles'); @@ -76,7 +73,7 @@ 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())); @@ -95,7 +92,7 @@ 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) { DI::baseUrl()->redirect('profiles/' . $r3[0]['id']); } @@ -112,13 +109,13 @@ 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); + notice(DI::l10n()->t('Profile unavailable to clone.') . EOL); exit(); } unset($r1[0]['id']); @@ -133,7 +130,7 @@ 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)) { DI::baseUrl()->redirect('profiles/'.$r3[0]['id']); } @@ -150,7 +147,7 @@ function profiles_init(App $a) { intval(local_user()) ); if (! DBA::isResult($r)) { - notice(L10n::t('Profile not found.') . EOL); + notice(DI::l10n()->t('Profile not found.') . EOL); exit(); } @@ -180,7 +177,7 @@ 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; } @@ -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,7 +201,7 @@ 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; } @@ -339,55 +336,55 @@ function profiles_post(App $a) { $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); - PConfig::set(local_user(), 'system', 'detailled_profile', !empty($_POST['detailed_profile']) ? 1: 0); + DI::pConfig()->set(local_user(), 'system', 'detailled_profile', !empty($_POST['detailed_profile']) ? 1: 0); $changes = []; if ($is_default) { if ($marital != $orig[0]['marital']) { - $changes[] = '[color=#ff0000]♥[/color] ' . L10n::t('Marital Status'); + $changes[] = '[color=#ff0000]♥[/color] ' . DI::l10n()->t('Marital Status'); } if ($withchanged) { - $changes[] = '[color=#ff0000]♥[/color] ' . L10n::t('Romantic Partner'); + $changes[] = '[color=#ff0000]♥[/color] ' . DI::l10n()->t('Romantic Partner'); } if ($likes != $orig[0]['likes']) { - $changes[] = L10n::t('Likes'); + $changes[] = DI::l10n()->t('Likes'); } if ($dislikes != $orig[0]['dislikes']) { - $changes[] = L10n::t('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'); + $changes[] = DI::l10n()->t('Religion'); } if ($politic != $orig[0]['politic']) { - $changes[] = L10n::t('Political Views'); + $changes[] = DI::l10n()->t('Political Views'); } if ($gender != $orig[0]['gender']) { - $changes[] = L10n::t('Gender'); + $changes[] = DI::l10n()->t('Gender'); } if ($sexual != $orig[0]['sexual']) { - $changes[] = L10n::t('Sexual Preference'); + $changes[] = DI::l10n()->t('Sexual Preference'); } if ($xmpp != $orig[0]['xmpp']) { - $changes[] = L10n::t('XMPP'); + $changes[] = DI::l10n()->t('XMPP'); } if ($homepage != $orig[0]['homepage']) { - $changes[] = L10n::t('Homepage'); + $changes[] = DI::l10n()->t('Homepage'); } if ($interest != $orig[0]['interest']) { - $changes[] = L10n::t('Interests'); + $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'); + $changes[] = DI::l10n()->t('Location'); } } @@ -467,7 +464,7 @@ 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) { @@ -482,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); } @@ -497,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(); } @@ -509,26 +506,26 @@ 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\" " : "") ]); @@ -536,7 +533,7 @@ function profiles_content(App $a) { $personal_account = !(in_array($a->user["page-flags"], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])); - $detailed_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"); @@ -546,10 +543,10 @@ function profiles_content(App $a) { '$details' => [ 'detailed_profile', //Name - L10n::t('Show more profile fields:'), //Label + 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'), @@ -558,75 +555,75 @@ 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.') . '
' . DI::l10n()->t('This is your public profile.
It may be visible to anybody using the internet.') . '