1 files changed, 78 insertions, 4 deletions

diff --git a/mod/page.php b/mod/page.php
index 62f9d9204..df17dbf52 100644
--- a/mod/page.php
+++ b/mod/page.php
@@ -2,9 +2,35 @@
 
 require_once('include/items.php');
 require_once('include/conversation.php');
+require_once('include/page_widgets.php');
+
+function page_init(&$a) {
+	// We need this to make sure the channel theme is always loaded.
+
+	$which = argv(1);
+	$profile = 0;
+	profile_load($a,$which,$profile);
+
+	if($a->profile['profile_uid'])
+		head_set_icon($a->profile['thumb']);
+
+}
+
+
+
 
 function page_content(&$a) {
 
+	$observer = $a->get_observer();
+	$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+	$perms = get_all_perms($a->profile['profile_uid'],$ob_hash);
+
+	if(! $perms['view_pages']) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
 	if(argc() < 3) {
 		notice( t('Invalid item.') . EOL);
 		return;
@@ -22,23 +48,71 @@ function page_content(&$a) {
 		return;
 	}
 
+	if($_REQUEST['rev'])
+		$revision = " and revision = " . intval($_REQUEST['rev']) . " ";
+	else
+		$revision = " order by revision desc ";
+
+	require_once('include/security.php');
+	$sql_options = item_permissions_sql($u[0]['channel_id']);
+
 	$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",
+		item_restrict = %d $sql_options $revision limit 1",
 		intval($u[0]['channel_id']),
 		dbesc($page_id),
 		intval(ITEM_WEBPAGE)
 	);
 
 	if(! $r) {
-		notice( t('Item not found.') . EOL);
+
+		// Check again with no permissions clause to see if it is a permissions issue
+
+		$x = 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 $revision limit 1",
+			intval($u[0]['channel_id']),
+			dbesc($page_id),
+			intval(ITEM_WEBPAGE)
+		);
+		if($x) {
+			// Yes, it's there. You just aren't allowed to see it.
+			notice( t('Permission denied.') . EOL);
+		}
+		else {
+			notice( t('Page not found.') . EOL);
+		}
 		return;
 	}
 
+	if($r[0]['layout_mid']) {
+		$l = q("select body from item where mid = '%s' and uid = %d limit 1",
+			dbesc($r[0]['layout_mid']),
+			intval($u[0]['channel_id'])
+		);
+
+		if($l) {
+			require_once('include/comanche.php');
+			comanche_parser(get_app(),$l[0]['body']);
+		}
+	}
+
+
+	// logger('layout: ' . print_r($a->layout,true));
+
+	// Use of widgets should be determined by Comanche, but we don't have it on system pages yet, so...
+
+	if ($perms['write_pages']) {
+		$chan = $a->channel['channel_id'];
+		$who = $channel_address;
+		$which = $r[0]['id'];
+		$o .= writepages_widget($who,$which);
+	}
+
 	xchan_query($r);
 	$r = fetch_post_tags($r,true);
-	$a->profile = array('profile_uid' => $u[0]['channel_id']);
+
 	$o .= prepare_page($r[0]);
 	return $o;
 
-}
\ No newline at end of file
+}