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

+}
 while (!feof($file_conf)) {
 	$buffer = fgets($file_conf, 4096);
 	if ((strpos($buffer, '=') !== false) && (substr($buffer, 0, 1) !== '#')) {
 		$tmp = explode('=', $buffer, 2);
-		$mail_conf[trim($tmp[0])] = trim($tmp[1]);
+		$conf[trim($tmp[0])] = trim($tmp[1]);
+	}
+}
 fclose($file_conf);
 /****************************************
 *			Choice of language			*
 	$l_mail_admin			= "Adresse Email de l'administrateur";
 	$l_whitelist_domain		= "Noms de domaine autorisés (whitelist)";
 	$l_mail_YES				= "OUI";
 	$l_mail_NO				= "NON";
 	$l_mail_submit			= "Enregistrer";
+} else if($Language == 'es') {
+	$l_mail_title			= "Registro por email";
+	$l_mail_registration	= "Activar el registro por correo electrónico :";
+	$l_mail_choice			= "Qué tipo de servicio de correo utiliza?";
+	$l_use_internal_server	= "Utilizar el servidor de correo interno";
+	$l_use_external_server	= "Retransmisión a un servidor de correo externo";
+	$l_use_email_address	= "Utilizar una dirección de correo electrónico";
+	$l_email_address		= "Dirección de correo electrónico utilizada para el envío de correo";
+	$l_email_password		= "Contraseña";
+	$l_email_password_confirm	= "Confirmar contraseña";
+	$l_mail_service			= "Elija el servicio de correo";
+	$l_mail_smtp_ip			= "Dirección IP o nombre del servidor de correo";
+	$l_mail_smtp_port		= "Puerto de escucha del servidor de correo";
+	$l_admin_log			= "Advertencia del administrador";
+	$l_mail_admin			= "Dirección de correo electrónico del administrador";
+	$l_whitelist_domain		= "Nombres de dominio autorizados (lista blanca)";
+	$l_mail_YES				= "SI";
+	$l_mail_NO				= "NO";
+	$l_mail_submit			= "SI";
 } else {
 	$l_mail_title			= "Registration by Email";
 	$l_mail_registration	= "Enable registration by Email :";
 	$l_mail_choice			= "What type of mail service use ?";
 	$l_use_internal_server	= "Use the internal mail server";
 	$l_mail_NO				= "NO";
 	$l_mail_submit			= "Save";
+}
 // Mail configuration params
-$mail_status        	= $mail_conf['MAIL'];
+$mail_status        	= $conf['MAIL'];
-$mail_type				= $mail_conf['MAIL_TYPE'];
+$mail_type				= $conf['MAIL_TYPE'];
-$mail_address			= $mail_conf['MAIL_ADDR'];
+$mail_address			= $conf['MAIL_ADDR'];
-$mail_smtp_port			= $mail_conf['MAIL_SMTP_PORT'];
+$mail_smtp_ip			= $conf['MAIL_SMTP_IP'];
-$mail_smtp_ip			= $mail_conf['MAIL_SMTP_IP'];
+$mail_smtp_port			= $conf['MAIL_SMTP_PORT'];
 $mail_password_mail 	= "";
 $mail_password_mail_2	= "";
-$mail_admin				= $mail_conf['MAIL_ADMIN'];
+$mail_admin				= $conf['MAIL_ADMIN'];
-$mail_whitelist			= $mail_conf['MAIL_WHITEDOMAIN'];
+$mail_whitelist			= $conf['MAIL_WHITEDOMAIN'];
 if(isset($_POST['submit'])){
 	if($_POST['mail_enable'] === 'on')
+	{
 		$mail_type = $_POST['mail_type'];
 		$mail_whitelist = $_POST['mail_whitelist'];
 		$admin_enable = $_POST['admin_enable'];
 		if(isset($_POST['mail_address']))	{ $mail_address = $_POST['mail_address']; }
 		if(isset($_POST['mail_server']))	{ $mail_server = $_POST['mail_server']; }
 		if(isset($_POST['mail_smtp_ip']))	{ $mail_smtp_ip = $_POST['mail_smtp_ip']; }
-		if(isset($_POST['mail_smtp_port']))	{ $mail_smtp_ip = $_POST['mail_smtp_port']; }
+		if(isset($_POST['mail_smtp_port']))	{ $mail_smtp_port = $_POST['mail_smtp_port']; }
 		if(isset($_POST['mail_mdp']))		{ $mail_mdp = $_POST['mail_mdp']; }
 		if(isset($_POST['mail_mdp2']))		{ $mail_mdp2 = $_POST['mail_mdp2']; }
 		if ($admin_enable == "1") { $mail_admin = $_POST['mail_admin']; }
 		switch ($mail_type) {
-			case '1':
+			case '1': // Act as a SMTP server
 				$mail_smtp_port = 25;
 				if ($admin_enable == "1"){
 					exec("sudo /usr/local/bin/alcasar-mail-install.sh -1 -a $mail_admin -w $mail_whitelist");
+				}
 				else {
 					exec("sudo /usr/local/bin/alcasar-mail-install.sh -1 -w $mail_whitelist");
+				}
 				break;
-			case '2':
+			case '2': // Relay to an external SMTP server
 				if ($admin_enable == "1"){
 					exec("sudo /usr/local/bin/alcasar-mail-install.sh -2 -s $mail_smtp_ip -p $mail_smtp_port -a $mail_admin -w $mail_whitelist");
+				}
 				else {
 					exec("sudo /usr/local/bin/alcasar-mail-install.sh -2 -s $mail_smtp_ip -p $mail_smtp_port -w $mail_whitelist");
+				}
 				break;
-			case '3':
+			case '3': // Use an user Email address
 				if(($mail_mdp != '') && ($mail_mdp==$mail_mdp2)) {
 					switch ($mail_server) {
 						case '1':
 							$mail_smtp_ip	= "smtp.orange.fr";
 							$mail_smtp_port		= 465;
 <html>
 <head>
 	<meta charset="UTF-8">
 	<title><?= $l_mail_title ?></title>
 	<link type="text/css" href="/css/acc.css" rel="stylesheet">
-	<link type="text/css" href="/css/mail.css" rel="stylesheet">
 	<script>
 	function onMailStatusChange() {
 		var listToDisables1 = ['mail_type','admin_enable','mail_admin','mail_whitelist'];
-		var listToDisables2 = ['mail_type','admin_enable','mail_admin','mail_whitelist','mail_server','mail_smtp_ip'];
+		var listToDisables2 = ['mail_type','admin_enable','mail_admin','mail_whitelist','mail_server','mail_smtp_ip','mail_smtp_port'];
-		var listToDisables3 = ['mail_type','admin_enable','mail_admin','mail_whitelist','mail_server','mail_smtp_ip','mail_mdp2','mail_mdp','mail_address'];
+		var listToDisables3 = ['mail_type','admin_enable','mail_admin','mail_whitelist','mail_server','mail_smtp_ip','mail_smtp_port','mail_address','mail_mdp','mail_mdp2'];
 		var formSubmit = document.querySelector('form input[type="submit"]');
 		var isChecked = false;
-		for (var i=0; i<listToDisables1.length; i++) {
-			document.getElementById(listToDisables1[i]).style.backgroundColor = '#c0c0c0';
-			document.getElementById(listToDisables1[i]).disabled = true;
-		}
-		for (var i=0; i<listToDisables2.length; i++) {
-			document.getElementById(listToDisables2[i]).style.backgroundColor = '#c0c0c0';
-			document.getElementById(listToDisables2[i]).disabled = true;
-		}
 		for (var i=0; i<listToDisables3.length; i++) {
 			document.getElementById(listToDisables3[i]).style.backgroundColor = '#c0c0c0';
 			document.getElementById(listToDisables3[i]).disabled = true;
+		}
 		if (document.getElementById('mail_enable').value === 'on') {
 				document.getElementById('mail_admin').disabled = true;
+				}
 				if (document.getElementById('mail_server').value != '9') {
 				document.getElementById('mail_smtp_ip').style.backgroundColor = '#c0c0c0';
 				document.getElementById('mail_smtp_ip').disabled = true;
+				document.getElementById('mail_smtp_port').style.backgroundColor = '#c0c0c0';
+				document.getElementById('mail_smtp_port').disabled = true;
+				}
+			}
 			else if (document.getElementById('mail_type').value === '3') {
 				for (var i=0; i<listToDisables3.length; i++) {
 				document.getElementById(listToDisables3[i]).style.backgroundColor = null;
 				document.getElementById('mail_admin').disabled = true;
+				}
 				if (document.getElementById('mail_server').value != '9') {
 				document.getElementById('mail_smtp_ip').style.backgroundColor = '#c0c0c0';
 				document.getElementById('mail_smtp_ip').disabled = true;
+				document.getElementById('mail_smtp_port').style.backgroundColor = '#c0c0c0';
+				document.getElementById('mail_smtp_port').disabled = true;
+				}
+			}
 			formSubmit.style.display = null;
+		}
+	}
 						<dt>
 							<label for="mail_type"><?= $l_mail_choice ?></label><br>
 						</dt>
 						<dd>
 							<select id="mail_type" name="mail_type" onchange="onMailStatusChange();">
-								<!--<option value="1"<?= ($mail_type == '1') ? ' selected="selected"' : '' ?>><?= $l_use_internal_server ?></option>-->
+								<option value="1"<?= ($mail_type == '1') ? ' selected="selected"' : '' ?>><?= $l_use_internal_server ?></option>
 								<option value="2"<?= ($mail_type == '2') ? ' selected="selected"' : '' ?>><?= $l_use_external_server ?></option>
 								<option value="3"<?= ($mail_type == '3') ? ' selected="selected"' : '' ?>><?= $l_use_email_address ?></option>
 							</select>
 						</dd>
 					</dl>
 					<dl>
 						<dt>
 							<label for="mail_mdp"><?= $l_email_password ?></label><br>
 						</dt>
 						<dd>
-							<input type="text" id="mail_mdp" size="40" name="mail_mdp" value="<?= $mail_password_mail ?>" oninput="onMailStatusChange();">
+							<input type="password" id="mail_mdp" size="40" name="mail_mdp" value="<?= $mail_password_mail ?>" oninput="onMailStatusChange();">
 						</dd>
 					</dl>
 					<dl>
 						<dt>
 							<label for="mail_mdp2"><?= $l_email_password_confirm ?></label><br>
 						</dt>
 						<dd>
-							<input type="text" id="mail_mdp2" size="40" name="mail_mdp2" value="<?= $mail_password_mail_2 ?>" oninput="onMailStatusChange();">
+							<input type="password" id="mail_mdp2" size="40" name="mail_mdp2" value="<?= $mail_password_mail_2 ?>" oninput="onMailStatusChange();">
 						</dd>
 					</dl>
 					<dl>
 						<dt>
 							<label for="mail_server"><?= $l_mail_service ?></label><br>

Subversion Repositories ALCASAR

(root)/web/acc/manager/htdocs/user_by_email.php – Rev 3021 → 3022