1 files changed, 53 insertions, 8 deletions

diff --git a/mod/home.php b/mod/home.php
index 1bb0148d2..86d489853 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -8,11 +8,16 @@ function home_init(&$a) {
 
 	$channel = $a->get_channel();
 
-	if(local_user() && $channel && $channel['xchan_url'])
-		goaway( $channel['xchan_url']);
+	if(local_user() && $channel && $channel['xchan_url']) {
+		$dest = get_pconfig(local_user(),'system','startpage');
+		if(! $dest)
+			$dest = z_root() . '/network';
+
+		goaway($dest);
+	}
 
 	if(get_account_id()) {
-		goaway('new_channel');
+		goaway(z_root() . '/new_channel');
 	}
 
 }}
@@ -28,15 +33,55 @@ function home_content(&$a) {
 	if(x($_SESSION,'mobile-theme'))
 		unset($_SESSION['mobile-theme']);
 
-	$o .= '<h1>' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '</h1>';
+$channel_address = get_config("system", "site-channel" );
+    if ($channel_address){
+
+require_once('include/items.php');
+require_once('include/conversation.php');
+
+
+//We can do better, but until we figure out auto-linkification, let's keep things simple
+	$page_id = 'home';
+
+	$u = q("select channel_id from channel where channel_address = '%s' limit 1",
+		dbesc($channel_address)
+	);
+
+	if(! $u) {
+		notice( t('Channel not found.') . EOL);
+		return;
+	}
+
+	$r = q("select item.* from item left join item_id on item.id = item_id.iid
+		where item.uid = %d and sid = '%s' and service = 'WEBPAGE' and 
+		item_restrict = %d limit 1",
+		intval($u[0]['channel_id']),
+		dbesc($page_id),
+		intval(ITEM_WEBPAGE)
+	);
+
+	if(! $r) {
+		notice( t('Item not found.') . EOL);
+		return;
+	}
+
+	xchan_query($r);
+	$r = fetch_post_tags($r,true);
+	$a->profile = array('profile_uid' => $u[0]['channel_id']);
+	$o .= prepare_page($r[0]);
+
+}
+
+// If there's no site channel specified, fallback to the old behaviour
+	else {	$o .= '<h1>' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '</h1>';
 	if(file_exists('home.html'))
  		$o .= file_get_contents('home.html');
+}
 
-	$o .= login(($a->config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
+		$o .= login(($a->config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
 	
 	call_hooks("home_content",$o);
-	
 	return $o;
-
+}
 	
-}} 
+}