enhanced profile reporting for single values

This commit is contained in:
friendica 2012-04-29 01:42:48 -07:00
parent 249a6814cd
commit a9dba2720b
1 changed files with 51 additions and 15 deletions

View File

@ -139,21 +139,49 @@ function profiles_post(&$a) {
$changes = array(); $changes = array();
$value = '';
if($is_default) { if($is_default) {
if($marital != $orig[0]['marital']) $changes[] = '♥ ' . t('Marital Status'); if($marital != $orig[0]['marital']) {
if($withchanged) $changes[] = '♥ ' . t('Romantic Partner'); $changes[] = '♥ ' . t('Marital Status');
if($work != $orig[0]['work']) $changes[] = t('Work/Employment'); $value = $marital;
if($religion != $orig[0]['religion']) $changes[] = t('Religion'); }
if($politic != $orig[0]['politic']) $changes[] = t('Political Views'); if($withchanged) {
if($gender != $orig[0]['gender']) $changes[] = t('Gender'); $changes[] = '♥ ' . t('Romantic Partner');
if($sexual != $orig[0]['sexual']) $changes[] = t('Sexual Preference'); $value = strip_tags($with);
if($homepage != $orig[0]['homepage']) $changes[] = t('Homepage'); }
if($interest != $orig[0]['interest']) $changes[] = t('Interests'); 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'] if($address != $orig[0]['address'] || $locality != $orig[0]['locality'] || $region != $orig[0]['region']
|| $country_name != $orig[0]['country_name']) || $country_name != $orig[0]['country_name']) {
$changes[] = t('Location'); $changes[] = t('Location');
}
profile_activity($changes); profile_activity($changes,$value);
} }
@ -245,7 +273,7 @@ function profiles_post(&$a) {
} }
function profile_activity($changed) { function profile_activity($changed, $value) {
$a = get_app(); $a = get_app();
if(! local_user() || ! is_array($changed) || ! count($changed)) if(! local_user() || ! is_array($changed) || ! count($changed))
@ -289,7 +317,7 @@ function profile_activity($changed) {
foreach($changed as $ch) { foreach($changed as $ch) {
if(strlen($changes)) { if(strlen($changes)) {
if ($z == ($t - 1)) if ($z == ($t - 1))
$changes .= ' and '; $changes .= t(' and ');
else else
$changes .= ', '; $changes .= ', ';
} }
@ -299,7 +327,15 @@ function profile_activity($changed) {
$prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]'; $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';
$arr['body'] = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes); 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>' $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PROFILE . '</type><title>' . $self[0]['name'] . '</title>'
. '<id>' . $self[0]['url'] . '/' . $self[0]['name'] . '</id>'; . '<id>' . $self[0]['url'] . '/' . $self[0]['name'] . '</id>';