WebSVN – ALCASAR – Path Comparison – / – /web/ Rev 1805 and /web/ Rev 1804

Ignore whitespace Rev 1805 → Rev 1804

 /web/acc/phpsysinfo/includes/xml/portail.php
 ,4 → 1,4
-<?php
+<?php
 /***************************************************************************
  *   Copyright (C) 2006 by phpSysInfo - A PHP System Information Script    *
  *   http://phpsysinfo.sourceforge.net/                                    *
 ,20 → 31,21
                 $DB_RADIUS = "radius";
                 $radiuspwd = "J7YI65SW";
                 // Connexion au serveur
-                $mysqli = new mysqli($host, $DB_USER, $radiuspwd, $DB_RADIUS);
+                mysql_connect($host, $DB_USER,$radiuspwd) or die("erreur de connexion au serveur");
+                mysql_select_db($DB_RADIUS) or die("erreur de connexion a la base de donnees");
+                // Creation et envoi de la requete
                 if ($texte == 'user') {$query = "SELECT UserName FROM userinfo";}
                 else { $query = "SELECT GroupName FROM radusergroup GROUP BY GroupName";}
-                $result = $mysqli->query($query);
+                $result = mysql_query($query);
                 // Recuperation des resultats
-                $strResult = $result->num_rows;
+                $strResult = mysql_num_rows($result);
                 // Deconnexion de la base de donnees
-                $mysqli->close();
+                 mysql_close();
                 return $strResult;
- }
+  }
 function xml_portail () {
         global $sysinfo;
         $_text = "  <Portail>\n"
 //              . "    <Utilisateur>" . htmlspecialchars( request('user'), ENT_QUOTES ) . "</Utilisateur>\n"
                 . "    <Utilisateur>" . "</Utilisateur>\n"
 ,9 → 52,9
                 . "    <Groupe>" . "</Groupe>\n";
 //              . "    <Groupe>" . htmlspecialchars( trim( request('group') ), ENT_QUOTES ) . "</Groupe>\n";
         $_text .= "  </Portail>\n";
         return $_text;
-}
+}
 // Fonction de test de connectivité internet
 function internetTest($INSTALLEDVERSION){
         $host = "www.google.com";  # Google Test
 ,7 → 66,7
         if (!$sock){
                 return false; # Internet access is down
                 }
-        else    {
+        else    {
                 fclose($sock);
                 $sock = fsockopen($host2, $port, $num, $error, 2);
                 if ($sock){
 ,12 → 150,12
                 . "  </tr>\n"
                 . "</table>\n";
         return $_text;
-}
+}
 function wml_portail () {
         global $XPath;
         global $text;
         $_text = "<card id=\"vitals\" title=\"" . $text['vitals']  . "\">\n"
                 . "<p>" . $text['hostname'] . ":<br/>\n"
                 . "-&nbsp;" . $XPath->getData( "/phpsysinfo/Vitals/Hostname" ) . "</p>\n"
 ,7 → 170,7
                 . "<p>" . $text['loadavg'] . ":<br/>"
                 . "-&nbsp;" . $XPath->getData( "/phpsysinfo/Vitals/LoadAvg" ) . "</p>\n"
                 . "</card>\n";
         return $_text;
 }
 ?>

/web/acc/manager/lib/lang/el/utf8.php
File deleted

/web/acc/manager/lib/lang/default/utf8.php
File deleted

/web/acc/manager/lib/operators.php
File deleted

/web/acc/manager/lib/add_badusers.php
File deleted

/web/acc/manager/lib/attrshow.php
File deleted

/web/acc/manager/lib/defaults.php
File deleted

/web/acc/manager/lib/xlat.php
File deleted

/web/acc/manager/lib/acctshow.php
File deleted

/web/acc/manager/lib/crypt/clear.php
File deleted

/web/acc/manager/lib/crypt/md5.php
File deleted

/web/acc/manager/lib/sql/functions.php
File deleted

/web/acc/manager/lib/sql/defaults.php
File deleted

/web/acc/manager/lib/sql/attrmap.php
File deleted

/web/acc/manager/lib/sql/group_admin.php
File deleted

/web/acc/manager/lib/sql/nas_list.php
File deleted

/web/acc/manager/lib/sql/change_passwd.php
File deleted

/web/acc/manager/lib/sql/user_info.php
File deleted

/web/acc/manager/lib/sql/group_change.php
File deleted

/web/acc/manager/lib/sql/change_info.php
File deleted

 /web/acc/manager/lib/sql/change_attrs.php
 ,12 → 6,12
         echo "<b>Could not include SQL library</b><br>\n";
         exit();
 }
-if ($config['sql_use_operators'] == 'true'){
+if ($config[sql_use_operators] == 'true'){
         $use_ops=1;
         $text1 = 'AND op =';
         $text2 = ',op';
 }
-$link = da_sql_pconnect($config);
+$link = @da_sql_pconnect($config);
 if ($link){
         foreach($show_attrs as $key => $desc){
                 if ($attrmap["$key"] == 'none')
 ,7 → 26,7
                 $name = $attrmap["$key"] . $i;
                 while(isset($$name)){
                         $val=$$name;
-                        $val = da_sql_escape_string($link, $val);
+                        $val = da_sql_escape_string($val);
                         $op_name = $name . '_op';
                         $i++;
                         $j++;
 ,18 → 33,18
                         $name = $attrmap["$key"] . $i;
                         $sql_attr=$attrmap["$key"];
                         $query_key = ($user_type == 'group') ? 'groupname' : 'username';
-                        if (isset($attr_type["$key"]) && $attr_type["$key"] == 'checkItem'){
-                                $table = ($user_type == 'group') ? $config['sql_groupcheck_table'] : $config['sql_check_table'];
+                        if ($attr_type["$key"] == 'checkItem'){
+                                $table = ($user_type == 'group') ? $config[sql_groupcheck_table] : $config[sql_check_table];
                                 $type = 1;
                         }
-                        else if (isset($attr_type["$key"]) && $attr_type["$key"] == 'replyItem'){
-                                $table = ($user_type == 'group') ? $config['sql_groupreply_table'] : $config['sql_reply_table'];
+                        else if ($attr_type["$key"] == 'replyItem'){
+                                $table = ($user_type == 'group') ? $config[sql_groupreply_table] : $config[sql_reply_table];
                                 $type = 2;
                         }
                         if ($use_ops){
                                 $op_val = $$op_name;
                                 if ($op_val != ''){
-                                        $op_val = da_sql_escape_string($link, $op_val);
+                                        $op_val = da_sql_escape_string($op_val);
                                         if (check_operator($op_val,$type) == -1){
                                                 echo "<b>Invalid operator ($op_val) for attribute $key</b><br>\n";
                                                 continue;
 ,26 → 52,25
                                         $op_val2 = ",'$op_val'";
                                 }
                         }
-                        $sql_attr = da_sql_escape_string($link, $sql_attr);
-                        $val = da_sql_escape_string($link, $val);
+                        $sql_attr = da_sql_escape_string($sql_attr);
+                        $val = da_sql_escape_string($val);
         // if we have operators, the operator has changed and the corresponding value exists then update
-                        if ($use_ops && isset($item_vals["$key"]['operator'][$j]) &&
-                                $op_val != $item_vals["$key"]['operator'][$j] ){
-                                $res = da_sql_query($link,$config,
+                        if ($use_ops && isset($item_vals["$key"][operator][$j]) &&
+                                $op_val != $item_vals["$key"][operator][$j] ){
+                                $res = @da_sql_query($link,$config,
                                 "UPDATE $table SET op = '$op_val' WHERE $query_key = '$login'
                                 AND attribute = '$sql_attr' AND value = '$val';");
-                                if (!$res || !da_sql_affected_rows($link,$res,$config))
+                                if (!$res || !@da_sql_affected_rows($link,$res,$config))
                                         echo "<b>Operator change failed for attribute $key: " . da_sql_error($link,$config) . "</b><br>\n";
                         }
-                        $chkdef = (isset($default_vals["$key"])) ? check_defaults($val,$op_val,$default_vals["$key"]) : 0;
         //      if value is the same as that in the sql database do nothing
-                        if (isset($item_vals["$key"]) && $val == $item_vals["$key"][$j])
+                        if ($val == $item_vals["$key"][$j])
                                 continue;
         //      if value is null or equals the default value and corresponding value exists then delete
-                        else if (($chkdef || $val == '' || ($sql_attr == "Filter-Id" && $val == "None")) && isset($item_vals["$key"][$j])){
-                                $res = da_sql_query($link,$config,
+                        else if ((check_defaults($val,$op_val,$default_vals["$key"]) || $val == '' || ($sql_attr == "Filter-Id" && $val == "None")) && isset($item_vals["$key"][$j])){
+                                $res = @da_sql_query($link,$config,
                                 "DELETE FROM $table WHERE $query_key = '$login' AND attribute = '$sql_attr';");
-                                if (!$res || !da_sql_affected_rows($link,$res,$config))
+                                if (!$res || !@da_sql_affected_rows($link,$res,$config))
                                         echo "<b>Delete failed for attribute $key: " . da_sql_error($link,$config) . "</b><br>\n";
                         }
         //      if value is null or equals the default value then don't add it
 ,16 → 80,16
                         else{
                                 if (isset($item_vals["$key"][$j])){
                                         $old_val = $item_vals["$key"][$j];
-                                        $old_val = da_sql_escape_string($link, $old_val);
-                                        $res = da_sql_query($link,$config,
+                                        $old_val = da_sql_escape_string($old_val);
+                                        $res = @da_sql_query($link,$config,
                                         "UPDATE $table SET value = '$val' WHERE $query_key = '$login' AND
                                         attribute = '$sql_attr' AND value = '$old_val';");
                                 }
                                 else
-                                        $res = da_sql_query($link,$config,
+                                        $res = @da_sql_query($link,$config,
                                         "INSERT INTO $table ($query_key,attribute,value $text2)
                                         VALUES ('$login','$sql_attr','$val' $op_val2);");
-                                if (!$res || !da_sql_affected_rows($link,$res,$config))
+                                if (!$res || !@da_sql_affected_rows($link,$res,$config))
                                         echo "<b>Change failed for attribute $key: " . da_sql_error($link,$config) . "</b><br>\n";
                         }
                 }

 /web/acc/manager/lib/sql/create_group.php
 ,23 → 6,23
         echo "<b>Could not include SQL library</b><br>\n";
         exit();
 }
-if ($config['sql_use_operators'] == 'true'){
-        include_once("../lib/operators.php");
+if ($config[sql_use_operators] == 'true'){
+        include("../lib/operators.php");
         $text = ',op';
         $passwd_op = ",':='";
 }
 $da_abort=0;
 $op_val2 = '';
-$link = da_sql_pconnect($config);
+$link = @da_sql_pconnect($config);
 if ($link){
         $Members = preg_split("/[\n\s]+/",$members,-1,PREG_SPLIT_NO_EMPTY);
         if (!empty($Members)){
                 foreach ($Members as $member){
-                        $member = da_sql_escape_string($link, $member);
-                        $res = da_sql_query($link,$config,
+                        $member = da_sql_escape_string($member);
+                        $res = @da_sql_query($link,$config,
                         "INSERT INTO $config[sql_usergroup_table] (username,groupname)
                         VALUES ('$member','$login');");
-                        if (!$res || !da_sql_affected_rows($link,$res,$config)){
+                        if (!$res || !@da_sql_affected_rows($link,$res,$config)){
                                 echo "<b>Unable to add user $member in group $login: " . da_sql_error($link,$config) . "</b><br>\n";
                                 $da_abort=1;
                         }
 ,10 → 30,10
         }
         else
                 {
-                $res = da_sql_query($link,$config,
+                $res = @da_sql_query($link,$config,
                         "INSERT INTO $config[sql_usergroup_table] (username,groupname)
                         VALUES ('$login','$login');");
-                        if (!$res || !da_sql_affected_rows($link,$res,$config))
+                        if (!$res || !@da_sql_affected_rows($link,$res,$config))
                                 {
                                 echo "<b>Unable to add user $member in group $login: " . da_sql_error($link,$config) . "</b><br>\n";
                                 $da_abort=1;
 ,20 → 55,20
                                 $attr_type["$key"] = 'replyItem';
                                 $rev_attrmap["$key"] = $key;
                         }
-                        if (isset($attr_type["$key"]) && $attr_type["$key"] == 'checkItem'){
+                        if ($attr_type["$key"] == 'checkItem'){
                                 $table = "$config[sql_groupcheck_table]";
                                 $type = 1;
                         }
-                        else if (isset($attr_type["$key"]) && $attr_type["$key"] == 'replyItem'){
+                        else if ($attr_type["$key"] == 'replyItem'){
                                 $table = "$config[sql_groupreply_table]";
                                 $type = 2;
                         }
                         $val = $$attrmap["$key"];
-                        $val = da_sql_escape_string($link, $val);
+                        $val = da_sql_escape_string($val);
                         $op_name = $attrmap["$key"] . '_op';
                         $op_val = $$op_name;
                         if ($op_val != ''){
-                                $op_val = da_sql_escape_string($link, $op_val);
+                                $op_val = da_sql_escape_string($op_val);
                                 if (check_operator($op_val,$type) == -1){
                                         echo "<b>Invalid operator ($op_val) for attribute $key</b><br>\n";
                                         coninue;
 ,13 → 75,12
                                 }
                                 $op_val2 = ",'$op_val'";
                         }
-                        $chkdef = (isset($default_vals["$key"])) ? check_defaults($val,$op_val,$default_vals["$key"]) : 0;
-                        if ($val == '' || $chkdef)
+                        if ($val == '' || check_defaults($val,$op_val,$default_vals["$key"]))
                                 continue;
-                        $res = da_sql_query($link,$config,
+                        $res = @da_sql_query($link,$config,
                         "INSERT INTO $table (attribute,value,groupname $text)
                         VALUES ('$attrmap[$key]','$val','$login' $op_val2);");
-                        if (!$res || !da_sql_affected_rows($link,$res,$config))
+                        if (!$res || !@da_sql_affected_rows($link,$res,$config))
                                 echo "<b>Query failed for attribute $key: " . da_sql_error($link,$config) . "</b><br>\n";
                 }
                 echo "<b>Le groupe $login a &eacute;t&eacute; correctement cr&eacute;&eacute;</b><br>\n";

 /web/acc/manager/lib/sql/create_user.php
 ,4 → 1,4
-<?php
+<?php
 if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php"))
         include_once("../lib/sql/drivers/$config[sql_type]/functions.php");
 else{
 ,7 → 6,7
         exit();
 }
 include_once('../lib/functions.php');
-if ($config['sql_use_operators'] == 'true'){
+if ($config[sql_use_operators] == 'true'){
         include_once("../lib/operators.php");
         $text = ',op';
         $passwd_op = ",':='";
 ,7 → 13,7
 }
 $da_abort=0;
 $op_val2 = '';
-$link = da_sql_pconnect($config);
+$link = @da_sql_pconnect($config);
 if ($link){
         if (is_file("../lib/crypt/$config[general_encryption_method].php")){
                 include_once("../lib/crypt/$config[general_encryption_method].php");
 ,31 → 21,31
                 $passwd_imp = $passwd;
                 /*Fin Ajout*/
                 $passwd = da_encrypt($passwd);
