X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=32ed24346fdd69d42721b69035c72fd379d3a3e6;hb=034d46196f0ceb99b0e5b42fefdc88c4d5b852a7;hp=7d2bceec1ac6b593447a7abd470036610fc9943e;hpb=6680ce1dd77b5b4b6fbfcd6d5b58b65710e52079;p=friendica.git
diff --git a/mod/profiles.php b/mod/profiles.php
index 7d2bceec1a..32ed24346f 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -1,13 +1,23 @@
argv[2]),
intval(local_user())
);
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
notice( t('Profile not found.') . EOL);
goaway('profiles');
return; // NOTREACHED
@@ -37,7 +47,7 @@ function profiles_init(App $a) {
intval($a->argv[2]),
intval(local_user())
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
info(t('Profile deleted.').EOL);
}
@@ -52,7 +62,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 = (DBM::is_result($r0) ? count($r0) : 0);
$name = t('Profile-') . ($num_profiles + 1);
@@ -74,7 +84,7 @@ function profiles_init(App $a) {
);
info( t('New profile created.') . EOL);
- if (dbm::is_result($r3) && count($r3) == 1) {
+ if (DBM::is_result($r3) && count($r3) == 1) {
goaway('profiles/' . $r3[0]['id']);
}
@@ -88,14 +98,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 = (DBM::is_result($r0) ? count($r0) : 0);
$name = 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(! DBM::is_result($r1)) {
notice( t('Profile unavailable to clone.') . EOL);
killme();
return;
@@ -106,20 +116,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)) {
+ if ((DBM::is_result($r3)) && (count($r3) == 1)) {
goaway('profiles/'.$r3[0]['id']);
}
@@ -134,13 +138,13 @@ function profiles_init(App $a) {
intval($a->argv[1]),
intval(local_user())
);
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
notice( 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']);
}
@@ -151,7 +155,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, "#");
@@ -181,7 +185,7 @@ function profiles_post(App $a) {
intval($a->argv[1]),
intval(local_user())
);
- if (! dbm::is_result($orig)) {
+ if (! DBM::is_result($orig)) {
notice( t('Profile not found.') . EOL);
return;
}
@@ -204,7 +208,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);
@@ -275,13 +279,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'];
}
@@ -326,9 +330,9 @@ 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']) {
@@ -488,7 +492,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),
@@ -500,15 +504,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);
}
- require_once 'include/profile_update.php';
- profile_change();
+ 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 +524,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 +538,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());
@@ -590,7 +593,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 +601,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);
}
}
@@ -618,65 +620,57 @@ function profiles_content(App $a) {
intval($a->argv[1]),
intval(local_user())
);
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
notice( 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
!!$r[0]['hide-friends'], //Value
'', //Help string
- array(t('No'), t('Yes')) //Off - On strings
- ),
+ [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'),
'$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
$detailled_profile, //Value
'', //Help string
- array(t('No'), t('Yes')) //Off - On strings
- ),
+ [t('No'), 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'),
@@ -707,59 +701,58 @@ function profiles_content(App $a) {
'$lbl_ex2' => 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', t('Profile Name:'), $r[0]['profile-name'], t('Required'), '*'],
'$is_default' => $is_default,
'$default' => (($is_default) ? '' . t('This is your public profile.
It may be visible to anybody using the internet.') . '
' : ""),
- '$name' => array('name', t('Your Full Name:'), $r[0]['name']),
- '$pdesc' => array('pdesc', t('Title/Description:'), $r[0]['pdesc']),
+ '$name' => ['name', t('Your Full Name:'), $r[0]['name']],
+ '$pdesc' => ['pdesc', t('Title/Description:'), $r[0]['pdesc']],
'$dob' => dob($r[0]['dob']),
'$hide_friends' => $hide_friends,
- '$address' => array('address', t('Street Address:'), $r[0]['address']),
- '$locality' => array('locality', t('Locality/City:'), $r[0]['locality']),
- '$region' => array('region', t('Region/State:'), $r[0]['region']),
- '$postal_code' => array('postal_code', t('Postal/Zip Code:'), $r[0]['postal-code']),
- '$country_name' => array('country_name', t('Country:'), $r[0]['country-name']),
+ '$address' => ['address', t('Street Address:'), $r[0]['address']],
+ '$locality' => ['locality', t('Locality/City:'), $r[0]['locality']],
+ '$region' => ['region', t('Region/State:'), $r[0]['region']],
+ '$postal_code' => ['postal_code', t('Postal/Zip Code:'), $r[0]['postal-code']],
+ '$country_name' => ['country_name', t('Country:'), $r[0]['country-name']],
'$age' => ((intval($r[0]['dob'])) ? '(' . t('Age: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
- '$gender' => gender_selector($r[0]['gender']),
- '$marital' => marital_selector($r[0]['marital']),
- '$with' => array('with', t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), t('Examples: cathy123, Cathy Williams, cathy@example.com')),
- '$howlong' => array('howlong', t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))),
- '$sexual' => sexpref_selector($r[0]['sexual']),
- '$about' => array('about', t('Tell us about yourself...'), $r[0]['about']),
- '$xmpp' => array('xmpp', t('XMPP (Jabber) address:'), $r[0]['xmpp'], t("The XMPP address will be propagated to your contacts so that they can follow you.")),
- '$homepage' => array('homepage', t('Homepage URL:'), $r[0]['homepage']),
- '$hometown' => array('hometown', t('Hometown:'), $r[0]['hometown']),
- '$politic' => array('politic', t('Political Views:'), $r[0]['politic']),
- '$religion' => array('religion', t('Religious Views:'), $r[0]['religion']),
- '$pub_keywords' => array('pub_keywords', t('Public Keywords:'), $r[0]['pub_keywords'], t("\x28Used for suggesting potential friends, can be seen by others\x29")),
- '$prv_keywords' => array('prv_keywords', t('Private Keywords:'), $r[0]['prv_keywords'], t("\x28Used for searching profiles, never shown to others\x29")),
- '$likes' => array('likes', t('Likes:'), $r[0]['likes']),
- '$dislikes' => array('dislikes', t('Dislikes:'), $r[0]['dislikes']),
- '$music' => array('music', t('Musical interests'), $r[0]['music']),
- '$book' => array('book', t('Books, literature'), $r[0]['book']),
- '$tv' => array('tv', t('Television'), $r[0]['tv']),
- '$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']),
- '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']),
- '$romance' => array('romance', t('Love/romance'), $r[0]['romance']),
- '$work' => array('work', t('Work/employment'), $r[0]['work']),
- '$education' => array('education', t('School/education'), $r[0]['education']),
- '$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']),
- ));
-
- $arr = array('profile' => $r[0], 'entry' => $o);
+ '$gender' => ContactSelector::gender($r[0]['gender']),
+ '$marital' => ContactSelector::maritalStatus($r[0]['marital']),
+ '$with' => ['with', t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), t('Examples: cathy123, Cathy Williams, cathy@example.com')],
+ '$howlong' => ['howlong', t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))],
+ '$sexual' => ContactSelector::sexualPreference($r[0]['sexual']),
+ '$about' => ['about', t('Tell us about yourself...'), $r[0]['about']],
+ '$xmpp' => ['xmpp', t('XMPP (Jabber) address:'), $r[0]['xmpp'], t("The XMPP address will be propagated to your contacts so that they can follow you.")],
+ '$homepage' => ['homepage', t('Homepage URL:'), $r[0]['homepage']],
+ '$hometown' => ['hometown', t('Hometown:'), $r[0]['hometown']],
+ '$politic' => ['politic', t('Political Views:'), $r[0]['politic']],
+ '$religion' => ['religion', t('Religious Views:'), $r[0]['religion']],
+ '$pub_keywords' => ['pub_keywords', t('Public Keywords:'), $r[0]['pub_keywords'], t("\x28Used for suggesting potential friends, can be seen by others\x29")],
+ '$prv_keywords' => ['prv_keywords', t('Private Keywords:'), $r[0]['prv_keywords'], t("\x28Used for searching profiles, never shown to others\x29")],
+ '$likes' => ['likes', t('Likes:'), $r[0]['likes']],
+ '$dislikes' => ['dislikes', t('Dislikes:'), $r[0]['dislikes']],
+ '$music' => ['music', t('Musical interests'), $r[0]['music']],
+ '$book' => ['book', t('Books, literature'), $r[0]['book']],
+ '$tv' => ['tv', t('Television'), $r[0]['tv']],
+ '$film' => ['film', t('Film/dance/culture/entertainment'), $r[0]['film']],
+ '$interest' => ['interest', t('Hobbies/Interests'), $r[0]['interest']],
+ '$romance' => ['romance', t('Love/romance'), $r[0]['romance']],
+ '$work' => ['work', t('Work/employment'), $r[0]['work']],
+ '$education' => ['education', t('School/education'), $r[0]['education']],
+ '$contact' => ['contact', t('Contact information and Social Networks'), $r[0]['contact']],
+ ]);
+
+ $arr = ['profile' => $r[0], 'entry' => $o];
call_hooks('profile_edit', $arr);
return $o;
} else {
-
// If we don't support multi profiles, don't display this list.
- if (!feature_enabled(local_user(), 'multi_profiles')) {
+ if (!Feature::isEnabled(local_user(), 'multi_profiles')) {
$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
local_user()
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
//Go to the default profile.
goaway('profiles/' . $r[0]['id']);
}
@@ -768,30 +761,30 @@ function profiles_content(App $a) {
$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
local_user());
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$tpl = get_markup_template('profile_entry.tpl');
$profiles = '';
foreach ($r as $rr) {
- $profiles .= replace_macros($tpl, array(
+ $profiles .= replace_macros($tpl, [
'$photo' => $a->remove_baseurl($rr['thumb']),
'$id' => $rr['id'],
'$alt' => t('Profile Image'),
'$profile_name' => $rr['profile-name'],
'$visible' => (($rr['is-default']) ? '' . t('visible to everybody') . ''
: '' . t('Edit visibility') . '')
- ));
+ ]);
}
$tpl_header = get_markup_template('profile_listing_header.tpl');
- $o .= replace_macros($tpl_header,array(
+ $o .= replace_macros($tpl_header,[
'$header' => t('Edit/Manage Profiles'),
'$chg_photo' => t('Change profile photo'),
'$cr_new' => t('Create New Profile'),
'$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"),
'$profiles' => $profiles
- ));
+ ]);
}
return $o;
}