WebSVN – ALCASAR – Diff – /web/acc/manager/htdocs/autoregistration.php

 <?php
-# $Id: autoregistration.php 2185 2017-04-26 17:29:44Z tom.houdayer $
+# $Id: autoregistration.php 2294 2017-06-20 16:45:48Z richard $
-# Test présence de clé/modem
+# Test if 3G/4G key is plugged
-$exec_com=exec("lsusb | grep -i 067b | cut -d ' ' -f6 | cut -d ' ' -f1");
+$exec_com=exec("lsusb | grep -i 067b: | cut -d ' ' -f6"); // converter "USB to UART" PL2303 (several USB-serial cables, Wavecom GSM Modem)
-$exec_com2=exec("lsusb | grep -i 12d1 | cut -d ' ' -f6 | cut -d ' ' -f1");
+$exec_com2=exec("lsusb | grep -i 12d1: | cut -d ' ' -f6"); // Huawei Technologies (E220/E230/E270/E870
-//$exec_com2=exec("lsusb | grep -i d-link | cut -d ' ' -f7");
+//$exec_com2=exec("lsusb | grep -i 2001: | cut -d ' ' -f6"); // Dlink (to test)
 $status_key="false";
 $script="/usr/local/bin/alcasar-sms.sh";
 #Define
 if($Language == 'fr'){
 	$l_title = "Auto enregistrement (SMS)";
 	$l_conf = "Configuration";
 	$l_conf_actu = "Configuration actuelle";
 	$l_pin = "Code PIN";
-	$l_num_alcasar = "Le numero de téléphone de la clé 3G";
+	$l_num_alcasar = "Numero de téléphone du MODEM GSM";
 	$l_ban_temp = "Nombre d'essais avant le blocage";
 	$l_time_account = "Durée pour une session créée";
 	$l_time_perm = "Durée du blocage (en jours)";
 	$l_status_gammu = "Etat du service";
 	$l_start = "Démarrer";
-	$l_status_device = "Status de votre clé 3G";
+	$l_status_device = "Status de votre MODEM GSM (clé 2G/3G/4G)";
 	$l_key_diseable = "Aucun périphérique détecté";
-	$l_key_enable = "Votre clé est connectée";
+	$l_key_enable = "Votre MODEM GSM est connectée à la vitesse de : ";
 	$l_force_signal = "Force du signal";
 	$l_imei_device = "IMEI du périphérique";
 	$l_sms_received = "Nombre de SMS reçu";
 	$l_stop = "Arrêter";
-	$l_gammu_on="Gammu est lancé";
+	$l_gammu_on="Le service est démarré";
-	$l_gammu_off="Gammu est arrêté";
+	$l_gammu_off="Le service est arrêté";
-	$l_edit = "Editer";
+	$l_edit = "Modifier";
 	$l_error_label_empty = "Le champ est vide";
 	$l_error_label_num = "Ce n'est pas un PIN valide";
 	$l_error_label_num2 = "Ce n'est pas un nombre";
 	$l_error_label_num3 = "Le format n'est pas correct: +xxxYYYYYYYYY (xxx: code pays / YYYYYYYYY: numéro de téléphone)";
-	$l_error_writefail = "Le service semble ne pas parvenir à discuter avec la clé (port ttyUSB0).";
+	$l_error_writefail = "Le service ne parvient pas à discuter avec le port du MODEM GSM (ttyUSB0).";
-	$l_error_timeoutfail = "Impossible de se connecter à la clé 3G. Timeout.";
+	$l_error_timeoutfail = "Impossible de se connecter au MODEM GSM (vérifiez la vitesse de connexion)";
 	$l_error_simfail = "Un problème au niveau de la carte SIM a été détecté. Est elle présente?";
 	$l_error_simsecu_l = "Attention, lors du dernier démarrage, votre code PIN était erroné.<br>
 					La SIM doit être bloqué (code PUK). Consultez la documentation.";
 	$l_autorefresh = "Rafraichissement : 30 sec";
 	$l_days = "jours ";
 	$l_num_block="Liste des numéros bloqués";
 	$l_num_num="Numéro";
 	$l_num_raison="Raison";
 	$l_num_expiration="Date d'expiration";
 	$l_num_action="Action";
 	$l_num_unlock="Effacer";
 	$l_country_enable="Activer";
 	$l_country_disable="Désactiver";
 	$l_service_status_img_ok="Démarré";
 	$l_service_status_img_ko="Arrété";
-	$l_conf_name="Configuration : ";
+	$l_conf_name="Modifier la vitesse de connexion : ";
-	$l_current_connect = "Connexion";
 	$l_tab_first = "premier";
 	$l_tab_last = "dernier";
 	$l_tab_next = "suivant";
 	$l_tab_prev = "précédent";
 	$l_tab_search = "Recherche :";
 	$l_tab_pmenu = "Affiche la page _PAGE_ sur _PAGES_";
 	$l_tab_info = "Montrer _MENU_ résultats par page";
 	$l_tab_infoempty = "Aucun résultat";
 	$l_country_filter = "Filtrage en cours : ";
 	$l_country_filtering = " Filtrage par pays";
 	$l_country_filtering_plus = " Filtrage par pays avancé";
 	$l_phone_ban = " Numéro de téléphone bloqués";
 	$l_country_france_ena = "Autorise les numéros français";
 else {
 	$l_title = "Auto registration (SMS)";
 	$l_conf = "Configuration";
 	$l_conf_actu = "Current configuration";
 	$l_pin = "PIN password";
-	$l_num_alcasar = "Phone number (3G key)";
+	$l_num_alcasar = "Phone number of the GSM MODEM";
 	$l_ban_temp = "Max number of try before a permanent ban";
 	$l_time_account = "Time for a new session";
 	$l_time_perm = "Duration of a ban (for example, after X try)";
 	$l_status_gammu = "Service status";
 	$l_start = "Start";
-	$l_status_device = "Status of your 3G key";
+	$l_status_device = "Status of your GSM MODEM (2G/3G/4G key)";
 	$l_key_diseable = "No device detected";
-	$l_key_enable = "Your 3g key is connected";
+	$l_key_enable = "Your GSM MODEM is connected at the speed of : ";
 	$l_force_signal = "Signal strength";
 	$l_imei_device = "Device IMEI";
 	$l_sms_received = "Number of SMS received";
 	$l_stop = "Stop";
-	$l_gammu_on="Gammu is running";
+	$l_gammu_on="The service is running";
-	$l_gammu_off="Gammu is down";
+	$l_gammu_off="The service is down";
-	$l_edit = "Edit";
+	$l_edit = "Modify";
 	$l_error_label_empty = "Field empty";
 	$l_error_label_num = "It's not a valid PIN password";
 	$l_error_label_num2 = "It's not a number";
 	$l_error_label_num3 = "The phone number is not good: +xxxYYYYYYYYY (xxx: code pays / YYYYYYYYY: numéro de téléphone)";
-	$l_error_writefail = "Can not listen the ttyUSB0 port.";
+	$l_error_writefail = "Can not communicate with the GSM MODEM port (ttyUSB0).";
-	$l_error_timeoutfail = "Timeout. Can not connect to modem.";
+	$l_error_timeoutfail = "Can not connect to the GSM MODEM (verify the connection speed).";
 	$l_error_simfail = "An issue with your Sim card was detected. Is it in the key?";
 	$l_error_simsecu_l = "Warning, during the last startup, the PIN code was wrong. <br>
 				The Sim card must be blocked. Please read the documentation.";
 	$l_autorefresh = "Refresh : 30 sec";
 	$l_days = "days ";
 	$l_num_block="List of blocked phone";
 	$l_num_num="Phone number";
 	$l_num_raison="Reason";
 	$l_num_expiration="Expiration date";
 	$l_num_action="Action";
 	$l_num_unlock="Erase";
 	$l_country_enable="Enable";
 	$l_country_disable="Disable";
 	$l_service_status_img_ok="Running";
 	$l_service_status_img_ko="Stopped";
-	$l_conf_name="Configuration : ";
+	$l_conf_name="Modify the speed : ";
-	$l_current_connect = "Connection";
 	$l_tab_first = "first";
 	$l_tab_last = "last";
 	$l_tab_next = "next";
 	$l_tab_prev = "previous";
 	$l_tab_search = "Search :";
 	$l_tab_pmenu = "Showing _PAGE_ to _PAGE_ of _PAGE_ entries :";
 	$l_tab_info = "Show _MENU_ entries";
 	$l_tab_infoempty = "No matching records found";
 	$l_country_filter = "Current filtering : ";
 	$l_country_filtering = " Country filtering";
 	$l_country_filtering_plus = " Country filtering advanced";
 	$l_phone_ban = " Phone Number banned";
 	$l_country_france_ena = "Authorize the french numbers";
 <!--<META HTTP-EQUIV="Refresh" CONTENT="30">-->
 <meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <title>Auto enregistrement</title>
 <link rel="stylesheet" href="/css/style.css">
 <!-- DataTables CSS -->
-<link rel="stylesheet" type="text/css" href="../../../css/jquery.dataTables.css">
+<link rel="stylesheet" type="text/css" href="/css/jquery.dataTables.css">
 <!-- jQuery -->
-<script type="text/javascript" charset="utf8" src="../../../js/jquery.js"></script>
+<script type="text/javascript" charset="utf8" src="/js/jquery.js"></script>
 <!-- DataTables -->
-<script type="text/javascript" charset="utf8" src="../../../js/jquery.dataTables.js"></script>
+<script type="text/javascript" charset="utf8" src="/js/jquery.dataTables.js"></script>
 <script type="text/javascript">
 function timedRefresh(timeoutPeriod) {
     var interval = setInterval(refreshPage, timeoutPeriod);
+}
             "info": "<?php echo $l_tab_pmenu; ?>",
             "infoEmpty": "<?php echo $l_tab_infoempty; ?>",
 			"sSearch": "<?php echo $l_tab_search; ?>"
+        }
 	});
 	$(".showhide-div_country").slideUp("slow");
 	$(".showhide-div_ban").slideUp("slow");
 	$(".showhide-div_country_plus").slideUp("slow");
 	$(".showhide-but_country").on("click", function(){
 	    $(".showhide-div_country").slideToggle("slow");
 	});
 	$(".showhide-but_country_plus").on("click", function(){
 	    $(".showhide-div_country_plus").slideToggle("slow");
 	});
 	$(".showhide-but_ban").on("click", function(){
 	    $(".showhide-div_ban").slideToggle("slow");
 	});
 } );
 </script>
 </head>
 <body onload="JavaScript:timedRefresh(30000);">
 <TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr bgcolor=\"#FFCC66\">
 		<td><img src=\"/images/pix.gif\" width=\"1\" height=\"2\"></td>
 	</tr>
 	</TABLE>
 	<br />