-                $passwd = da_sql_escape_string($link, $passwd);
-                $res = da_sql_query($link,$config,
+                $passwd = da_sql_escape_string($passwd);
+                $res = @da_sql_query($link,$config,
                 "INSERT INTO $config[sql_check_table] (attribute,value,username $text)
                 VALUES ('$config[sql_password_attribute]','$passwd','$login' $passwd_op);");
-                if (!$res || !da_sql_affected_rows($link,$res,$config)){
+                if (!$res || !@da_sql_affected_rows($link,$res,$config)){
                         echo "<b>Unable to add user $login: " . da_sql_error($link,$config) . "</b><br>\n";
                         $da_abort=1;
                 }
-                if ($config['sql_use_user_info_table'] == 'true' && !$da_abort){
-                        $res = da_sql_query($link,$config,
+                if ($config[sql_use_user_info_table] == 'true' && !$da_abort){
+                        $res = @da_sql_query($link,$config,
                         "SELECT username FROM $config[sql_user_info_table] WHERE
                         username = '$login';");
                         if ($res){
-                                if (!da_sql_num_rows($res,$config)){
-                                        $Fcn = (isset($Fcn)) ? da_sql_escape_string($link, $Fcn) : '';
-                                        $Fmail = (isset($Fmail)) ? da_sql_escape_string($link, $Fmail) : '';
-                                        $Fou = (isset($Fou)) ? da_sql_escape_string($link, $Fou) : '';
-                                        $Fhomephone = (isset($Fhomephone)) ? da_sql_escape_string($link, $Fhomephone) : '';
-                                        $Ftelephonenumber = (isset($Ftelephonenumber)) ? da_sql_escape_string($link, $Ftelephonenumber) : '';
-                                        $Fmobile = (isset($Fmobile)) ? da_sql_escape_string($link, $Fmobile) : '';
-                                        $res = da_sql_query($link,$config,
+                                if (!@da_sql_num_rows($res,$config)){
+                                        $Fcn = da_sql_escape_string($Fcn);
+                                        $Fmail = da_sql_escape_string($Fmail);
+                                        $Fou = da_sql_escape_string($Fou);
+                                        $Fhomephone = da_sql_escape_string($Fhomephone);
+                                        $Fworkphone = da_sql_escape_string($Fworkphone);
+                                        $Fmobile = da_sql_escape_string($Fmobile);
+                                        $res = @da_sql_query($link,$config,
                                         "INSERT INTO $config[sql_user_info_table]
                                         (username,name,mail,department,homephone,workphone,mobile) VALUES
                                         ('$login','$Fcn','$Fmail','$Fou','$Fhomephone','$Ftelephonenumber','$Fmobile');");
-                                        if (!$res || !da_sql_affected_rows($link,$res,$config))
+                                        if (!$res || !@da_sql_affected_rows($link,$res,$config))
                                                 echo "<b>Could not add user information in user info table: " . da_sql_error($link,$config) . "</b><br>\n";
                                 }
                                 else
 ,17 → 54,17
                         else
                                 echo "<b>Could not add user information in user info table: " . da_sql_error($link,$config) . "</b><br>\n";
                 }
-                if (isset($Fgroup) && $Fgroup != ''){
-                        $Fgroup = da_sql_escape_string($link, $Fgroup);
-                        $res = da_sql_query($link,$config,
+                if ($Fgroup != ''){
+                        $Fgroup = da_sql_escape_string($Fgroup);
+                        $res = @da_sql_query($link,$config,
                         "SELECT username FROM $config[sql_usergroup_table]
                         WHERE username = '$login' AND groupname = '$Fgroup';");
                         if ($res){
-                                if (!da_sql_num_rows($res,$config)){
-                                        $res = da_sql_query($link,$config,
+                                if (!@da_sql_num_rows($res,$config)){
+                                        $res = @da_sql_query($link,$config,
                                         "INSERT INTO $config[sql_usergroup_table]
                                         (username,groupname) VALUES ('$login','$Fgroup');");
-                                        if (!$res || !da_sql_affected_rows($link,$res,$config))
+                                        if (!$res || !@da_sql_affected_rows($link,$res,$config))
                                                 echo "<b>Could not add user to group $Fgroup. SQL Error</b><br>\n";
                                 }
                                 else
 ,7 → 74,7
                                 echo "<b>Could not add user to group $Fgroup: " . da_sql_error($link,$config) . "</b><br>\n";
                 }
                 if (!$da_abort){
-                        if (isset($Fgroup) && $Fgroup != '')
+                        if ($Fgroup != '')
                                 require('../lib/defaults.php');
                         foreach($show_attrs as $key => $attr){
                                 if ($attrmap["$key"] == 'none')
 ,15 → 86,15
                                         $attr_type["$key"] = 'replyItem';
                                         $rev_attrmap["$key"] = $key;
                                 }
-                                if (isset($attr_type["$key"]) && $attr_type["$key"] == 'checkItem'){
+                                if ($attr_type["$key"] == 'checkItem'){
                                         $table = "$config[sql_check_table]";
                                         $type = 1;
                                 }
-                                else if (isset($attr_type["$key"]) && $attr_type["$key"] == 'replyItem'){
+                                else if ($attr_type["$key"] == 'replyItem'){
                                         $table = "$config[sql_reply_table]";
                                         $type = 2;
                                 }
-                                $val = (isset($$attrmap["$key"])) ? $$attrmap["$key"] : '';
+                                $val = $$attrmap["$key"];
                                 /*Ajout en vue de l'impression des données (thank's to Geoffroy MUSITELLI)*/
                                 if($key == "Session-Timeout") $sto_imp = $val;
                                 if($key == "Max-All-Session") $mas_imp = $val;
 ,11 → 101,11
                                 if($key == "Max-Daily-Session") $mds_imp = $val;
                                 if($key == "Max-Monthly-Session") $mms_imp = $val;
                                 /*Fin Ajout*/
-                                $val = da_sql_escape_string($link, $val);
+                                $val = da_sql_escape_string($val);
                                 $op_name = $attrmap["$key"] . '_op';
-                                $op_val = (isset($$op_name)) ? $$op_name : '';
+                                $op_val = $$op_name;
                                 if ($op_val != ''){
-                                        $op_val = da_sql_escape_string($link, $op_val);
+                                        $op_val = da_sql_escape_string($op_val);
                                         if (check_operator($op_val,$type) == -1){
                                                 echo "<b>Invalid operator ($op_val) for attribute $key</b><br>\n";
                                                 continue;
 ,13 → 112,12
                                         }
                                         $op_val2 = ",'$op_val'";
                                 }
-                                $chkdef = (isset($default_vals["$key"])) ? check_defaults($val,$op_val,$default_vals["$key"]) : 0;
-                                if ($val == '' || $chkdef)
+                                if ($val == '' || check_defaults($val,$op_val,$default_vals["$key"]))
                                         continue;
-                                $sqlquery = "INSERT INTO $table (attribute,value,username $text)
-                                        VALUES ('$attrmap[$key]','$val','$login' $op_val2);";
-                                $res = da_sql_query($link,$config,$sqlquery);
-                                if (!$res || !da_sql_affected_rows($link,$res,$config))
+                                $res = @da_sql_query($link,$config,
+                                "INSERT INTO $table (attribute,value,username $text)
+                                VALUES ('$attrmap[$key]','$val','$login' $op_val2);");
+                                if (!$res || !@da_sql_affected_rows($link,$res,$config))
                                         echo "<b>Query failed for attribute $key: " . da_sql_error($link,$config) . "</b><br>\n";
                         }
                 }

 /web/acc/manager/lib/sql/password_check.php
 ,17 → 7,17
         exit();
 }
-if (isset($action) && $action == 'checkpass'){
-        $link = da_sql_pconnect($config);
+if ($action == 'checkpass'){
+        $link = @da_sql_pconnect($config);
         if ($link){
-                $res = da_sql_query($link,$config,
+                $res = @da_sql_query($link,$config,
                         "SELECT attribute,value FROM $config[sql_check_table] WHERE username = '$login'
                         AND attribute = '$config[sql_password_attribute]';");
                 if ($res){
-                        $row = da_sql_fetch_array($res,$config);
+                        $row = @da_sql_fetch_array($res,$config);
                         if (is_file("../lib/crypt/$config[general_encryption_method].php")){
                                 include("../lib/crypt/$config[general_encryption_method].php");
-                                $enc_passwd = $row['value'];
+                                $enc_passwd = $row[value];
                                 $passwd = da_encrypt($passwd,$enc_passwd);
                                 if ($passwd == $enc_passwd)
                                         $msg = '<font color=blue><b>YES It is that</b></font>';

 /web/acc/manager/lib/sql/group_info.php
 ,7 → 6,7
         echo "<b>Could not include SQL library</b><br>\n";
         exit();
 }
-if ($config['sql_use_operators'] == 'true'){
+if ($config[sql_use_operators] == 'true'){
         $op = ',op';
         $use_op = 1;
 }else{
 ,18 → 14,18
         $use_op = 0;
 }
 $group_exists = 'no';
-$link = da_sql_pconnect($config);
+$link = @da_sql_pconnect($config);
 if ($link){
-        if (!isset($login) || $login == ''){
+        if ($login == ''){
                 unset($existing_groups);
-                $res = da_sql_query($link,$config,
+                $res = @da_sql_query($link,$config,
                 "SELECT COUNT(*) as counter,groupname FROM $config[sql_usergroup_table]
                 GROUP BY groupname;");
                 if ($res){
-                        while(($row = da_sql_fetch_array($res,$config))){
-                                $name = $row['groupname'];
-                                $existing_groups["$name"] = $row['counter'];
+                        while(($row = @da_sql_fetch_array($res,$config))){
+                                $name = $row[groupname];
+                                $existing_groups["$name"] = $row[counter];
                         }
                         if (isset($existing_groups))
                                 ksort($existing_groups);
 ,15 → 39,14
                 unset($group_members);
                 unset($existing_groups);
-                $res = da_sql_query($link,$config,
+                $res = @da_sql_query($link,$config,
                 "SELECT attribute,value $op FROM $config[sql_groupcheck_table] WHERE groupname = '$login';");
                 if ($res){
-                        if (da_sql_num_rows($res,$config))
+                        if (@da_sql_num_rows($res,$config))
                                 $group_exists = 'yes';
-                        while(($row = da_sql_fetch_array($res,$config))){
-                                $attr = $row['attribute'];
-                                $val = $row['value'];
-                                if(!isset($tmp["$attr"]['count'])) $tmp["$attr"]['count'] = 0;
+                        while(($row = @da_sql_fetch_array($res,$config))){
+                                $attr = $row[attribute];
+                                $val = $row[value];
                                 /*Ajout en vue de l'impression des données (thank's to Geoffroy MUSITELLI)*/
                                 if($attr == "Max-All-Session") $mas_imp = $val;
                                 if($attr == "Max-Daily-Session") $mds_imp = $val;
 ,41 → 54,40
                                 if($attr == "Expiration") $Expiration = $val;
                                 /*Fin Ajout*/
                                 if ($use_op){
-                                        $oper = $row['op'];
-                                        $tmp["$attr"]['operator'][]="$oper";
+                                        $oper = $row[op];
+                                        $tmp["$attr"][operator][]="$oper";
                                 }
                                 $tmp["$attr"][]="$val";
-                                $tmp["$attr"]['count']++;
+                                $tmp["$attr"][count]++;
                         }
-                        $res = da_sql_query($link,$config,
+                        $res = @da_sql_query($link,$config,
                         "SELECT attribute,value $op FROM $config[sql_groupreply_table] WHERE groupname = '$login';");
                         if ($res){
-                                if (da_sql_num_rows($res,$config))
+                                if (@da_sql_num_rows($res,$config))
                                         $group_exists = 'yes';
-                                while(($row = da_sql_fetch_array($res,$config))){
-                                        $attr = $row['attribute'];
-                                        $val = $row['value'];
-                                        if(!isset($tmp["$attr"]['count'])) $tmp["$attr"]['count'] = 0;
+                                while(($row = @da_sql_fetch_array($res,$config))){
+                                        $attr = $row[attribute];
+                                        $val = $row[value];
                                         /*Ajout en vue de l'impression des données (thank's to Geoffroy MUSITELLI)*/
                                         if($attr == "Session-Timeout") $sto_imp = $val;
                                         /*Fin Ajout*/
                                         if ($use_op){
-                                                $oper = $row['op'];
-                                                $tmp["$attr"]['operator'][]="$oper";
+                                                $oper = $row[op];
+                                                $tmp["$attr"][operator][]="$oper";
                                         }
                                         $tmp["$attr"][] = "$val";
-                                        $tmp["$attr"]['count']++;
+                                        $tmp["$attr"][count]++;
                                 }
                         }
                         else
                                 echo "<b>Database query failed partially: " . da_sql_error($link,$config) . "</b><br>\n";
-                        $res = da_sql_query($link,$config,
+                        $res = @da_sql_query($link,$config,
                         "SELECT username FROM $config[sql_usergroup_table] WHERE groupname = '$login' ORDER BY username;");
                         if ($res){
-                                if (da_sql_num_rows($res,$config))
+                                if (@da_sql_num_rows($res,$config))
                                         $group_exists = 'yes';
-                                while(($row = da_sql_fetch_array($res,$config))){
-                                        $member = $row['username'];
+                                while(($row = @da_sql_fetch_array($res,$config))){
+                                        $member = $row[username];
                                         $group_members[] = "$member";
                                 }
                         }
 ,9 → 105,9
                                                 $rev_attrmap["$val"] = $key;
                                         }
                                         $item_vals["$key"] = $tmp[$val];
-                                        $item_vals["$key"]['count'] = $tmp[$val]['count'];
+                                        $item_vals["$key"][count] = $tmp[$val][count];
                                         if ($use_op)
-                                                $item_vals["$key"]['operator'] = $tmp[$val]['operator'];
+                                                $item_vals["$key"][operator] = $tmp[$val][operator];
                                 }
                         }
                 }

 /web/acc/manager/lib/sql/drivers/mysql/functions.php
 ,89 → 16,90
 function da_sql_host_connect($server,$config)
 {
-        if ($config['sql_use_http_credentials'] == 'yes'){
+        if ($config[sql_use_http_credentials] == 'yes'){
                 global $HTTP_SERVER_VARS;
                 $SQL_user = $HTTP_SERVER_VARS["PHP_AUTH_USER"];
                 $SQL_passwd = $HTTP_SERVER_VARS["PHP_AUTH_PW"];
         }
         else{
-                $SQL_user = $config['sql_username'];
-                $SQL_passwd = $config['sql_password'];
+                $SQL_user = $config[sql_username];
+                $SQL_passwd = $config[sql_password];
         }
-        if ($config['sql_connect_timeout'] != 0)
-                ini_set('mysql.connect_timeout',$config['sql_connect_timeout']);
-        if ($config['sql_debug'] == 'true')
+        if ($config[sql_connect_timeout] != 0)
+                @ini_set('mysql.connect_timeout',$config[sql_connect_timeout]);
+        if ($config[sql_debug] == 'true')
                 print "<b>DEBUG(SQL,MYSQL DRIVER): Connect: User=$SQL_user,Password=$SQL_passwd </b><br>\n";
-        return mysqli_connect("$server:$config[sql_port]",$SQL_user,$SQL_passwd,$config['sql_database']);
+        return @mysql_connect("$server:$config[sql_port]",$SQL_user,$SQL_passwd);
 }
 function da_sql_connect($config)
 {
-        if (isset($config['sql_use_http_credentials']) && $config['sql_use_http_credentials'] == 'yes'){
+        if ($config[sql_use_http_credentials] == 'yes'){
                 global $HTTP_SERVER_VARS;
                 $SQL_user = $HTTP_SERVER_VARS["PHP_AUTH_USER"];
                 $SQL_passwd = $HTTP_SERVER_VARS["PHP_AUTH_PW"];
         }
         else{
-                $SQL_user = $config['sql_username'];
-                $SQL_passwd = $config['sql_password'];
+                $SQL_user = $config[sql_username];
+                $SQL_passwd = $config[sql_password];
         }
-        if ($config['sql_connect_timeout'] != 0)
-                ini_set('mysql.connect_timeout',$config['sql_connect_timeout']);
-        if ($config['sql_debug'] == 'true')
+        if ($config[sql_connect_timeout] != 0)
+                @ini_set('mysql.connect_timeout',$config[sql_connect_timeout]);
+        if ($config[sql_debug] == 'true')
                 print "<b>DEBUG(SQL,MYSQL DRIVER): Connect: User=$SQL_user,Password=$SQL_passwd </b><br>\n";
-        return mysqli_connect("$config[sql_server]:$config[sql_port]",$SQL_user,$SQL_passwd,$config['sql_database']);
+        return @mysql_connect("$config[sql_server]:$config[sql_port]",$SQL_user,$SQL_passwd);
 }
 function da_sql_pconnect($config)
 {
-        if (isset($config['sql_use_http_credentials']) && $config['sql_use_http_credentials'] == 'yes'){
+        if ($config[sql_use_http_credentials] == 'yes'){
                 global $HTTP_SERVER_VARS;
                 $SQL_user = $HTTP_SERVER_VARS["PHP_AUTH_USER"];
                 $SQL_passwd = $HTTP_SERVER_VARS["PHP_AUTH_PW"];
         }
         else{
-                $SQL_user = $config['sql_username'];
-                $SQL_passwd = $config['sql_password'];
+                $SQL_user = $config[sql_username];
+                $SQL_passwd = $config[sql_password];
         }
-        if ($config['sql_connect_timeout'] != 0)
-                ini_set('mysql.connect_timeout',$config['sql_connect_timeout']);
-        if ($config['sql_debug'] == 'true')
+        if ($config[sql_connect_timeout] != 0)
+                @ini_set('mysql.connect_timeout',$config[sql_connect_timeout]);
+        if ($config[sql_debug] == 'true')
                 print "<b>DEBUG(SQL,MYSQL DRIVER): Connect: User=$SQL_user,Password=$SQL_passwd </b><br>\n";
-        return mysqli_connect($config['sql_server'],$SQL_user,$SQL_passwd,$config['sql_database'],$config['sql_port']);
+        return @mysql_pconnect("$config[sql_server]:$config[sql_port]",$SQL_user,$SQL_passwd);
 }
 function da_sql_close($link,$config)
 {
-        return mysqli_close($link);
+        return @mysql_close($link);
 }
-function da_sql_escape_string($link, $string)
+function da_sql_escape_string($string)
 {
-        return mysqli_real_escape_string($link, $string);
+        return @mysql_real_escape_string($string);
 }
 function da_sql_query($link,$config,$query)
 {
-        if ($config['sql_debug'] == 'true')
+        if ($config[sql_debug] == 'true')
                 print "<b>DEBUG(SQL,MYSQL DRIVER): Query: <i>$query</i></b><br>\n";
-        return mysqli_query($link,$query);
+        return @mysql_db_query($config[sql_database],$query,$link);
 }
 function da_sql_num_rows($result,$config)
 {
-        if ($config['sql_debug'] == 'true')
-                print "<b>DEBUG(SQL,MYSQL DRIVER): Query Result: Num rows:: " . mysqli_num_rows($result) . "</b><br>\n";
-        return mysqli_num_rows($result);
+        if ($config[sql_debug] == 'true')
+                print "<b>DEBUG(SQL,MYSQL DRIVER): Query Result: Num rows:: " . @mysql_num_rows($result) . "</b><br>\n";
+        return @mysql_num_rows($result);
 }
 function da_sql_fetch_array($result,$config)
 {
-        $row = @array_change_key_case(mysqli_fetch_array($result,
-                MYSQLI_ASSOC),CASE_LOWER);
-        if ($config['sql_debug'] == 'true'){
+        $row = array_change_key_case(@mysql_fetch_array($result,
+                MYSQL_ASSOC),CASE_LOWER);
+        if ($config[sql_debug] == 'true'){
                 print "<b>DEBUG(SQL,MYSQL DRIVER): Query Result: <pre>";
                 print_r($row);
                 print "</b></pre>\n";
 ,28 → 109,28
 function da_sql_affected_rows($link,$result,$config)
 {
-        if ($config['sql_debug'] == 'true')
-                print "<b>DEBUG(SQL,MYSQL DRIVER): Query Result: Affected rows:: " . mysqli_affected_rows($result) . "</b><br>\n";
-        return mysqli_affected_rows($link);
+        if ($config[sql_debug] == 'true')
+                print "<b>DEBUG(SQL,MYSQL DRIVER): Query Result: Affected rows:: " . @mysql_affected_rows($result) . "</b><br>\n";
+        return @mysql_affected_rows($link);
 }
 function da_sql_list_fields($table,$link,$config)
 {
-        return da_sql_query($link, $config, "SHOW COLUMNS FROM $table");
+        return @mysql_list_fields($config[sql_database],$table);
 }
 function da_sql_num_fields($fields,$config)
 {
-        return mysqli_num_fields($fields);
+        return @mysql_num_fields($fields);
 }
 function da_sql_field_name($fields,$num,$config)
 {
-        return mysqli_fetch_field_direct($fields,$num);
+        return @mysql_field_name($fields,$num);
 }
 function da_sql_error($link,$config)
 {
-        return mysqli_error($link);
+        return @mysql_error($link);
 }
 ?>

 /web/acc/manager/lib/sql/delete_group.php
 ,15 → 5,15
         echo "<b>Could not include SQL library</b><br>\n";
         exit();
 }
-$link = da_sql_pconnect($config);
+$link = @da_sql_pconnect($config);
 if ($link){
-        $res = da_sql_query($link,$config,
+        $res = @da_sql_query($link,$config,
                 "DELETE FROM $config[sql_groupreply_table] WHERE groupname = '$login';");
         if ($res){
-                $res = da_sql_query($link,$config,
+                $res = @da_sql_query($link,$config,
                         "DELETE FROM $config[sql_groupcheck_table] WHERE groupname = '$login';");
                 if ($res){
-                        $res = da_sql_query($link,$config,
+                        $res = @da_sql_query($link,$config,
                                 "DELETE FROM $config[sql_usergroup_table] WHERE groupname = '$login';");
                                 if ($res)
                                         echo "<b>Le groupe $login a &eacute;t&eacute; correctement supprim&eacute;</b><br>\n";

 /web/acc/manager/lib/sql/delete_user.php
 ,20 → 5,20
         echo "<b>Could not include SQL library</b><br>\n";
         exit();
 }
-$link = da_sql_pconnect($config);
+$link = @da_sql_pconnect($config);
 if ($link){
-        $res = da_sql_query($link,$config,
+        $res = @da_sql_query($link,$config,
                 "DELETE FROM $config[sql_reply_table] WHERE username = '$login';");
         if ($res){
-                $res = da_sql_query($link,$config,
+                $res = @da_sql_query($link,$config,
                         "DELETE FROM $config[sql_check_table] WHERE username = '$login';");
                 if ($res){
-                        $res = da_sql_query($link,$config,
+                        $res = @da_sql_query($link,$config,
                                 "DELETE FROM $config[sql_usergroup_table] WHERE username = '$login';");
                         if (!$res)
                                 echo "<b>Error deleting user $login from user group table: " . da_sql_error($link,$config) . "</b><br>\n";
-                        if ($config['sql_use_user_info_table'] == 'true'){
-                                $res = da_sql_query($link,$config,
+                        if ($config[sql_use_user_info_table] == 'true'){
+                                $res = @da_sql_query($link,$config,
                                 "DELETE FROM $config[sql_user_info_table] WHERE username = '$login';");
                                 if ($res)
                                         echo "<b>L'usager $login a &eacute;t&eacute; correctement supprim&eacute;</b><br>\n";

 /web/acc/manager/lib/sql/find.php
 ,19 → 8,18
 unset($found_users);
-$link = da_sql_pconnect($config);
+$link = @da_sql_pconnect($config);
 if ($link){
-        $search = da_sql_escape_string($link, $search);
-        if (!isset($max) || !is_numeric($max))
+        $search = da_sql_escape_string($search);
+        if (!is_numeric($max))
 #               $max = 10;
 # modif by MG fo Alcasar
                 $max = 40;
         if ($max > 500)
                 $max = 10;
         if (($search_IN == 'name' || $search_IN == 'department' || $search_IN == 'username') &&
-                        $config['sql_use_user_info_table'] == 'true'){
-                $res = da_sql_query($link,$config,
+                        $config[sql_use_user_info_table] == 'true'){
+                $res = @da_sql_query($link,$config,
                 "SELECT " . da_sql_limit($max,0,$config) . " username FROM $config[sql_user_info_table] WHERE
                 lower($search_IN) LIKE '%$search%' " .
 #               da_sql_limit($max,1,$config) . " " . da_sql_limit($max,2,$config) . " ;");
 ,8 → 26,8
 # modif by MG for Alcasar
                 da_sql_limit($max,1,$config) . " " . da_sql_limit($max,1,$config) . " ;");
                 if ($res){
-                        while(($row = da_sql_fetch_array($res,$config)))
-                                $found_users[] = $row['username'];
+                        while(($row = @da_sql_fetch_array($res,$config)))
+                                $found_users[] = $row[username];
                 }
                 else
                         "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
 ,15 → 38,15
                         $attrmap["$radius_attr"] = $radius_attr;
                         $attr_type["$radius_attr"] = 'replyItem';
                 }
-                $table = ($attr_type[$radius_attr] == 'checkItem') ? $config['sql_check_table'] : $config['sql_reply_table'];
+                $table = ($attr_type[$radius_attr] == 'checkItem') ? $config[sql_check_table] : $config[sql_reply_table];
                 $attr = $attrmap[$radius_attr];
-                $attr = da_sql_escape_string($link, $attr);
-                $res = da_sql_query($link,$config,
+                $attr = da_sql_escape_string($attr);
+                $res = @da_sql_query($link,$config,
                 "SELECT " . da_sql_limit($max,0,$config) . " username FROM $table WHERE attribute = '$attr'
                 AND value LIKE '%$search%' " . da_sql_limit($max,1,$config) . " " . da_sql_limit($max,2,$config) . " ;");
                 if ($res){
-                        while(($row = da_sql_fetch_array($res,$config)))
-                                $found_users[] = $row['username'];
+                        while(($row = @da_sql_fetch_array($res,$config)))
+                                $found_users[] = $row[username];
                 }
                 else
                         "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";

 /web/acc/manager/lib/functions.php
 ,7 → 6,6
                 return "0 seconds";
         $d = $time/86400;
         $d = floor($d);
-        $str = '';
         if ($d){
                 $str .= "$d days, ";
                 $time = $time % 86400;
 ,9 → 24,8
         }
         if ($time)
                 $str .= "$time seconds, ";
+        $str = ereg_replace(', $','',$str);
-        $str = preg_replace('/, $/','',$str);
         return $str;
 }
 ,8 → 115,8
 }
 function check_defaults($val,$op,$def)
 {
-        for($i=0;$i<$def['count'];$i++){
-                if ($val == $def[$i] && ($op == '' || $op == $def['operator'][$i]))
+        for($i=0;$i<$def[count];$i++){
+                if ($val == $def[$i] && ($op == '' || $op == $def[operator][$i]))
                         return 1;
         }

/web/acc/manager/htdocs/badusers.php
File deleted

/web/acc/manager/htdocs/images/bg.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/manager/htdocs/images/arrow.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/manager/htdocs/images/black.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/manager/htdocs/images/greenlines1.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/manager/htdocs/images/pixel.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/manager/htdocs/images/logo2.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/manager/htdocs/images/title2.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

 /web/acc/manager/htdocs/user_new.php
 ,17 → 1,12
-<?php
+<?php
-if (!isset ($create)) $create=0;
-if (!isset ($show)) $show=0;
+if (!isset ($create)) { $create=0; }
+if (!isset ($show)) { $show=0; }
 // ticket d'impression (thank's to Geoffroy MUSITELLI)
 //gestion de la langue
 if (is_file("../lib/langues.php"))
         include("../lib/langues.php");
-if(!isset($login)) $login = '';
-if(!isset($cn)) $cn = '';
-if(!isset($mail)) $mail = '';
-if(!isset($langue_imp)) $langue_imp = '';
 require('/etc/freeradius-web/config.php');
 if($show == 2)
 {
 ,7 → 15,7
 }
 require('../lib/attrshow.php');
 require('../lib/defaults.php');
-if ($config['general_lib_type'] == 'sql' && $config['sql_use_operators'] == 'true'){
+if ($config[general_lib_type] == 'sql' && $config[sql_use_operators] == 'true'){
         $colspan=2;
         $show_ops=1;
 }else{
 ,7 → 24,7
 }
 ?>
 <html><head><title>Voucher creation</title>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php  echo $config['general_charset']?>">
+<meta http-equiv="Content-Type" content="text/html; charset=<?php  echo $config[general_charset]?>">
 <link rel="stylesheet" href="/css/style.css">
 <link rel="stylesheet" type="text/css" href="/css/epoch_styles.css" />
 <script type="text/javascript" src="/js/epoch_classes.js"></script>
 ,7 → 32,7
 <script language="javascript" type="text/javascript">
 /*Insertion du calendrier */
-        var dp_cal;
+        var dp_cal;
 window.onload = function () {
         dp_cal  = new Epoch('epoch_popup','popup',document.getElementById('popup_container'));
 };
 ,12 → 60,11
 </td></tr>
 <tr bgcolor="black" valign=top><td colspan=2>
         <table border=0 width=100% cellpadding=12 cellspacing=0 bgcolor="#ffffd0" valign=top>
-        <tr><td>
-<?php
+        <tr><td>
+<?php
 function sec_imp($time)
-/* Formatage des secondes avant l'impression */
-{
-        $result = '';
+        /* Formatage des secondes avant l'impression */
+    {
         $jour = 0;$heure = 0;$minute = 0;$seconde = 0;
         $jour = floor($time/86400);
         $reste = $time%86400;
 ,7 → 77,7
         $seconde = $reste%60;
         if ($seconde!=0) $result = $result.$seconde.' s ';
         return $result;
-}
+    }
 if ($create == 1){
         if (is_file("../lib/$config[general_lib_type]/user_info.php"))
 ,7 → 92,7
                         include("../lib/$config[general_lib_type]/create_user.php");
                 /*  Petit traitement pré-impression pour la lisibilité */
                 /*  Récupération des attributs du groupe le cas échéant */
-                if (isset($group) && $group!=''){
+                if ($group!=''){
                         $saved_login = $login;
                         $login = $group;
                         if (is_file("../lib/sql/group_info.php"))
 ,7 → 103,7
                 if ($sto_imp==''){ $sto_imp='-';}
                         else { $sto_imp=sec_imp($sto_imp);}
                 if ($mas_imp==''){ $mas_imp='-';}
-                        else { $mas_imp=sec_imp($mas_imp);}
+                else { $mas_imp=sec_imp($mas_imp);}
                 if ($mds_imp==''){ $mds_imp='-';}
                         else { $mds_imp=sec_imp($mds_imp);}
                 if ($mms_imp==''){ $mms_imp='-';}
 ,9 → 110,9
                         else { $mms_imp=sec_imp($mms_imp);}
                 /*Formatage de la date afin d'être lisible dans toute les langues 'jj mm yyyy'*/
                 if ($Expiration!=''){ $Expiration=date("d - m - Y",strtotime($Expiration));}
-                        else { $Expiration='-';}
+                        else { $Expiration=$v_without;}
                 if ($show != 3) //utilisateur normal
-                {
+                {
                         //Appel du ticket d'impression , passage en paramètres des valeurs à afficher
                         echo'   <form name="impression" method="post" action="ticket_user.php" target=_blank>
                                         <input type="hidden" name="langue_imp" value="'.$langue_imp.'">
 ,7 → 142,7
       <input type=hidden name=show value="0">
           <input type=hidden name=langue_imp value='fr'>
         <table border=1 bordercolordark=#ffffe0 bordercolorlight=#000000 width=100% cellpadding=2 cellspacing=0 bgcolor="#ffffe0" valign=top>
-<?php
+<?php
 if($create==0){
         echo <<<EOM
         <tr>
 ,7 → 162,7
                 </td>
         </tr>
 EOM;
-        if ($config['general_lib_type'] == 'sql'){
+        if ($config[general_lib_type] == 'sql'){
                 if (isset($member_groups))
                         $selected[$member_groups[0]] = 'selected';
                 echo <<<EOM
 ,8 → 182,8
                 else echo "$l_group_empty";
         echo "</td></tr>";
         }
-        if ($config['general_lib_type'] == 'ldap' ||
-        ($config['general_lib_type'] == 'sql' && $config['sql_use_user_info_table'] == 'true')){
+        if ($config[general_lib_type] == 'ldap' ||
+        ($config[general_lib_type] == 'sql' && $config[sql_use_user_info_table] == 'true')){
                 echo <<<EOM
         <tr>
                 <td class="etiquette" colspan=$colspan>
 ,13 → 206,7
                 if ($name == 'none')
                         continue;
                 $oper_name = $name . '_op';
-                if(isset($item_vals["$key"][0]) && $item_vals["$key"][0] != ''){
-                        $val = $item_vals["$key"][0];
-                } else if(isset($default_vals["$key"][0])) {
-                        $val = $default_vals["$key"][0];
-                } else {
-                        $val = '';
-                }
+                $val = ($item_vals["$key"][0] != "") ? $item_vals["$key"][0] : $default_vals["$key"][0];
                 /*
                 Gestion d'un mode simple ou d'un mode avancé
                 Définition du mode avancé: les attributs concernant la gestion des octets, de la bande passante
 ,13 → 219,13
                         case 'ChilliSpot-Bandwidth-Max-Up' :
                         case 'ChilliSpot-Bandwidth-Max-Down' :
                         case 'WISPr-Redirection-URL' :
-                        case 'Login-Time' :
+                        case 'Login-Time' :
                         case 'Session-Timeout' :
                         case 'Max-Daily-Session' :
                         case 'Max-Monthly-Session' :
                                 $advanced=0; //<-- attribut non-affiché
                                 break;
-                        case 'Simultaneous-Use' :
+                        case 'Simultaneous-Use' :
                                 $advanced=1;
                                 $help_link="help/simultaneous_use_help.html";
                                 $desc=$l_simultaneous_use;
 ,12 → 257,12
                         </td>
 EOM;
                         switch ($key){
-                                case 'Simultaneous-Use' :
+                                case 'Simultaneous-Use' :
                                 case 'Max-All-Session' :
                                 case 'Max-Daily-Session' :
                                 case 'Max-Weekly-Session' :
                                 case 'Max-Monthly-Session' :
-                                case 'Login-Time' :
+                                case 'Login-Time' :
                                 case 'Expiration' :
                                         echo "<input type=\"hidden\" name=$oper_name value=\":=\">";
                                         break;
 ,9 → 301,9
                                         break;
                         }
                 }
-/*
+/*
 Ajout du pré-remplissage de cellule
-du choix d'unité (pour les durées limites de session,journée et de mois)
+du choix d'unité (pour les durées limites de session,journée et de mois)
 et d'un calendrier pour la date d'expiration
 Sauf dans le cas de la visualisation
 */
 ,9 → 316,9
                                         echo"<input type=text name=\"$name\" value=\"$val\" size=20>";
                                         break;
                                 /*
-                                Choix de l'unité heures, minutes ou secondes
-                                pour les durées limites de session,journée et de mois
-                                */
+                                Choix de l'unité heures, minutes ou secondes
+                                pour les durées limites de session,journée et de mois
+                                */
                                 case 'Session-Timeout' :
                                 case 'Max-Daily-Session' :
                                         /*valeur d'origine de durée limite */
 ,7 → 378,7
                         <option value=\"es\" >Espa&ntilde;ol</option>
                         <option value=\"it\" >Italiano</option>
                         <option value=\"pt\" >Portugês</option>
-                </select></td></tr>";
+                </select></td></tr>";
 }
 echo "</table>";
 if($create == 1)

 /web/acc/manager/htdocs/user_new2.php
 ,18 → 3,6
 //gestion de la langue
 if (is_file("../lib/langues.php"))
         include("../lib/langues.php");
-require('../lib/operators.php');
-if(!isset($create)) $create=0;
-if(!isset($show)) $show=0;
-if(!isset($login)) $login = '';
-if(!isset($cn)) $cn = '';
-if(!isset($mail)) $mail = '';
-if(!isset($langue_imp)) $langue_imp = '';
-if(!isset($selected)) $selected = array();
-if(!isset($selected['='])) $selected['='] = '';
 require('/etc/freeradius-web/config.php');
 if($show == 2)
 {
 ,7 → 12,7
 require('../lib/attrshow.php');
 require('../lib/defaults.php');
-if ($config['general_lib_type'] == 'sql' && $config['sql_use_operators'] == 'true'){
+if ($config[general_lib_type] == 'sql' && $config[sql_use_operators] == 'true'){
         $colspan=2;
         $show_ops=1;
 }else{
 ,7 → 22,7
 ?>
 <html><head><title>User creation</title>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config['general_charset']?>">
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <link rel="stylesheet" href="/css/style.css">
 <link rel="stylesheet" type="text/css" href="/css/epoch_styles.css" />
 <script type="text/javascript" src="/js/epoch_classes.js"></script>
 ,7 → 30,7
 <script language="javascript" type="text/javascript">
 /*Insertion du calendrier */
-        var dp_cal;
+        var dp_cal;
 window.onload = function () {
         dp_cal  = new Epoch('epoch_popup','popup',document.getElementById('popup_container'));
 };
 ,12 → 60,11
 </td></tr>
 <tr bgcolor="black" valign=top><td colspan=2>
         <table border=0 width=100% cellpadding=12 cellspacing=0 bgcolor="#ffffd0" valign=top>
-        <tr><td>
+        <tr><td>
 <?php
 function sec_imp($time)
-/*Formatage des secondes avant l'impression */
-{
-        $result = '';
+        /*Formatage des secondes avant l'impression */
+    {
         $jour = 0;$heure = 0;$minute = 0;$seconde = 0;
         $jour = floor($time/86400);
         $reste = $time%86400;
 ,7 → 77,7
         $seconde = $reste%60;
         if ($seconde!=0) $result = $result.$seconde.' s ';
         return $result;
-}
+    }
 if ($create == 1){
         if (is_file("../lib/$config[general_lib_type]/user_info.php"))
 ,7 → 92,7
                         include("../lib/$config[general_lib_type]/create_user.php");
                 /*  Petit traitement pré-impression pour la lisibilité */
                 /*  Récupération des attributs du groupe le cas échéant */
-                if (isset($group) && $group!=''){
+                if ($group!=''){
                         $saved_login = $login;
                         $login = $group;
                         if (is_file("../lib/sql/group_info.php"))
 ,19 → 100,19
                         $login = $saved_login;}
                 /*  Si les valeurs de durée sont vide remplissage avec la valeur 'Illimitée'*/
                 /*  et formatage des secondes sous le format Heure min ses*/
-                if ($sto_imp==''){ $sto_imp='-';}
+                if ($sto_imp==''){ $sto_imp=$v_illimit;}
                         else { $sto_imp=sec_imp($sto_imp);}
-                if ($mas_imp==''){ $mas_imp='-';}
+                if ($mas_imp==''){ $mas_imp=$v_illimit;}
                         else { $mas_imp=sec_imp($mas_imp);}
-                if ($mds_imp==''){ $mds_imp='-';}
+                if ($mds_imp==''){ $mds_imp=$v_illimit;}
                         else { $mds_imp=sec_imp($mds_imp);}
-                if ($mms_imp==''){ $mms_imp='-';}
+                if ($mms_imp==''){ $mms_imp=$v_illimit;}
                         else { $mms_imp=sec_imp($mms_imp);}
                 /*Formatage de la date afin d'être lisible dans toute les langues 'jj mm yyyy'*/
                 if ($Expiration!=''){ $Expiration=date("d - m - Y",strtotime($Expiration));}
-                        else { $Expiration='-';}
+                        else { $Expiration=$v_without;}
                 if ($show != 3)
-                {
+                {
                         //Appel du ticket d'impression , passage en paramètres des valeurs à afficher
                         echo'   <form name="impression" method="post" action="ticket_user.php" target=_blank>
                                         <input type="hidden" name="langue_imp" value="'.$langue_imp.'">
 ,7 → 162,7
                 </td>
         </tr>
 EOM;
-        if ($config['general_lib_type'] == 'sql'){
+        if ($config[general_lib_type] == 'sql'){
                 if (isset($member_groups))
                         $selected[$member_groups[0]] = 'selected';
                 echo <<<EOM
 ,8 → 182,8
                 else echo "$l_group_empty";
         echo "</td></tr>";
         }
-        if ($config['general_lib_type'] == 'ldap' ||
-        ($config['general_lib_type'] == 'sql' && $config['sql_use_user_info_table'] == 'true')){
+        if ($config[general_lib_type] == 'ldap' ||
+        ($config[general_lib_type] == 'sql' && $config[sql_use_user_info_table] == 'true')){
                 echo <<<EOM
         <tr>
                 <td class="etiquette" colspan=$colspan>
 ,17 → 206,11
                 if ($name == 'none')
                         continue;
                 $oper_name = $name . '_op';
-                if(isset($item_vals["$key"][0]) && $item_vals["$key"][0] != '') {
-                        $val = $item_vals["$key"][0];
-                } else if(isset($default_vals["$key"][0])){
-                        $val = $default_vals["$key"][0];
-                } else{
-                        $val = '';
-                }
+                $val = ($item_vals["$key"][0] != "") ? $item_vals["$key"][0] : $default_vals["$key"][0];
                 switch ($key)
                 {
-                // $advanced = 1 : champs de saisie amélioré (calendrier, convertisseur, etc.)
-                        case 'Simultaneous-Use' :
+                // $advanced = 1 : champs de saisie amélioré (calendrier, convertisseur, etc.)
+                        case 'Simultaneous-Use' :
                                 $advanced=1;
                                 $help_link="help/simultaneous_use_help.html";
                                 $desc=$l_simultaneous_use;
 ,7 → 220,7
                                 $help_link="help/max_all_session_help.html";
                                 $desc=$l_max_all_session;
                                 break;
-                        case 'Session-Timeout' :
+                        case 'Session-Timeout' :
                                 $advanced=1;
                                 $help_link="help/session_timeout_help.html";
                                 $desc=$l_session_timeout;
 ,7 → 235,7
                                 $help_link="help/session_timeout_help.html";
                                 $desc=$l_monthly_timeout;
                                 break;
-                        case 'Login-Time' :
+                        case 'Login-Time' :
                                 $advanced=1;
                                 $help_link="help/login_time_help.html";
                                 $desc=$l_login_time;
 ,12 → 292,12
                         </td>
 EOM;
                         switch ($key){
-                                case 'Simultaneous-Use' :
+                                case 'Simultaneous-Use' :
                                 case 'Max-All-Session' :
                                 case 'Max-Daily-Session' :
                                 case 'Max-Weekly-Session' :
                                 case 'Max-Monthly-Session' :
-                                case 'Login-Time' :
+                                case 'Login-Time' :
                                 case 'Expiration' :
                                         echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=";
                                         break;
 ,8 → 336,8
                                         break;
                         }
                 }
-/*
-Ajout du choix d'unité (pour les durées limites de session,journée et de mois)
+/*
+Ajout du choix d'unité (pour les durées limites de session,journée et de mois)
 et d'un calendrier pour la date d'expiration
 Sauf dans le cas de la visualisation
 */
 ,9 → 345,9
                 if ($create==0 ){
                         switch ($name){
                                 /*
-                                Choix de l'unité jour, heures, minutes ou secondes
-                                pour les durées limites max, de session,de journée et de mois
-                                */
+                                Choix de l'unité jour, heures, minutes ou secondes
+                                pour les durées limites max, de session,de journée et de mois
+                                */
                                 case 'Session-Timeout' :
                                 case 'Max-Daily-Session' :
                                         /*valeur d'origine de durée limite */
 ,7 → 405,7
                         <option value=\"es\" >Espa&ntilde;ol</option>
                         <option value=\"it\" >Italiano</option>
                         <option value=\"pt\" >Portugês</option>
-                </select></td></tr>";
+                </select></td></tr>";
         }
 echo "</table><BR>";
 if($create == 1)
 ,7 → 413,7
         echo "<a href=\"ticket.pdf\">Ticket</a><br>";
         echo "<center><a href=\"user_admin.php?login=$login\">$l_show_profile</a></center>";
 }
-else
+else
 {
         echo "<input type=submit class=button value=\"$l_create\" OnClick=\"return formControl('newuser');\">";
         echo "<input type='hidden' name='nbtickets' value=''>";

 /web/acc/manager/htdocs/find.php
 ,26 → 3,6
 if (is_file("../lib/langues.php"))
         include("../lib/langues.php");
 require('/etc/freeradius-web/config.php');
-if(!isset($selected))
-{
-        $selected['username'] = '';
-        $selected['name'] = '';
-        $selected['department'] = '';
-        $selected['radius'] = '';
-        $selected['Expiration'] = '';
-        $selected['Max-All-Session'] = '';
-        $selected['Session-Timeout'] = '';
-        $selected['Max-Daily-Session'] = '';
-        $selected['Max-Monthly-Session'] = '';
-        $selected['Simultaneous-Use'] = '';
-        $selected['Login-Time'] = '';
-        $selected['ChilliSpot-Max-Input-Octets'] = '';
-        $selected['ChilliSpot-Max-Total-Octets'] = '';
-        $selected['ChilliSpot-Bandwidth-Max-Up'] = '';
-        $selected['ChilliSpot-Bandwidth-Max-Down'] = '';
-        $selected['ChilliSpot-Max-Output-Octets'] = '';
-        $selected['WISPr-Redirection-URL'] = '';
-}
 if (isset($search_IN)) $selected[$search_IN] = 'selected';
 if (isset ($radius_attr)) $selected[$radius_attr] = 'selected';
 if (isset ($max_results)){ $max = ($max_results) ? $max_results : 40;}
 ,7 → 16,7
 <body>
 <TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr><th><?php echo "$l_users_managment";?></th></tr>
-        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
+        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
 height="2"></td></tr>
 </TABLE>
 <TABLE width="100%" border=0 cellspacing=0 cellpadding=1>
 ,7 → 46,6
                 include("../lib/$config[general_lib_type]/find.php");
         if (isset($found_users)){
                 $num = 0;
-                $msg ='';
                 $msg .= <<<EOM
         <table border=1 bordercolordark=#ffffe0 bordercolorlight=#000000 width=100% cellpadding=2 cellspacing=0 bgcolor="#ffffe0" valign=top>
 ,7 → 75,7
                                 <a href="user_delete.php?login=$User" title="$l_remove"><img src=/images/state_error.gif></a></td><td>
 EOM;
                         if (isset($member_groups)) foreach ($member_groups as $group) { $msg .= "$group";}
-                        else $msg .= "&nbsp";
+                        else $msg .= "&nbsp";
                 $msg .= "</td>";
                 }
                 $msg .= "</tr></table>\n";
 ,57 → 121,57
                 foreach($show_attrs as $key => $desc)
                 switch ($key)
                 {
-                        case 'Simultaneous-Use' :
+                        case 'Simultaneous-Use' :
                                 $desc=$l_simultaneous_use;
-                                echo "<option $selected[$key] value=\"$key\">$desc\n";
+                                echo "<option $selected[$key] value=\"$key\">$desc\n";
                                 break;
                         case 'Max-All-Session' :
                                 $desc=$l_max_all_session;
-                                echo "<option $selected[$key] value=\"$key\">$desc\n";
+                                echo "<option $selected[$key] value=\"$key\">$desc\n";
                                 break;
-                        case 'Session-Timeout' :
+                        case 'Session-Timeout' :
                                 $desc=$l_session_timeout;
-                                echo "<option $selected[$key] value=\"$key\">$desc\n";
+                                echo "<option $selected[$key] value=\"$key\">$desc\n";
                                 break;
                         case 'Max-Daily-Session' :
                                 $desc=$l_daily_timeout;
-                                echo "<option $selected[$key] value=\"$key\">$desc\n";
+                                echo "<option $selected[$key] value=\"$key\">$desc\n";
                                 break;
                         case 'Max-Monthly-Session' :
                                 $desc=$l_monthly_timeout;
-                                echo "<option $selected[$key] value=\"$key\">$desc\n";
+                                echo "<option $selected[$key] value=\"$key\">$desc\n";
                                 break;
-                        case 'Login-Time' :
+                        case 'Login-Time' :
                                 $desc=$l_login_time;
-                                echo "<option $selected[$key] value=\"$key\">$desc\n";
+                                echo "<option $selected[$key] value=\"$key\">$desc\n";
                                 break;
                         case 'Expiration' :
                                 $desc=$l_expiration;
-                                echo "<option $selected[$key] value=\"$key\">$desc\n";
+                                echo "<option $selected[$key] value=\"$key\">$desc\n";
                                 break;
                         case 'ChilliSpot-Max-Input-Octets' :
                                 $desc=$l_max_input_octets;
-                                echo "<option $selected[$key] value=\"$key\">$desc\n";
+                                echo "<option $selected[$key] value=\"$key\">$desc\n";
                                 break;
                         case 'ChilliSpot-Max-Output-Octets' :
                                 $desc=$l_max_output_octets;
-                                echo "<option $selected[$key] value=\"$key\">$desc\n";
+                                echo "<option $selected[$key] value=\"$key\">$desc\n";
                                 break;
                         case 'ChilliSpot-Max-Total-Octets' :
                                 $desc=$l_max_total_octets;
-                                echo "<option $selected[$key] value=\"$key\">$desc\n";
+                                echo "<option $selected[$key] value=\"$key\">$desc\n";
                                 break;
                         case 'ChilliSpot-Bandwidth-Max-Up' :
                                 $desc=$l_max_bandwidth_up;
-                                echo "<option $selected[$key] value=\"$key\">$desc\n";
+                                echo "<option $selected[$key] value=\"$key\">$desc\n";
                                 break;
                         case 'ChilliSpot-Bandwidth-Max-Down' :
                                 $desc=$l_max_bandwidth_down;
-                                echo "<option $selected[$key] value=\"$key\">$desc\n";
+                                echo "<option $selected[$key] value=\"$key\">$desc\n";
                                 break;
                         case 'WISPr-Redirection-URL' :
                                 $desc=$l_wispr_redirection;
-                                echo "<option $selected[$key] value=\"$key\">$desc\n";
+                                echo "<option $selected[$key] value=\"$key\">$desc\n";
                                 break;
                 }
                 echo <<<EOM
 ,7 → 197,7
 <td>
 <input type=text name="max_results" value="<?php echo $max ?>" size=25>
 </td>
-</tr> -->
+</tr> -->
 </table>
 <br>
 <input type=submit class=button value="<?php echo"$l_search";?>" OnClick="this.form.find_user.value=1">

 /web/acc/manager/htdocs/group_new.php
 ,36 → 1,11
 <?php
-if (!isset ($create)) $create=0;
-if (!isset ($login)) $login='';
-if (!isset ($selected)) $selected=array();
-/*if(!isset($selected))
-{
-        $selected['username'] = '';
-        $selected['name'] = '';
-        $selected['department'] = '';
-        $selected['radius'] = '';
-        $selected['Expiration'] = '';
-        $selected['Max-All-Session'] = '';
-        $selected['Session-Timeout'] = '';
-        $selected['Max-Daily-Session'] = '';
-        $selected['Max-Monthly-Session'] = '';
-        $selected['Simultaneous-Use'] = '';
-        $selected['Login-Time'] = '';
-        $selected['ChilliSpot-Max-Input-Octets'] = '';
-        $selected['ChilliSpot-Max-Total-Octets'] = '';
-        $selected['ChilliSpot-Bandwidth-Max-Up'] = '';
-        $selected['ChilliSpot-Bandwidth-Max-Down'] = '';
-        $selected['ChilliSpot-Max-Output-Octets'] = '';
-        $selected['WISPr-Redirection-URL'] = '';
-}*/
 //Gestion de la langue
 if (is_file("../lib/langues.php"))
         include("../lib/langues.php");
 require('/etc/freeradius-web/config.php');
-if ($config['general_lib_type'] != 'sql'){
+if ($config[general_lib_type] != 'sql'){
         echo <<<EOM
 <title>$l_title</title>
 <meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 ,11 → 24,9
 require('../lib/defaults.php');
 require("../lib/$config[general_lib_type]/group_info.php");
-if ($config['general_lib_type'] == 'sql' && $config['sql_use_operators'] == 'true'){
+if ($config[general_lib_type] == 'sql' && $config[sql_use_operators] == 'true'){
         $colspan=2;
         $show_ops=1;
-        include_once("../lib/operators.php");
-        if(!isset($selected[$op_eq])) $selected[$op_eq] = '';
 }else{
         $show_ops = 0;
         $colspan=1;
 ,7 → 41,7
 <script type="text/javascript" src="/js/fonctions.js"></script>
 <script language="javascript" type="text/javascript">
 /*Insertion du calendrier*/
-        var dp_cal;
+        var dp_cal;
 window.onload = function () {
         dp_cal  = new Epoch('epoch_popup','popup',document.getElementById('popup_container'));
 };
 ,7 → 51,7
 <body>
 <TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
         <tr><th><? echo "$l_groups_managment"; ?></th></tr>
-        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
+        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
 height="2"></td></tr>
 </TABLE>
 <TABLE width="100%" border=0 cellspacing=0 cellpadding=1>
 ,7 → 72,7
 <tr bgcolor="black" valign=top><td colspan=2>
         <table border=0 width=100% cellpadding=12 cellspacing=0 bgcolor="#ffffd0" valign=top>
         <tr><td>
 <?php
 if (is_file("../lib/$config[general_lib_type]/group_info.php"))
         include("../lib/$config[general_lib_type]/group_info.php");
 ,7 → 105,7
                 if (!isset($existing_groups))
                         echo "<b>$l_group_empty</b>\n";
                 else{
-                        echo "<select name=\"existing_groups\">\n";
+                        echo "<select name=\"existing_groups\">\n";
                         foreach ($existing_groups as $group => $count)
                                 echo "<option value=\"$group\">$group\n";
                         echo "</select>\n";
 ,7 → 127,7
                 <textarea name=members cols="50" wrap="PHYSICAL" rows=5></textarea>
                 </td>
         </tr>
 EOM;
         foreach($show_attrs as $key => $desc){
                 $name = $attrmap["$key"];
 ,17 → 134,11
                 if ($name == 'none')
                         continue;
                 $oper_name = $name . '_op';
-                if(isset($item_vals["$key"][0]) && $item_vals["$key"][0] != ''){
-                        $val = $item_vals["$key"][0];
-                } else if(isset($default_vals["$key"][0])) {
-                        $val = $default_vals["$key"][0];
-                } else {
-                        $val = '';
-                }
+                $val = ($item_vals["$key"][0] != "") ? $item_vals["$key"][0] : $default_vals["$key"][0];
                 switch ($key)
                 {
-                // $advanced = 1 : champs de saisie amélioré (calendrier, convertisseur, etc.)
-                        case 'Simultaneous-Use' :
+                // $advanced = 1 : champs de saisie amélioré (calendrier, convertisseur, etc.)
+                        case 'Simultaneous-Use' :
                                 $advanced=1;
                                 $help_link="help/simultaneous_use_help.html";
                                 $desc=$l_simultaneous_use;
 ,7 → 148,7
                                 $help_link="help/max_all_session_help.html";
                                 $desc=$l_max_all_session;
                                 break;
-                        case 'Session-Timeout' :
+                        case 'Session-Timeout' :
                                 $advanced=1;
                                 $help_link="help/session_timeout_help.html";
                                 $desc=$l_session_timeout;
 ,7 → 163,7
                                 $help_link="help/session_timeout_help.html";
                                 $desc=$l_monthly_timeout;
                                 break;
-                        case 'Login-Time' :
+                        case 'Login-Time' :
                                 $advanced=1;
                                 $help_link="help/login_time_help.html";
                                 $desc=$l_login_time;
 ,12 → 228,12
                         </td>
 EOM;
                         switch ($key){
-                                case 'Simultaneous-Use' :
+                                case 'Simultaneous-Use' :
                                 case 'Max-All-Session' :
                                 case 'Max-Daily-Session' :
                                 case 'Max-Weekly-Session' :
                                 case 'Max-Monthly-Session' :
-                                case 'Login-Time' :
+                                case 'Login-Time' :
                                 case 'Expiration' :
                                         echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=";
                                         break;
 ,9 → 272,9
                                         break;
                         }
                 }
-/*
-Ajout du choix d'unité (pour les durées limites de session, journée et de mois)
+/*
+Ajout du choix d'unité (pour les durées limites de session, journée et de mois)
 et d'un calendrier pour la date d'expiration
 Sauf dans le cas de la visualisation
 */
 ,9 → 282,9
         if ($create==0 ){
                 switch ($name){
                         /*
-                        Choix de l'unité heures, minutes ou secondes
-                        pour les durées limites de session,journée et de mois
-                        */
+                        Choix de l'unité heures, minutes ou secondes
+                        pour les durées limites de session,journée et de mois
+                        */
                         case 'Session-Timeout' :
                         case 'Max-Daily-Session' :
                         case 'Max-Monthly-Session' :

 /web/acc/manager/htdocs/user_edit.php
 ,16 → 5,10
 require('/etc/freeradius-web/config.php');
 require('../lib/attrshow.php');
 require('../lib/defaults.php');
-if(!isset($change)) $change = 0;
-if(!isset($user_type)) $user_type = 'user';
-if(!isset($badusers)) $badusers = 0;
-if(!isset($cn)) $cn = '';
 if ($user_type != 'group'){
         if (is_file("../lib/$config[general_lib_type]/user_info.php"))
                 include("../lib/$config[general_lib_type]/user_info.php");
-        if ($config['general_lib_type'] == 'sql' && $config['sql_show_all_groups'] == 'true'){
+        if ($config[general_lib_type] == 'sql' && $config[sql_show_all_groups] == 'true'){
                 $saved_login = $login;
                 $login = '';
                 if (is_file("../lib/sql/group_info.php"))
 ,7 → 20,7
         if (is_file("../lib/$config[general_lib_type]/group_info.php"))
                 include("../lib/$config[general_lib_type]/group_info.php");
 }
-if ($config['general_lib_type'] == 'sql' && $config['sql_use_operators'] == 'true'){
+if ($config[general_lib_type] == 'sql' && $config[sql_use_operators] == 'true'){
         $colspan=2;
         $show_ops = 1;
         include("../lib/operators.php");
 ,7 → 33,7
 <html>
 <head>
 <title>Users & groups edition</title>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config['general_charset']?>">
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <link rel="stylesheet" href="/css/style.css">
 <script language="javascript" type="text/javascript">
 var chars='0123456789abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNPQRSTUVWXYZ'
 ,7 → 51,7
 <script type="text/javascript" src="/js/epoch_classes.js"></script>
 <script language="javascript" type="text/javascript">
 /*Insertion du calendrier */
-        var dp_cal;
+        var dp_cal;
 window.onload = function () {
         dp_cal  = new Epoch('epoch_popup','popup',document.getElementById('popup_container'));
 };
 ,10 → 62,10
 <TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
         <tr><th>
 <?php
-if($user_type != 'group'){ echo "$l_users_managment";} else{ echo "$l_groups_managment";}
+if ($user_type != 'group'){ echo "$l_users_managment";} else{ echo "$l_groups_managment";}
 ?>
         </th></tr>
-        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
+        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
 height="2"></td></tr>
 </TABLE>
 <TABLE width="100%" border=1 cellspacing=0 cellpadding=1>
 ,13 → 73,16
         <center>
         <table border=0 width=640 cellpadding=0 cellspacing=2>
 <?php
-if ($user_type != 'group'){
+if ($user_type != 'group')
+        {
         include("../html/user_toolbar.html.php");
         $titre=$l_user;
-}else{
+        }
+else
+        {
         include("../html/group_toolbar.html.php");
         $titre=$l_group;
-}
+        }
 print <<<EOM
 </table>
 <br>
 ,17 → 100,17
         <table border=0 width=100% cellpadding=12 cellspacing=0 bgcolor="#ffffd0" valign=top>
         <tr><td>
 EOM;
 if ($change == 1){
         if (is_file("../lib/$config[general_lib_type]/change_attrs.php"))
                 include("../lib/$config[general_lib_type]/change_attrs.php");
         if ($user_type != 'group'){
-                if ($config['general_show_user_password'] != 'no' && $passwd != ''
+                if ($config[general_show_user_password] != 'no' && $passwd != ''
                         && is_file("../lib/$config[general_lib_type]/change_passwd.php"))
                         include("../lib/$config[general_lib_type]/change_passwd.php");
                 if (is_file("../lib/$config[general_lib_type]/user_info.php"))
                         include("../lib/$config[general_lib_type]/user_info.php");
-                if ($group_change && $config['general_lib_type'] == 'sql' && $config['sql_show_all_groups'] == 'true'){
+                if ($group_change && $config[general_lib_type] == 'sql' && $config[sql_show_all_groups] == 'true'){
                         include("../lib/sql/group_change.php");
                         include("../lib/defaults.php");
                 }
 ,7 → 134,7
         if (is_file("../lib/add_badusers.php"))
                 include("../lib/add_badusers.php");
 }
 ?>
    <form name="edituser" method=post>
       <input type=hidden name=login value=<?php print $login ?>>
 ,7 → 145,7
       <input type=hidden name=group_change value="0">
         <table border=1 bordercolordark=#ffffe0 bordercolorlight=#000000 width=100% cellpadding=2 cellspacing=0 bgcolor="#ffffe0" valign=top>
 <?php
-if ($user_type != 'group' && $config['general_show_user_password'] != 'no'){
+if ($user_type != 'group' && $config[general_show_user_password] != 'no'){
         echo <<<EOM
 <tr>
 <td align=right colspan=$colspan bgcolor="#d0ddb0">
 ,7 → 163,7
 }
         foreach($show_attrs as $key => $desc){
                 $name = $attrmap["$key"];
-                $generic = (isset($attrmap['generic']["$key"])) ? $attrmap['generic']["$key"] : '';
+                $generic = $attrmap[generic]["$key"];
                 if ($name == 'none')
                         continue;
                 unset($vals);
 ,17 → 170,17
                 unset($selected);
                 unset($ops);
                 $def_added = 0;
-                if (isset($item_vals["$key"]['count']) && $item_vals["$key"]['count']){
-                        for($i=0;$i<$item_vals["$key"]['count'];$i++){
+                if ($item_vals["$key"][count]){
+                        for($i=0;$i<$item_vals["$key"][count];$i++){
                                 $vals[] = $item_vals["$key"][$i];
-                                $ops[] = $item_vals["$key"]['operator'][$i];
+                                $ops[] = $item_vals["$key"][operator][$i];
                         }
                 }
                 else{
-                        if (isset($default_vals["$key"]['count']) && $default_vals["$key"]['count']){
-                                for($i=0;$i<$default_vals["$key"]['count'];$i++){
+                        if ($default_vals["$key"][count]){
+                                for($i=0;$i<$default_vals["$key"][count];$i++){
                                         $vals[] = $default_vals["$key"][$i];
-                                        $ops[] = $default_vals["$key"]['operator'][$i];
+                                        $ops[] = $default_vals["$key"][operator][$i];
                                 }
                         }
                         else{
 ,20 → 190,20
                         $def_added = 1;
                 }
                 if ($generic == 'generic' && $def_added == 0){
-                        for($i=0;$i<$default_vals["$key"]['count'];$i++){
+                        for($i=0;$i<$default_vals["$key"][count];$i++){
                                 $vals[] = $default_vals["$key"][$i];
-                                $ops[] = $default_vals["$key"]['operator'][$i];
+                                $ops[] = $default_vals["$key"][operator][$i];
                         }
-                }
-                if (isset($add) && $add && $name == $add_attr){
+                }
+                if ($add && $name == $add_attr){
                         $vals[] = $default_vals["$key"][0];
-                        $ops[] = ($default_vals["$key"]['operator'][0] != '') ? $default_vals["$key"]['operator'][0] : '=';
+                        $ops[] = ($default_vals["$key"][operator][0] != '') ? $default_vals["$key"][operator][0] : '=';
                 }
                 $i = 0;
                 foreach($vals as $val){
                         $name1 = $name . $i;
-                        $val = preg_replace('/\"/','&quot;',$val);
+                        $val = ereg_replace('"','&quot;',$val);
                         $oper_name = $name1 . '_op';
                         $oper = $ops[$i];
                         $selected[$oper] = 'selected';
 ,8 → 210,8
                         $i++;
                 switch ($key)
                 {
-                                // $advanced = 1 : champs de saisie amélioré (calendrier, convertisseur, etc.)
-                        case 'Simultaneous-Use' :
+                                // $advanced = 1 : champs de saisie amélioré (calendrier, convertisseur, etc.)
+                        case 'Simultaneous-Use' :
                                 $advanced=1;
                                 $help_link="help/simultaneous_use_help.html";
                                 $desc=$l_simultaneous_use;
 ,7 → 221,7
                                 $help_link="help/max_all_session_help.html";
                                 $desc=$l_max_all_session;
                                 break;
-                        case 'Session-Timeout' :
+                        case 'Session-Timeout' :
                                 $advanced=1;
                                 $help_link="help/session_timeout_help.html";
                                 $desc=$l_session_timeout;
 ,7 → 236,7
                                 $help_link="help/session_timeout_help.html";
                                 $desc=$l_monthly_timeout;
                                 break;
-                        case 'Login-Time' :
+                        case 'Login-Time' :
                                 $advanced=1;
                                 $help_link="help/login_time_help.html";
                                 $desc=$l_login_time;
 ,13 → 291,12
                         <a href="$help_link" target=help onclick=window.open("$help_link","help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="$l_click_for_help"><font color="blue">$desc</font></a>
 EOM;
                         if ($show_ops){
-                                if(!isset($selected[$op_eq])) $selected[$op_eq] = '';
                                 switch ($key)
                                         {
-                                        case 'Simultaneous-Use' :
+                                        case 'Simultaneous-Use' :
                                                 echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=</td><td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
                                                 break;
-                                        case 'Login-Time' :
+                                        case 'Login-Time' :
                                                 echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=</td><td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
                                                 break;
                                         case 'Expiration' :
 ,7 → 395,7
 EOM;
 if (isset($member_groups)){
         echo "<select size=5 name=\"edited_groups[]\" multiple OnChange=\"this.form.group_change.value=1\">";
-        if ($config['sql_show_all_groups'] == 'true'){
+        if ($config[sql_show_all_groups] == 'true'){
                 foreach ($existing_groups as $group => $count){
                         if ($member_groups[$group] == $group)
                                 echo "<option selected value=\"$group\">$group\n";
 ,7 → 411,7
         else{
                 echo "aucun group</td></tr>";
         }
-}
+}
 echo "</table><br>";
 echo "<input type=submit class=button value=$l_change OnClick=\"this.form.change.value=1\">";
 //if ($user_type != 'group'){

 /web/acc/manager/htdocs/user_accounting.php
 ,17 → 2,6
 //gestion de la langue
 if (is_file("../lib/langues.php"))
         include("../lib/langues.php");
-if(!isset($selected['5'])) $selected['5'] = '';
-if(!isset($selected['10'])) $selected['10'] = '';
-if(!isset($selected['15'])) $selected['15'] = '';
-if(!isset($selected['20'])) $selected['20'] = '';
-if(!isset($selected['40'])) $selected['40'] = '';
-if(!isset($selected['80'])) $selected['80'] = '';
-if(!isset($selected['all'])) $selected['all'] = '';
-if(!isset($selected['asc'])) $selected['asc'] = '';
-if(!isset($selected['desc'])) $selected['desc'] = '';
 require('/etc/freeradius-web/config.php');
 require('../lib/functions.php');
 require('../lib/sql/functions.php');
 ,22 → 29,20
 }
 $now = time();
-$now_str = (isset($now_str) && $now_str != '') ? "$now_str" : date($config['sql_date_format'],$now + 86400);
-$prev_str = (isset($prev_str) && $prev_str != '') ? "$prev_str" : date($config['sql_date_format'], $now - 604800 );
+$now_str = ($now_str != '') ? "$now_str" : date($config[sql_date_format],$now + 86400);
+$prev_str = ($prev_str != '') ? "$prev_str" : date($config[sql_date_format], $now - 604800 );
 $num = 0;
-$pagesize = (isset($pagesize) && $pagesize) ? $pagesize : 10;
+$pagesize = ($pagesize) ? $pagesize : 10;
 if (!is_numeric($pagesize) && $pagesize != 'all')
         $pagesize = 10;
 $limit = ($pagesize == 'all') ? '' : "$pagesize";
 $selected[$pagesize] = 'selected';
-$order = (isset($order) && $order != '') ? $order : $config['general_accounting_info_order'];
+$order = ($order != '') ? $order : $config[general_accounting_info_order];
 if ($order != 'desc' && $order != 'asc')
         $order = 'desc';
 $selected[$order] = 'selected';
-$link = da_sql_pconnect($config);
-$now_str = da_sql_escape_string($link, $now_str);
-$prev_str = da_sql_escape_string($link, $prev_str);
+$now_str = mysql_escape_string($now_str);
+$prev_str = mysql_escape_string($prev_str);
 //$now_str = da_sql_escape_string($now_str);
 //$prev_str = da_sql_escape_string($prev_str);
 ,7 → 61,7
 <body>
 <TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr><th>$l_users_managment</th></tr>
-<tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
+<tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
 height="2"></td></tr>
 </TABLE>
 <TABLE width="100%" border=0 cellspacing=0 cellpadding=1>
 ,55 → 99,53
         <td><b>#</b></td>
 <?php
 for($i=1;$i<=9;$i++){
-        if (isset($acct_attrs['ua']["$i"]) && ($acct_attrs['ua']["$i"] != '') && ($acct_attrs['ua']["$i"] != 'server') && ($acct_attrs['ua']["$i"] != 'callerid'))
+        if (($acct_attrs['ua']["$i"] != '') && ($acct_attrs['ua']["$i"] != 'server') && ($acct_attrs['ua']["$i"] != 'callerid'))
                 echo "<td><b>" . $acct_attrs['ua']["$i"] . "</b></td>\n";
 }
 $sql_extra_query = '';
-if (isset($config['sql_accounting_extra_query']) && $config['sql_accounting_extra_query'] != '')
-        $sql_extra_query = xlat($config['sql_accounting_extra_query'],$login,$config);
+if ($config[sql_accounting_extra_query] != '')
+        $sql_extra_query = xlat($config[sql_accounting_extra_query],$login,$config);
 ?>
         </tr>
 <?php
+$link = @da_sql_pconnect($config);
 if ($link){
-        $search = da_sql_query($link,$config,
+        $search = @da_sql_query($link,$config,
         "SELECT " . da_sql_limit($limit,0,$config) . " * FROM $config[sql_accounting_table]
         WHERE username = '$login' AND acctstarttime <= '$now_str'
         AND acctstarttime >= '$prev_str' $sql_extra_query " . da_sql_limit($limit,1,$config) .
         " ORDER BY acctstarttime $order " . da_sql_limit($limit,2,$config). " ;");
         if ($search){
-                $acct_sessiontime_sum = 0;
-                $acct_upload_sum = 0;
-                $acct_download_sum = 0;
-                while( $row = da_sql_fetch_array($search,$config) ){
+                while( $row = @da_sql_fetch_array($search,$config) ){
                         $num++;
                         $acct_type = "$row[framedprotocol]/$row[nasporttype]";
                         if ($acct_type == '')
                                 $acct_type = '-';
-                        $acct_logedin = $row['acctstarttime'];
-                        $acct_sessiontime = $row['acctsessiontime'];
+                        $acct_logedin = $row[acctstarttime];
+                        $acct_sessiontime = $row[acctsessiontime];
                         $acct_sessiontime_sum += $acct_sessiontime;
                         $acct_sessiontime = time2str($acct_sessiontime);
-                        $acct_ip = $row['framedipaddress'];
+                        $acct_ip = $row[framedipaddress];
                         if ($acct_ip == '')
                                 $acct_ip = '-';
-                        $acct_upload = $row['acctinputoctets'];
+                        $acct_upload = $row[acctinputoctets];
                         $acct_upload_sum += $acct_upload;
                         $acct_upload = bytes2str($acct_upload);
-                        $acct_download = $row['acctoutputoctets'];
+                        $acct_download = $row[acctoutputoctets];
                         $acct_download_sum += $acct_download;
                         $acct_download = bytes2str($acct_download);
-                        $acct_server = $row['nasipaddress'];
+                        $acct_server = $row[nasipaddress];
                         if ($acct_server != ''){
-                                $acct_server = (isset($da_name_cache)) ? $da_name_cache[$row['nasipaddress']] : null;
+                                $acct_server = $da_name_cache[$row[nasipaddress]];
                                 if (!isset($acct_server)){
-                                        $acct_server = gethostbyaddr($row['nasipaddress']);
-                                        if (!isset($da_name_cache) && $config['general_use_session'] == 'yes'){
-                                                $da_name_cache[$row['nasipaddress']] = $acct_server;
+                                        $acct_server = @gethostbyaddr($row[nasipaddress]);
+                                        if (!isset($da_name_cache) && $config[general_use_session] == 'yes'){
+                                                $da_name_cache[$row[nasipaddress]] = $acct_server;
                                                 session_register('da_name_cache');
                                         }
                                         else
-                                                $da_name_cache[$row['nasipaddress']] = $acct_server;
+                                                $da_name_cache[$row[nasipaddress]] = $acct_server;
                                 }
                         }
                         else
 ,29 → 154,29
                         $acct_terminate_cause = "$row[acctterminatecause]";
                         if ($acct_terminate_cause == '')
                                 $acct_terminate_cause = '-';
-                        if (preg_match('/Login-Incorrect/',$acct_terminate_cause) ||
-                                preg_match('/Multiple-Logins/', $acct_terminate_cause) || preg_match('/Invalid-User/',$acct_terminate_cause))
+                        if (ereg('Login-Incorrect',$acct_terminate_cause) ||
+                                ereg('Multiple-Logins', $acct_terminate_cause) || ereg('Invalid-User',$acct_terminate_cause))
                         $acct_callerid = "$row[callingstationid]";
-                        if (!isset($acct_callerid) || $acct_callerid == '')
+                        if ($acct_callerid == '')
                                 $acct_callerid = '-';
                         echo <<<EOM
                         <tr align=center>
                                 <td>$num</td>
 EOM;
-                                if (isset($acct_attrs['ua'][1]) && $acct_attrs['ua'][1] != '') echo "<td>$acct_type</td>\n";
-                                if (isset($acct_attrs['ua'][2]) && $acct_attrs['ua'][2] != '') echo "<td>$acct_logedin</td>\n";
-                                if (isset($acct_attrs['ua'][3]) && $acct_attrs['ua'][3] != '') echo "<td>$acct_sessiontime</td>\n";
-                                if (isset($acct_attrs['ua'][4]) && $acct_attrs['ua'][4] != '') echo "<td>$acct_ip</td>\n";
-                                if (isset($acct_attrs['ua'][5]) && $acct_attrs['ua'][5] != '') echo "<td>$acct_upload</td>\n";
-                                if (isset($acct_attrs['ua'][6]) && $acct_attrs['ua'][6] != '') echo "<td>$acct_download</td>\n";
-//                              if (isset($acct_attrs['ua'][7]) && $acct_attrs[ua][7] != '') echo "<td>$acct_server</td>\n";
-                                if (isset($acct_attrs['ua'][8]) && $acct_attrs['ua'][8] != '') echo "<td>$acct_terminate_cause</td>\n";
-//                              if (isset($acct_attrs['ua'][9]) && $acct_attrs[ua][9] != '') echo "<td>$acct_callerid</td>\n";
+                                if ($acct_attrs[ua][1] != '') echo "<td>$acct_type</td>\n";
+                                if ($acct_attrs[ua][2] != '') echo "<td>$acct_logedin</td>\n";
+                                if ($acct_attrs[ua][3] != '') echo "<td>$acct_sessiontime</td>\n";
+                                if ($acct_attrs[ua][4] != '') echo "<td>$acct_ip</td>\n";
+                                if ($acct_attrs[ua][5] != '') echo "<td>$acct_upload</td>\n";
+                                if ($acct_attrs[ua][6] != '') echo "<td>$acct_download</td>\n";
+//                              if ($acct_attrs[ua][7] != '') echo "<td>$acct_server</td>\n";
+                                if ($acct_attrs[ua][8] != '') echo "<td>$acct_terminate_cause</td>\n";
+//                              if ($acct_attrs[ua][9] != '') echo "<td>$acct_callerid</td>\n";
                         echo "</tr>\n";
                 }
-                $acct_sessiontime_sum = (isset($acct_sessiontime_sum)) ? time2str($acct_sessiontime_sum) : "0 seconds";
-                $acct_upload_sum = (isset($acct_upload_sum)) ? bytes2str($acct_upload_sum) : "0.00 KBs";
-                $acct_download_sum = (isset($acct_download_sum)) ? bytes2str($acct_download_sum) : "0.00 KBs";
+                $acct_sessiontime_sum = time2str($acct_sessiontime_sum);
+                $acct_upload_sum = bytes2str($acct_upload_sum);
+                $acct_download_sum = bytes2str($acct_download_sum);
         }
         else
                 echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
 ,21 → 184,21
 else
         echo "<b>Could not connect to SQL database</b><br>\n";
 $colspan = 3;
-if (!isset($acct_attrs['ua'][1]) || $acct_attrs['ua'][1] == ''){
-        $colspan--;}
-if (!isset($acct_attrs['ua'][2]) || $acct_attrs['ua'][2] == ''){
-        $colspan--;}
+if ($acct_attrs[ua][1] == '')
+        $colspan--;
+if ($acct_attrs[ua][2] == '')
+        $colspan--;
 echo <<<EOM
                         <tr bgcolor="lightyellow" align="center">
                         <td colspan=$colspan><b>Total</b></td>
 EOM;
-                                if (isset($acct_attrs['ua'][3]) && $acct_attrs['ua'][3] != '') echo "<td><b>$acct_sessiontime_sum</b></td>\n";
-                                if (isset($acct_attrs['ua'][4]) && $acct_attrs['ua'][4] != '') echo "<td>&nbsp;</td>\n";
-                                if (isset($acct_attrs['ua'][5]) && $acct_attrs['ua'][5] != '') echo "<td><b>$acct_upload_sum</b></td>\n";
-                                if (isset($acct_attrs['ua'][6]) && $acct_attrs['ua'][6] != '') echo "<td><b>$acct_download_sum</b></td>\n";
-//                              if (isset($acct_attrs['ua'][7]) && $acct_attrs['ua'][7] != '') echo "<td>&nbsp;</td>\n";
-                                if (isset($acct_attrs['ua'][8]) && $acct_attrs['ua'][8] != '') echo "<td>&nbsp;</td>\n";
-//                              if (isset($acct_attrs['ua'][9]) && $acct_attrs['ua'][9] != '') echo "<td>&nbsp;</td>\n";
+                                if ($acct_attrs[ua][3] != '') echo "<td><b>$acct_sessiontime_sum</b></td>\n";
+                                if ($acct_attrs[ua][4] != '') echo "<td>&nbsp;</td>\n";
+                                if ($acct_attrs[ua][5] != '') echo "<td><b>$acct_upload_sum</b></td>\n";
+                                if ($acct_attrs[ua][6] != '') echo "<td><b>$acct_download_sum</b></td>\n";
+//                              if ($acct_attrs[ua][7] != '') echo "<td>&nbsp;</td>\n";
+                                if ($acct_attrs[ua][8] != '') echo "<td>&nbsp;</td>\n";
+//                              if ($acct_attrs[ua][9] != '') echo "<td>&nbsp;</td>\n";
 ?>
                                 </tr>
         </table>

 /web/acc/manager/htdocs/user_info.php
 ,12 → 3,11
 if (is_file("../lib/langues.php"))
         include("../lib/langues.php");
 require('/etc/freeradius-web/config.php');
-if(!isset($change)) $change = 0;
 ?>
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config['general_charset']?>">
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <title>User personal information</title>
 <link rel="stylesheet" href="/css/style.css">
 </head>
 ,7 → 14,7
 <body>
 <TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr><th><?php echo "$l_users_managment";?></th></tr>
-        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
+        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
 height="2"></td></tr>
 </TABLE>
 <TABLE width="100%" border=0 cellspacing=0 cellpadding=1>
 ,7 → 54,7
 <tr bgcolor="black" valign=top><td colspan=2>
         <table border=0 width=100% cellpadding=12 cellspacing=0 bgcolor="#ffffd0" valign=top>
         <tr><td>
    <form method=post>
       <input type=hidden name=login value="<?php echo $login?>">
       <input type=hidden name=change value="0">

 /web/acc/manager/htdocs/clear_opensessions.php
 ,7 → 3,6
 if (is_file("../lib/langues.php"))
         include("../lib/langues.php");
 require('/etc/freeradius-web/config.php');
-if(!isset($clear_sessions)) $clear_sessions = 0;
 if (is_file("../lib/$config[general_lib_type]/user_info.php"))
         include("../lib/$config[general_lib_type]/user_info.php");
 if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php"))
 ,7 → 32,7
 <body>
 <TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
         <tr><th>$l_users_managment</th></tr>
-        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
+        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
 height="2"></td></tr>
 </TABLE>
 <TABLE width="100%" border=0 cellspacing=0 cellpadding=1>
 ,7 → 63,7
         <table border=0 width=100% cellpadding=12 cellspacing=0 bgcolor="#ffffd0" valign=top>
         <tr><td>
 EOM;
 if ($clear_sessions == 1)
         {
 # close active sessions
 ,10 → 71,10
 # delete open accounting sessions
         $now = time();
         $today_now = date("Y-m-d H:i:s",$now);
-        $link = da_sql_pconnect($config);
+        $link = @da_sql_pconnect($config);
         if ($link)
                 {
-                $res = da_sql_query($link,$config,
+                $res = @da_sql_query($link,$config,
                 "UPDATE $config[sql_accounting_table] SET acctstoptime = '$today_now', acctterminatecause='Admin-Reset'
                 WHERE username='$login' AND acctstoptime IS NULL;");
                 if (! $res)
 ,13 → 85,13
         }
 # Count of accounting open sessions (in database)
 $open_accnt_sessions = 0;
-$link = da_sql_pconnect($config);
+$link = @da_sql_pconnect($config);
 if ($link){
-        $search = da_sql_query($link,$config,
+        $search = @da_sql_query($link,$config,
         "SELECT COUNT(*) AS counter FROM $config[sql_accounting_table]
         WHERE username = '$login' AND acctstoptime IS NULL;");
         if ($search){
-                if ($row = da_sql_fetch_array($search,$config))
+                if ($row = @da_sql_fetch_array($search,$config))
                         $open_accnt_sessions = $row['counter'];
         }
         else

 /web/acc/manager/htdocs/user_delete.php
 ,7 → 3,6
 if (is_file("../lib/langues.php"))
         include("../lib/langues.php");
 require('/etc/freeradius-web/config.php');
-if (!isset($type)) $type = 'user';
 if ($type != 'group'){
         if (is_file("../lib/$config[general_lib_type]/user_info.php"))
                 include("../lib/$config[general_lib_type]/user_info.php");
 ,9 → 19,6
 <head>
 EOM;
-if (!isset($user_type)) $user_type = 'user';
-if (!isset($delete_user)) $delete_user = 0;
 if ($user_type != 'group'){
         $util = $l_user;
         $title = $l_users_managment;}
 ,7 → 34,7
 <body>
 <TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
         <tr><th>$title</th></tr>
-        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
+        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
 height="2"></td></tr>
 </TABLE>
 <TABLE width="100%" border=0 cellspacing=0 cellpadding=1>
 ,7 → 68,7
         <table border=0 width=100% cellpadding=12 cellspacing=0 bgcolor="#ffffd0" valign=top>
         <tr><td>
 EOM;
 if ($delete_user == 1){
         if ($user_type != 'group'){
                 if (is_file("../lib/$config[general_lib_type]/delete_user.php"))
 ,7 → 75,7
                         include("../lib/$config[general_lib_type]/delete_user.php");
         }
         else{
-                if (isset($delete_users_of_group) && $delete_users_of_group == 1){
+                if ($delete_users_of_group == 1){
                         unset($group_members);
                         $tmp_group_name=$login;
                         if (is_file("../lib/$config[general_lib_type]/group_info.php")){

 /web/acc/manager/htdocs/group_admin.php
 ,11 → 3,11
 if (is_file("../lib/langues.php"))
         include("../lib/langues.php");
 require('/etc/freeradius-web/config.php');
-if (isset($show) && $show == 1 && isset($del_members)){
+if ($show == 1 && isset($del_members)){
         header("Location: user_admin.php?login=$del_members[0]");
         exit;
 }
-if ($config['general_lib_type'] != 'sql'){
+if ($config[general_lib_type] != 'sql'){
         echo <<<EOM
 <title>Admin_groups</title>
 <meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 ,7 → 28,7
         if ($group_exists == 'no'){
                 echo <<<EOM
 <title>Admin_groups</title>
-<meta http-equiv="Content-Type" content="text/html" charset="$config[general_charset]">
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body>
 ,7 → 36,7
 <form action="group_admin.php" method=get>
 <b>Le groupe &nbsp;&nbsp;</b>
 <input type="text" size=10 name="login" value="$login">
-<b>&nbsp;&nbsp;n''existe pas</b><br>
+<b>&nbsp;&nbsp;n'existe pas</b><br>
 <input type=submit class=button value="Show Group">
 </body>
 </html>
 ,13 → 49,13
 <html>
 <head>
 <title>Admin_groups</title>
-<meta http-equiv="Content-Type" content="text/html" charset="<?php echo $config['general_charset']?>">
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <link rel="stylesheet" href="/css/style.css">
 </head>
 <body>
 <TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr><th><?php echo "$l_groups_managment"; ?></th></tr>
-        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
+        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
 height="2"></td></tr>
 </TABLE>
 <TABLE width="100%" border=0 cellspacing=0 cellpadding=1>
 ,7 → 84,7
         <tr><td>
 <?php
-if (isset($do_changes) && $do_changes == 1){
+if ($do_changes == 1){
         if (is_file("../lib/$config[general_lib_type]/group_admin.php"))
                 include("../lib/$config[general_lib_type]/group_admin.php");
         if (is_file("../lib/$config[general_lib_type]/group_info.php"))
 ,7 → 91,7
                 include("../lib/$config[general_lib_type]/group_info.php");
 }
 ?>
    <form method=post>
       <input type=hidden name=login value=<?php echo $login ?>>
       <input type=hidden name=do_changes value=0>
 ,7 → 102,7
 <?php echo "$l_group_members_to_remove";?>
 </td>
 <td>
-<select name=del_members[] multiple size=5>
+<select name=del_members[] multiple size=5>
 <?php
 foreach ($group_members as $member){
         echo "<option value=\"$member\">$member\n";

 /web/acc/manager/htdocs/show_groups.php
 ,7 → 10,7
         echo <<<EOM
 <html>
 <title>Find group</title>
-<meta http-equiv="Content-Type" content="text/html" charset="$config[general_charset]">
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="/css/style.css">
 </head>
 <body>
 ,11 → 21,11
 EOM;
         exit();
 }
-if ($config['general_lib_type'] != 'sql'){
+if ($config[general_lib_type] != 'sql'){
         echo <<<EOM
 <html>
 <title>find group</title>
-<meta http-equiv="Content-Type" content="text/html" charset="$config[general_charset]">
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body>
 ,7 → 45,7
 <body>
 <TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
         <tr><th><?php echo "$l_groups_managment"; ?></th></tr>
-        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
+        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
 height="2"></td></tr>
 </TABLE>
 <TABLE width="100%" border=0 cellspacing=0 cellpadding=1>

 /web/acc/manager/htdocs/user_admin.php
 ,51 → 51,16
         exit();
 }
-if(isset($item_vals['Max-Monthly-Session'][0]) && $item_vals['Max-Monthly-Session'][0] != ''){
-        $monthly_limit = $item_vals['Max-Monthly-Session'][0];
-} else if (isset($default_vals['Max-Monthly-Session'][0])){
-        $monthly_limit = $default_vals['Max-Monthly-Session'][0];
-} else {
-        $monthly_limit = '';
-}
-$monthly_limit = ($monthly_limit) ? $monthly_limit : $config['counter_default_monthly'];
-if(isset($item_vals['Max-Weekly-Session'][0]) && $item_vals['Max-Weekly-Session'][0] != ''){
-        $weekly_limit = $item_vals['Max-Weekly-Session'][0];
-} else if (isset($default_vals['Max-Weekly-Session'][0])){
-        $weekly_limit = $default_vals['Max-Weekly-Session'][0];
-} else {
-        $weekly_limit = '';
-}
-$weekly_limit = ($weekly_limit) ? $weekly_limit : $config['counter_default_weekly'];
-if(isset($item_vals['Max-Daily-Session'][0]) && $item_vals['Max-Daily-Session'][0] != ''){
-        $daily_limit = $item_vals['Max-Daily-Session'][0];
-} else if (isset($default_vals['Max-Daily-Session'][0])){
-        $daily_limit = $default_vals['Max-Daily-Session'][0];
-} else {
-        $daily_limit = '';
-}
-$daily_limit = ($daily_limit) ? $daily_limit : $config['counter_default_daily'];
-if(isset($item_vals['Session-Timeout'][0]) && $item_vals['Session-Timeout'][0] != ''){
-        $session_limit = $item_vals['Session-Timeout'][0];
-} else if (isset($default_vals['Session-Timeout'][0])){
-        $session_limit = $default_vals['Session-Timeout'][0];
-} else {
-        $session_limit = '';
-}
+$monthly_limit = ($item_vals['Max-Monthly-Session'][0] != '') ? $item_vals['Max-Monthly-Session'][0] : $default_vals['Max-Monthly-Session'][0];
+$monthly_limit = ($monthly_limit) ? $monthly_limit : $config[counter_default_monthly];
+$weekly_limit = ($item_vals['Max-Weekly-Session'][0] != '') ? $item_vals['Max-Weekly-Session'][0] : $default_vals['Max-Weekly-Session'][0];
+$weekly_limit = ($weekly_limit) ? $weekly_limit : $config[counter_default_weekly];
+$daily_limit = ($item_vals['Max-Daily-Session'][0] != '') ? $item_vals['Max-Daily-Session'][0] : $default_vals['Max-Daily-Session'][0];
+$daily_limit = ($daily_limit) ? $daily_limit : $config[counter_default_daily];
+$session_limit = ($item_vals['Session-Timeout'][0] != '') ? $item_vals['Session-Timeout'][0] : $default_vals['Session-Timeout'][0];
 $session_limit = ($session_limit) ? $session_limit : 'none';
-if(isset($item_vals['Max-All-Session'][0]) && $item_vals['Max-All-Session'][0] != ''){
-        $total_limit = $item_vals['Max-All-Session'][0];
-} else if (isset($default_vals['Max-All-Session'][0])){
-        $total_limit = $default_vals['Max-All-Session'][0];
-} else {
-        $total_limit = '';
-}
+$total_limit = ($item_vals['Max-All-Session'][0] != '') ? $item_vals['Max-All-Session'][0] : $default_vals['Max-All-Session'][0];
 $total_limit = ($total_limit) ? $total_limit : 'none';
 $remaining = 'unlimited time';
 $log_color = 'green';
 ,12 → 69,12
 $now_str = date("$config[sql_date_format]",$now + 86400);
 $week_str = date("$config[sql_date_format]",$week);
 $day = date('w');
-$week_start = date($config['sql_date_format'],$now - ($day)*86400);
-$month_start = date($config['sql_date_format'],$now - date('j')*86400);
+$week_start = date($config[sql_date_format],$now - ($day)*86400);
+$month_start = date($config[sql_date_format],$now - date('j')*86400);
 $today = $day;
 $now_tmp = $now;
 for ($i = $day; $i >-1; $i--){
-        $days[$i] = date($config['sql_date_format'],$now_tmp);
+        $days[$i] = date($config[sql_date_format],$now_tmp);
         $now_tmp -= 86400;
 }
 $day++;
 ,7 → 82,7
 $now -= 604800;
 $now += 86400;
 for ($i = $day; $i <= 6; $i++){
-        $days[$i] = date($config['sql_date_format'],$now);
+        $days[$i] = date($config[sql_date_format],$now);
 //      $now -= 86400;
         $now += 86400;
 }
 ,9 → 91,9
 $extra_msg = '';
 $used = array('-','-','-','-','-','-','-');
-$link = da_sql_pconnect($config);
+$link = @da_sql_pconnect($config);
 if ($link){
-        $search = da_sql_query($link,$config,
+        $search = @da_sql_query($link,$config,
         "SELECT sum(acctsessiontime) AS sum_sess_time,
         sum(acctinputoctets) AS sum_in_octets,
         sum(acctoutputoctets) AS sum_out_octets,
 ,38 → 104,38
         $config[sql_accounting_table] WHERE username = '$login'
         AND acctstarttime >= '$week_str' AND acctstarttime <= '$now_str';");
         if ($search){
-                $row = da_sql_fetch_array($search,$config);
-                $tot_time = time2str($row['sum_sess_time']);
-                $tot_input = bytes2str($row['sum_in_octets']);
-                $tot_output = bytes2str($row['sum_out_octets']);
-                $avg_time = time2str($row['avg_sess_time']);
-                $avg_input = bytes2str($row['avg_in_octets']);
-                $avg_output = bytes2str($row['avg_out_octets']);
-                $tot_conns = $row['counter'];
+                $row = @da_sql_fetch_array($search,$config);
+                $tot_time = time2str($row[sum_sess_time]);
+                $tot_input = bytes2str($row[sum_in_octets]);
+                $tot_output = bytes2str($row[sum_out_octets]);
+                $avg_time = time2str($row[avg_sess_time]);
+                $avg_input = bytes2str($row[avg_in_octets]);
+                $avg_output = bytes2str($row[avg_out_octets]);
+                $tot_conns = $row[counter];
         }
         else
                 echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
-        $search = da_sql_query($link,$config,
+        $search = @da_sql_query($link,$config,
         "SELECT sum(acctsessiontime) AS sum_sess_time FROM $config[sql_accounting_table] WHERE username = '$login'
         AND acctstarttime >= '$week_start' AND acctstarttime <= '$now_str';");
         if ($search){
-                $row = da_sql_fetch_array($search,$config);
-                $weekly_used = $row['sum_sess_time'];
+                $row = @da_sql_fetch_array($search,$config);
+                $weekly_used = $row[sum_sess_time];
         }
         else
                 echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
-        if ($monthly_limit != 'none' || (isset($config['counter_monthly_calculate_usage']) && $config['counter_monthly_calculate_usage'] == 'true')){
-                $search = da_sql_query($link,$config,
+        if ($monthly_limit != 'none' || $config[counter_monthly_calculate_usage] == 'true'){
+                $search = @da_sql_query($link,$config,
                 "SELECT sum(acctsessiontime) AS sum_sess_time FROM $config[sql_accounting_table] WHERE username = '$login'
                 AND acctstarttime >= '$month_start' AND acctstarttime <= '$now_str';");
                 if ($search){
-                        $row = da_sql_fetch_array($search,$config);
-                        $monthly_used = $row['sum_sess_time'];
+                        $row = @da_sql_fetch_array($search,$config);
+                        $monthly_used = $row[sum_sess_time];
                 }
                 else
                         echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
         }
-        $search = da_sql_query($link,$config,
+        $search = @da_sql_query($link,$config,
         "SELECT COUNT(*) AS counter FROM $config[sql_accounting_table] WHERE username = '$login'
         AND acctstoptime >= '$week_str' AND acctstoptime <= '$now_str'
         AND (acctterminatecause LIKE 'Login-Incorrect%' OR
 ,8 → 142,8
         acctterminatecause LIKE 'Invalid-User%' OR
         acctterminatecause LIKE 'Multiple-Logins%');");
         if ($search){
-                $row = da_sql_fetch_array($search,$config);
-                $tot_badlogins = $row['counter'];
+                $row = @da_sql_fetch_array($search,$config);
+                $tot_badlogins = $row[counter];
         }
         else
                 echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
 ,19 → 150,19
         for($i = 0; $i <=6; $i++){
                 if ($days[$i] == '')
                         continue;
-                $search = da_sql_query($link,$config,
+                $search = @da_sql_query($link,$config,
                 "SELECT sum(acctsessiontime) AS sum_sess_time FROM $config[sql_accounting_table] WHERE
                 username = '$login' AND acctstoptime >= '$days[$i] 00:00:00'
                 AND acctstoptime <= '$days[$i] 23:59:59';");
                 if ($search){
-                        $row = da_sql_fetch_array($search,$config);
-                        $used[$i] = $row['sum_sess_time'];
+                        $row = @da_sql_fetch_array($search,$config);
+                        $used[$i] = $row[sum_sess_time];
                         if ($daily_limit != 'none' && $used[$i] > $daily_limit)
                                 $used[$i] = "<font color=red>" . time2str($used[$i]) . "</font>";
                         else
                                 $used[$i] = time2str($used[$i]);
                         if ($today == $i){
-                                $daily_used = $row['sum_sess_time'];
+                                $daily_used = $row[sum_sess_time];
                                 if ($daily_limit != 'none'){
                                         $remaining = $daily_limit - $daily_used;
                                         if ($remaining <=0)
 ,7 → 207,7
                         $remaining = $tmp;
                 $log_color = ($remaining) ? 'green' : 'red';
         }
-        if ($monthly_limit != 'none' || (isset($config['counter_monthly_calculate_usage']) && $config['counter_monthly_calculate_usage'] == 'true')){
+        if ($monthly_limit != 'none' || $config[counter_monthly_calculate_usage] == 'true'){
                 $monthly_used = time2str($monthly_used);
                 if ($monthly_limit != 'none' && !$tmp)
                         $monthly_used = "<font color=red>$monthly_used</font>";
 ,14 → 219,14
                         $remaining = $session_limit;
         }
-        $search = da_sql_query($link,$config,
+        $search = @da_sql_query($link,$config,
         "SELECT " . da_sql_limit(1,0,$config) . " * FROM $config[sql_accounting_table]
         WHERE username = '$login' AND acctstoptime IS NULL " . da_sql_limit(1,1,$config) . "
          ORDER BY acctstarttime DESC " . da_sql_limit(1,2,$config). " ;");
         if ($search){
-                if (da_sql_num_rows($search,$config)){
+                if (@da_sql_num_rows($search,$config)){
                         $logged_now = 1;
-                        $row = da_sql_fetch_array($search,$config);
+                        $row = @da_sql_fetch_array($search,$config);
                         $lastlog_time = $row['acctstarttime'];
                         $lastlog_server_ip = $row['nasipaddress'];
                         $lastlog_server_port = $row['nasportid'];
 ,11 → 235,11
                                 $remaining = $remaining - $lastlog_session_time;
                                 if ($remaining < 0)
                                         $remaining = 0;
-                                $log_color = ($remaining) ? 'green' : 'red';
+                                $log_color = ($remaining) ? 'green' : 'red';
                         }
                         $lastlog_session_time_jvs = 1000 * $lastlog_session_time;
                         $lastlog_session_time = time2strclock($lastlog_session_time);
-                        $lastlog_client_ip = $row['framedipaddress'];
+                        $lastlog_client_ip = $row['framedipaddress'];
                         $lastlog_server_name = @gethostbyaddr($lastlog_server_ip);
                         $lastlog_client_name = @gethostbyaddr($lastlog_client_ip);
                         $lastlog_callerid = $row['callingstationid'];
 ,19 → 259,19
         }
         else
                 echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
-        if (!isset($logged_now) || !$logged_now){
-                $search = da_sql_query($link,$config,
+        if (! $logged_now){
+                $search = @da_sql_query($link,$config,
                 "SELECT " . da_sql_limit(1,0,$config) . " * FROM $config[sql_accounting_table]
                 WHERE username = '$login' AND acctsessiontime != '0' " . da_sql_limit(1,1,$config) . "
                  ORDER BY acctstoptime DESC " . da_sql_limit(1,2,$config). " ;");
                 if ($search){
-                        if (da_sql_num_rows($search,$config)){
-                                $row = da_sql_fetch_array($search,$config);
+                        if (@da_sql_num_rows($search,$config)){
+                                $row = @da_sql_fetch_array($search,$config);
                                 $lastlog_time = $row['acctstarttime'];
                                 $lastlog_server_ip = $row['nasipaddress'];
                                 $lastlog_server_port = $row['nasportid'];
                                 $lastlog_session_time = time2str($row['acctsessiontime']);
-                                $lastlog_client_ip = $row['framedipaddress'];
+                                $lastlog_client_ip = $row['framedipaddress'];
                 $lastlog_server_name = ($lastlog_server_ip != '') ? @gethostbyaddr($lastlog_server_ip) : '-';
                 $lastlog_client_name = ($lastlog_client_ip != '') ? @gethostbyaddr($lastlog_client_ip) : '-';
                                 $lastlog_callerid = $row['callingstationid'];
 ,7 → 307,7
         $msg =<<<EON
 $l_user_remain_login<font color="$log_color"> <b>$remaining $extra_msg</b></font>
 EON;
-$lock_msg = (isset($item_vals['Dialup-Lock-Msg'][0])) ? $item_vals['Dialup-Lock-Msg'][0] : '';
+$lock_msg = $item_vals['Dialup-Lock-Msg'][0];
 if ($lock_msg != '')
         $descr =<<<EON
 <font color=red><b>$lock_msg </b</font>
 ,7 → 315,7
 else
         $descr = '-';
-$expiration = isset($default_vals['Expiration'][0]) ? $default_vals['Expiration'][0] : '';
+$expiration = $default_vals['Expiration'][0];
 if ($item_vals['Expiration'][0] != '')
         $expiration = $item_vals['Expiration'][0];
 if ($expiration != ''){

 /web/acc/manager/htdocs/accounting.php
 ,22 → 25,22
 }
 $operators=array( '=','<', '>', '<=', '>=', 'regexp', 'like' );
-if ($config['sql_type'] == 'pg'){
+if ($config[sql_type] == 'pg'){
         $operators=array( '=','<', '>', '<=', '>=', '~', 'like', '~*', '~~*', '<<=' );
 }
-$link = da_sql_pconnect ($config) or die('cannot connect to sql databse');
-$fields = da_sql_list_fields($config[sql_accounting_table],$link,$config);
-$no_fields = da_sql_num_fields($fields,$config);
+$link = @da_sql_pconnect ($config) or die('cannot connect to sql databse');
+$fields = @da_sql_list_fields($config[sql_accounting_table],$link,$config);
+$no_fields = @da_sql_num_fields($fields,$config);
 unset($items);
 for($i=0;$i<$no_fields;$i++){
-        $key = strtolower(da_sql_field_name($fields,$i,$config));
-        $val = $sql_attrs[$key]['desc'];
+        $key = strtolower(@da_sql_field_name($fields,$i,$config));
+        $val = $sql_attrs[$key][desc];
         if ($val == '')
                 continue;
-        $show = $sql_attrs[$key]['show'];
+        $show = $sql_attrs[$key][show];
         $selected[$key] = ($show == 'yes') ? 'selected' : '';
         $items[$key] = "$val";
 }
 ,9 → 263,9
 }
 echo "</tr>\n";
-        $search = da_sql_query($link,$config,$query);
+        $search = @da_sql_query($link,$config,$query);
         if ($search){
-                while( $row = da_sql_fetch_array($search,$config) ){
+                while( $row = @da_sql_fetch_array($search,$config) ){
                         $num++;
                         echo "<tr align=center>\n";
                         foreach($accounting_show_attrs as $val){

 /web/acc/manager/html/user_admin.html.php
 ,7 → 10,7
 <body>
 <TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
         <tr><th>$l_users_managment</th></tr>
-        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
+        <tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
 height="2"></td></tr>
 </TABLE>
 <TABLE width="100%" border=0 cellspacing=0 cellpadding=1>
 ,14 → 19,14
                 <tr><td valign="middle" align="left">
 <link rel="stylesheet" href="/css/style.css">
 EOM;
-if (isset($logged_now) && $logged_now)
+if ($logged_now)
         print <<<EOM
 <script Language="JavaScript">
 <!--
         var start;
         var our_time;
-        function startcounter()
+        function startcounter()
         {
                 var start_date = new Date();
                 start = start_date.getTime();
 ,21 → 38,21
         {
                 var now_date = new Date();
                 var diff = now_date.getTime() - start + our_time;
                 var hours = parseInt(diff / 3600000);
                 if(isNaN(hours)) hours = 0;
                 var minutes = parseInt((diff % 3600000) / 60000);
                 if(isNaN(minutes)) minutes = 0;
                 var seconds = parseInt(((diff % 3600000) % 60000) / 1000);
                 if(isNaN(seconds)) seconds = 0;
                 var timeValue = " " ;
                 timeValue += ((hours < 10) ? "0" : "") + hours;
                 timeValue += ((minutes < 10) ? ":0" : ":") + minutes;
                 timeValue += ((seconds < 10) ? ":0" : ":") + seconds;
                 document.online.status.value = timeValue;
                 setTimeout("showcounter()", 1000);
         }
 ,7 → 86,7
         <table border=1 bordercolordark=#ffffe0 bordercolorlight=#000000 width=100% cellpadding=2 cellspacing=0 bgcolor="#ffffe0" valign=top>
 EOM;
-if (isset($logged_now) && $logged_now){
+if ($logged_now){
         print <<<EOM
         <form name="online" onSubmit="return(false);">
         <tr><td align=center bgcolor="#d0ddb0">
 ,7 → 96,7
         </td></tr>
         <tr><td align=center bgcolor="#d0ddb0">
         <b>$l_connection_time</b>
-        </td><td>
+        </td><td>
         <input type="text" name="status" size=10 value="$lastlog_session_time">
         </form>
         </td></tr>
 ,7 → 211,7
         <tr><td align=center bgcolor="#d0ddb0"><b>$l_download ($l_average)</b></td><td>
         $avg_input</td></tr>
         <tr><td align=center bgcolor="#d0ddb0"><b>$l_upload ($l_average)</b></td><td>
-        $avg_output</td></tr>
+        $avg_output</td></tr>
         </table>
         </table>
 </table>
 ,7 → 410,7
         print <<<EOM
 </tr></table>
 EOM;
-if (isset($logged_now) && $logged_now)
+if ($logged_now)
         print <<<EOM
 <script Language="JavaScript">
         startcounter();

Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 1805 → Rev 1804