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

 $Language = 'en';
 if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])){
   $Langue = explode(",",$_SERVER['HTTP_ACCEPT_LANGUAGE']);
   $Language = strtolower(substr(chop($Langue[0]),0,2)); }
 if($Language == 'fr'){
-  $l_title = "Import d'usagers";
+  $l_title = "Importer et vider la base des usagers";
-  $l_database_state = "&Eacute;tat actuel de la base : nombre de groupes =";
+  $l_database_state = "état actuel de la base : nombre de groupes =";
   $l_number_of_users = "Nombre d'usagers";
-  $l_text_import = "Importer &agrave; partir d'un fichier texte ('.txt')";
+  $l_text_import = "Importer à partir d'un fichier texte";
-  $l_text_import_help = "Ce fichier ne doit contenir que des noms d'usagers &eacute;crits les uns sous les autres.";
+  $l_text_import_help = "Ce fichier ne doit contenir que des noms d'usagers écrits les uns sous les autres.";
   $l_file = "Fichier";
-  $l_users_group = "D&eacute;finissez leur groupe (conseill&eacute;)";
+  $l_users_group = "Définissez leur groupe (conseillé)";
-  $l_send = "Envoyer";
+  $l_send = "Importer";
+  $l_empty = "Vider";
   $l_imported_files = "Fichiers des identifiants/mot_de_passe import&eacute;s durant les derni&egrave;res 24h :";
-  $l_db_import = "Importer &agrave; partir d'une sauvegarde de la base d'usagers (format SQL)";
+  $l_db_import = "Importer à partir d'une sauvegarde de la base d'usagers";
-  $l_db_import_help = "Afin de pouvoir imputer les derni&egrave;res traces de connexion, une sauvegarde de la base actuelle sera automatiquement r&eacute;alis&eacute;e.";
+  $l_db_import_help = "Afin de pouvoir imputer les dernières traces de connexion, une sauvegarde de la base actuelle sera automatiquement réalisée.";
-  $l_db_reset = "Remise &agrave; z&eacute;ro de la base usagers";
+  $l_db_reset = "Vider la base des usagers";
-  $l_error_ext_txt = "Erreur! Veuillez s&eacute;lectionner un fichier avec l'extension '.csv' ou '.txt'";
+  $l_error_ext_txt = "Erreur! Veuillez sélectionner un fichier avec l'extension '.csv' ou '.txt'";
-  $l_error_ext_sql = "Erreur! Veuillez s&eacute;lectionner un fichier avec l'extension '.sql'";
+  $l_error_ext_sql = "Erreur! Veuillez sélectionner un fichier avec l'extension '.sql' ou '.sql.gz'";
   $l_group_empty = "La liste des groupes est vide";
   $l_out_title = "   ---  Accès à Internet via ALCASAR  ---  ";
   $l_out_login = "Nom de connexion :";
   $l_out_passwd = "Mot de passe :";
   $l_out_mind = "Pensez à changer votre mot de passe (lien sur la page d'authentification)";
+}
 else {
-  $l_title = "Users import";
+  $l_title = "Import and empty the users database";
   $l_database_state ="State of the database : number of groups =";
   $l_number_of_users = "Number of users";
-  $l_text_import = "Import from a text file ('.txt')";
+  $l_text_import = "Import from a text file";
   $l_text_import_help = "In this file, you must write only the user login one below the other.";
   $l_file = "File";
   $l_users_group = "Define their group (advisable)";
-  $l_send = "Send";
+  $l_send = "Import";
+  $l_empty = "Empty";
   $l_imported_files = "Logins/passwords file imported during the last 24h :";
-  $l_db_import = "Import from a saved users database file (SQL format)";
+  $l_db_import = "Import from a saved users database file";
   $l_db_import_help = "In order to impute the last connections, the actual users database will be automaticly saved.";
-  $l_db_reset = "Reset the users database";
+  $l_db_reset = "Empty the users database";
   $l_error_ext_txt = "Error! Please select a file with '.txt' or '.csv' extension";
-  $l_error_ext_sql = "Error! Please select a file with '.sql' extension";
+  $l_error_ext_sql = "Error! Please select a file with '.sql' or '.sql.gz' extension";
   $l_group_empty = "The group list is empty";
   $l_out_title = "   ---  Internet access via ALCASAR  ---  ";
   $l_out_login = "Login :";
   $l_out_passwd = "Password :";
   $l_out_mind = "Don't forget to change your password (a link is on the authentication window)";
 // a file is downloaded
 if(isset($_FILES['import-users']) && ($_FILES['import-users']['name'] !=""))
+	{
 	unset($result);
 	if (isset ($_POST['groupe'])) $group = $_POST ['groupe'];
-	$destination = '/tmp/import_file.txt';
-	list($file_name , $extension) = explode("." , $_FILES['import-users']['name']);
+	list($file_name , $extension) = explode("." , $_FILES['import-users']['name'] , 2);
 	if ($choix == "csv") // import of a txt file
+		{
 		if (($extension != 'csv') && ($extension != 'txt')) $result = $l_error_ext_txt;
 		else
+			{
+			$destination = '/tmp/import_file.txt';
 			exec ("sudo /usr/local/sbin/alcasar-mysql.sh --dump");
 			move_uploaded_file($_FILES['import-users']['tmp_name'], $destination);
 			$RS_in   = file ($destination);
 			$da_abort=0;
 			if ($link)
 							} // end if ($login !='')
 						} // end foreach
 					fclose($RS_out);
 					} // end if (is file)
 				} // end if (link)
