make home tab work from remote profile, fix link in comment notify emails

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index d510e4398a5949fc482e33515c7864c9033ef148..1c75dc0eb140956eaca0ab2af10d26cf9c74143f 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -52,11 +52,58 @@ 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']));
                $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,'<a href="' . $prf . '">' . $newname        . '</a>', $with);
+                               }
+                       }
+                       else
+                               $with = $orig[0]['with'];
+               }
+
                $sexual = notags(trim($_POST['sexual']));
                $homepage = notags(trim($_POST['homepage']));
                $politic = notags(trim($_POST['politic']));
@@ -86,10 +133,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',
@@ -112,10 +161,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),
@@ -214,13 +265,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 +330,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 +347,6 @@ function profiles_content(&$a) {
                $a->page['htmlhead'] .= "<script type=\"text/javascript\" src=\"include/country.js\" ></script>";
 
 
-
-       
-
                $is_default = (($r[0]['is-default']) ? 1 : 0);
                $tpl = load_view_file("view/profile_edit.tpl");
                $o .= replace_macros($tpl,array(
@@ -318,11 +366,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'],
@@ -335,8 +385,6 @@ function profiles_content(&$a) {
                ));
 
                return $o;
-
-
        }
        else {