X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=72bcac49fc0b6ebf7760111a069f67d8dca16428;hb=ac9b3b78457f466980c7300cea602d78e7af8d45;hp=459a1c5e75a73fc1e0030933fe2d051499b6d0f9;hpb=d4a02dc31408210ab9f67ecac1948dc22b95b8da;p=friendica.git diff --git a/mod/profiles.php b/mod/profiles.php index 459a1c5e75..72bcac49fc 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -8,8 +8,8 @@ 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\Hook; use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\Renderer; @@ -19,6 +19,7 @@ use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\GContact; use Friendica\Model\Profile; +use Friendica\Model\User; use Friendica\Module\Login; use Friendica\Network\Probe; use Friendica\Util\DateTimeFormat; @@ -48,12 +49,12 @@ 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()) ); @@ -79,7 +80,7 @@ function profiles_init(App $a) { $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), @@ -117,8 +118,7 @@ function profiles_init(App $a) { ); if(! DBA::isResult($r1)) { notice(L10n::t('Profile unavailable to clone.') . EOL); - killme(); - return; + exit(); } unset($r1[0]['id']); $r1[0]['is-default'] = 0; @@ -150,8 +150,7 @@ function profiles_init(App $a) { ); if (! DBA::isResult($r)) { notice(L10n::t('Profile not found.') . EOL); - killme(); - return; + exit(); } Profile::load($a, $a->user['nickname'], $r[0]['id']); @@ -186,7 +185,7 @@ function profiles_post(App $a) { $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", @@ -216,7 +215,7 @@ function profiles_post(App $a) { } else { $ignore_year = false; } - if (!in_array($dob, ['0000-00-00', '0001-01-01'])) { + if (!in_array($dob, ['0000-00-00', DBA::NULL_DATE])) { if (strpos($dob, '0000-') === 0 || strpos($dob, '0001-') === 0) { $ignore_year = true; $dob = substr($dob, 5); @@ -251,7 +250,7 @@ function profiles_post(App $a) { $marital = Strings::escapeTags(trim($_POST['marital'])); $howlong = Strings::escapeTags(trim($_POST['howlong'])); - $with = ((x($_POST,'with')) ? Strings::escapeTags(trim($_POST['with'])) : ''); + $with = (!empty($_POST['with']) ? Strings::escapeTags(trim($_POST['with'])) : ''); if (! strlen($howlong)) { $howlong = DBA::NULL_DATETIME; @@ -339,57 +338,45 @@ 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)); + PConfig::set(local_user(), 'system', 'detailled_profile', (($_POST['detailed_profile'] == 1) ? 1: 0)); $changes = []; - $value = ''; if ($is_default) { if ($marital != $orig[0]['marital']) { $changes[] = '[color=#ff0000]♥[/color] ' . L10n::t('Marital Status'); - $value = $marital; } if ($withchanged) { $changes[] = '[color=#ff0000]♥[/color] ' . L10n::t('Romantic Partner'); - $value = strip_tags($with); } if ($likes != $orig[0]['likes']) { $changes[] = L10n::t('Likes'); - $value = $likes; } if ($dislikes != $orig[0]['dislikes']) { $changes[] = L10n::t('Dislikes'); - $value = $dislikes; } if ($work != $orig[0]['work']) { $changes[] = L10n::t('Work/Employment'); } if ($religion != $orig[0]['religion']) { $changes[] = L10n::t('Religion'); - $value = $religion; } if ($politic != $orig[0]['politic']) { $changes[] = L10n::t('Political Views'); - $value = $politic; } if ($gender != $orig[0]['gender']) { $changes[] = L10n::t('Gender'); - $value = $gender; } if ($sexual != $orig[0]['sexual']) { $changes[] = L10n::t('Sexual Preference'); - $value = $sexual; } if ($xmpp != $orig[0]['xmpp']) { $changes[] = L10n::t('XMPP'); - $value = $xmpp; } if ($homepage != $orig[0]['homepage']) { $changes[] = L10n::t('Homepage'); - $value = $homepage; } if ($interest != $orig[0]['interest']) { $changes[] = L10n::t('Interests'); - $value = $interest; } if ($address != $orig[0]['address']) { $changes[] = L10n::t('Address'); @@ -400,9 +387,6 @@ function profiles_post(App $a) { 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; } } @@ -487,7 +471,7 @@ function profiles_post(App $a) { 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()) ); @@ -549,20 +533,20 @@ function profiles_content(App $a) { ]); $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 = (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 + 'detailed_profile', //Name L10n::t('Show more profile fields:'), //Label - $detailled_profile, //Value + $detailed_profile, //Value '', //Help string [L10n::t('No'), L10n::t('Yes')] //Off - On strings ], @@ -610,7 +594,7 @@ function profiles_content(App $a) { '$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']), + '$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']], @@ -618,11 +602,11 @@ function profiles_content(App $a) { '$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']], + '$gender' => L10n::t(ContactSelector::gender($r[0]['gender'])), + '$marital' => ['selector' => ContactSelector::maritalStatus($r[0]['marital']), 'value' => L10n::t($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']], + '$sexual' => ['selector' => ContactSelector::sexualPreference($r[0]['sexual']), 'value' => L10n::t($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']], @@ -645,7 +629,7 @@ function profiles_content(App $a) { ]); $arr = ['profile' => $r[0], 'entry' => $o]; - Addon::callHooks('profile_edit', $arr); + Hook::callAll('profile_edit', $arr); return $o; } else {