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

start to partition the dav

Browse Source
This commit is contained in:
redmatrix 2015-06-10 18:11:15 -07:00
parent a14d2de1f0
commit bc1b7afc85
2 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mod/cloud.php
View File

@ -7,35 +7,17 @@
*/ */
use Sabre\DAV; use Sabre\DAV;
use Hubzilla\RedDAV; use RedMatrix\RedDAV;
// composer autoloader for SabreDAV // composer autoloader for SabreDAV
require_once('vendor/autoload.php'); require_once('vendor/autoload.php');
// workaround for HTTP-auth in CGI mode
if (x($_SERVER, 'REDIRECT_REMOTE_USER')) {
$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ;
if(strlen($userpass)) {
list($name, $password) = explode(':', $userpass);
$_SERVER['PHP_AUTH_USER'] = $name;
$_SERVER['PHP_AUTH_PW'] = $password;
}
}
if (x($_SERVER, 'HTTP_AUTHORIZATION')) {
$userpass = base64_decode(substr($_SERVER["HTTP_AUTHORIZATION"], 6)) ;
if(strlen($userpass)) {
list($name, $password) = explode(':', $userpass);
$_SERVER['PHP_AUTH_USER'] = $name;
$_SERVER['PHP_AUTH_PW'] = $password;
}
}
/** /**
* @brief Fires up the SabreDAV server. * @brief Fires up the SabreDAV server.
* *
* @param App &$a * @param App &$a
*/ */
function cloud_init(&$a) { function cloud_init(&$a) {
require_once('include/reddav.php'); require_once('include/reddav.php');
@ -116,13 +98,8 @@ function cloud_init(&$a) {
} }
if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) { if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) {
try { logger('mod_cloud: auth exception');
$auth->Authenticate($server, t('$Projectname - Guests: Username: {your email address}, Password: +++')); http_status_exit(401, 'Permission denied.');
}
catch (Exception $e) {
logger('mod_cloud: auth exception' . $e->getMessage());
http_status_exit($e->getHTTPCode(), $e->getMessage());
}
} }
require_once('include/RedDAV/RedBrowser.php'); require_once('include/RedDAV/RedBrowser.php');

4
mod/dav.php
View File

@ -7,7 +7,7 @@
*/ */
use Sabre\DAV; use Sabre\DAV;
use Hubzilla\RedDAV; use RedMatrix\RedDAV;
// composer autoloader for SabreDAV // composer autoloader for SabreDAV
require_once('vendor/autoload.php'); require_once('vendor/autoload.php');
@ -131,8 +131,6 @@ function dav_init(&$a) {
$browser = new RedDAV\RedBrowser($auth); $browser = new RedDAV\RedBrowser($auth);
$auth->setBrowserPlugin($browser); $auth->setBrowserPlugin($browser);
$server->addPlugin($browser);
// Experimental QuotaPlugin // Experimental QuotaPlugin
// require_once('include/RedDAV/QuotaPlugin.php'); // require_once('include/RedDAV/QuotaPlugin.php');
// $server->addPlugin(new RedDAV\QuotaPlugin($auth)); // $server->addPlugin(new RedDAV\QuotaPlugin($auth));