diff options
author | 2010-09-30 07:46:51 +0200 | |
---|---|---|
committer | 2010-09-30 07:46:51 +0200 | |
commit | 2d31b55b24e79a2014171c89d96c7242e4c590ac (patch) | |
tree | ab838abfb208ba0fa7cb50b062f6d3cd7f16ae67 /www/api/httpauth.inc.php | |
parent | 5565b0695f72fc28f625c2671648f4cd0a798238 (diff) | |
parent | e1f9d9e3a07652d4ec668a2337d8b788e031ab9f (diff) | |
download | scuttle-2d31b55b24e79a2014171c89d96c7242e4c590ac.tar.gz scuttle-2d31b55b24e79a2014171c89d96c7242e4c590ac.zip |
merge master
Diffstat (limited to 'www/api/httpauth.inc.php')
-rw-r--r-- | www/api/httpauth.inc.php | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/www/api/httpauth.inc.php b/www/api/httpauth.inc.php index 0e3a66d..ee5c7f2 100644 --- a/www/api/httpauth.inc.php +++ b/www/api/httpauth.inc.php @@ -1,10 +1,29 @@ <?php +/** + * Checks if the user is logged on and sends a HTTP basic auth + * request to the browser if not. In that case the script ends. + * If username and password are available, the user service's + * login method is used to log the user in. + * + * SemanticScuttle - your social bookmark manager. + * + * PHP version 5. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net> + * @author Christian Weiske <cweiske@cweiske.de> + * @author Eric Dane <ericdane@users.sourceforge.net> + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ require_once '../www-header.php'; -// Provides HTTP Basic authentication of a user -// and logs the user in if necessary - -function authenticate() { +/** + * Sends HTTP auth headers to the browser + */ +function authenticate() +{ header('WWW-Authenticate: Basic realm="SemanticScuttle API"'); header('HTTP/1.0 401 Unauthorized'); @@ -26,7 +45,9 @@ if (!$userservice->isLoggedOn()) { if (!isset($_SERVER['PHP_AUTH_USER'])) { authenticate(); } else { - $login = $userservice->login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']); + $login = $userservice->login( + $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'] + ); if ($login) { $currentUser = $userservice->getCurrentObjectUser(); } else { |