Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 3020 → Rev 3021

/web/acc/manager/htdocs/user_by_email.php
52,7 → 52,8
$l_email_password = "Mot de passe";
$l_email_password_confirm = "Confirmez le mot de passe";
$l_mail_service = "Choisissez le service de messagerie";
$l_mail_smtp_ip = "Adresse IP ou nom du du serveur SMTP";
$l_mail_smtp_ip = "Adresse IP ou nom du serveur SMTP";
$l_mail_smtp_port = "Port d'écoute du serveur SMTP";
$l_admin_log = "Avertissement de l'administratateur";
$l_mail_admin = "Adresse Email de l'administrateur";
$l_whitelist_domain = "Noms de domaine autorisés (whitelist)";
71,6 → 72,7
$l_email_password_confirm = "Confirm password";
$l_mail_service = "Choose the mail service";
$l_mail_smtp_ip = "IP address or name of mail server";
$l_mail_smtp_port = "Listen port of mail server";
$l_admin_log = "Administrator's warning";
$l_mail_admin = "Administrator Email address";
$l_whitelist_domain = "Authorized domain names (whitelist)";
83,7 → 85,7
$mail_status = $mail_conf['MAIL'];
$mail_type = $mail_conf['MAIL_TYPE'];
$mail_address = $mail_conf['MAIL_ADDR'];
$mail_port = $mail_conf['MAIL_PORT'];
$mail_smtp_port = $mail_conf['MAIL_SMTP_PORT'];
$mail_smtp_ip = $mail_conf['MAIL_SMTP_IP'];
$mail_password_mail = "";
$mail_password_mail_2 = "";
91,20 → 93,21
$mail_whitelist = $mail_conf['MAIL_WHITEDOMAIN'];
 
if(isset($_POST['submit'])){
if($_POST['auth_enable'] === 'on')
if($_POST['mail_enable'] === 'on')
{
$mail_type = $_POST['mail_type'];
$mail_address = $_POST['mail_address'];
$mail_server = $_POST['mail_server'];
$mail_smtp_ip = $_POST['mail_smtp_ip'];
$mail_mdp = $_POST['mail_mdp'];
$mail_mdp2 = $_POST['mail_mdp2'];
$admin_enable = $_POST['admin_enable'];
if ($admin_enable == "1") { $mail_admin = $_POST['mail_admin']; };
$mail_whitelist = $_POST['mail_whitelist'];
$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_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':
$mail_port = 25;
$mail_smtp_port = 25;
if ($admin_enable == "1"){
exec("sudo /usr/local/bin/alcasar-mail-install.sh -1 -a $mail_admin -w $mail_whitelist");
}
114,10 → 117,10
break;
case '2':
if ($admin_enable == "1"){
exec("sudo /usr/local/bin/alcasar-mail-install.sh -2 -s $mail_smtp_ip -p $mail_port -a $mail_admin -w $mail_whitelist");
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_port -w $mail_whitelist");
exec("sudo /usr/local/bin/alcasar-mail-install.sh -2 -s $mail_smtp_ip -p $mail_smtp_port -w $mail_whitelist");
}
break;
case '3':
125,35 → 128,35
switch ($mail_server) {
case '1':
$mail_smtp_ip = "smtp.orange.fr";
$mail_port = 465;
$mail_smtp_port = 465;
break;
case '2':
$mail_smtp_ip = "smtp.live.com";
$mail_port = 587;
$mail_smtp_port = 587;
break;
case '3':
$mail_smtp_ip = "smtp.office365.com";
$mail_port = 587;
$mail_smtp_port = 587;
break;
case '4':
$mail_smtp_ip = "smtp.sfr.fr";
$mail_port = 465;
$mail_smtp_port = 465;
break;
case '5':
$mail_smtp_ip = "smtp.free.fr";
$mail_port = 465;
$mail_smtp_port = 465;
break;
case '6':
$mail_smtp_ip = "smtp.gmail.com";
$mail_port = 587;
$mail_smtp_port = 587;
break;
case '7':
$mail_smtp_ip = "smtp.laposte.net";
$mail_port = 465;
$mail_smtp_port = 465;
break;
case '8':
$mail_smtp_ip = "smtp.bbox.fr";
$mail_port = 587;
$mail_smtp_port = 587;
break;
default:
echo "Erreur dans la saisie !";
160,10 → 163,10
break;
}
if ($admin_enable == "1"){
exec("sudo /usr/local/bin/alcasar-mail-install.sh -3 -s $mail_smtp_ip -p $mail_port -m $mail_address -o $mail_mdp -a $mail_admin -w $mail_whitelist");
exec("sudo /usr/local/bin/alcasar-mail-install.sh -3 -s $mail_smtp_ip -p $mail_smtp_port -m $mail_address -o $mail_mdp -a $mail_admin -w $mail_whitelist");
}
else {
exec("sudo /usr/local/bin/alcasar-mail-install.sh -3 -s $mail_smtp_ip -p $mail_port -m $mail_address -o $mail_mdp -w $mail_whitelist");
exec("sudo /usr/local/bin/alcasar-mail-install.sh -3 -s $mail_smtp_ip -p $mail_smtp_port -m $mail_address -o $mail_mdp -w $mail_whitelist");
}
}
else { // no password or password are not same
209,7 → 212,7
document.getElementById(listToDisables3[i]).style.backgroundColor = '#c0c0c0';
document.getElementById(listToDisables3[i]).disabled = true;
}
if (document.getElementById('auth_enable').value === 'on') {
if (document.getElementById('mail_enable').value === 'on') {
document.getElementById('mail_type').style.backgroundColor = null;
document.getElementById('mail_type').disabled = false;
if (document.getElementById('mail_type').value === '1') {
268,10 → 271,10
</legend>
<dl>
<dt>
<label for="auth_enable"><?= $l_mail_registration ?></label>
<label for="mail_enable"><?= $l_mail_registration ?></label>
</dt>
<dd>
<select id="auth_enable" name="auth_enable" onchange="onMailStatusChange();">
<select id="mail_enable" name="mail_enable" onchange="onMailStatusChange();">
<option value="on"<?= ($mail_status == 'on') ? ' selected="selected"' : '' ?>><?= $l_mail_YES ?></option>
<option value="off"<?= ($mail_status == 'off') ? ' selected="selected"' : '' ?>><?= $l_mail_NO ?></option>
</select>
283,7 → 286,7
</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>
338,6 → 341,12
<dd>
<input type="text" id="mail_smtp_ip" size="40" name="mail_smtp_ip" value="<?= $mail_smtp_ip ?>" oninput="onMailStatusChange();">
</dd>
<dt>
<label for="mail_smtp_port"><?= $l_mail_smtp_port ?></label><br>
</dt>
<dd>
<input type="text" id="mail_smtp_port" size="5" name="mail_smtp_port" value="<?= $mail_smtp_port ?>" oninput="onMailStatusChange();">
</dd>
</dl>
<dl>
<dt>