X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=943742e3a2edfd7dfbc076656fafd5fa43595d59;hb=d92c9a444f42dc5bc74ca4f827369ae5a6257cf7;hp=9ce478ba198a375a80d664fcfea4c8935dab4f2c;hpb=d6cf791677e3c676108f84e64818ba2a272f6d08;p=friendica.git
diff --git a/mod/profiles.php b/mod/profiles.php
index 9ce478ba19..943742e3a2 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -1,7 +1,7 @@
get_baseurl(true) . '/profiles');
+ goaway('profiles');
return; // NOTREACHED
}
@@ -35,9 +35,9 @@ function profiles_init(&$a) {
intval(local_user())
);
if($r)
- info( t('Profile deleted.') . EOL);
+ info(t('Profile deleted.').EOL);
- goaway($a->get_baseurl(true) . '/profiles');
+ goaway('profiles');
return; // NOTREACHED
}
@@ -74,9 +74,9 @@ function profiles_init(&$a) {
info( t('New profile created.') . EOL);
if(count($r3) == 1)
- goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
+ goaway('profiles/'.$r3[0]['id']);
- goaway($a->get_baseurl(true) . '/profiles');
+ goaway('profiles');
}
if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
@@ -117,9 +117,9 @@ function profiles_init(&$a) {
);
info( t('New profile created.') . EOL);
if(count($r3) == 1)
- goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
+ goaway('profiles/'.$r3[0]['id']);
- goaway($a->get_baseurl(true) . '/profiles');
+ goaway('profiles');
return; // NOTREACHED
}
@@ -140,10 +140,9 @@ function profiles_init(&$a) {
}
-}
+
}
-if(! function_exists('profile_clean_keywords')) {
function profile_clean_keywords($keywords) {
$keywords = str_replace(","," ",$keywords);
$keywords = explode(" ", $keywords);
@@ -160,9 +159,7 @@ function profile_clean_keywords($keywords) {
return $keywords;
}
-}
-if(! function_exists('profiles_post')) {
function profiles_post(&$a) {
if(! local_user()) {
@@ -255,11 +252,11 @@ function profiles_post(&$a) {
$lookup = str_replace('_',' ', $lookup);
if(strpos($lookup,'@') || (strpos($lookup,'http://'))) {
$newname = $lookup;
- $links = @lrdd($lookup);
+ $links = @Probe::lrdd($lookup);
if(count($links)) {
foreach($links as $link) {
if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
- $prf = $link['@attributes']['href'];
+ $prf = $link['@attributes']['href'];
}
}
}
@@ -306,10 +303,11 @@ function profiles_post(&$a) {
}
$sexual = notags(trim($_POST['sexual']));
+ $xmpp = notags(trim($_POST['xmpp']));
$homepage = notags(trim($_POST['homepage']));
if ((strpos($homepage, 'http') !== 0) && (strlen($homepage))) {
- // neither http nor https in URL, add them
- $homepage = 'http://'.$homepage;
+ // neither http nor https in URL, add them
+ $homepage = 'http://'.$homepage;
}
$hometown = notags(trim($_POST['hometown']));
$politic = notags(trim($_POST['politic']));
@@ -371,6 +369,10 @@ function profiles_post(&$a) {
$changes[] = t('Sexual Preference');
$value = $sexual;
}
+ if($xmpp != $orig[0]['xmpp']) {
+ $changes[] = t('XMPP');
+ $value = $xmpp;
+ }
if($homepage != $orig[0]['homepage']) {
$changes[] = t('Homepage');
$value = $homepage;
@@ -412,6 +414,7 @@ function profiles_post(&$a) {
`with` = '%s',
`howlong` = '%s',
`sexual` = '%s',
+ `xmpp` = '%s',
`homepage` = '%s',
`hometown` = '%s',
`politic` = '%s',
@@ -446,6 +449,7 @@ function profiles_post(&$a) {
dbesc($with),
dbesc($howlong),
dbesc($sexual),
+ dbesc($xmpp),
dbesc($homepage),
dbesc($hometown),
dbesc($politic),
@@ -488,7 +492,7 @@ function profiles_post(&$a) {
if($is_default) {
$location = formatted_location(array("locality" => $locality, "region" => $region, "country-name" => $country_name));
- $r = q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` = 1 AND `uid` = %d",
+ q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d",
dbesc($about),
dbesc($location),
dbesc($pub_keywords),
@@ -499,16 +503,18 @@ function profiles_post(&$a) {
// Update global directory in background
$url = $_SESSION['my_url'];
if($url && strlen(get_config('system','directory')))
- proc_run('php',"include/directory.php","$url");
+ proc_run(PRIORITY_LOW, "include/directory.php", $url);
require_once('include/profile_update.php');
profile_change();
+
+ // Update the global contact for the user
+ update_gcontact_for_user(local_user());
}
}
}
-}
-if(! function_exists('profile_activity')) {
+
function profile_activity($changed, $value) {
$a = get_app();
@@ -531,6 +537,8 @@ function profile_activity($changed, $value) {
return;
$arr = array();
+
+ $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'];
@@ -586,21 +594,11 @@ function profile_activity($changed, $value) {
$arr['deny_gid'] = $a->user['deny_gid'];
$i = item_store($arr);
- if($i) {
-
- // give it a permanent link
- //q("update item set plink = '%s' where id = %d",
- // dbesc($a->get_baseurl() . '/display/' . $a->user['nickname'] . '/' . $i),
- // intval($i)
- //);
-
- proc_run('php',"include/notifier.php","activity","$i");
-
- }
-}
+ if($i)
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
}
-if(! function_exists('profiles_content')) {
+
function profiles_content(&$a) {
if(! local_user()) {
@@ -672,25 +670,29 @@ function profiles_content(&$a) {
'$detailled_profile' => $detailled_profile,
'$details' => array(
- 'detailled_profile', //Name
- t('Show more profile fields:'), //Label
- $detailled_profile, //Value
- '', //Help string
- array(t('No'),t('Yes')) //Off - On strings
- ),
-
- '$multi_profiles' => feature_enabled(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' => '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"),
- '$banner' => t('Edit Profile Details'),
- '$submit' => t('Submit'),
- '$profpic' => t('Change Profile Photo'),
- '$viewprof' => t('View this profile'),
- '$cr_prof' => t('Create a new profile using these settings'),
- '$cl_prof' => t('Clone this profile'),
- '$del_prof' => t('Delete this profile'),
+ 'detailled_profile', //Name
+ t('Show more profile fields:'), //Label
+ $detailled_profile, //Value
+ '', //Help string
+ array(t('No'),t('Yes')) //Off - On strings
+ ),
+
+ '$multi_profiles' => feature_enabled(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_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'),
@@ -698,81 +700,56 @@ function profiles_content(&$a) {
'$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_profname' => t('Profile Name:'),
- '$lbl_fullname' => t('Your Full Name:'),
- '$lbl_title' => t('Title/Description:'),
'$lbl_gender' => t('Your Gender:'),
- '$lbl_bd' => t("Birthday :"),
- '$lbl_address' => t('Street Address:'),
- '$lbl_city' => t('Locality/City:'),
- '$lbl_zip' => t('Postal/Zip Code:'),
- '$lbl_country' => t('Country:'),
- '$lbl_region' => t('Region/State:'),
'$lbl_marital' => t('♥ Marital Status:'),
- '$lbl_with' => t("Who: \x28if applicable\x29"),
- '$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'),
- '$lbl_howlong' => t('Since [date]:'),
'$lbl_sexual' => t('Sexual Preference:'),
- '$lbl_homepage' => t('Homepage URL:'),
- '$lbl_hometown' => t('Hometown:'),
- '$lbl_politic' => t('Political Views:'),
- '$lbl_religion' => t('Religious Views:'),
- '$lbl_pubkey' => t('Public Keywords:'),
- '$lbl_prvkey' => t('Private Keywords:'),
- '$lbl_likes' => t('Likes:'),
- '$lbl_dislikes' => t('Dislikes:'),
'$lbl_ex2' => t('Example: fishing photography software'),
- '$lbl_pubdsc' => t("\x28Used for suggesting potential friends, can be seen by others\x29"),
- '$lbl_prvdsc' => t("\x28Used for searching profiles, never shown to others\x29"),
- '$lbl_about' => t('Tell us about yourself...'),
- '$lbl_hobbies' => t('Hobbies/Interests'),
- '$lbl_social' => t('Contact information and Social Networks'),
- '$lbl_music' => t('Musical interests'),
- '$lbl_book' => t('Books, literature'),
- '$lbl_tv' => t('Television'),
- '$lbl_film' => t('Film/dance/culture/entertainment'),
- '$lbl_love' => t('Love/romance'),
- '$lbl_work' => t('Work/employment'),
- '$lbl_school' => t('School/education'),
+
'$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
'$baseurl' => $a->get_baseurl(true),
'$profile_id' => $r[0]['id'],
- '$profile_name' => $r[0]['profile-name'],
+ '$profile_name' => array('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' => $r[0]['name'],
- '$pdesc' => $r[0]['pdesc'],
+ '$name' => array('name', t('Your Full Name:'), $r[0]['name']),
+ '$pdesc' => array('pdesc', t('Title/Description:'), $r[0]['pdesc']),
'$dob' => dob($r[0]['dob']),
'$hide_friends' => $hide_friends,
- '$address' => $r[0]['address'],
- '$locality' => $r[0]['locality'],
- '$region' => $r[0]['region'],
- '$postal_code' => $r[0]['postal-code'],
- '$country_name' => $r[0]['country-name'],
+ '$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']),
'$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' => strip_tags($r[0]['with']),
- '$howlong' => ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])),
+ '$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'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))),
'$sexual' => sexpref_selector($r[0]['sexual']),
- '$about' => $r[0]['about'],
- '$homepage' => $r[0]['homepage'],
- '$hometown' => $r[0]['hometown'],
- '$politic' => $r[0]['politic'],
- '$religion' => $r[0]['religion'],
- '$pub_keywords' => $r[0]['pub_keywords'],
- '$prv_keywords' => $r[0]['prv_keywords'],
- '$likes' => $r[0]['likes'],
- '$dislikes' => $r[0]['dislikes'],
- '$music' => $r[0]['music'],
- '$book' => $r[0]['book'],
- '$tv' => $r[0]['tv'],
- '$film' => $r[0]['film'],
- '$interest' => $r[0]['interest'],
- '$romance' => $r[0]['romance'],
- '$work' => $r[0]['work'],
- '$education' => $r[0]['education'],
- '$contact' => $r[0]['contact']
+ '$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);
@@ -792,7 +769,7 @@ function profiles_content(&$a) {
);
if(count($r)){
//Go to the default profile.
- goaway($a->get_baseurl(true) . '/profiles/'.$r[0]['id']);
+ goaway('profiles/'.$r[0]['id']);
}
}
@@ -800,29 +777,28 @@ function profiles_content(&$a) {
local_user());
if(count($r)) {
- $tpl_header = get_markup_template('profile_listing_header.tpl');
- $o .= replace_macros($tpl_header,array(
- '$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")
- ));
-
-
$tpl = get_markup_template('profile_entry.tpl');
-
foreach($r as $rr) {
- $o .= replace_macros($tpl, array(
- '$photo' => $a->get_cached_avatar_image($rr['thumb']),
+ $profiles .= replace_macros($tpl, array(
+ '$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') . '')
+ : '' . t('Edit visibility') . '')
));
}
+
+ $tpl_header = get_markup_template('profile_listing_header.tpl');
+ $o .= replace_macros($tpl_header,array(
+ '$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;
}
-}
+
}