WebSVN – ALCASAR – Path Comparison – / – /gestion/phpsysinfo/includes/ Rev 58 and /gestion/phpsysinfo/includes/ Rev 59

Ignore whitespace Rev 58 → Rev 59

 /gestion/phpsysinfo/includes/xml/portail.php
 ,7 → 2,7
 /***************************************************************************
  *   Copyright (C) 2006 by phpSysInfo - A PHP System Information Script    *
  *   http://phpsysinfo.sourceforge.net/                                    *
- *                                                                         *
+ *   Copyright (C) 2010 by 3abtux & Rexy for ALCASAR                       *                                                *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
 ,18 → 23,19
 // xml_utilisateur()
-function utilisateur () {
+function request ($texte) {
                 $strResult = 0;
                 // Déclaration des paramètres de connexion
                 $host = "localhost";
                 $DB_USER = "radius";
                 $DB_RADIUS = "radius";
-                $radiuspwd = "gLMmnOpk";
+                $radiuspwd = "xKosCPLa";
                 // Connexion au serveur
                 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
-                $query = "SELECT UserName FROM userinfo";
+                if ($texte = 'user') {$query = "SELECT UserName FROM userinfo";}
+                else { $query = "SELECT GroupName FROM radusergroup GROUP BY GroupName";}
                 $result = mysql_query($query);
                 // Recuperation des resultats
                 $strResult = mysql_num_rows($result);
 ,39 → 43,17
                  mysql_close();
                 return $strResult;
   }
-function groupe () {
-                $strResult = 0;
-                // Déclaration des paramètres de connexion
-                $host = "localhost";
-                $DB_USER = "radius";
-                $DB_RADIUS = "radius";
-                $radiuspwd = "gLMmnOpk";
-                // Connexion au serveur
-                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
-                $query = "SELECT GroupName FROM radusergroup GROUP BY GroupName";
-                $result = mysql_query($query);
-                // Recuperation des resultats
-                $strResult = mysql_num_rows($result);
-                // Deconnexion de la base de donnees
-                 mysql_close();
-                return $strResult;
-  }
 function xml_portail () {
         global $sysinfo;
         $_text = "  <Portail>\n"
 //              . "    <Utilisateur>" . htmlspecialchars( $sysinfo->utilisateur(), ENT_QUOTES ) . "</Utilisateur>\n"
-                . "    <Utilisateur>" . htmlspecialchars( utilisateur(), ENT_QUOTES ) . "</Utilisateur>\n"
-                . "    <Groupe>" . htmlspecialchars( trim( groupe() ), ENT_QUOTES ) . "</Groupe>\n";
+                . "    <Utilisateur>" . htmlspecialchars( request('user'), ENT_QUOTES ) . "</Utilisateur>\n"
+                . "    <Groupe>" . htmlspecialchars( trim( request('group') ), ENT_QUOTES ) . "</Groupe>\n";
         $_text .= "  </Portail>\n";
         return $_text;
 }
 // Fonction de test de connectivité internet
 function internetTest(){
         $host = "www.google.fr";
 ,7 → 68,25
                 return true;
         }
 }
+// Fonction de test du filtrage
+function filtrageTest($file, $search_regex){
+        $pointeur = fopen($file,"r");
+        $result = false;
+        if ($pointeur)
+                {
+                while (!feof($pointeur))
+                        {
+                                $ligne = fgets($pointeur);
+                                if (preg_match($search_regex, $ligne, $r))
+                                {
+                                $result = true;
+                                break;
+                                }
+                        }
+                }
+        fclose($pointeur);
+        return $result;
+}
 // html_portail()
 function html_portail () {
         global $webpath;
 ,24 → 97,31
         $handle = fopen ($file_version, "r");
         $INSTALLEDVERSION = fread ($handle, filesize ($file_version));
         fclose ($handle);
-        $version_stable = dns_get_record("version.alcasar.info",DNS_TXT);
-        $AVAILABLEDVERSION = $version_stable[0]['txt'];
-        $version_devel = dns_get_record("devel.alcasar.info",DNS_TXT);
-        $DEVELVERSION = $version_devel[0]['txt'];
         $file_bl = "/var/www/html/VERSION-BL";
         $handle = fopen ($file_bl, "r");
         $VERSIONBL = fread ($handle, filesize ($file_bl));
         fclose ($handle);
-        $nbr_user = utilisateur ();
-        $nbr_grp  = groupe ();
+        $nbr_user = request ('user');
+        $nbr_grp  = request ('group');
         $nbr_user_online = exec ("sudo /usr/sbin/chilli_query list | cut -d\" \" -f5 | grep \"1\" | wc -l");
+        if (filtrageTest("/usr/local/bin/alcasar-iptables.sh", "/^FILTERING=\"yes\"/")){
+                $network_filter_status = $text['enable'];}
+        else {  $network_filter_status = $text['disable'];}
+        if (filtrageTest("/etc/dansguardian/dansguardian.conf","/^reportinglevel = 3/")){
+                $web_filter_status = $text['enable'];}
+        else {  $web_filter_status = $text['disable'];}
+        if (InternetTest()){
+                $internet_status =  "<img src='/images/state_ok.gif'>".$text['enable'];
+                $version_stable = dns_get_record("version.alcasar.info",DNS_TXT);
+                $AVAILABLEDVERSION = $version_stable[0]['txt'];
+                $version_devel = dns_get_record("devel.alcasar.info",DNS_TXT);
+                $DEVELVERSION = $version_devel[0]['txt'];
-        if (InternetTest()){
-                $internet_status =  "<img src='/images/state_ok.gif'>".$text['internet_enable'];
         } else {
-                $internet_status =  "<img src='/images/state_error.gif'>".$text['internet_disable'];
+                $internet_status =  "<img src='/images/state_error.gif'>".$text['disable'];
+                $AVAILABLEDVERSION = "-";
+                $DEVELVERSION = "-";
         }
         $_text = "<table border=\"0\" width=\"100%\" align=\"center\">\n"
                 . "  <tr>\n"
                 . "    <td valign=\"top\"><font size=\"-1\">" . $text['portail-version'] . "</font></td>\n"
 ,14 → 128,10
                 . "    <td><font size=\"-1\">" . $INSTALLEDVERSION . "</font></td>\n"
                 . "  </tr>\n"
                 . "  <tr>\n"
-                . "    <td valign=\"top\"><font size=\"-1\">" . $text['portail-stable'] . "</font></td>\n"
-                . "    <td><font size=\"-1\">" . $AVAILABLEDVERSION . "</font></td>\n"
+                . "    <td valign=\"top\"><font size=\"-1\">" . $text['portail-disp'] . "</font></td>\n"
+                . "    <td><font size=\"-1\">" . $AVAILABLEDVERSION . " (stable), " . $DEVELVERSION . " (devel)</font></td>\n"
                 . "  </tr>\n"
                 . "  <tr>\n"
-                . "    <td valign=\"top\"><font size=\"-1\">" . $text['portail-devel'] . "</font></td>\n"
-                . "    <td><font size=\"-1\">" . $DEVELVERSION . "</font></td>\n"
-                . "  </tr>\n"
-                . "  <tr>\n"
                 . "    <td valign=\"top\"><font size=\"-1\">" . $text['utilisateur'] . "</font></td>\n"
                 . "    <td><font size=\"-1\">" . $nbr_user_online . " / " . $nbr_user . "</font></td>\n"
                 . "  </tr>\n"
 ,14 → 144,14
                 . "    <td><font size=\"-1\">" . $VERSIONBL . "</font></td>\n"
                 . "  </tr>\n"
                 . "  <tr>\n"
+                . "    <td valign=\"top\"><font size=\"-1\">" . $text['filter'] . "</font></td>\n"
+                . "    <td><font size=\"-1\">web : " . $web_filter_status . ", " . $text['network'] . " : " . $network_filter_status . "</font></td>\n"
+                . "  </tr>\n"
+                . "  <tr>\n"
                 . "    <td valign=\"top\"><font size=\"-1\">" . $text['internet_link'] . "</font></td>\n"
                 . "    <td><font size=\"-1\">" . $internet_status . "</font></td>\n"
                 . "  </tr>\n"
-                . "  <tr>\n"
-                . "    <td valign=\"top\" colspan=\"2\"><font size=\"-1\"><a href=\"/certs/certificat_alcasar_ca.pem\">" . $text['ca'] . "</a></font></td>\n"
-                . "  </tr>\n"
                 . "</table>\n";
         return $_text;
 }

 /gestion/phpsysinfo/includes/xml/vitals.php
 ,11 → 71,11
                 . "    <td valign=\"top\"><font size=\"-1\">" . $text['hostname'] . "</font></td>\n"
                 . "    <td><font size=\"-1\">" . $XPath->getData( "/phpsysinfo/Vitals/Hostname" ) . "</font></td>\n"
                 . "  </tr>\n"
+//              . "  <tr>\n"
+//              . "    <td valign=\"top\"><font size=\"-1\">" . $text['ip'] . "</font></td>\n"
+//              . "    <td><font size=\"-1\">" . $XPath->getData( "/phpsysinfo/Vitals/IPAddr" ) . "</font></td>\n"
+//              . "  </tr>\n"
                 . "  <tr>\n"
-                . "    <td valign=\"top\"><font size=\"-1\">" . $text['ip'] . "</font></td>\n"
-                . "    <td><font size=\"-1\">" . $XPath->getData( "/phpsysinfo/Vitals/IPAddr" ) . "</font></td>\n"
-                . "  </tr>\n"
-                . "  <tr>\n"
                 . "    <td valign=\"top\"><font size=\"-1\">" . $text['kversion'] . "</font></td>\n"
                 . "    <td><font size=\"-1\">" . $XPath->getData( "/phpsysinfo/Vitals/Kernel" ) . "</font></td>\n"
                 . "  </tr>\n"

 /gestion/phpsysinfo/includes/lang/fr.php
 ,15 → 45,15
 //
 $text['portail']        = 'Informations g&eacute;n&eacute;rales du portail ALCASAR';
 $text['portail-version']= 'Version install&eacute;e';
-$text['portail-stable'] = 'Version stable disponible';
-$text['portail-devel']  = 'Version devel disponible';
+$text['portail-disp']   = 'Versions disponibles';
 $text['utilisateur']    = 'Usager(s) en ligne';
 $text['groupe']         = 'Nombre de groupe(s)';
 $text['bl-version']     = 'Liste noire';
-$text['ca']             = 'Certificat de l\'Autorit&eacute; de Certification (A.C.)';
 $text['internet_link']  = "Lien Internet";
-$text['internet_enable']        = "actif";
-$text['internet_disable']       = "inactif";
+$text['enable']         = "actif";
+$text['disable']        = "inactif";
+$text['filter']         = "filtrage";
+$text['network']        = "r&eacute;seau";
 //
 $text['netusage']       = 'R&eacute;seau';

 /gestion/phpsysinfo/includes/lang/en.php
 ,15 → 45,15
 //
 $text['portail']        = 'General Informations about ALCASAR portal';
 $text['portail-version']= 'Installed version';
-$text['portail-stable'] = 'Stable version available';
-$text['portail-devel']  = 'Devel version available';
+$text['portail-disp']   = 'Available versions';
 $text['utilisateur']    = 'logged user(s)';
 $text['groupe']         = 'Number of group(s)';
 $text['bl-version']     = 'Updated \'Blacklist\'';
-$text['ca']             = 'Authenticated Authority certificate (A.C.)';
 $text['internet_link']  = "Internet connexion";
-$text['internet_enable']        = "enable";
-$text['internet_disable']       = "disable";
+$text['enable']         = "enable";
+$text['disable']        = "disable";
+$text['filter']         = "filter";
+$text['network']        = "network";
 //
 $text['netusage']       = 'Network Usage';

Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 58 → Rev 59