X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=8bb09aa6dd76d52379fcc7b9f723b1df17ba93ab;hb=5ebe10d7fc808dc2ed3502b532e6db020928aa1c;hp=79f763bd03606b4a0063462680b892316a388675;hpb=6212b3d287a2ed3a1accdeb487b63f9479685360;p=friendica.git diff --git a/mod/profiles.php b/mod/profiles.php index 79f763bd03..8bb09aa6dd 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -2,19 +2,25 @@ /** * @file mod/profiles.php */ + use Friendica\App; 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\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) { @@ -30,7 +36,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 } @@ -49,7 +55,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'); @@ -65,7 +71,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())); @@ -84,7 +90,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']); } @@ -101,13 +107,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; } @@ -123,7 +129,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']); } @@ -140,7 +146,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); killme(); return; } @@ -173,7 +179,7 @@ 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; } @@ -187,7 +193,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; } @@ -197,7 +203,7 @@ 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; } @@ -214,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'); } } @@ -248,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 @@ -337,61 +344,61 @@ function profiles_post(App $a) { $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; @@ -476,32 +483,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(["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']; @@ -568,7 +561,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 .= ', '; } @@ -577,13 +570,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); } @@ -600,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); } @@ -610,7 +603,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; } @@ -622,7 +615,7 @@ 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; } @@ -637,14 +630,14 @@ function profiles_content(App $a) { $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 - [t('No'), t('Yes')] //Off - On strings + [L10n::t('No'), L10n::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'), + '$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\" " : "") ]); @@ -662,10 +655,10 @@ function profiles_content(App $a) { '$details' => [ 'detailled_profile', //Name - t('Show more profile fields:'), //Label + L10n::t('Show more profile fields:'), //Label $detailled_profile, //Value '', //Help string - [t('No'), t('Yes')] //Off - On strings + [L10n::t('No'), L10n::t('Yes')] //Off - On strings ], '$multi_profiles' => Feature::isEnabled(local_user(), 'multi_profiles'), @@ -674,73 +667,73 @@ function profiles_content(App $a) { '$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' => ['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.') . '
' . L10n::t('This is your public profile.
It may be visible to anybody using the internet.') . '