-			}
+			unlink ($destination);
+			} // end if (extension = (txt or cvs))
+		}
 	else if ($choix == "bdd") // database import
+		{
-		if ($extension != 'sql') $result = $l_error_ext_sql;
+		if (($extension == 'sql') || ($extension == 'sql.gz'))
-		else
+			{
+			$destination = '/tmp/import_file.'.$extension;
 			exec ("sudo /usr/local/sbin/alcasar-mysql.sh --dump");
 			move_uploaded_file($_FILES['import-users']['tmp_name'], $destination);
 			exec ("sudo /usr/local/sbin/alcasar-mysql.sh --import $destination");
-			echo "OK : $destination";
+			//echo "OK : $destination";
+			unlink ($destination);
+			}
+		else $result = $l_error_ext_sql;
+		}
+	}
 if ($link)
+	{
 	$res = @da_sql_query($link,$config,"SELECT GroupName FROM radusergroup GROUP BY GroupName");
 echo "<CENTER><H3>$l_text_import</H3></CENTER></td></tr>";
 echo "<tr><td valign=\"middle\" align=\"left\">";
 echo "$l_text_import_help<br>";
 echo "<tr><td valign=\"middle\" align=\"left\">";
 echo "<br><FORM action='$_SERVER[PHP_SELF]' method=POST ENCTYPE=\"multipart/form-data\">";
-echo "$l_file (.txt) : <input type=\"file\" name=\"import-users\"><br>";
+echo "$l_file (.txt or .csv) : <input type=\"file\" name=\"import-users\"><br>";
 echo "$l_users_group : ";
 require("../lib/defaults.php");
 include_once("../lib/$config[general_lib_type]/group_info.php");
 if (isset($existing_groups)){
 	echo "<select name=\"groupe\">";
 echo "</td></tr></table>";
 echo "<tr><td valign=\"middle\" align=\"left\">";
 echo "<H3><CENTER>$l_db_import</CENTER></H3>";
 echo "$l_db_import_help <br><br>";
 echo "<FORM action='$_SERVER[PHP_SELF]' method=POST ENCTYPE=\"multipart/form-data\">";
-echo "$l_file (.sql) : <input type=\"file\" name=\"import-users\"><br>";
+echo "$l_file (.sql or .sql.gz) : <input type=\"file\" name=\"import-users\"><br>";
 echo "<input type='hidden' name='choix' value='bdd'>";
 if (($choix == "bdd") && isset($result)) echo "<b>".$result."</b><BR>";
 echo "<input type=\"submit\" value=\"$l_send\">";
 echo "</FORM>";
 echo "</td></tr>";
 echo "<tr><td valign=\"middle\" align=\"left\">";
 echo "<H3><CENTER>$l_db_reset</CENTER></H3>";
 echo "$l_db_import_help<br><br>";
 echo "<FORM action='$_SERVER[PHP_SELF]' method=POST>";
 echo "<input type='hidden' name='choix' value='raz'>";
-echo "<input type=\"submit\" value=\"$l_send\">";
+echo "<input type=\"submit\" value=\"$l_empty\">";
 echo "</FORM>";
 echo "</TD></TR></TABLE>";
 ?>
 </BODY>
 </HTML>

Subversion Repositories ALCASAR

(root)/web/acc/manager/htdocs/import_user.php – Rev 1561 → 1583