-	<input type='checkbox' checked='checked' name='autoRefreshCheckboxes' >".$l_autorefresh."</input>
+	<input type='checkbox' checked='checked' name='autoRefreshCheckboxes' >".$l_autorefresh."
 	";
 ?>
 <center>
 <br /><br />
+<form form="GET" action="./autoregistration.php">
 <table border=1 width=100%>
 <tr>
-<td colspan=3><h3><?php echo $l_status_device ?></h3></td>
+<td colspan=2><h3><?php echo $l_status_device ?></h3></td>
 </tr>
 <tr>
 <?php
 if(!empty($exec_com) || !empty($exec_com2))
+{
 	if(isset($_GET['config_submit'])){
 		switch ($_GET['config']) {
 		case "at":
 			exec("sudo $script --replace_connect  ");
 			break;
 			exec("sudo $script --replace_connect 19200");
 			break;
 		case "115200":
 			exec("sudo $script --replace_connect 115200");
 			break;
+		}
+	}
 	$current_connect = exec("sudo $script --connect");
-	echo '<td width="50%">'.$l_key_enable.'</td>';
-	echo '<td width="20%">'.$l_current_connect.' : '.$current_connect.'</td>';
+	echo '<td width="50%">'.$l_key_enable.$current_connect.' Bauds</td>';
-	echo '	<form form="GET" action="./autoregistration.php">
-			<td align="right">	'.$l_conf_name.'
+	echo '		<td align="right">	'.$l_conf_name.'
 				<select name="config">
-					<option value="at">at</option>
+					<option value="at"></option>
-					<option value="9600">at9600</option>
+					<option value="9600">9600 Bauds</option>
-					<option value="19200">at19200</option>
+					<option value="19200">19200 Bauds</option>
-					<option value="115200">at115200</option>
+					<option value="115200">115200 Bauds</option>
 				</select>
-				<input type="submit" name="config_submit"></submit>
+				<input type="submit" name="config_submit">
 			</td>
-		</form>
 		';
 	$status_key="true";
+}
 else
