diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-22 07:34:42 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-22 07:34:42 +0200 |
| commit | cbd7f8906674f6373f0dc6a8f79ecfcd4ce4bd8d (patch) | |
| tree | f224e6b7737373e0a8432861154a6101da359fa2 /mod/cloud.php | |
| parent | 7834274bff5e86a7a0eb646f1319b5b9e4bac96f (diff) | |
| parent | 146ff6f70308647b27374a1bba386c156498bd2e (diff) | |
| download | volse-hubzilla-cbd7f8906674f6373f0dc6a8f79ecfcd4ce4bd8d.tar.gz volse-hubzilla-cbd7f8906674f6373f0dc6a8f79ecfcd4ce4bd8d.tar.bz2 volse-hubzilla-cbd7f8906674f6373f0dc6a8f79ecfcd4ce4bd8d.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/cloud.php')
| -rw-r--r-- | mod/cloud.php | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/mod/cloud.php b/mod/cloud.php index 7f6dc0962..efb33f935 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -73,6 +73,8 @@ function cloud_init(&$a) { $server->addPlugin($lockPlugin); +/* This next bit should no longer be needed... */ + // The next section of code allows us to bypass prompting for http-auth if a // FILE is being accessed anonymously and permissions allow this. This way // one can create hotlinks to public media files in their cloud and anonymous @@ -83,24 +85,24 @@ function cloud_init(&$a) { // In order to avoid prompting for passwords for viewing a DIRECTORY, add // the URL query parameter 'davguest=1'. - $isapublic_file = false; - $davguest = ((x($_SESSION, 'davguest')) ? true : false); - - if ((! $auth->observer) && ($_SERVER['REQUEST_METHOD'] === 'GET')) { - try { - $x = RedFileData('/' . $a->cmd, $auth); - if($x instanceof RedDAV\RedFile) - $isapublic_file = true; - } - catch (Exception $e) { - $isapublic_file = false; - } - } - - if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) { - logger('mod_cloud: auth exception'); - http_status_exit(401, 'Permission denied.'); - } +// $isapublic_file = false; +// $davguest = ((x($_SESSION, 'davguest')) ? true : false); + +// if ((! $auth->observer) && ($_SERVER['REQUEST_METHOD'] === 'GET')) { +// try { +// $x = RedFileData('/' . $a->cmd, $auth); +// if($x instanceof RedDAV\RedFile) +// $isapublic_file = true; +// } +// catch (Exception $e) { +// $isapublic_file = false; +// } +// } + +// if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) { +// logger('mod_cloud: auth exception'); +// http_status_exit(401, 'Permission denied.'); +// } require_once('include/RedDAV/RedBrowser.php'); // provide a directory view for the cloud in Hubzilla |