Merge branch 'master' into trinidad

3 files changed, 34 insertions, 15 deletions

diff --git a/mod/manage.php b/mod/manage.php
index 00c6db7f0..b0de945bf 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -28,8 +28,13 @@ function manage_content(&$a) {
 	if($change_channel) {
 		$r = change_channel($change_channel);
 
-		if($r && $r['channel_startpage'])
-			goaway(z_root() . '/' . $r['channel_startpage']);
+		if((argc() > 2) && !(argv(2) === 'default')) {
+			goaway(z_root() . '/' . implode('/',array_slice($a->argv,2))); // Go to whatever is after /manage/, but with the new channel
+		}
+		else {
+			if($r && $r['channel_startpage'])
+				goaway(z_root() . '/' . $r['channel_startpage']); // If nothing extra is specified, go to the default page
+		}
 		goaway(z_root());
 	}
 
@@ -41,15 +46,12 @@ function manage_content(&$a) {
 			intval(PAGE_REMOVED)
 		);
 
-		$selected_channel = null;
 		$account = get_app()->get_account();
 
 		if($r && count($r)) {
 			$channels = $r;
 			for($x = 0; $x < count($channels); $x ++) {
 				$channels[$x]['link'] = 'manage/' . intval($channels[$x]['channel_id']);
-				if($channels[$x]['channel_id'] == local_user())
-					$selected_channel = $channels[$x];
 				$channels[$x]['default'] = (($channels[$x]['channel_id'] == $account['account_default_channel']) ? "1" : ''); 
 				$channels[$x]['default_links'] = '1';
 
@@ -147,12 +149,14 @@ function manage_content(&$a) {
 	$o = replace_macros(get_markup_template('channels.tpl'), array(
 		'$header'           => t('Channel Manager'),
 		'$msg_selected'     => t('Current Channel'),
-		'$selected'         => $selected_channel,
-		'$desc'             => t('Attach to one of your channels by selecting it.'),
+		'$selected'         => local_user(),
+		'$desc'             => t('Switch to one of your channels by selecting it.'),
 		'$msg_default'      => t('Default Channel'),
 		'$msg_make_default' => t('Make Default'),
 		'$links'            => $links,
 		'$all_channels'     => $channels,
+		'$mail_format'        => t('%d new messages'),
+		'$intros_format'        => t('%d new introductions'),
 		'$channel_usage_message' => $channel_usage_message,
 	));
 
diff --git a/mod/ping.php b/mod/ping.php
index ef8afd91c..cdb6aa0b2 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -46,6 +46,7 @@ function ping_init(&$a) {
 	if(local_user())  {
 		$vnotify = get_pconfig(local_user(),'system','vnotify');
 		$evdays = intval(get_pconfig(local_user(),'system','evdays'));
+		$ob_hash = get_observer_hash();
 	}
 
 	// if unset show all visual notification types
@@ -275,10 +276,12 @@ function ping_init(&$a) {
 		$result = array();
 
 		$r = q("SELECT * FROM item
-			WHERE item_restrict = %d and ( item_flags & %d ) > 0 and uid = %d",
+			WHERE item_restrict = %d and ( item_flags & %d ) > 0 and uid = %d
+			and author_xchan != '%s' ",
 			intval(ITEM_VISIBLE),
 			intval(ITEM_UNSEEN),
-			intval(local_user())
+			intval(local_user()),
+			dbesc($ob_hash)
 		);
 
 		if($r) {
@@ -381,10 +384,12 @@ function ping_init(&$a) {
 
 	if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) {
 		$r = q("SELECT id, item_restrict, item_flags FROM item
-			WHERE (item_restrict = %d) and ( item_flags & %d ) > 0 and uid = %d",
+			WHERE (item_restrict = %d) and ( item_flags & %d ) > 0 and uid = %d
+			and author_xchan != '%s'",
 			intval(ITEM_VISIBLE),
 			intval(ITEM_UNSEEN),
-			intval(local_user())
+			intval(local_user()),
+			dbesc($ob_hash)
 		);
 
 		if($r) {	
diff --git a/mod/profiles.php b/mod/profiles.php
index 1d784c506..f2695f332 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -156,9 +156,14 @@ function profiles_init(&$a) {
 
 	// Run profile_load() here to make sure the theme is set before
 	// we start loading content
-	if((argc() > 1) && (intval(argv(1)))) {
+	if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_user(),'multi_profiles')) {
+		if(feature_enabled(local_user(),'multi_profiles'))
+			$id = $a->argv[1];
+		else
+			$id = q("select id from profile where uid = %d and is_default = 1",local_user())[0]['id'];
+
 		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($a->argv[1]),
+			intval($id),
 			intval(local_user())
 		);
 		if(! count($r)) {
@@ -556,9 +561,14 @@ function profiles_content(&$a) {
 	$profile_fields_basic    = get_profile_fields_basic();
 	$profile_fields_advanced = get_profile_fields_advanced();
 
-	if((argc() > 1) && (intval(argv(1)))) {
+	if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_user(),'multi_profiles')) {
+		if(feature_enabled(local_user(),'multi_profiles'))
+			$id = $a->argv[1];
+		else
+			$id = q("select id from profile where uid = %d and is_default = 1",local_user())[0]['id'];
+		
 		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($a->argv[1]),
+			intval($id),
 			intval(local_user())
 		);
 		if(! count($r)) {