Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2487 → Rev 2488

/web/acc/manager/htdocs/badusers.php
79,7 → 79,7
$row = da_sql_fetch_array($search,$config);
if ($row[id] == $row_id){
$admin = "$row[admin]";
if (($admin != '-' && $_SERVER["PHP_AUTH_USER"] == $admin) || $admin == '-'){
if (($admin != '-' && $_SERVER["REMOTE_USER"] == $admin) || $admin == '-'){
$sql_servers = array();
if ($config[sql_extra_servers] != '')
$sql_servers = explode(' ',$config[sql_extra_servers]);
137,7 → 137,7
</tr>
 
<?php
$auth_user = $_SERVER["PHP_AUTH_USER"];
$auth_user = $_SERVER["REMOTE_USER"];
if ($config[general_restrict_badusers_access] == 'yes'){
$auth_user = da_sql_escape_string($link,$auth_user);
$extra_query = "AND admin == '$auth_user'";
/web/acc/manager/lib/add_badusers.php
10,8 → 10,8
$lockmsg_name = $attrmap['Dialup-Lock-Msg'] . '0';
$msg = $$lockmsg_name;
$admin = '-';
if ($_SERVER["PHP_AUTH_USER"] != '')
$admin = $_SERVER["PHP_AUTH_USER"];
if ($_SERVER["REMOTE_USER"] != '')
$admin = $_SERVER["REMOTE_USER"];
if ($msg == '')
echo "<b>Lock Message should not be empty</b><br>\n";
else{
/web/acc/manager/lib/sql/drivers/mysql/functions.php
18,7 → 18,7
{
if ($config['sql_use_http_credentials'] == 'yes'){
global $HTTP_SERVER_VARS;
$SQL_user = $HTTP_SERVER_VARS["PHP_AUTH_USER"];
$SQL_user = $HTTP_SERVER_VARS["REMOTE_USER"];
$SQL_passwd = $HTTP_SERVER_VARS["PHP_AUTH_PW"];
}
else{
37,7 → 37,7
{
if (isset($config['sql_use_http_credentials']) && $config['sql_use_http_credentials'] == 'yes'){
global $HTTP_SERVER_VARS;
$SQL_user = $HTTP_SERVER_VARS["PHP_AUTH_USER"];
$SQL_user = $HTTP_SERVER_VARS["REMOTE_USER"];
$SQL_passwd = $HTTP_SERVER_VARS["PHP_AUTH_PW"];
}
else{
56,7 → 56,7
{
if (isset($config['sql_use_http_credentials']) && $config['sql_use_http_credentials'] == 'yes'){
global $HTTP_SERVER_VARS;
$SQL_user = $HTTP_SERVER_VARS["PHP_AUTH_USER"];
$SQL_user = $HTTP_SERVER_VARS["REMOTE_USER"];
$SQL_passwd = $HTTP_SERVER_VARS["PHP_AUTH_PW"];
}
else{
/web/acc/manager/lib/sql/nas_list.php
15,7 → 15,7
}
$link = da_sql_pconnect($config);
if ($link){
$auth_user = $_SERVER["PHP_AUTH_USER"];
$auth_user = $_SERVER["REMOTE_USER"];
$extra = '';
if (isset($mappings[$auth_user]['nasdb'])){
$NAS_ARR = array();
/web/acc/manager/lib/xlat.php
4,7 → 4,7
$string = $filter;
if ($filter != ''){
$string = preg_replace('/%u/',$login,$string);
$string = preg_replace('/%U/',$_SERVER["PHP_AUTH_USER"],$string);
$string = preg_replace('/%U/',$_SERVER["REMOTE_USER"],$string);
$string = preg_replace('/%ma/',$mappings[$http_user]['accounting'],$string);
$string = preg_replace('/%mu/',$mappings[$http_user]['userdb'],$string);
$string = preg_replace('/%mn/',$mappings[$http_user]['nasdb'],$string);