harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

create cdav principal also on client access and remove redundant pconfig check in authentication process

Browse Source
This commit is contained in:
Mario Vavti 2017-08-10 21:58:44 +02:00
parent 0a96cdd950
commit 0e3b5536e2
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Zotlabs/Module/Cdav.php
View File

@ -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;
}
}
}

9
Zotlabs/Storage/BasicAuth.php
View File

@ -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;
}
/**