diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-09-07 15:42:37 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-09-07 15:51:44 +0200 |
| commit | 5eba5798274823fe3147a8d671ca5e15b3eb7843 (patch) | |
| tree | eb9cfb3fc687b8be26dde07a08fd23ca3455991f /apps/files/appinfo/filesync.php | |
| parent | b483f2aab856e3324026588a9702043072fd7ad2 (diff) | |
| parent | 3829460ab8cbb6de65c53583a20fd04cbe7927dd (diff) | |
| download | nextcloud-server-5eba5798274823fe3147a8d671ca5e15b3eb7843.tar.gz nextcloud-server-5eba5798274823fe3147a8d671ca5e15b3eb7843.zip | |
Merge branch 'master' into routing
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
Diffstat (limited to 'apps/files/appinfo/filesync.php')
| -rw-r--r-- | apps/files/appinfo/filesync.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/appinfo/filesync.php b/apps/files/appinfo/filesync.php index 707ee2435c0..c1fe444cec7 100644 --- a/apps/files/appinfo/filesync.php +++ b/apps/files/appinfo/filesync.php @@ -23,14 +23,14 @@ // only need filesystem apps $RUNTIME_APPTYPES=array('filesystem','authentication'); OC_App::loadApps($RUNTIME_APPTYPES); -if(!OC_User::isLoggedIn()){ - if(!isset($_SERVER['PHP_AUTH_USER'])){ +if(!OC_User::isLoggedIn()) { + if(!isset($_SERVER['PHP_AUTH_USER'])) { header('WWW-Authenticate: Basic realm="ownCloud Server"'); header('HTTP/1.0 401 Unauthorized'); echo 'Valid credentials must be supplied'; exit(); } else { - if(!OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])){ + if(!OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { exit(); } } |