From 7e2d4d402692335b4cdd2f7c8d6988ba8806affe Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Apr 2012 16:51:57 -0700 Subject: turn off new friend activity by default --- mod/notifications.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/notifications.php b/mod/notifications.php index 690a99562..4e268188e 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -198,7 +198,7 @@ function notifications_content(&$a) { '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"), '$fullname' => $rr['name'], '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')), + '$activity' => array('activity', t('Post a new friend activity'), 0, t('if applicable')), '$url' => zrl($rr['url']), '$knowyou' => $knowyou, '$approve' => t('Approve'), -- cgit v1.2.3 From 32cd62ff0a69cbce29617ac943dbcb580e395b67 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Apr 2012 18:15:46 -0700 Subject: allow setting default new friend notify --- mod/notifications.php | 2 +- mod/settings.php | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/notifications.php b/mod/notifications.php index 4e268188e..8e3eebba1 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -198,7 +198,7 @@ function notifications_content(&$a) { '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"), '$fullname' => $rr['name'], '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), 0, t('if applicable')), + '$activity' => array('activity', t('Post a new friend activity'), get_config('system','post_newfriend'), t('if applicable')), '$url' => zrl($rr['url']), '$knowyou' => $knowyou, '$approve' => t('Approve'), diff --git a/mod/settings.php b/mod/settings.php index 2dd9fb9a6..12af99560 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -346,6 +346,7 @@ function settings_post(&$a) { $suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0); $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); $hidewall = (($_POST['hidewall'] == 1) ? 1: 0); + $post_newfriend = (($_POST['post_newfriend'] == 1) ? 1: 0); $notify = 0; @@ -428,6 +429,7 @@ function settings_post(&$a) { set_pconfig(local_user(),'expire','photos', $expire_photos); set_pconfig(local_user(),'system','suggestme', $suggestme); + set_pconfig(local_user(),'system','post_newfriend', $post_newfriend); $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, `unkmail` = %d, `cntunkmail` = %d WHERE `uid` = %d LIMIT 1", @@ -790,6 +792,8 @@ function settings_content(&$a) { $suggestme = get_pconfig(local_user(), 'system','suggestme'); $suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0 + $post_newfriend = get_pconfig(local_user(), 'system','post_newfriend'); + $post_newfriend = (($post_newfriend===false)? '0': $post_newfriend); // default if not set: 0 if(! strlen($a->user['timezone'])) @@ -877,6 +881,10 @@ function settings_content(&$a) { )); + $activity_options = t('By default post a status message when:'); + + $post_newfriend = array('post_newfriend', t('accepting a friend request'), $post_newfriend, ''); + $invisible = (((! $profile['publish']) && (! $profile['net-publish'])) ? true : false); @@ -958,6 +966,8 @@ function settings_content(&$a) { '$h_not' => t('Notification Settings'), + '$activity_options' => $activity_options, + '$post_newfriend' => $post_newfriend, '$lbl_not' => t('Send a notification email when:'), '$notify1' => array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''), '$notify2' => array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''), -- cgit v1.2.3 From 972c01edb3009e835d7a5a0861867cea8c06283f Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Apr 2012 21:10:32 -0700 Subject: profile change activities --- mod/profiles.php | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- mod/settings.php | 12 ++++--- 2 files changed, 102 insertions(+), 7 deletions(-) (limited to 'mod') diff --git a/mod/profiles.php b/mod/profiles.php index eef58bb06..99b197fde 100644 --- 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,8 +62,6 @@ 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'])) : ''); @@ -134,6 +133,24 @@ function profiles_post(&$a) { $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); + + + $changes = array(); + if($is_default) { + logger('changes'); + if($marital != $orig[0]['marital']) $changes[] = '♥ ' . t('Marital Status'); + if($work != $orig[0]['work']) $changes[] = t('Work/Employment'); + if($religion != $orig[0]['religion']) $changes[] = t('Religion'); + if($politic != $orig[0]['politic']) $changes[] = t('Political Views'); + + 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); + + } + $r = q("UPDATE `profile` SET `profile-name` = '%s', `name` = '%s', @@ -195,7 +212,7 @@ function profiles_post(&$a) { dbesc($education), intval($hide_friends), intval($a->argv[1]), - intval($_SESSION['uid']) + intval(local_user()) ); if($r) @@ -222,6 +239,80 @@ function profiles_post(&$a) { } +function profile_activity($changed) { + $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; + + logger('activity'); + 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 .= ' and '; + else + $changes .= ', '; + } + $z ++; + $changes .= $ch; + } + + $prof = '[url=' . $self[0]['url'] . ']' . t('public profile') . '[/url]'; + + $arr['body'] = sprintf( t('%1$s has an updated %2$s changing %3$s.'), $A, $prof, $changes); + + $arr['object'] = '' . ACTIVITY_OBJ_PROFILE . '' . $self[0]['name'] . '' + . '' . $self[0]['url'] . '/' . $self[0]['name'] . ''; + $arr['object'] .= '' . xmlify('' . "\n"); + $arr['object'] .= xmlify('' . "\n"); + $arr['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) { diff --git a/mod/settings.php b/mod/settings.php index 12af99560..721468437 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -347,6 +347,7 @@ function settings_post(&$a) { $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); $hidewall = (($_POST['hidewall'] == 1) ? 1: 0); $post_newfriend = (($_POST['post_newfriend'] == 1) ? 1: 0); + $post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0); $notify = 0; @@ -430,6 +431,7 @@ function settings_post(&$a) { set_pconfig(local_user(),'system','suggestme', $suggestme); set_pconfig(local_user(),'system','post_newfriend', $post_newfriend); + set_pconfig(local_user(),'system','post_profilechange', $post_profilechange); $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, `unkmail` = %d, `cntunkmail` = %d WHERE `uid` = %d LIMIT 1", @@ -795,6 +797,9 @@ function settings_content(&$a) { $post_newfriend = get_pconfig(local_user(), 'system','post_newfriend'); $post_newfriend = (($post_newfriend===false)? '0': $post_newfriend); // default if not set: 0 + $post_profilechange = get_pconfig(local_user(), 'system','post_profilechange'); + $post_profilechange = (($post_profilechange===false)? '0': $post_profilechange); // default if not set: 0 + if(! strlen($a->user['timezone'])) $timezone = date_default_timezone_get(); @@ -881,9 +886,7 @@ function settings_content(&$a) { )); - $activity_options = t('By default post a status message when:'); - $post_newfriend = array('post_newfriend', t('accepting a friend request'), $post_newfriend, ''); $invisible = (((! $profile['publish']) && (! $profile['net-publish'])) @@ -966,8 +969,9 @@ function settings_content(&$a) { '$h_not' => t('Notification Settings'), - '$activity_options' => $activity_options, - '$post_newfriend' => $post_newfriend, + '$activity_options' => t('By default post a status message when:'), + '$post_newfriend' => array('post_newfriend', t('accepting a friend request'), $post_newfriend, ''), + '$post_profilechange' => array('post_profilechange', t('making an interesting profile change'), $post_profilechange, ''), '$lbl_not' => t('Send a notification email when:'), '$notify1' => array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''), '$notify2' => array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''), -- cgit v1.2.3 From 2b339d5a6b3018618944e353cb5fc18c6f81aefb Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Apr 2012 21:21:35 -0700 Subject: stray log statements --- mod/profiles.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'mod') diff --git a/mod/profiles.php b/mod/profiles.php index 99b197fde..64a0142ec 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -137,7 +137,6 @@ function profiles_post(&$a) { $changes = array(); if($is_default) { - logger('changes'); if($marital != $orig[0]['marital']) $changes[] = '♥ ' . t('Marital Status'); if($work != $orig[0]['work']) $changes[] = t('Work/Employment'); if($religion != $orig[0]['religion']) $changes[] = t('Religion'); @@ -251,7 +250,6 @@ function profile_activity($changed) { if(! get_pconfig(local_user(),'system','post_profilechange')) return; - logger('activity'); require_once('include/items.php'); $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", -- cgit v1.2.3 From 446e962bb85cf377d476734812318f6dc76bdfb2 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Apr 2012 21:38:40 -0700 Subject: send link directly to profile tab --- mod/profiles.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mod') diff --git a/mod/profiles.php b/mod/profiles.php index 64a0142ec..227fb0763 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -290,13 +290,13 @@ function profile_activity($changed) { $changes .= $ch; } - $prof = '[url=' . $self[0]['url'] . ']' . 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); + $arr['body'] = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes); $arr['object'] = '' . ACTIVITY_OBJ_PROFILE . '' . $self[0]['name'] . '' . '' . $self[0]['url'] . '/' . $self[0]['name'] . ''; - $arr['object'] .= '' . xmlify('' . "\n"); + $arr['object'] .= '' . xmlify('' . "\n"); $arr['object'] .= xmlify('' . "\n"); $arr['object'] .= '' . "\n"; $arr['last-child'] = 1; -- cgit v1.2.3 From af68d033e330e33571f95763b58833273d22d3a7 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Apr 2012 21:58:15 -0700 Subject: extended the "interesting" profile attributes --- mod/profiles.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/profiles.php b/mod/profiles.php index 227fb0763..7a33a03e4 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -67,8 +67,11 @@ function profiles_post(&$a) { // 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) @@ -138,10 +141,14 @@ function profiles_post(&$a) { $changes = array(); if($is_default) { if($marital != $orig[0]['marital']) $changes[] = '♥ ' . t('Marital Status'); + if($withchanged) $changes[] = '♥ ' . t('Romantic Partner'); if($work != $orig[0]['work']) $changes[] = t('Work/Employment'); if($religion != $orig[0]['religion']) $changes[] = t('Religion'); if($politic != $orig[0]['politic']) $changes[] = t('Political Views'); - + if($gender != $orig[0]['gender']) $changes[] = t('Gender'); + if($sexual != $orig[0]['sexual']) $changes[] = t('Sexual Preference'); + if($homepage != $orig[0]['homepage']) $changes[] = t('Homepage'); + if($interest != $orig[0]['interest']) $changes[] = t('Interests'); if($address != $orig[0]['address'] || $locality != $orig[0]['locality'] || $region != $orig[0]['region'] || $country_name != $orig[0]['country_name']) $changes[] = t('Location'); -- cgit v1.2.3 From 3c4e6d34610ae4913d1d9ea090499c5d328a62e8 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Apr 2012 23:06:41 -0700 Subject: bug #369 - show contacts who are not in any groups --- mod/nogroup.php | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 mod/nogroup.php (limited to 'mod') diff --git a/mod/nogroup.php b/mod/nogroup.php new file mode 100644 index 000000000..bd1ec82ed --- /dev/null +++ b/mod/nogroup.php @@ -0,0 +1,65 @@ +page,'aside')) + $a->page['aside'] = ''; + + $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id); +} + + +function nogroup_content(&$a) { + + if(! local_user()) { + notice( t('Permission denied.') . EOL); + return ''; + } + + require_once('include/Contact.php'); + $r = contacts_not_grouped(local_user()); + if(count($r)) { + $a->set_pager_total($r[0]['total']); + } + $r = contacts_not_grouped(local_user(),$a->pager['start'],$a->pager['itemspage']); + if(count($r)) { + foreach($r as $rr) { + + + $contacts[] = array( + 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']), + 'edit_hover' => t('Edit contact'), + 'photo_menu' => contact_photo_menu($rr), + 'id' => $rr['id'], + 'alt_text' => $alt_text, + 'dir_icon' => $dir_icon, + 'thumb' => $rr['thumb'], + 'name' => $rr['name'], + 'username' => $rr['name'], + 'sparkle' => $sparkle, + 'itemurl' => $rr['url'], + 'url' => $url, + 'network' => network_to_name($rr['network']), + ); + } + } + $tpl = get_markup_template("nogroup-template.tpl"); + $o .= replace_macros($tpl,array( + '$header' => t('Contacts who are not members of a group'), + '$contacts' => $contacts, + '$paginate' => paginate($a), + )); + + return $o; + +} -- cgit v1.2.3