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

   $l_send = "Envoyer";
   $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_help = "Afin de pouvoir imputer les derni&egrave;re traces de connexion, une sauvegarde de la base actuelle sera automatiquement r&eacute;alis&eacute;e.";
   $l_db_reset = "Remise &agrave; z&eacute;ro de la base usagers";
-  $l_error_ext_txt = "Erreur! Veuillez s&eacute;lectionner un fichier de type csv ou txt";
+  $l_error_ext_txt = "Erreur! Veuillez s&eacute;lectionner un fichier avec l'extension '.csv' ou '.txt'";
-  $l_error_ext_sql = "Erreur! Veuillez s&eacute;lectionner un fichier de type sql";
+  $l_error_ext_sql = "Erreur! Veuillez s&eacute;lectionner un fichier avec l'extension '.sql'";
   $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_database_state ="State of the database : number of groups =";
   $l_number_of_users = "Number of users";
   $l_send = "Send";
   $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_help = "In order to impute the last connections, the actual users database will be automaticly saved.";
   $l_db_reset = "Reset the users database";
-  $l_error_ext_txt = "Error! Please select a txt or csv file";
+  $l_error_ext_txt = "Error! Please select a file with '.txt' or '.csv' extension";
-  $l_error_ext_sql = "Error! Please select a sql file";
+  $l_error_ext_sql = "Error! Please select a file with '.sql' 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)";
+}
 function getImportFileList(){
 	$importFile = array();
 	if ($handle = opendir('/tmp')) {
 		while (false !== ($file = readdir($handle))) {
+		}
 		closedir($handle);
+	}
 	return $importFile;
+}
-function creatlog ($login,$password,$service,$RS_out)
-	{
- /* génère un fichier en sortie avec les info de connexion en clair */
-	fputs($RS_out,"   ---  Accès à Internet via ALCASAR  ---  "."\r\n\r\n");
-	fputs($RS_out,"Service          : $service"."\r\n\r\n");
-	fputs($RS_out,"Nom de connexion : $login   |  Mot de passe : $password\r\n\r\n");
-	fputs($RS_out,"Pensez à changer votre mot de passe (lien sur la page d'authentification)"."\r\n\r\n");
-	fputs($RS_out,"--------------------------------------------------------------------------------"."\r\n\r\n");
-	}
 function GenPassword($nb_car="8")
+	{
  /* generation aléatoire du mot de passe */
 	$password = "";
 	$chaine  = "aAzZeErRtTyYuUIopP152346897mMLkK";
 //import d'un fichier txt
+		{
 		if (($extension != '.csv') && ($extension != '.txt')) $result = $l_error_ext_txt;
 		else
+			{
-			$tmpdate = date("Ymd-hms");
-			$file_out = "/tmp/$tmpdate-$name_file.pwd" ;
 			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)
+				{
 				if (is_file($LIBpath."crypt/$config[general_encryption_method].php"))
+					{
 					include($LIBpath."crypt/$config[general_encryption_method].php");
+					$tmpdate = date("Ymd-his");
+					$file_out = "/tmp/$tmpdate-$name_file.pwd" ;
 					$RS_out = fopen ("$file_out", "wb");
 					foreach ($RS_in as $no => $ligne)
+						{
+						if (substr($ligne,0,3) == pack('CCC',239,187,191)) # remove UTF8-BOM
+							{
+								$ligne = substr ($ligne,3);
+							}
 						$tligne = split(" ",$ligne);
-						$login  = str_replace("%0D","",str_replace("%0A","",urlencode ($tligne[0])));
+						$login = trim ($tligne[0]);
-						$password  = str_replace("%0D","",str_replace("%0A","",urlencode ($tligne[1])));
+						$password = trim ($tligne[1]);
 						if ($login != '')
+							{
 							if ($password == "")
+								{
 								$password = GenPassword();
+								}
-							$passwd = da_encrypt($password);
+							$login = da_sql_escape_string($login);
 							$passwd = da_sql_escape_string($passwd);
+							$passwd = da_encrypt($password);
 /* insertion (login + password) dans la table "radcheck" (si l'usager existe --> changement de mot de passe) */
 							$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))
+								{
 								echo "<b>Unable to add user $login: " . da_sql_error($link,$config) . "</b><br>\n";
 								$da_abort=1;
+								}
 							else
+								{
+/* create the user informations file */
+								fputs($RS_out,"$l_out_title\r\n\r\n");
-								creatlog ($login,$password,$service,$RS_out);
+								fputs($RS_out,"Service          : $service\r\n\r\n");
+								fputs($RS_out,"$l_out_login $login   |   $l_out_passwd $password\r\n\r\n");
-								/*echo $login." : ".$password." , ";*/
+								fputs($RS_out,"$l_out_mind\r\n\r\n");
+								fputs($RS_out,"--------------------------------------------------------------------------------\r\n\r\n");
+								}
 /* insertion de l'usager dans la table "userinfo" */
 							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';");

Subversion Repositories ALCASAR

(root)//web/acc/manager/htdocs/import_user.php – Rev 768 → 847