X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=d951a470d7605db79ea8f97af1eeba3278b39c0e;hb=c13dc549ed84b0636fb0d0384ca4f532e67eed82;hp=87081a4daf1665596e5609d859bf0584f404eba2;hpb=6b44fbbda03af125035c185c964f10ce78f97610;p=friendica.git diff --git a/mod/profiles.php b/mod/profiles.php index 87081a4daf..d951a470d7 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -2,6 +2,7 @@ /** * @file mod/profiles.php */ + use Friendica\App; use Friendica\Content\ContactSelector; use Friendica\Content\Feature; @@ -12,10 +13,13 @@ use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\System; use Friendica\Core\Worker; -use Friendica\Database\DBM; +use Friendica\Database\DBA; +use Friendica\Model\Contact; use Friendica\Model\GContact; use Friendica\Model\Profile; use Friendica\Network\Probe; +use Friendica\Util\DateTimeFormat; +use Friendica\Util\Temporal; function profiles_init(App $a) { @@ -30,7 +34,7 @@ function profiles_init(App $a) { intval($a->argv[2]), intval(local_user()) ); - if (! DBM::is_result($r)) { + if (! DBA::isResult($r)) { notice(L10n::t('Profile not found.') . EOL); goaway('profiles'); return; // NOTREACHED @@ -49,7 +53,7 @@ function profiles_init(App $a) { intval($a->argv[2]), intval(local_user()) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { info(L10n::t('Profile deleted.').EOL); } @@ -64,7 +68,7 @@ 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 = (DBA::isResult($r0) ? count($r0) : 0); $name = L10n::t('Profile-') . ($num_profiles + 1); @@ -74,19 +78,19 @@ function profiles_init(App $a) { $r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`) VALUES ( %d, '%s', '%s', '%s', '%s' )", intval(local_user()), - dbesc($name), - dbesc($r1[0]['name']), - dbesc($r1[0]['photo']), - dbesc($r1[0]['thumb']) + DBA::escape($name), + DBA::escape($r1[0]['name']), + DBA::escape($r1[0]['photo']), + DBA::escape($r1[0]['thumb']) ); $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1", intval(local_user()), - dbesc($name) + DBA::escape($name) ); info(L10n::t('New profile created.') . EOL); - if (DBM::is_result($r3) && count($r3) == 1) { + if (DBA::isResult($r3) && count($r3) == 1) { goaway('profiles/' . $r3[0]['id']); } @@ -100,14 +104,14 @@ 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 = (DBA::isResult($r0) ? count($r0) : 0); $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)) { + if(! DBA::isResult($r1)) { notice(L10n::t('Profile unavailable to clone.') . EOL); killme(); return; @@ -116,16 +120,16 @@ function profiles_init(App $a) { $r1[0]['is-default'] = 0; $r1[0]['publish'] = 0; $r1[0]['net-publish'] = 0; - $r1[0]['profile-name'] = dbesc($name); + $r1[0]['profile-name'] = DBA::escape($name); - dba::insert('profile', $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) + DBA::escape($name) ); info(L10n::t('New profile created.') . EOL); - if ((DBM::is_result($r3)) && (count($r3) == 1)) { + if ((DBA::isResult($r3)) && (count($r3) == 1)) { goaway('profiles/'.$r3[0]['id']); } @@ -140,7 +144,7 @@ function profiles_init(App $a) { intval($a->argv[1]), intval(local_user()) ); - if (! DBM::is_result($r)) { + if (! DBA::isResult($r)) { notice(L10n::t('Profile not found.') . EOL); killme(); return; @@ -148,12 +152,10 @@ function profiles_init(App $a) { Profile::load($a, $a->user['nickname'], $r[0]['id']); } - - - } -function profile_clean_keywords($keywords) { +function profile_clean_keywords($keywords) +{ $keywords = str_replace(",", " ", $keywords); $keywords = explode(" ", $keywords); @@ -187,7 +189,7 @@ function profiles_post(App $a) { intval($a->argv[1]), intval(local_user()) ); - if (! DBM::is_result($orig)) { + if (! DBA::isResult($orig)) { notice(L10n::t('Profile not found.') . EOL); return; } @@ -215,10 +217,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'); } } @@ -249,7 +252,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 @@ -278,16 +281,16 @@ function profiles_post(App $a) { $newname = $lookup; $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1", - dbesc($newname), + DBA::escape($newname), intval(local_user()) ); - if (! DBM::is_result($r)) { + if (! DBA::isResult($r)) { $r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1", - dbesc($lookup), + DBA::escape($lookup), intval(local_user()) ); } - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $prf = $r[0]['url']; $newname = $r[0]['name']; } @@ -397,9 +400,6 @@ function profiles_post(App $a) { $comma2 = (($region && $country_name) ? ', ' : ''); $value = $locality . $comma1 . $region . $comma2 . $country_name; } - - profile_activity($changes,$value); - } $r = q("UPDATE `profile` @@ -438,71 +438,58 @@ function profiles_post(App $a) { `education` = '%s', `hide-friends` = %d WHERE `id` = %d AND `uid` = %d", - dbesc($profile_name), - dbesc($name), - dbesc($pdesc), - dbesc($gender), - dbesc($dob), - dbesc($address), - dbesc($locality), - dbesc($region), - dbesc($postal_code), - dbesc($country_name), - dbesc($marital), - dbesc($with), - dbesc($howlong), - dbesc($sexual), - dbesc($xmpp), - dbesc($homepage), - dbesc($hometown), - dbesc($politic), - dbesc($religion), - dbesc($pub_keywords), - dbesc($prv_keywords), - dbesc($likes), - dbesc($dislikes), - dbesc($about), - dbesc($interest), - dbesc($contact), - dbesc($music), - dbesc($book), - dbesc($tv), - dbesc($film), - dbesc($romance), - dbesc($work), - dbesc($education), + DBA::escape($profile_name), + DBA::escape($name), + DBA::escape($pdesc), + DBA::escape($gender), + DBA::escape($dob), + DBA::escape($address), + DBA::escape($locality), + DBA::escape($region), + DBA::escape($postal_code), + DBA::escape($country_name), + DBA::escape($marital), + DBA::escape($with), + DBA::escape($howlong), + DBA::escape($sexual), + DBA::escape($xmpp), + DBA::escape($homepage), + DBA::escape($hometown), + DBA::escape($politic), + DBA::escape($religion), + DBA::escape($pub_keywords), + DBA::escape($prv_keywords), + DBA::escape($likes), + DBA::escape($dislikes), + DBA::escape($about), + DBA::escape($interest), + DBA::escape($contact), + DBA::escape($music), + DBA::escape($book), + DBA::escape($tv), + DBA::escape($film), + DBA::escape($romance), + DBA::escape($work), + DBA::escape($education), intval($hide_friends), intval($a->argv[1]), intval(local_user()) ); + /// @TODO decide to use DBA::isResult() here and check $r if ($r) { info(L10n::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()) - ); - } - 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", + DBA::escape($name), + intval(local_user()) + ); + } + + Contact::updateSelfFromUserID(local_user()); // Update global directory in background $url = $_SESSION['my_url']; @@ -518,96 +505,6 @@ function profiles_post(App $a) { } } - -function profile_activity($changed, $value) { - $a = get_app(); - - if (! local_user() || ! is_array($changed) || ! count($changed)) { - return; - } - - if ($a->user['hidewall'] || Config::get('system', 'block_public')) { - return; - } - - if (! PConfig::get(local_user(), 'system', 'post_profilechange')) { - return; - } - - require_once 'include/items.php'; - - $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", - intval(local_user()) - ); - - if (! DBM::is_result($self)) { - return; - } - - $arr = []; - - $arr['guid'] = get_guid(32); - $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), local_user()); - $arr['uid'] = local_user(); - $arr['contact-id'] = $self[0]['id']; - $arr['wall'] = 1; - $arr['type'] = 'wall'; - $arr['gravity'] = 0; - $arr['origin'] = 1; - $arr['author-name'] = $arr['owner-name'] = $self[0]['name']; - $arr['author-link'] = $arr['owner-link'] = $self[0]['url']; - $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb']; - $arr['verb'] = ACTIVITY_UPDATE; - $arr['object-type'] = ACTIVITY_OBJ_PROFILE; - - $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]'; - - - $changes = ''; - $t = count($changed); - $z = 0; - foreach ($changed as $ch) { - if (strlen($changes)) { - if ($z == ($t - 1)) { - $changes .= L10n::t(' and '); - } else { - $changes .= ', '; - } - } - $z ++; - $changes .= $ch; - } - - $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . L10n::t('public profile') . '[/url]'; - - if ($t == 1 && strlen($value)) { - $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 = L10n::t('%1$s has an updated %2$s, changing %3$s.', $A, $prof, $changes); - } - - - $arr['body'] = $message; - - $arr['object'] = '' . ACTIVITY_OBJ_PROFILE . '' . $self[0]['name'] . '' - . '' . $self[0]['url'] . '/' . $self[0]['name'] . ''; - $arr['object'] .= '' . xmlify('' . "\n"); - $arr['object'] .= xmlify('' . "\n"); - $arr['object'] .= '' . "\n"; - - $arr['allow_cid'] = $a->user['allow_cid']; - $arr['allow_gid'] = $a->user['allow_gid']; - $arr['deny_cid'] = $a->user['deny_cid']; - $arr['deny_gid'] = $a->user['deny_gid']; - - $i = item_store($arr); - if ($i) { - Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i); - } -} - - function profiles_content(App $a) { if (! local_user()) { @@ -622,7 +519,7 @@ function profiles_content(App $a) { intval($a->argv[1]), intval(local_user()) ); - if (! DBM::is_result($r)) { + if (! DBA::isResult($r)) { notice(L10n::t('Profile not found.') . EOL); return; } @@ -651,7 +548,7 @@ function profiles_content(App $a) { ]); $personal_account = !(in_array($a->user["page-flags"], - [PAGE_COMMUNITY, PAGE_PRVGROUP])); + [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP])); $detailled_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account); @@ -679,7 +576,9 @@ function profiles_content(App $a) { '$banner' => L10n::t('Edit Profile Details'), '$submit' => L10n::t('Submit'), '$profpic' => 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'), @@ -710,21 +609,21 @@ 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' => dob($r[0]['dob']), + '$dob' => Temporal::getDateofBirthField($r[0]['dob']), '$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: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''), + '$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' => ContactSelector::maritalStatus($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'] <= NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))], + '$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : DateTimeFormat::local($r[0]['howlong']))], '$sexual' => ContactSelector::sexualPreference($r[0]['sexual']), '$about' => ['about', L10n::t('Tell us about yourself...'), $r[0]['about']], - '$xmpp' => ['xmpp', L10n::t('XMPP (Jabber) address:'), $r[0]['xmpp'], L10n::t("The XMPP address will be propagated to your contacts so that they can follow you.")], + '$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']], @@ -754,7 +653,7 @@ function profiles_content(App $a) { $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1", local_user() ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { //Go to the default profile. goaway('profiles/' . $r[0]['id']); } @@ -763,7 +662,7 @@ function profiles_content(App $a) { $r = q("SELECT * FROM `profile` WHERE `uid` = %d", local_user()); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $tpl = get_markup_template('profile_entry.tpl');