From 0564d64de2ea6838e7a874da5e99fa5358a0f75f Mon Sep 17 00:00:00 2001 From: mensonge Date: Thu, 3 Apr 2008 13:28:48 +0000 Subject: Interface design: add export option through API into the profile page git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@94 b3834d28-1941-0410-a4f8-b48e95affb8f --- api/httpauth.inc.php | 41 ++++++++++++++++++++++------------------- templates/editprofile.tpl.php | 13 ++++++++++++- 2 files changed, 34 insertions(+), 20 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 @@ 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(); + } } } ?> diff --git a/templates/editprofile.tpl.php b/templates/editprofile.tpl.php index ebfc972..d84fac5 100644 --- a/templates/editprofile.tpl.php +++ b/templates/editprofile.tpl.php @@ -4,6 +4,17 @@ $this->includeTemplate($GLOBALS['top_include']);