From d6889066c0d285bf59e89b484800443304585b68 Mon Sep 17 00:00:00 2001
From: mensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>
Date: Fri, 5 Dec 2008 07:25:04 +0000
Subject: Major Refactoring: finish transforming  into object . Put  and  into
 header.inc.php.

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@199 b3834d28-1941-0410-a4f8-b48e95affb8f
---
 api/httpauth.inc.php | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

(limited to 'api/httpauth.inc.php')

diff --git a/api/httpauth.inc.php b/api/httpauth.inc.php
index d0198fd..5dd7444 100644
--- a/api/httpauth.inc.php
+++ b/api/httpauth.inc.php
@@ -1,37 +1,33 @@
 <?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.
 
 function authenticate() {
-    header('WWW-Authenticate: Basic realm="SemanticScuttle API"');
-    header('HTTP/1.0 401 Unauthorized');
-    
-    die(T_("Use of the API calls requires authentication."));
+	header('WWW-Authenticate: Basic realm="SemanticScuttle API"');
+	header('HTTP/1.0 401 Unauthorized');
+
+	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');
+	/* 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);
+	}
 
-	$login = $userservice->login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
-	if (!$login) {
-	    authenticate();
+	if (!isset($_SERVER['PHP_AUTH_USER'])) {
+		authenticate();
+	} else {
+		$login = $userservice->login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
+		if (!$login) {
+			authenticate();
+		}
 	}
-    }
 }
 ?>
-- 
cgit v1.2.3