[geeklog-cvs] Geeklog-1.x/system lib-webservices.php,1.22,1.23

[Ramnath Iyer]

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv29858

Modified Files:
	lib-webservices.php 
Log Message:
Changed $_REQUEST['gl_auth_header'] to $_SERVER['REMOTE_USER'] to make it work with the .htaccess fix for PHP as a CGI binary.



Index: lib-webservices.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-webservices.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** lib-webservices.php	25 Nov 2007 06:55:07 -0000	1.22
--- lib-webservices.php	1 Dec 2007 19:17:32 -0000	1.23
***************
*** 696,710 ****
              COM_errorLog("WS: Attempting to log in user '$username'");
          }
!     } elseif (!empty($_REQUEST['gl_auth_header'])) {
          /* PHP installed as CGI may not have access to authorization headers of
!          * Apache. In that case, use .htaccess to store the auth header as a
!          * request variable called gl_auth_digest
           */
  
!         list($auth_type, $auth_data) = explode(' ', $_REQUEST['gl_auth_digest']);
          list($username, $password) = explode(':', base64_decode($auth_data));
  
          if ($WS_VERBOSE) {
!             COM_errorLog("WS: Attempting to log in user '$username' (via gl_auth_header)");
          }
      } else {
--- 696,710 ----
              COM_errorLog("WS: Attempting to log in user '$username'");
          }
!     } elseif (!empty($_SERVER['REMOTE_USER'])) {
          /* PHP installed as CGI may not have access to authorization headers of
!          * Apache. In that case, use .htaccess to store the auth header as explained
!          * at http://wiki.geeklog.net/wiki/index.php/Webservices_API#Authentication
           */
  
!         list($auth_type, $auth_data) = explode(' ', $_SERVER['REMOTE_USER']);
          list($username, $password) = explode(':', base64_decode($auth_data));
  
          if ($WS_VERBOSE) {
!             COM_errorLog("WS: Attempting to log in user '$username' (via \$_SERVER['REMOTE_USER'])");
          }
      } else {