"profile url" e.g. the wall/stream is now "channel url". "Profile URL" goes to the profile details.

17 files changed, 286 insertions, 188 deletions

diff --git a/mod/auth.php b/mod/auth.php
index dae8a0e16..75d5fe545 100644
--- a/mod/auth.php
+++ b/mod/auth.php
@@ -76,7 +76,7 @@ function auth_init(&$a) {
 				}
 			}
 			$profile = $r[0]['nickname'];
-			goaway((strlen($destination_url)) ? $destination_url : $a->get_baseurl() . '/profile/' . $profile);
+			goaway((strlen($destination_url)) ? $destination_url : $a->get_baseurl() . '/channel/' . $profile);
 		}
 		goaway(z_root());
 
@@ -451,14 +451,14 @@ function auth_content(&$a) {
 
 		switch($destination_url) {
 			case 'profile':
-				$dest = $a->get_baseurl() . '/profile/' . $profile . '?tab=profile';
+				$dest = $a->get_baseurl() . '/profile/' . $profile ;
 				break;
 			case 'photos':
 				$dest = $a->get_baseurl() . '/photos/' . $profile;
 				break;
 			case 'status':
 			case '':
-				$dest = $a->get_baseurl() . '/profile/' . $profile;
+				$dest = $a->get_baseurl() . '/channel/' . $profile;
 				break;		
 			default:
 				$dest = $destination_url;
diff --git a/mod/channel.php b/mod/channel.php
new file mode 100644
index 000000000..b484f0f60
--- /dev/null
+++ b/mod/channel.php
@@ -0,0 +1,256 @@
+<?php
+
+function channel_init(&$a) {
+
+	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/feed/' . $which .'" />' . "\r\n" ;
+
+}
+
+
+function channel_aside(&$a) {
+
+	require_once('include/contact_widgets.php');
+	require_once('include/items.php');
+
+	if(argc() > 1)
+		$which = argv(1);
+	else {
+		notice( t('Requested profile is not available.') . EOL );
+		$a->error = 404;
+		return;
+	}
+
+	$profile = 0;
+	$channel = $a->get_channel();
+
+	if((local_user()) && (argc() > 2) && (argv(2) === 'view')) {
+		$which = $channel['channel_address'];
+		$profile = argv(1);		
+	}
+
+	$cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat']) : '');
+
+	profile_load($a,$which,$profile);
+
+	$a->set_widget('archive',posted_date_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$a->profile['profile_uid'],true));	
+	$a->set_widget('categories',categories_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$cat));
+
+}
+
+
+function channel_content(&$a, $update = 0) {
+
+	$category = $datequery = $datequery2 = '';
+
+	if(argc() > 2) {
+		for($x = 2; $x < argc(); $x ++) {
+			if(is_a_date_arg(argv($x))) {
+				if($datequery)
+					$datequery2 = escape_tags(argv($x));
+				else
+					$datequery = escape_tags(argv($x));
+			}
+		}
+	}
+
+	if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) {
+			return login();
+	}
+
+
+	require_once("include/bbcode.php");
+	require_once('include/security.php');
+	require_once('include/conversation.php');
+	require_once('include/acl_selectors.php');
+	require_once('include/items.php');
+
+	$groups = array();
+
+	$tab = 'posts';
+	$o = '';
+
+	if($update) {
+		// Ensure we've got a profile owner if updating.
+		$a->profile['profile_uid'] = $update;
+	}
+	else {
+		if($a->profile['profile_uid'] == local_user()) {
+			nav_set_selected('home');
+		}
+	}
+
+
+	$contact = null;
+	$remote_contact = false;
+
+	$contact_id = 0;
+
+	if(is_array($_SESSION['remote'])) {
+		foreach($_SESSION['remote'] as $v) {
+			if($v['uid'] == $a->profile['profile_uid']) {
+				$contact_id = $v['cid'];
+				break;
+			}
+		}
+	}
+
+	if($contact_id) {
+		$groups = init_groups_visitor($contact_id);
+		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			intval($contact_id),
+			intval($a->profile['profile_uid'])
+		);
+		if(count($r)) {
+			$contact = $r[0];
+			$remote_contact = true;
+		}
+	}
+
+	if(! $remote_contact) {
+		if(local_user()) {
+			$contact_id = $_SESSION['cid'];
+			$contact = $a->contact;
+		}
+	}
+
+	$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
+
+	if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+		notice( t('Access to this profile has been restricted.') . EOL);
+		return;
+	}
+
+	if(! $update) {
+
+
+		$o .= profile_tabs($a, $is_owner, $a->profile['channel_address']);
+
+		$o .= common_friends_visitor_widget($a->profile['profile_uid']);
+
+
+		$commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
+		$commvisitor = (($commpage && $remote_contact == true) ? true : false);
+
+		$celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+
+		if(can_write_wall($a,$a->profile['profile_uid'])) {
+
+			$x = array(
+				'is_owner' => $is_owner,
+            	'allow_location' => ((($is_owner || $commvisitor) && $a->profile['allow_location']) ? true : false),
+	            'default_location' => (($is_owner) ? $a->user['default-location'] : ''),
+    	        'nickname' => $a->profile['channel_address'],
+        	    'lockstate' => (((strlen($a->profile['channel_allow_cid'])) || (strlen($a->profile['channel_allow_gid'])) || (strlen($a->profile['channel_deny_cid'])) || (strlen($a->profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
+            	'acl' => (($is_owner) ? populate_acl($channel, $celeb) : ''),
+	            'bang' => '',
+    	        'visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'),
+        	    'profile_uid' => $a->profile['profile_uid']
+        	);
+
+        	$o .= status_editor($a,$x);
+		}
+
+	}
+
+
+	/**
+	 * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
+	 */
+
+	$sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
+
+
+	if($update) {
+
+		$r = q("SELECT distinct(parent) AS `item_id` from item
+			WHERE uid = %d AND item_restrict = 0
+			AND item_flags &  %d
+			$sql_extra
+			ORDER BY created DESC",
+			intval($a->profile['profile_uid']),
+			intval(ITEM_WALL)
+		);
+
+	}
+	else {
+
+		if(x($category)) {
+			$sql_extra .= protect_sprintf(file_tag_file_query('item',$category,'category'));
+		}
+
+		if($datequery) {
+			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
+		}
+		if($datequery2) {
+			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
+		}
+
+
+		$a->set_pager_itemspage(40);
+
+		$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
+
+		$r = q("SELECT id AS item_id FROM item 
+			WHERE uid = %d AND item_restrict = 0
+			AND item_flags & %d
+			$sql_extra $sql_extra2
+			ORDER BY created DESC $pager_sql ",
+			intval($a->profile['profile_uid']),
+			intval(ITEM_WALL|ITEM_THREAD_TOP)
+
+		);
+
+	}
+
+	if($r && count($r)) {
+
+		$parents_str = ids_to_querystr($r,'item_id');
+ 
+		$items = q("SELECT `item`.*, `item`.`id` AS `item_id` 
+			FROM `item`
+			WHERE `item`.`uid` = %d AND `item`.`item_restrict` = 0
+			AND `item`.`parent` IN ( %s )
+			$sql_extra ",
+			intval($a->profile['profile_uid']),
+			dbesc($parents_str)
+		);
+
+		xchan_query($items);
+		$items = fetch_post_tags($items);
+		$items = conv_sort($items,'created');
+
+	} else {
+		$items = array();
+	}
+
+
+	if((! $update) && ($tab === 'posts')) {
+
+		// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
+		// because browser prefetching might change it on us. We have to deliver it with the page.
+
+		$o .= '<div id="live-profile"></div>' . "\r\n";
+		$o .= "<script> var profile_uid = " . $a->profile['profile_uid'] 
+			. "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+	}
+
+
+
+	if($is_owner) {
+		$r = q("UPDATE item SET item_flags = (item_flags ^ %d)
+			WHERE (item_flags & %d) AND (item_flags & %d) AND uid = %d ",
+			intval(ITEM_UNSEEN),
+			intval(ITEM_UNSEEN),
+			intval(ITEM_WALL),
+			intval(local_user())
+		);
+	}
+
+
+	$o .= conversation($a,$items,'channel',$update);
+
+	if(! $update)
+		$o .= alt_pager($a,count($items));
+
+	return $o;
+}
diff --git a/mod/delegate.php b/mod/delegate.php
index 8c5031859..e582b9387 100644
--- a/mod/delegate.php
+++ b/mod/delegate.php
@@ -23,7 +23,7 @@ function delegate_content(&$a) {
 		if(count($r)) {
 			$r = q("select id from contact where uid = %d and nurl = '%s' limit 1",
 				intval(local_user()),
-				dbesc(normalise_link($a->get_baseurl() . '/profile/' . $r[0]['nickname']))
+				dbesc(normalise_link($a->get_baseurl() . '/channel/' . $r[0]['nickname']))
 			);
 			if(count($r)) {
 				q("insert into manage ( uid, mid ) values ( %d , %d ) ",
diff --git a/mod/directory.php b/mod/directory.php
index 5744971db..1854a0e62 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -84,7 +84,7 @@ function directory_content(&$a) {
 		foreach($r as $rr) {
 
 
-			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+			$profile_link = $a->get_baseurl() . '/channel/' . $rr['nickname'];
 		
 			$pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
 
diff --git a/mod/friendica.php b/mod/friendica.php
index 28807b5b5..276e1c7f5 100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -12,7 +12,7 @@ function friendica_init(&$a) {
 			$r = q("SELECT username, nickname FROM user WHERE email='%s' $sql_extra", dbesc($a->config['admin_email']));
 			$admin = array(
 				'name' => $r[0]['username'],
-				'profile'=> $a->get_baseurl().'/profile/'.$r[0]['nickname'],
+				'profile'=> $a->get_baseurl().'/channel/'.$r[0]['nickname'],
 			);
 		} else {
 			$admin = false;
diff --git a/mod/invite.php b/mod/invite.php
index 2dbf93c59..f5cf090e0 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -114,7 +114,7 @@ function invite_content(&$a) {
 		'$default_message' => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
 			. $linktxt
 			. "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:') 
-			. "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname']
+			. "\r\n" . "\r\n" . $a->get_baseurl() . '/channel/' . $a->user['nickname']
 			. "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendica.com') . "\r\n" . "\r\n"  ,
 		'$submit' => t('Submit')
 	));
diff --git a/mod/message.php b/mod/message.php
index 25b3b2813..d501f3b54 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -175,7 +175,7 @@ function message_content(&$a) {
 		return;
 	}
 
-	$myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname'];
+	$myprofile = $a->get_baseurl(true) . '/channel/' . $a->user['nickname'];
 
 	$tpl = get_markup_template('mail_head.tpl');
 	$header = replace_macros($tpl, array(
diff --git a/mod/msearch.php b/mod/msearch.php
index e8e7d447b..9d587d1e4 100644
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -27,7 +27,7 @@ function msearch_post(&$a) {
 		foreach($r as $rr)
 			$results[] = array(
 				'name' => $rr['name'], 
-				'url' => $a->get_baseurl() . '/profile/' . $rr['nickname'], 
+				'url' => $a->get_baseurl() . '/channel/' . $rr['nickname'], 
 				'photo' => $a->get_baseurl() . '/photo/avatar/' . $rr['uid'],
 				'tags' => str_replace(array(',','  '),array(' ',' '),$rr['pub_keywords'])
 			);
diff --git a/mod/network.php b/mod/network.php
index 0d55438c1..b4b736e28 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -563,7 +563,7 @@ function network_content(&$a, $update = 0, $load = false) {
 
 	if($conv) {
 		// find a substring of my profile url that can be normalised
-		$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+		$myurl = $a->get_baseurl() . '/channel/' . $a->user['nickname'];
 		$myurl = substr($myurl,strpos($myurl,'://')+3);
 		$myurl = str_replace('www.','',$myurl);
 
diff --git a/mod/notifications.php b/mod/notifications.php
index 5bb85085f..8221dd7c3 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -338,10 +338,10 @@ function notifications_content(&$a) {
 		
 		$notif_tpl = get_markup_template('notifications.tpl');
 		
-		$myurl = $a->get_baseurl(true) . '/profile/'. $a->user['nickname'];
+		$myurl = $a->get_baseurl(true) . '/channel/'. $a->user['nickname'];
 		$myurl = substr($myurl,strpos($myurl,'://')+3);
 		$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
-		$diasp_url = str_replace('/profile/','/u/',$myurl);
+		$diasp_url = str_replace('/channel/','/u/',$myurl);
 		$sql_extra .= sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ",
 			dbesc($myurl . '$'),
 			dbesc($myurl . '\\]'),
diff --git a/mod/ping.php b/mod/ping.php
index a679c9342..342726ec1 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -170,7 +170,7 @@ function ping_init(&$a) {
 
 	$t4 = dba_timer();
 
-	$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
+	$myurl = $a->get_baseurl() . '/channel/' . $a->user['nickname'] ;
 	$mails = q("SELECT *,  COUNT(*) AS `total` FROM `mail`
 		WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
 		intval(local_user()),
diff --git a/mod/profile.php b/mod/profile.php
index 8fdd38ced..68cc53f56 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -28,31 +28,16 @@ function profile_aside(&$a) {
 		$profile = argv(1);		
 	}
 
-	$cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat']) : '');
-
 	profile_load($a,$which,$profile);
 
-	$a->set_widget('archive',posted_date_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true));	
-	$a->set_widget('categories',categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],$cat));
+	$a->set_widget('archive',posted_date_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$a->profile['profile_uid'],true));	
+	$a->set_widget('categories',categories_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$cat));
 
 }
 
 
 function profile_content(&$a, $update = 0) {
 
-	$category = $datequery = $datequery2 = '';
-
-	if(argc() > 2) {
-		for($x = 2; $x < argc(); $x ++) {
-			if(is_a_date_arg(argv($x))) {
-				if($datequery)
-					$datequery2 = escape_tags(argv($x));
-				else
-					$datequery = escape_tags(argv($x));
-			}
-		}
-	}
-
 	if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) {
 			return login();
 	}
@@ -66,20 +51,13 @@ function profile_content(&$a, $update = 0) {
 
 	$groups = array();
 
-	$tab = 'posts';
+	$tab = 'profile';
 	$o = '';
 
-	if($update) {
-		// Ensure we've got a profile owner if updating.
-		$a->profile['profile_uid'] = $update;
-	}
-	else {
-		if($a->profile['profile_uid'] == local_user()) {
-			nav_set_selected('home');
-		}
+	if($a->profile['profile_uid'] == local_user()) {
+		nav_set_selected('home');
 	}
 
-
 	$contact = null;
 	$remote_contact = false;
 
@@ -120,149 +98,13 @@ function profile_content(&$a, $update = 0) {
 		return;
 	}
 
-	if(! $update) {
-
-
-		if(x($_GET,'tab'))
-			$tab = notags(trim($_GET['tab']));
-
-		$o .= profile_tabs($a, $is_owner, $a->profile['channel_address']);
-
-
-		if($tab === 'profile') {
-			require_once('include/profile_advanced.php');
-			$o .= advanced_profile($a);
-			call_hooks('profile_advanced',$o);
-			return $o;
-		}
-
-
-		$o .= common_friends_visitor_widget($a->profile['profile_uid']);
-
-
-		$commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
-		$commvisitor = (($commpage && $remote_contact == true) ? true : false);
-
-		$celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
-
-		if(can_write_wall($a,$a->profile['profile_uid'])) {
-
-			$x = array(
-				'is_owner' => $is_owner,
-            	'allow_location' => ((($is_owner || $commvisitor) && $a->profile['allow_location']) ? true : false),
-	            'default_location' => (($is_owner) ? $a->user['default-location'] : ''),
-    	        'nickname' => $a->profile['channel_address'],
-        	    'lockstate' => (((strlen($a->profile['channel_allow_cid'])) || (strlen($a->profile['channel_allow_gid'])) || (strlen($a->profile['channel_deny_cid'])) || (strlen($a->profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
-            	'acl' => (($is_owner) ? populate_acl($channel, $celeb) : ''),
-	            'bang' => '',
-    	        'visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'),
-        	    'profile_uid' => $a->profile['profile_uid']
-        	);
-
-        	$o .= status_editor($a,$x);
-		}
-
-	}
-
-
-	/**
-	 * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
-	 */
-
-	$sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
 
+	$o .= profile_tabs($a, $is_owner, $a->profile['channel_address']);
 
-	if($update) {
-
-		$r = q("SELECT distinct(parent) AS `item_id` from item
-			WHERE uid = %d AND item_restrict = 0
-			AND item_flags &  %d
-			$sql_extra
-			ORDER BY created DESC",
-			intval($a->profile['profile_uid']),
-			intval(ITEM_WALL)
-		);
-
-	}
-	else {
-
-		if(x($category)) {
-			$sql_extra .= protect_sprintf(file_tag_file_query('item',$category,'category'));
-		}
-
-		if($datequery) {
-			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
-		}
-		if($datequery2) {
-			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
-		}
-
-
-		$a->set_pager_itemspage(40);
-
-		$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
-
-		$r = q("SELECT id AS item_id FROM item 
-			WHERE uid = %d AND item_restrict = 0
-			AND item_flags & %d
-			$sql_extra $sql_extra2
-			ORDER BY created DESC $pager_sql ",
-			intval($a->profile['profile_uid']),
-			intval(ITEM_WALL|ITEM_THREAD_TOP)
-
-		);
-
-	}
-
-	if($r && count($r)) {
-
-		$parents_str = ids_to_querystr($r,'item_id');
- 
-		$items = q("SELECT `item`.*, `item`.`id` AS `item_id` 
-			FROM `item`
-			WHERE `item`.`uid` = %d AND `item`.`item_restrict` = 0
-			AND `item`.`parent` IN ( %s )
-			$sql_extra ",
-			intval($a->profile['profile_uid']),
-			dbesc($parents_str)
-		);
-
-		xchan_query($items);
-		$items = fetch_post_tags($items);
-		$items = conv_sort($items,'created');
-
-	} else {
-		$items = array();
-	}
-
-
-	if((! $update) && ($tab === 'posts')) {
-
-		// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
-		// because browser prefetching might change it on us. We have to deliver it with the page.
-
-		$o .= '<div id="live-profile"></div>' . "\r\n";
-		$o .= "<script> var profile_uid = " . $a->profile['profile_uid'] 
-			. "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
-	}
-
-
-
-	if($is_owner) {
-		$r = q("UPDATE item SET item_flags = (item_flags ^ %d)
-			WHERE (item_flags & %d) AND (item_flags & %d) AND uid = %d ",
-			intval(ITEM_UNSEEN),
-			intval(ITEM_UNSEEN),
-			intval(ITEM_WALL),
-			intval(local_user())
-		);
-	}
-
-
-	$o .= conversation($a,$items,'profile',$update);
-
-	if(! $update)
-		$o .= alt_pager($a,count($items));
 
+	require_once('include/profile_advanced.php');
+	$o .= advanced_profile($a);
+	call_hooks('profile_advanced',$o);
 	return $o;
+
 }
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index ddefb69e5..e78d2ca6f 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -125,7 +125,7 @@ function profile_photo_post(&$a) {
 
 				info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
 				// Update global directory in background
-				$url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+				$url = $a->get_baseurl() . '/channel/' . $a->user['nickname'];
 				if($url && strlen(get_config('system','directory_submit_url')))
 					proc_run('php',"include/directory.php","$url");
 
diff --git a/mod/settings.php b/mod/settings.php
index 7cbe278a3..cfb0a3b26 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -769,7 +769,7 @@ function settings_content(&$a) {
 		info( t('Profile is <strong>not published</strong>.') . EOL );
 
 
-	$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : '');
+	$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/channel/' . $nickname : '');
 
 	$tpl_addr = get_markup_template("settings_nick_set.tpl");
 
diff --git a/mod/update_profile.php b/mod/update_channel.php
index c4884b30f..08b7bd5d7 100644
--- a/mod/update_profile.php
+++ b/mod/update_channel.php
@@ -7,9 +7,9 @@
  */
 
 
-require_once('mod/profile.php');
+require_once('mod/channel.php');
 
-function update_profile_content(&$a) {
+function update_channel_content(&$a) {
 
 	$profile_uid = intval($_GET['p']);
 
@@ -32,7 +32,7 @@ function update_profile_content(&$a) {
 	 *
 	 */
 
-	$text = profile_content($a,$profile_uid);
+	$text = channel_content($a,$profile_uid);
 
 	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
 	$replace = "<img\${1} dst=\"\${2}\"";
diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index cf349775c..8a1194104 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -68,7 +68,7 @@ function wallmessage_post(&$a) {
 			info( t('Message sent.') . EOL );
 	}
 
-//	goaway($a->get_baseurl() . '/profile/' . $user['nickname']);
+//	goaway($a->get_baseurl() . '/channel/' . $user['nickname']);
 	
 }
 
diff --git a/mod/xrd.php b/mod/xrd.php
index a718d623d..d22ff4699 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -34,7 +34,7 @@ function xrd_init(&$a) {
 	$o = replace_macros($tpl, array(
 		'$nick'        => $r[0]['nickname'],
 		'$accturi'     => $uri,
-		'$profile_url' => $a->get_baseurl() . '/profile/'       . $r[0]['nickname'],
+		'$profile_url' => $a->get_baseurl() . '/channel/'       . $r[0]['nickname'],
 		'$hcard_url'   => $a->get_baseurl() . '/hcard/'         . $r[0]['nickname'],
 		'$atom'        => $a->get_baseurl() . '/dfrn_poll/'     . $r[0]['nickname'],
 		'$zot_post'    => $a->get_baseurl() . '/post/'          . $r[0]['nickname'],