Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index eef58bb06fcd8201361fa812ed8798a208e85180..26fc8876547bbd1ef98c5c7103c578fae7d6856e 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -51,6 +51,7 @@ 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']));
@@ -61,15 +62,16 @@ function profiles_post(&$a) {
                $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;
 
                $with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
 
                // linkify the relationship target if applicable
 
+               $withchanged = false;
+
                if(strlen($with)) {
                        if($with != strip_tags($orig[0]['with'])) {
+                               $withchanged = true;
                                $prf = '';
                                $lookup = $with;
                                if(strpos($lookup,'@') === 0)
@@ -134,6 +136,55 @@ function profiles_post(&$a) {
 
                $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
 
+
+
+               $changes = array();
+               $value = '';
+               if($is_default) {
+                       if($marital != $orig[0]['marital']) {
+                               $changes[] = '[color=#ff0000]♥[/color] ' . t('Marital Status');
+                               $value = $marital;
+                       }
+                       if($withchanged) {
+                               $changes[] = '♥ ' . t('Romantic Partner');
+                               $value = strip_tags($with);
+                       }                                                       
+                       if($work != $orig[0]['work']) {
+                               $changes[] = t('Work/Employment');
+                       }
+                       if($religion != $orig[0]['religion']) {
+                               $changes[] = t('Religion');
+                               $value = $religion;
+                       }
+                       if($politic != $orig[0]['politic']) {
+                               $changes[] = t('Political Views');
+                               $value = $politic;
+                       }
+                       if($gender != $orig[0]['gender']) {
+                               $changes[] = t('Gender');
+                               $value = $gender;
+                       }
+                       if($sexual != $orig[0]['sexual']) {
+                               $changes[] = t('Sexual Preference');
+                               $value = $sexual;
+                       }
+                       if($homepage != $orig[0]['homepage']) {
+                               $changes[] = t('Homepage');
+                               $value = $homepage;
+                       }
+                       if($interest != $orig[0]['interest']) {
+                               $changes[] = t('Interests');
+                               $value = $interest;
+                       }
+                       if($address != $orig[0]['address'] || $locality != $orig[0]['locality'] || $region != $orig[0]['region']
+                               || $country_name != $orig[0]['country-name']) {
+                               $changes[] = t('Location');
+                       }
+
+                       profile_activity($changes,$value);
+
+               }                       
+                       
                $r = q("UPDATE `profile` 
                        SET `profile-name` = '%s',
                        `name` = '%s',
@@ -195,7 +246,7 @@ function profiles_post(&$a) {
                        dbesc($education),
                        intval($hide_friends),
                        intval($a->argv[1]),
-                       intval($_SESSION['uid'])
+                       intval(local_user())
                );
 
                if($r)
@@ -222,6 +273,87 @@ function profiles_post(&$a) {
 }
 
 
+function profile_activity($changed, $value) {
+       $a = get_app();
+
+       if(! local_user() || ! is_array($changed) || ! count($changed))
+               return;
+
+       if($a->user['hidewall'] || get_config('system','block_public'))
+               return;
+
+       if(! get_pconfig(local_user(),'system','post_profilechange'))
+               return;
+
+       require_once('include/items.php');
+
+       $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+               intval(local_user())
+       );
+
+       if(! count($self))
+               return;
+
+       $arr = array();
+       $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), local_user()); 
+       $arr['uid'] = local_user();
+       $arr['contact-id'] = $self[0]['id'];
+       $arr['wall'] = 1;
+       $arr['type'] = 'wall';
+       $arr['gravity'] = 0;
+       $arr['origin'] = 1;
+       $arr['author-name'] = $arr['owner-name'] = $self[0]['name'];
+       $arr['author-link'] = $arr['owner-link'] = $self[0]['url'];
+       $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb'];
+       $arr['verb'] = ACTIVITY_UPDATE;
+       $arr['object-type'] = ACTIVITY_OBJ_PROFILE;
+                               
+       $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]';
+
+
+       $changes = '';
+       $t = count($changed);
+       $z = 0;
+       foreach($changed as $ch) {
+               if(strlen($changes)) {
+                       if ($z == ($t - 1))
+                               $changes .= t(' and ');
+                       else
+                               $changes .= ', ';
+               }
+               $z ++;
+               $changes .= $ch;
+       }
+
+       $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';      
+
+       if($t == 1 && strlen($value)) {
+               $message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value);
+               $message .= "\n\n" . sprintf( t(' - Visit %1$s\'s %2$s'), $A, $prof);
+       }
+       else
+               $message =      sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
+ 
+
+       $arr['body'] = $message;  
+
+       $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PROFILE . '</type><title>' . $self[0]['name'] . '</title>'
+       . '<id>' . $self[0]['url'] . '/' . $self[0]['name'] . '</id>';
+       $arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $self[0]['url'] . '?tab=profile' . '" />' . "\n");
+       $arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $self[0]['thumb'] . '" />' . "\n");
+       $arr['object'] .= '</link></object>' . "\n";
+       $arr['last-child'] = 1;
+
+       $arr['allow_cid'] = $a->user['allow_cid'];
+       $arr['allow_gid'] = $a->user['allow_gid'];
+       $arr['deny_cid']  = $a->user['deny_cid'];
+       $arr['deny_gid']  = $a->user['deny_gid'];
+
+       $i = item_store($arr);
+       if($i)
+               proc_run('php',"include/notifier.php","activity","$i");
+
+}
 
 
 function profiles_content(&$a) {