Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

CHANGELOG

@@ -63,6 +63,8 @@ Hubzilla 2.6 (2017-??-??)
 	- Replace Mardownify library with html-to-markdown library
 
 	Bugfixes
+	- Fix channel manager and nav channel select visible if in a delegate session
+	- Fix wrong wiki pages in the sidebar github issue #841
 	- Fix a bug where if multiple channels uploaded the same file to the same folder, the uploaded file would end up with an incremental number added to the filename for each upload even if the file did not exist yet in the channels folder
 	- Fix privacy groups not syncing across clones properly (github issue #832)
 	- Fix an issue where the ability to use a portion of the message-id to display a message wasn't honoured in all cases

Zotlabs/Module/Cdav.php

@@ -85,6 +85,15 @@ class Cdav extends \Zotlabs\Web\Controller {
 				if($channel['channel_timezone'])
 					$auth->setTimezone($channel['channel_timezone']);
 				$auth->observer = $channel['channel_hash'];
+
+				$principalUri = 'principals/' . $channel['channel_address'];
+				if(!cdav_principal($principalUri)) {
+					$this->activate($pdo, $channel);
+					if(!cdav_principal($principalUri)) {
+						return;
+					}
+				}
+
 			}
 
 

Zotlabs/Storage/BasicAuth.php

@@ -188,13 +188,10 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
 
 	protected function check_module_access($channel_id) {
 		if($channel_id && \App::$module === 'cdav') {
-			$x = get_pconfig($channel_id,'cdav','enabled');
-			if(! $x) {
-				$this->module_disabled = true;
-				return false;
-			}
+			return true;
 		}
-		return true;
+		$this->module_disabled = true;
+		return false;
 	}
 
 	/**

Zotlabs/Widget/Wiki_pages.php

@@ -11,14 +11,8 @@ class Wiki_pages {
 			return;
 
 		if(! $arr['resource_id']) {
-
-			$c = \App::get_channel();
-
-			if(! $c)
-				$c = channelx_by_nick(argv(1));
-
+			$c = channelx_by_nick(argv(1));
 			$w = \Zotlabs\Lib\NativeWiki::exists_by_name($c['channel_id'],argv(2));
-
 			$arr = array(
 				'resource_id' => $w['resource_id'],
 				'channel_id' => $c['channel_id'],

include/nav.php

@@ -34,9 +34,11 @@ EOT;
 			intval($channel['channel_id'])
 		);
 
-		$chans = q("select channel_name, channel_id from channel where channel_account_id = %d and channel_removed = 0 order by channel_name ",
-			intval(get_account_id())
-		);
+		if(! $_SESSION['delegate']) {
+			$chans = q("select channel_name, channel_id from channel where channel_account_id = %d and channel_removed = 0 order by channel_name ",
+				intval(get_account_id())
+			);
+		}
 	}
 	elseif(remote_channel())
 		$observer = App::get_observer();
@@ -196,7 +198,9 @@ EOT;
 		$nav['all_events']['all']=array('events', t('View events'), "", "");
 		$nav['all_events']['mark'] = array('', t('Mark all events seen'), '','');
 
-		$nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn');
+		if(! $_SESSION['delegate']) {
+			$nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn');
+		}
 
 		$nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn');