aboutsummaryrefslogtreecommitdiff
path: root/api/httpauth.inc.php
diff options
context:
space:
mode:
Diffstat (limited to 'api/httpauth.inc.php')
-rw-r--r--api/httpauth.inc.php41
1 files changed, 22 insertions, 19 deletions
diff --git a/api/httpauth.inc.php b/api/httpauth.inc.php
index 3e5d464..f693d35 100644
--- a/api/httpauth.inc.php
+++ b/api/httpauth.inc.php
@@ -1,4 +1,7 @@
<?php
+require_once('../header.inc.php');
+$userservice =& ServiceFactory::getServiceInstance('UserService');
+
// Provides HTTP Basic authentication of a user, and sets two variables, sId and username,
// with the user's info.
@@ -6,30 +9,30 @@ function authenticate() {
header('WWW-Authenticate: Basic realm="SemanticScuttle API"');
header('HTTP/1.0 401 Unauthorized');
- die("Use of the API calls requires authentication.");
-}
-
-
-/* Maybe we have caught authentication data in $_SERVER['REMOTE_USER']
-( Inspired by http://www.yetanothercommunitysystem.com/article-321-regle-comment-utiliser-l-authentification-http-en-php-chez-ovh ) */
-if((!$_SERVER['PHP_AUTH_USER'] || !$_SERVER['PHP_AUTH_USER'])
-&& preg_match('/Basic\s+(.*)$/i', $_SERVER['REMOTE_USER'], $matches)) {
-list($name, $password) = explode(':', base64_decode($matches[1]));
-$_SERVER['PHP_AUTH_USER'] = strip_tags($name);
-$_SERVER['PHP_AUTH_PW'] = strip_tags($password);
+ die(T_("Use of the API calls requires authentication."));
}
+if(!$userservice->isLoggedOn()) {
+ /* Maybe we have caught authentication data in $_SERVER['REMOTE_USER']
+ ( Inspired by http://www.yetanothercommunitysystem.com/article-321-regle-comment-utiliser-l-authentification-http-en-php-chez-ovh ) */
+ if((!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW']))
+ && preg_match('/Basic\s+(.*)$/i', $_SERVER['REMOTE_USER'], $matches)) {
+ list($name, $password) = explode(':', base64_decode($matches[1]));
+ $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
+ $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
+ }
-if (!isset($_SERVER['PHP_AUTH_USER'])) {
- authenticate();
-} else {
- require_once('../header.inc.php');
- $userservice =& ServiceFactory::getServiceInstance('UserService');
+ if (!isset($_SERVER['PHP_AUTH_USER'])) {
+ authenticate();
+ } else {
+ require_once('../header.inc.php');
+ $userservice =& ServiceFactory::getServiceInstance('UserService');
- $login = $userservice->login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
- if (!$login) {
- authenticate();
+ $login = $userservice->login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
+ if (!$login) {
+ authenticate();
+ }
}
}
?>