Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 1830 → Rev 1831

/web/acc/manager/lib/acctshow.php
4,17 → 4,26
if (isset($_SESSION['sql_attrs']))
$sql_attrs = $_SESSION["sql_attrs"];
if (!isset($sql_attrs)){
$ARR = file($config[general_sql_attrs_file]);
$ARR = file($config['general_sql_attrs_file']);
foreach($ARR as $val){
$val=chop($val);
if (preg_match('/^[[:space:]]*#/',$val) || preg_match('/^[[:space:]]*$/',$val))
continue;
list($key,$desc,$show,$func)=preg_split("/\t+/",$val);
$sql_attrs[strtolower($key)][desc] = "$desc";
$sql_attrs[strtolower($key)][show] = "$show";
$sql_attrs[strtolower($key)][func] = ($func == "") ? "nothing" : "$func";
$list_val=preg_split("/\t+/",$val);
$key = $list_val[0];
$desc = $list_val[1];
$show = $list_val[2];
 
$sql_attrs[strtolower($key)]['desc'] = "$desc";
$sql_attrs[strtolower($key)]['show'] = "$show";
 
if(isset($list_val[3])){
$func = $list_val[3];
$sql_attrs[strtolower($key)]['func'] = ($func == "") ? "nothing" : "$func";
}
}
if ($config[general_use_session] == 'yes')
if ($config['general_use_session'] == 'yes')
session_register('sql_attrs');
}
?>
/web/acc/manager/lib/functions.php
89,15 → 89,6
return ($now - $timest);
}
 
function date2time($date)
{
list($day,$time)=explode(' ',$date);
$day = explode('-',$day);
$time = explode(':',$time);
$timest = mktime($time[0] ?"":0,$time[1],$time[2],$day[1],$day[2],$day[0]);
return $timest;
}
 
function bytes2str($bytes)
{
$bytes=floor($bytes);
117,7 → 108,7
}
function check_defaults($val,$op,$def)
{
for($i=0;$i<$def['count'];$i++){
for($i=0;isset($def['count']) && $i<$def['count'];$i++){
if ($val == $def[$i] && ($op == '' || $op == $def['operator'][$i]))
return 1;
}
/web/acc/manager/lib/langues.php
50,7 → 50,7
$l_manage_selected_user= "Gérer l'usager sélectionné";
$l_group_member = "Membre du groupe";
$l_group_empty = "La liste des groupes est vide";
$l_main_group = "Le groupe principal est surligné";
$l_main_group = "Le groupe de l'utilisateur est surligné en bleu";
$l_no_open_session = "Aucune session ouverte";
$l_opened_sessions = "session(s) ouverte(s)";
$l_active_accounting = "comptabilité(s) active(s)";
158,7 → 158,7
$l_manage_selected_user= "Manage the selected user";
$l_group_member = "Member of group";
$l_group_empty = "The group list is empty";
$l_main_group = "The main group is highlighted";
$l_main_group = "The current user group is highlighted in blue";
$l_no_open_session = "No open session";
$l_opened_sessions = "opened session(s)";
$l_active_accounting = "active accounting(s)";
/web/acc/manager/lib/sql/change_passwd.php
20,7 → 20,7
if (is_file("../lib/crypt/$config[general_encryption_method].php")){
include("../lib/crypt/$config[general_encryption_method].php");
$passwd = da_encrypt($passwd);
$passwd = da_sql_escape_string($passwd);
$passwd = da_sql_escape_string($link,$passwd);
$res = da_sql_query($link,$config,
"SELECT value FROM $config[sql_check_table] WHERE username = '$login'
AND attribute = '$config[sql_password_attribute]';");
/web/acc/manager/lib/sql/defaults.php
1,6 → 1,7
<?php
require('../lib/sql/attrmap.php');
if ((isset($login) && $login != '') && (isset($user_type) && $user_type !== 'group')){
 
if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php"))
include_once("../lib/sql/drivers/$config[sql_type]/functions.php");
else{
66,7 → 67,10
$tmp["$attr"]['operator'][]="$oper";
}
$tmp["$attr"][] = "$val";
$tmp["$attr"]['count']++;
if(isset($tmp["$attr"]['count']))
{
$tmp["$attr"]['count']++;
}
}
}
else
124,11 → 128,23
unset($member_groups);
$link = da_sql_pconnect($config);
if ($link){
$res = da_sql_query($link,$config,
"SELECT DISTINCT groupname FROM $config[sql_usergroup_table];");
if(isset($login) && $login != '')
{
#affiche le groupe appartenant à l'utilisateur
$res = da_sql_query($link,$config,
"SELECT DISTINCT groupname FROM $config[sql_usergroup_table] WHERE username = '$login';");
}
else
{
#affiche la liste de groupe disponible (dans le cas de la creation d'un utilisateur)
$res = da_sql_query($link,$config,
"SELECT DISTINCT groupname FROM $config[sql_usergroup_table] ;");
}
 
if ($res){
while(($row = da_sql_fetch_array($res,$config)))
while(($row = da_sql_fetch_array($res,$config))){
$member_groups[] = $row['groupname'];
}
}
else
echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
/web/acc/manager/lib/sql/drivers/mysql/functions.php
120,7 → 120,7
 
function da_sql_num_fields($fields,$config)
{
return mysqli_num_fields($fields);
return mysqli_num_fields($fields);
}
 
function da_sql_field_name($fields,$num,$config)
/web/acc/manager/lib/sql/group_change.php
11,7 → 11,7
$del_groups = array_diff($member_groups,$edited_groups);
if (isset($del_groups)){
foreach ($del_groups as $del){
$del = da_sql_escape_string($del);
$del = da_sql_escape_string($link,$del);
$res = da_sql_query($link,$config,
"DELETE FROM $config[sql_usergroup_table] WHERE username = '$login' AND groupname = '$del';");
if (!$res)
23,7 → 23,7
$new_groups = array_diff($edited_groups,$member_groups);
if (isset($new_groups)){
foreach($new_groups as $new){
$new = da_sql_escape_string($new);
$new = da_sql_escape_string($link,$new);
$res = da_sql_query($link,$config,
"INSERT INTO $config[sql_usergroup_table] (groupname,username)
VALUES ('$new','$login');");
/web/acc/manager/lib/sql/nas_list.php
5,7 → 5,7
unset($da_name_cache);
if (isset($_SESSION['da_name_cache']))
$da_name_cache = $_SESSION['da_name_cache'];
if ($config[sql_nas_table] != ''){
if ($config['sql_nas_table'] != ''){
 
if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php"))
include_once("../lib/sql/drivers/$config[sql_type]/functions.php");
17,7 → 17,7
if ($link){
$auth_user = $_SERVER["PHP_AUTH_USER"];
$extra = '';
if (isset($mappings[$auth_user][nasdb])){
if (isset($mappings[$auth_user]['nasdb'])){
$NAS_ARR = array();
$NAS_ARR = preg_split('/,/',$mappings[$auth_user][nasdb]);
$extra = 'WHERE nasname IN (';
/web/acc/manager/lib/sql/user_info.php
99,7 → 99,9
foreach(array_keys($tmp) as $val){
if ($val == '')
continue;
if(isset($rev_attrmap["$val"])) $key = $rev_attrmap["$val"];
if(isset($rev_attrmap["$val"])) {
$key = $rev_attrmap["$val"];
}
if ($key == ''){
$key = $val;
$attrmap["$key"] = $val;
119,4 → 121,5
}
else
echo "<b>Could not connect to SQL database</b><br>\n";
 
?>