Subject: CVS: phpwiki/lib/WikiUser HttpAuth.php,1.4,1.5 - msg#00159

Update of /cvsroot/phpwiki/phpwiki/lib/WikiUser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv688/WikiUser

Modified Files:
HttpAuth.php
Log Message:
linebreaks

Index: HttpAuth.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUser/HttpAuth.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -2 -b -p -d -r1.4 -r1.5
--- HttpAuth.php 26 Dec 2004 17:11:16 -0000 1.4
+++ HttpAuth.php 28 Feb 2005 20:35:45 -0000 1.5
@@ -27,5 +27,6 @@ extends _PassUser
$this->_authmethod = 'HttpAuth';

- // Is this double check really needed? It is not expensive so we keep
it for now.
+ // Is this double check really needed?
+ // It is not expensive so we keep it for now.
if ($this->userExists())
return $this;
@@ -52,5 +53,6 @@ extends _PassUser
if (!isset($_SERVER))
$_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
- // maybe we should random the realm to really force a logout. but the
next login will fail.
+ // Maybe we should random the realm to really force a logout.
+ // But the next login will fail.
// better_srand(); $realm = microtime().rand();
header('WWW-Authenticate: Basic realm="'.WIKI_NAME.'"');
@@ -77,5 +79,6 @@ extends _PassUser
//IIS:
if (!empty($_SERVER['HTTP_AUTHORIZATION'])) {
- list($userid, $passwd) = explode(':',
base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
+ list($userid, $passwd) = explode(':',
+ base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
return $userid;
}
@@ -86,5 +89,7 @@ extends _PassUser
function userExists() {
$username = $this->_http_username();
- if (empty($username) or strtolower($username) !=
strtolower($this->_userid)) {
+ if (empty($username)
+ or strtolower($username) != strtolower($this->_userid))
+ {
$this->logout();
$user = $GLOBALS['ForbiddenUser'];
@@ -113,14 +118,10 @@ extends _PassUser
return false;
}
-/*
- // hmm... either the server dialog or our own.
- function _disabled_PrintLoginForm (&$request, $args, $fail_message=false,
$seperate_page=true) {
- $this->_logout();
- return parent::PrintLoginForm ($request, $args, $fail_message,
$seperate_page);
- }
-*/
}

// $Log$
+// Revision 1.5 2005/02/28 20:35:45 rurban
+// linebreaks
+//
// Revision 1.4 2004/12/26 17:11:16 rurban
// just copyright



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click