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

Merge branch 'master' of https://github.com/friendica/red

Browse Source
This commit is contained in:
marijus 2014-01-26 14:43:07 +01:00
commit 44658f7b7f
5 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/features.php
View File

@ -7,6 +7,8 @@
function feature_enabled($uid,$feature) { function feature_enabled($uid,$feature) {
$x = get_pconfig($uid,'feature',$feature); $x = get_pconfig($uid,'feature',$feature);
if($x === false)
$x = get_config('feature',$feature);
$arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x); $arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x);
call_hooks('feature_enabled',$arr); call_hooks('feature_enabled',$arr);
return($arr['enabled']); return($arr['enabled']);

24
mod/cloud.php
View File

@ -74,7 +74,6 @@ function cloud_init(&$a) {
$_SERVER['REQUEST_URI'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['REQUEST_URI']); $_SERVER['REQUEST_URI'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['REQUEST_URI']);
$_SERVER['REQUEST_URI'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['REQUEST_URI']); $_SERVER['REQUEST_URI'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['REQUEST_URI']);
$rootDirectory = new RedDirectory('/',$auth); $rootDirectory = new RedDirectory('/',$auth);
$server = new DAV\Server($rootDirectory); $server = new DAV\Server($rootDirectory);
$lockBackend = new DAV\Locks\Backend\File('store/[data]/locks'); $lockBackend = new DAV\Locks\Backend\File('store/[data]/locks');
@ -82,8 +81,29 @@ function cloud_init(&$a) {
$server->addPlugin($lockPlugin); $server->addPlugin($lockPlugin);
// 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 viewers won't get asked to login.
// If a DIRECTORY is accessed or there are permission issues accessing the file and we aren't previously authenticated via zot,
// prompt for HTTP-auth. This will be the default case for mounting a DAV directory.
if(! $auth->observer) { // FIXME - we may require one more hack here; to allow an unauthenticated guest to view your file collection (e.g. a DIRECTORY) from
// the web browser interface without prompting for password, but still requiring one for unauthenticated folks using DAV. We may be
// able to do this with a special $_GET request var and a cookie.
$isapublic_file = false;
if((! $auth->observer) && ($_SERVER['REQUEST_METHOD'] === 'GET')) {
try {
$x = RedFileData('/' . $a->cmd,$auth);
if($x instanceof RedFile)
$isapublic_file = true;
}
catch ( Exception $e ) {
$isapublic_file = false;
}
}
if((! $auth->observer) && (! $isapublic_file)) {
try { try {
$auth->Authenticate($server, t('Red Matrix - Guests: Username: {your email address}, Password: +++')); $auth->Authenticate($server, t('Red Matrix - Guests: Username: {your email address}, Password: +++'));
} }

2
mod/settings.php
View File

@ -635,7 +635,7 @@ function settings_content(&$a) {
$arr[$fname] = array(); $arr[$fname] = array();
$arr[$fname][0] = $fdata[0]; $arr[$fname][0] = $fdata[0];
foreach(array_slice($fdata,1) as $f) { foreach(array_slice($fdata,1) as $f) {
$arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(get_pconfig(local_user(),'feature',$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On')));
} }
} }

2
version.inc
View File

@ -1 +1 @@
2014-01-25.568 2014-01-26.569