that was not intended to be merged with master yet. Put it under a define
This commit is contained in:
parent
381f8a1b42
commit
3f4f3e244a
@ -12,6 +12,29 @@ use RedMatrix\RedDAV;
|
|||||||
// composer autoloader for SabreDAV
|
// composer autoloader for SabreDAV
|
||||||
require_once('vendor/autoload.php');
|
require_once('vendor/autoload.php');
|
||||||
|
|
||||||
|
if(! defined('TRINIDAD')) {
|
||||||
|
// 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.
|
||||||
*
|
*
|
||||||
@ -107,9 +130,20 @@ function cloud_init(&$a) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) {
|
if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) {
|
||||||
|
if(defined('TRINIDAD')) {
|
||||||
logger('mod_cloud: auth exception' . $e->getMessage());
|
logger('mod_cloud: auth exception' . $e->getMessage());
|
||||||
http_status_exit($e->getHTTPCode(), $e->getMessage());
|
http_status_exit($e->getHTTPCode(), $e->getMessage());
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
try {
|
||||||
|
$auth->Authenticate($server, t('RedMatrix channel'));
|
||||||
|
}
|
||||||
|
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');
|
||||||
// provide a directory view for the cloud in Red Matrix
|
// provide a directory view for the cloud in Red Matrix
|
||||||
|
Reference in New Issue
Block a user