+{
 	echo "<td>$l_key_diseable</td>";
 	$status_key="false";
+}
 ?>
 </tr>
 </table>
+</form>
 </center>
 <br /><br />
 <?php
-#Test si gammu est lancé
+#Test if gammu is started
 $gammu_pid=exec("sudo $script --pidof");
 if ($status_key=="false")
+{
 	if ($gammu_pid!="")
+	{
 		exec("sudo $script stop");
 		<td> $l_pin </td><td><input type=text name='pin' maxlength=\"8\"></td>
 		<td><button type=\"submit\" name=\"b_pin\" $gammu_status_on>$l_edit</button></td>
 		<td><center><font color=\"green\">$current_pin</font></center></td>
 		</tr>
 		<tr><td colspan=\"4\"><font color=red><b>$error_pin</b></font></td></tr>
+		<tr>
 		<td> $l_time_account </td><td><input type=text name='time_account'> $l_days </td>
 		<td><button type=\"submit\" name=\"b_time_account\" $gammu_status_on>$l_edit</button></td>
 		<td><center><font color=\"blue\">$current_time_account</font></center></td>
 		</tr>
 		<tr><td colspan=\"4\"><font color=red><b>$error_time_account</b></font></td></tr>
 		<td>$l_time_perm</td><td><input type=text name='time_perm'> $l_days</td>
 		<td><button type=\"submit\" name=\"b_time_perm\" $gammu_status_on>$l_edit</button></td>
 		<td><center><font color=\"orange\">$current_time_perm</font></center></td>
 		</tr>
 		<tr><td colspan=\"4\"><font color=red><b>$error_time_perm</b></font></td></tr>
-		</tr>
 		</table>
 		</form>";
 	require('/etc/freeradius-web/config.php');

Subversion Repositories ALCASAR

(root)/web/acc/manager/htdocs/autoregistration.php @ 2542 – Rev 2185 → 2294