Merge remote-tracking branch 'upstream/master'

Conflicts:
	boot.php
	include/dba/dba_driver.php
	include/diaspora.php
	include/follow.php
	include/session.php
	include/zot.php
	mod/photos.php
	mod/ping.php

1 files changed, 96 insertions, 64 deletions

diff --git a/mod/blocks.php b/mod/blocks.php
index 3f2bef116..6237a645b 100644
--- a/mod/blocks.php
+++ b/mod/blocks.php
@@ -1,108 +1,140 @@
 <?php
 
-function blocks_content(&$a) {
+require_once('include/identity.php');
+require_once('include/conversation.php');
+require_once('include/acl_selectors.php');
 
+function blocks_init(&$a) {
 
+	if(argc() > 1 && argv(1) === 'sys' && is_site_admin()) {
+		$sys = get_sys_channel();
+		if($sys && intval($sys['channel_id'])) {
+			$a->is_sys = true;
+		}
+	}
 
 	if(argc() > 1)
 		$which = argv(1);
-	else {
+	else
+		return;
+
+	profile_load($a,$which);
+
+}
+
+
+function blocks_content(&$a) {
+
+	if(! $a->profile) {
 		notice( t('Requested profile is not available.') . EOL );
 		$a->error = 404;
 		return;
 	}
 
-	profile_load($a,$which,0);
+	$which = argv(1);
 
+	$uid = local_user();
+	$owner = 0;
+	$channel = null;
+	$observer = $a->get_observer();
 
-	// Figure out who the page owner is.
-	$r = q("select channel_id from channel where channel_address = '%s'",
-		dbesc($which)
-	);
-	if($r) {
-		$owner = intval($r[0]['channel_id']);
-	}
+	$channel = $a->get_channel();
 
-	// Block design features from visitors 
+	if($a->is_sys && is_site_admin()) {
+		$sys = get_sys_channel();
+		if($sys && intval($sys['channel_id'])) {
+			$uid = $owner = intval($sys['channel_id']);
+			$channel = $sys;
+			$observer = $sys;
+		}
+	}
 
-	if((! local_user()) || (local_user() != $owner)) {
-		notice( t('Permission denied.') . EOL);
-		return;
+	if(! $owner) {
+		// Figure out who the page owner is.
+		$r = q("select channel_id from channel where channel_address = '%s'",
+			dbesc($which)
+		);
+		if($r) {
+			$owner = intval($r[0]['channel_id']);
+		}
 	}
 
+	$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
 
+	$perms = get_all_perms($owner,$ob_hash);
 
+	if(! $perms['write_pages']) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
 
-// Get the observer, check their permissions
 
-        $observer = $a->get_observer();
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+	// Block design features from visitors 
 
-        $perms = get_all_perms($owner,$ob_hash);
+	if((! $uid) || ($uid != $owner)) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
 
-        if(! $perms['write_pages']) {
-                notice( t('Permission denied.') . EOL);
-                return;
-        }
 
+	if(feature_enabled($owner,'expert')) {
+		$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
+		if(! $mimetype)
+			$mimetype = 'choose';	
+	}
+	else {
+		$mimetype = 'text/bbcode';
+	}
 
-// Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
-// Nickname is set to the observers xchan, and profile_uid to the owners.  
-// This lets you post pages at other people's channels.
-require_once ('include/conversation.php');
-		$x = array(
-			'webpage' => ITEM_BUILDBLOCK,
-			'is_owner' => true,
-			'nickname' => $a->profile['channel_address'],
-			'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-			'bang' => (($group || $cid) ? '!' : ''),
-			'showacl' => false,
-			'visitor' => true,
-			'mimetype' => 'choose',
-			'ptlabel' => t('Block Name'),
-			'profile_uid' => intval($owner),
-		);
 
-		if($_REQUEST['title'])
-			$x['title'] = $_REQUEST['title'];
-		if($_REQUEST['body'])
-			$x['body'] = $_REQUEST['body'];
-		if($_REQUEST['pagetitle'])
-			$x['pagetitle'] = $_REQUEST['pagetitle'];
+	$x = array(
+		'webpage' => ITEM_BUILDBLOCK,
+		'is_owner' => true,
+		'nickname' => $a->profile['channel_address'],
+		'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
+		'bang' => '',
+		'showacl' => false,
+		'visitor' => true,
+		'mimetype' => $mimetype,
+		'ptlabel' => t('Block Name'),
+		'profile_uid' => intval($owner),
+	);
 
+	if($_REQUEST['title'])
+		$x['title'] = $_REQUEST['title'];
+	if($_REQUEST['body'])
+		$x['body'] = $_REQUEST['body'];
+	if($_REQUEST['pagetitle'])
+		$x['pagetitle'] = $_REQUEST['pagetitle'];
 
 
-		$o .= status_editor($a,$x);
 
-	//Get a list of blocks.  We can't display all them because endless scroll makes that unusable, so just list titles and an edit link.
-//TODO - this should be replaced with pagelist_widget
+	$o .= status_editor($a,$x);
 
-$r = q("select * from item_id where uid = %d and service = 'BUILDBLOCK' order by sid asc",
-	intval($owner)
-);
+	$r = q("select * from item_id where uid = %d and service = 'BUILDBLOCK' order by sid asc",
+		intval($owner)
+	);
 
-		$pages = null;
+	$pages = null;
 
-		if($r) {
-			$pages = array();
-			foreach($r as $rr) {
-				$pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']);
-			} 
-		}
+	if($r) {
+		$pages = array();
+		foreach($r as $rr) {
+			$pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']);
+		} 
+	}
 
+	//Build the base URL for edit links
+	$url = z_root() . '/editblock/' . $which; 
 
-//Build the base URL for edit links
-		$url = z_root() . "/editblock/" . $which; 
-// This isn't pretty, but it works.  Until I figure out what to do with the UI, it's Good Enough(TM).
-       return $o . replace_macros(get_markup_template("blocklist.tpl"), array(
+	$o .= replace_macros(get_markup_template('blocklist.tpl'), array(
 		'$baseurl' => $url,
 		'$edit' => t('Edit'),
 		'$pages' => $pages,
 		'$channel' => $which,
 		'$view' => t('View'),
 		'$preview' => '1',
-	
-        ));
+	));
     
-
+	return $o;
 }