X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=9c92d81bad906779f0cc9b198cbc8e77ac2ddcb2;hb=040fc247a0caa51e0d4da4169980dc32e80ee804;hp=d74219501a0ce3501888994bf715e908320188af;hpb=e9251499dd63523a552bc3bf6274e3b851cba4c8;p=friendica.git
diff --git a/mod/profiles.php b/mod/profiles.php
index d74219501a..9c92d81bad 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -55,7 +55,8 @@ function profiles_post(&$a) {
$region = notags(trim($_POST['region']));
$postal_code = notags(trim($_POST['postal_code']));
$country_name = notags(trim($_POST['country_name']));
- $keywords = notags(trim($_POST['keywords']));
+ $pub_keywords = notags(trim($_POST['pub_keywords']));
+ $prv_keywords = notags(trim($_POST['prv_keywords']));
$marital = notags(trim($_POST['marital']));
if($marital != $orig[0]['marital'])
$maritalchanged = true;
@@ -68,7 +69,10 @@ function profiles_post(&$a) {
if($with != strip_tags($orig[0]['with'])) {
$prf = '';
$lookup = $with;
- if((strpos($lookup,'@')) || (strpos($lookup,'http://'))) {
+ if(strpos($lookup,'@') === 0)
+ $lookup = substr($lookup,1);
+ $lookup = str_replace('_',' ', $lookup);
+ if(strpos($lookup,'@') || (strpos($lookup,'http://'))) {
$newname = $lookup;
$links = @lrdd($lookup);
if(count($links)) {
@@ -101,6 +105,8 @@ function profiles_post(&$a) {
if($prf) {
$with = str_replace($lookup,'' . $newname . '', $with);
+ if(strpos($with,'@') === 0)
+ $with = substr($with,1);
}
}
else
@@ -142,7 +148,8 @@ function profiles_post(&$a) {
`homepage` = '%s',
`politic` = '%s',
`religion` = '%s',
- `keywords` = '%s',
+ `pub_keywords` = '%s',
+ `prv_keywords` = '%s',
`about` = '%s',
`interest` = '%s',
`contact` = '%s',
@@ -171,7 +178,8 @@ function profiles_post(&$a) {
dbesc($homepage),
dbesc($politic),
dbesc($religion),
- dbesc($keywords),
+ dbesc($pub_keywords),
+ dbesc($prv_keywords),
dbesc($about),
dbesc($interest),
dbesc($contact),
@@ -188,7 +196,7 @@ function profiles_post(&$a) {
);
if($r)
- notice( t('Profile updated.') . EOL);
+ info( t('Profile updated.') . EOL);
if($namechanged && $is_default) {
@@ -200,11 +208,9 @@ function profiles_post(&$a) {
if($is_default) {
// Update global directory in background
- $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
$url = $_SESSION['my_url'];
if($url && strlen(get_config('system','directory_submit_url')))
- //proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &", array(),$foo));
- proc_run($php_path,"include/directory.php","$url");
+ proc_run('php',"include/directory.php","$url");
}
}
}
@@ -223,7 +229,7 @@ function profiles_content(&$a) {
}
if(($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
- $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 AND `self` = 0 LIMIT 1",
+ $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
intval($a->argv[2]),
intval(local_user())
);
@@ -240,11 +246,12 @@ function profiles_content(&$a) {
intval($a->argv[2]),
intval(local_user())
);
- $r = q("DELETE FROM `profile` WHERE `id` = %d LIMIT 1",
- intval($a->argv[2])
+ $r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ intval($a->argv[2]),
+ intval(local_user())
);
if($r)
- notice( t('Profile deleted.') . EOL);
+ info( t('Profile deleted.') . EOL);
goaway($a->get_baseurl() . '/profiles');
return; // NOTREACHED
@@ -279,7 +286,7 @@ function profiles_content(&$a) {
dbesc($name)
);
- notice( t('New profile created.') . EOL);
+ info( t('New profile created.') . EOL);
if(count($r3) == 1)
goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
goaway($a->get_baseurl() . '/profiles');
@@ -318,7 +325,7 @@ function profiles_content(&$a) {
intval(local_user()),
dbesc($name)
);
- notice( t('New profile created.') . EOL);
+ info( t('New profile created.') . EOL);
if(count($r3) == 1)
goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
goaway($a->get_baseurl() . '/profiles');
@@ -340,10 +347,13 @@ function profiles_content(&$a) {
require_once('include/profile_selectors.php');
- $tpl = load_view_file('view/profed_head.tpl');
+ $tpl = get_markup_template('profed_head.tpl');
- $opt_tpl = load_view_file("view/profile-hide-friends.tpl");
+ $opt_tpl = get_markup_template("profile-hide-friends.tpl");
$hide_friends = replace_macros($opt_tpl,array(
+ '$desc' => t('Hide my 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\" " : "")
));
@@ -354,8 +364,46 @@ function profiles_content(&$a) {
$is_default = (($r[0]['is-default']) ? 1 : 0);
- $tpl = load_view_file("view/profile_edit.tpl");
+ $tpl = get_markup_template("profile_edit.tpl");
$o .= replace_macros($tpl,array(
+ '$banner' => t('Edit Profile Details'),
+ '$submit' => t('Submit'),
+ '$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'),
+ '$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 \x28y/m/d\x29:"),
+ '$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_sexual' => t('Sexual Preference:'),
+ '$lbl_homepage' => t('Homepage URL:'),
+ '$lbl_politic' => t('Political Views:'),
+ '$lbl_religion' => t('Religious Views:'),
+ '$lbl_pubkey' => t('Public Keywords:'),
+ '$lbl_prvkey' => t('Private Keywords:'),
+ '$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(),
'$profile_id' => $r[0]['id'],
@@ -379,7 +427,8 @@ function profiles_content(&$a) {
'$homepage' => $r[0]['homepage'],
'$politic' => $r[0]['politic'],
'$religion' => $r[0]['religion'],
- '$keywords' => $r[0]['keywords'],
+ '$pub_keywords' => $r[0]['pub_keywords'],
+ '$prv_keywords' => $r[0]['prv_keywords'],
'$music' => $r[0]['music'],
'$book' => $r[0]['book'],
'$tv' => $r[0]['tv'],
@@ -402,21 +451,28 @@ function profiles_content(&$a) {
local_user());
if(count($r)) {
- $o .= load_view_file('view/profile_listing_header.tpl');
- $tpl_default = load_view_file('view/profile_entry_default.tpl');
- $tpl = load_view_file('view/profile_entry.tpl');
+ $tpl_header = get_markup_template('profile_listing_header.tpl');
+ $o .= replace_macros($tpl_header,array(
+ '$header' => t('Profiles'),
+ '$chg_photo' => t('Change profile photo'),
+ '$cr_new' => t('Create New Profile')
+ ));
+
+
+ $tpl = get_markup_template('profile_entry.tpl');
foreach($r as $rr) {
- $template = (($rr['is-default']) ? $tpl_default : $tpl);
- $o .= replace_macros($template, array(
+ $o .= replace_macros($tpl, array(
'$photo' => $rr['thumb'],
'$id' => $rr['id'],
'$alt' => t('Profile Image'),
- '$profile_name' => $rr['profile-name']
+ '$profile_name' => $rr['profile-name'],
+ '$visible' => (($rr['is-default']) ? '' . t('Visible to everybody') . ''
+ : '' . t('Edit visibility') . '')
));
}
}
return $o;
}
-}
\ No newline at end of file
+}