Merge commit 'mike/master'

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index e675af2e4856405ebd7e09d1ffbfab5cad5aeafe..d74219501a0ce3501888994bf715e908320188af 100644 (file)
--- 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,13 +48,14 @@ 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;
@@ -125,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',
@@ -138,6 +142,7 @@ function profiles_post(&$a) {
                        `homepage` = '%s',
                        `politic` = '%s',
                        `religion` = '%s',
+                       `keywords` = '%s',
                        `about` = '%s',
                        `interest` = '%s',
                        `contact` = '%s',
@@ -152,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),
@@ -165,6 +171,7 @@ function profiles_post(&$a) {
                        dbesc($homepage),
                        dbesc($politic),
                        dbesc($religion),
+                       dbesc($keywords),
                        dbesc($about),
                        dbesc($interest),
                        dbesc($contact),
@@ -196,8 +203,8 @@ function profiles_post(&$a) {
                        $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_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &", array(),$foo));
+                               proc_run($php_path,"include/directory.php","$url");
                }
        }
 }
@@ -206,6 +213,7 @@ function profiles_post(&$a) {
 
 
 function profiles_content(&$a) {
+
        $o = '';
        $o .= '<script> $(document).ready(function() { $(\'#nav-profiles-link\').addClass(\'nav-selected\'); });</script>';
 
@@ -263,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']);
@@ -353,6 +362,7 @@ function profiles_content(&$a) {
                        '$profile_name' => $r[0]['profile-name'],
                        '$default' => (($is_default) ? '<p id="profile-edit-default-desc">' . t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""),
                        '$name' => $r[0]['name'],
+                       '$pdesc' => $r[0]['pdesc'],
                        '$dob' => dob($r[0]['dob']),
                        '$hide_friends' => $hide_friends,
                        '$address' => $r[0]['address'],
@@ -369,6 +379,7 @@ function profiles_content(&$a) {
                        '$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'],
@@ -380,6 +391,9 @@ function profiles_content(&$a) {
                        '$contact' => $r[0]['contact']
                ));
 
+               $arr = array('profile' => $r[0], 'entry' => $o);
+               call_hooks('profile_edit', $arr);
+
                return $o;
        }
        else {
@@ -397,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']
                                ));
                        }