X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fprofiles.php;h=0bb476549eb89d93b624c404740b72aba13cd7b3;hb=c000510c2737e66a4504d90ca31a673d84ce90f7;hp=d510e4398a5949fc482e33515c7864c9033ef148;hpb=d98a6956894b1d3f120091ac9dd17436e51e0515;p=friendica.git
diff --git a/mod/profiles.php b/mod/profiles.php
index d510e4398a..0bb476549e 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -10,6 +10,8 @@ function profiles_post(&$a) {
$namechanged = false;
+ call_hooks('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",
intval($a->argv[1]),
@@ -46,17 +48,65 @@ function profiles_post(&$a) {
if($orig[0]['name'] != $name)
$namechanged = true;
+ $pdesc = notags(trim($_POST['pdesc']));
$gender = notags(trim($_POST['gender']));
$address = notags(trim($_POST['address']));
$locality = notags(trim($_POST['locality']));
$region = notags(trim($_POST['region']));
$postal_code = notags(trim($_POST['postal_code']));
$country_name = notags(trim($_POST['country_name']));
-
+ $keywords = notags(trim($_POST['keywords']));
$marital = notags(trim($_POST['marital']));
if($marital != $orig[0]['marital'])
$maritalchanged = true;
+ $with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
+
+ // linkify the relationship target if applicable
+
+ if(strlen($with)) {
+ if($with != strip_tags($orig[0]['with'])) {
+ $prf = '';
+ $lookup = $with;
+ if((strpos($lookup,'@')) || (strpos($lookup,'http://'))) {
+ $newname = $lookup;
+ $links = @lrdd($lookup);
+ if(count($links)) {
+ foreach($links as $link) {
+ if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
+ $prf = $link['@attributes']['href'];
+ }
+ }
+ }
+ }
+ else {
+ $newname = $lookup;
+ if(strstr($lookup,' ')) {
+ $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($newname),
+ intval(local_user())
+ );
+ }
+ else {
+ $r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($lookup),
+ intval(local_user())
+ );
+ }
+ if(count($r)) {
+ $prf = $r[0]['url'];
+ $newname = $r[0]['name'];
+ }
+ }
+
+ if($prf) {
+ $with = str_replace($lookup,'' . $newname . '', $with);
+ }
+ }
+ else
+ $with = $orig[0]['with'];
+ }
+
$sexual = notags(trim($_POST['sexual']));
$homepage = notags(trim($_POST['homepage']));
$politic = notags(trim($_POST['politic']));
@@ -78,6 +128,7 @@ function profiles_post(&$a) {
$r = q("UPDATE `profile`
SET `profile-name` = '%s',
`name` = '%s',
+ `pdesc` = '%s',
`gender` = '%s',
`dob` = '%s',
`address` = '%s',
@@ -86,10 +137,12 @@ function profiles_post(&$a) {
`postal-code` = '%s',
`country-name` = '%s',
`marital` = '%s',
+ `with` = '%s',
`sexual` = '%s',
`homepage` = '%s',
`politic` = '%s',
`religion` = '%s',
+ `keywords` = '%s',
`about` = '%s',
`interest` = '%s',
`contact` = '%s',
@@ -104,6 +157,7 @@ function profiles_post(&$a) {
WHERE `id` = %d AND `uid` = %d LIMIT 1",
dbesc($profile_name),
dbesc($name),
+ dbesc($pdesc),
dbesc($gender),
dbesc($dob),
dbesc($address),
@@ -112,10 +166,12 @@ function profiles_post(&$a) {
dbesc($postal_code),
dbesc($country_name),
dbesc($marital),
+ dbesc($with),
dbesc($sexual),
dbesc($homepage),
dbesc($politic),
dbesc($religion),
+ dbesc($keywords),
dbesc($about),
dbesc($interest),
dbesc($contact),
@@ -157,6 +213,7 @@ function profiles_post(&$a) {
function profiles_content(&$a) {
+
$o = '';
$o .= '';
@@ -214,13 +271,14 @@ function profiles_content(&$a) {
dbesc($name),
dbesc($r1[0]['name']),
dbesc($r1[0]['photo']),
- dbesc($ra[0]['thumb'])
+ dbesc($r1[0]['thumb'])
);
$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
intval(local_user()),
dbesc($name)
);
+
notice( t('New profile created.') . EOL);
if(count($r3) == 1)
goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
@@ -278,7 +336,6 @@ function profiles_content(&$a) {
return;
}
- require_once('mod/profile.php');
profile_load($a,$a->user['nickname'],$r[0]['id']);
require_once('include/profile_selectors.php');
@@ -296,9 +353,6 @@ function profiles_content(&$a) {
$a->page['htmlhead'] .= "";
-
-
-
$is_default = (($r[0]['is-default']) ? 1 : 0);
$tpl = load_view_file("view/profile_edit.tpl");
$o .= replace_macros($tpl,array(
@@ -308,6 +362,7 @@ function profiles_content(&$a) {
'$profile_name' => $r[0]['profile-name'],
'$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'],
'$dob' => dob($r[0]['dob']),
'$hide_friends' => $hide_friends,
'$address' => $r[0]['address'],
@@ -318,11 +373,13 @@ function profiles_content(&$a) {
'$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']),
'$sexual' => sexpref_selector($r[0]['sexual']),
'$about' => $r[0]['about'],
'$homepage' => $r[0]['homepage'],
'$politic' => $r[0]['politic'],
'$religion' => $r[0]['religion'],
+ '$keywords' => $r[0]['keywords'],
'$music' => $r[0]['music'],
'$book' => $r[0]['book'],
'$tv' => $r[0]['tv'],
@@ -334,9 +391,10 @@ function profiles_content(&$a) {
'$contact' => $r[0]['contact']
));
- return $o;
-
+ $arr = array('profile' => $r[0], 'entry' => $o);
+ call_hooks('profile_edit', $arr);
+ return $o;
}
else {
@@ -353,6 +411,7 @@ function profiles_content(&$a) {
$o .= replace_macros($template, array(
'$photo' => $rr['thumb'],
'$id' => $rr['id'],
+ '$alt' => t('Profile Image'),
'$profile_name' => $rr['profile-name']
));
}