xals merge 1.0

This commit is contained in:
Alan Garcia 2011-06-03 12:42:00 +00:00
parent f234730c88
commit aed601e12d
1 changed files with 2 additions and 2 deletions

View File

@ -70,7 +70,7 @@ if (isset($http_auth) && $http_auth) {
header('HTTP/1.0 401 Unauthorized'); header('HTTP/1.0 401 Unauthorized');
exit(); exit();
} }
} }
if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) { if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
// Gruiiik // Gruiiik
$_REQUEST["username"]=$_SERVER['PHP_AUTH_USER']; $_REQUEST["username"]=$_SERVER['PHP_AUTH_USER'];
@ -84,7 +84,7 @@ $help_baseurl="http://www.aide-alternc.org/";
$host=getenv("HTTP_HOST"); $host=getenv("HTTP_HOST");
/* Global variables (AlternC configuration) */ /* Global variables (AlternC configuration) */
require_once($root."class/local.php"); require_once(dirname(__FILE__)."/local.php");
/* PHPLIB inclusions : */ /* PHPLIB inclusions : */
$root=$L_ALTERNC_LOC."/bureau/"; $root=$L_ALTERNC_LOC."/bureau/";