X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=4ae946e6a27003938a1b42e7782b24e4ba42d4a7;hb=208a149a7b7e25dc84c39e5631cba11d41869bae;hp=01030914c47bd095b7806403ab52ea63eead1a44;hpb=a98e1e559087ece25e2cebcfbfcf108f2e3c2be6;p=friendica.git diff --git a/mod/profiles.php b/mod/profiles.php index 01030914c4..4ae946e6a2 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -1,14 +1,25 @@ argv[2]), intval(local_user()) ); - if (! dbm::is_result($r)) { - notice( t('Profile not found.') . EOL); + if (! DBM::is_result($r)) { + notice(L10n::t('Profile not found.') . EOL); goaway('profiles'); return; // NOTREACHED } @@ -38,8 +49,8 @@ function profiles_init(App $a) { intval($a->argv[2]), intval(local_user()) ); - if (dbm::is_result($r)) { - info(t('Profile deleted.').EOL); + if (DBM::is_result($r)) { + info(L10n::t('Profile deleted.').EOL); } goaway('profiles'); @@ -53,9 +64,9 @@ function profiles_init(App $a) { $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d", intval(local_user())); - $num_profiles = (dbm::is_result($r0) ? count($r0) : 0); + $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())); @@ -74,8 +85,8 @@ function profiles_init(App $a) { dbesc($name) ); - info( t('New profile created.') . EOL); - if (dbm::is_result($r3) && count($r3) == 1) { + info(L10n::t('New profile created.') . EOL); + if (DBM::is_result($r3) && count($r3) == 1) { goaway('profiles/' . $r3[0]['id']); } @@ -89,15 +100,15 @@ function profiles_init(App $a) { $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d", intval(local_user())); - $num_profiles = (dbm::is_result($r0) ? count($r0) : 0); + $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); + if(! DBM::is_result($r1)) { + notice(L10n::t('Profile unavailable to clone.') . EOL); killme(); return; } @@ -107,20 +118,14 @@ function profiles_init(App $a) { $r1[0]['net-publish'] = 0; $r1[0]['profile-name'] = dbesc($name); - dbm::esc_array($r1[0], true); - - $r2 = dbq("INSERT INTO `profile` (`" - . implode("`, `", array_keys($r1[0])) - . "`) VALUES (" - . implode(", ", array_values($r1[0])) - . ")" ); + dba::insert('profile', $r1[0]); $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1", intval(local_user()), dbesc($name) ); - info( t('New profile created.') . EOL); - if ((dbm::is_result($r3)) && (count($r3) == 1)) { + info(L10n::t('New profile created.') . EOL); + if ((DBM::is_result($r3)) && (count($r3) == 1)) { goaway('profiles/'.$r3[0]['id']); } @@ -135,13 +140,13 @@ function profiles_init(App $a) { intval($a->argv[1]), intval(local_user()) ); - if (! dbm::is_result($r)) { - notice( t('Profile not found.') . EOL); + if (! DBM::is_result($r)) { + 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']); } @@ -152,7 +157,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, "#"); @@ -169,21 +174,21 @@ 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", intval($a->argv[1]), intval(local_user()) ); - if (! dbm::is_result($orig)) { - notice( t('Profile not found.') . EOL); + if (! DBM::is_result($orig)) { + notice(L10n::t('Profile not found.') . EOL); return; } @@ -193,7 +198,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; } @@ -205,7 +210,7 @@ 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); @@ -276,13 +281,13 @@ function profiles_post(App $a) { dbesc($newname), intval(local_user()) ); - if (! dbm::is_result($r)) { + if (! DBM::is_result($r)) { $r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1", dbesc($lookup), intval(local_user()) ); } - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $prf = $r[0]['url']; $newname = $r[0]['name']; } @@ -327,67 +332,67 @@ function profiles_post(App $a) { $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); - set_pconfig(local_user(), 'system', 'detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0)); + 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; @@ -472,7 +477,7 @@ function profiles_post(App $a) { ); if ($r) { - info(t('Profile updated.') . EOL); + info(L10n::t('Profile updated.') . EOL); } @@ -489,7 +494,7 @@ function profiles_post(App $a) { } if ($is_default) { - $location = formatted_location(array("locality" => $locality, "region" => $region, "country-name" => $country_name)); + $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), @@ -501,14 +506,14 @@ function profiles_post(App $a) { // Update global directory in background $url = $_SESSION['my_url']; - if ($url && strlen(get_config('system', 'directory'))) { - proc_run(PRIORITY_LOW, "include/directory.php", $url); + if ($url && strlen(Config::get('system', 'directory'))) { + Worker::add(PRIORITY_LOW, "Directory", $url); } - proc_run(PRIORITY_LOW, 'include/profile_update.php', local_user()); + Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user()); // Update the global contact for the user - update_gcontact_for_user(local_user()); + GContact::updateForUser(local_user()); } } } @@ -521,11 +526,11 @@ function profile_activity($changed, $value) { return; } - if ($a->user['hidewall'] || get_config('system', 'block_public')) { + if ($a->user['hidewall'] || Config::get('system', 'block_public')) { return; } - if (! get_pconfig(local_user(), 'system', 'post_profilechange')) { + if (! PConfig::get(local_user(), 'system', 'post_profilechange')) { return; } @@ -535,11 +540,11 @@ function profile_activity($changed, $value) { intval(local_user()) ); - if (! dbm::is_result($self)) { + if (! DBM::is_result($self)) { return; } - $arr = array(); + $arr = []; $arr['guid'] = get_guid(32); $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), local_user()); @@ -564,7 +569,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 .= ', '; } @@ -573,13 +578,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); } @@ -590,7 +595,6 @@ 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']; @@ -599,7 +603,7 @@ function profile_activity($changed, $value) { $i = item_store($arr); if ($i) { - proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i); + Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i); } } @@ -607,7 +611,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; } @@ -618,148 +622,139 @@ function profiles_content(App $a) { intval($a->argv[1]), intval(local_user()) ); - if (! dbm::is_result($r)) { - notice( t('Profile not found.') . EOL); + if (! DBM::is_result($r)) { + 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( - '$baseurl' => App::get_baseurl(true), - )); - $a->page['end'] .= replace_macros(get_markup_template('profed_end.tpl'), array( - '$baseurl' => App::get_baseurl(true), - )); + $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'), [ + '$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))); - - $detailled_profile = (get_pconfig(local_user(), 'system', 'detailled_profile') AND $personal_account); + [PAGE_COMMUNITY, PAGE_PRVGROUP])); - $f = get_config('system', 'birthday_input_format'); - if (! $f) { - $f = 'ymd'; - } + $detailled_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account); $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' => feature_enabled(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' => ((feature_enabled(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' => App::get_baseurl(true), + '$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.') . '
' . L10n::t('This is your public profile.
It may be visible to anybody using the internet.') . '