Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 3000 → Rev 3001

/web/acc/manager/htdocs/user_by_email.php
45,8 → 45,8
$l_mail_title = "Inscription par Email";
$l_mail_registration = "Activer l'inscription par Email :";
$l_mail_choice = "Quel type de service mail utiliser ?";
$l_use_internal_server = "Utiliser le serveur interne";
$l_use_external_server = "Relayer vers un serveur externe";
$l_use_internal_server = "Utiliser le serveur de messagerie interne";
$l_use_external_server = "Relayer vers un serveur de messagerie externe";
$l_use_email_address = "Utiliser une adresse mail";
$l_email_address = "Adresse mail utilisée pour l'envoi de mail";
$l_email_password = "Mot de passe";
54,7 → 54,7
$l_mail_service = "Choisissez le service de messagerie";
$l_mail_smtp_ip = "Adresse IP ou nom du du serveur SMTP";
$l_admin_log = "Avertissement de l'administratateur";
$l_admin_address = "Adresse Email de l'administrateur";
$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";
63,8 → 63,8
$l_mail_title = "Registration by Email";
$l_mail_registration = "Enable registration by Email :";
$l_mail_choice = "What type of mail service use ?";
$l_internal_server = "Use the internal server";
$l_external_server = "Relay to an external server";
$l_internal_server = "Use the internal mail server";
$l_external_server = "Relay to an external mail server";
$l_email_address = "Use an email address";
$l_email_address = "Email address used for sending mail";
$l_email_password = "Password";
72,7 → 72,7
$l_mail_service = "Choose the mail service";
$l_mail_smtp_ip = "IP address or name of mail server";
$l_admin_log = "Administrator's warning";
$l_admin_address = "Administrator Email address";
$l_mail_admin = "Administrator Email address";
$l_whitelist_domain = "Authorized domain names (whitelist)";
$l_mail_YES = "YES";
$l_mail_NO = "NO";
88,7 → 88,7
$mail_smtp_ip = $mail_conf['MAIL_SMTP_IP'];
$mail_password_mail = "";
$mail_password_mail_2 = "";
$admin_address = $mail_conf['MAIL_ADMIN'];
$mail_admin = $mail_conf['MAIL_ADMIN'];
$mail_whitelist = $mail_conf['MAIL_WHITEDOMAIN'];
 
if(isset($_POST['submit'])){
100,13 → 100,13
$mail_mdp = $_POST['mail_mdp'];
$mail_mdp2 = $_POST['mail_mdp2'];
$admin_enable = $_POST['admin_enable'];
$admin_address = $_POST['admin_address'];
if ($admin_enable == "1") { $mail_admin = $_POST['mail_admin']; };
$mail_whitelist = $_POST['mail_whitelist'];
switch ($mail_type) {
case '1':
$mail_port = 25;
if(isset($mail_admin)){
exec("sudo /usr/local/bin/alcasar-mail-install.sh -1 -a $admin_address -w $mail_whitelist");
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");
113,8 → 113,8
}
break;
case '2':
if(isset($mail_admin)){
exec("sudo /usr/local/bin/alcasar-mail-install.sh -2 -s $mail_smtp_ip -p $mail_port -r $mail_ip -a $admin_address -w $mail_whitelist");
if ($admin_enable == "1"){
exec("sudo /usr/local/bin/alcasar-mail-install.sh -2 -s $mail_smtp_ip -p $mail_port -r $mail_ip -a $mail_admin -w $mail_whitelist");
}
else {
exec("sudo /usr/local/bin/alcasar-mail-install.sh -2 -s $mail_smtp_ip -p $mail_port -r $mail_ip -w $mail_whitelist");
121,7 → 121,7
}
break;
case '3':
if ($mail_mdp == $mail_mdp2) {
if(($mail_mdp != '') && ($mail_mdp==$mail_mdp2)) {
switch ($mail_server) {
case '1':
$mail_smtp_ip = "smtp.orange.fr";
159,15 → 159,15
echo "Erreur dans la saisie !";
break;
}
if(isset($mail_admin)){
exec("sudo /usr/local/bin/alcasar-mail-install.sh -3 -s $mail_smtp_ip -p $mail_port -m $mail_address -o $mail_mdp -a $admin_address -w $mail_whitelist");
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");
}
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");
}
}
else { // password are not the same
echo "Erreur";
else { // no password or password are not same
header("Refresh:0");
}
break;
default:
192,35 → 192,34
<link type="text/css" href="/css/mail.css" rel="stylesheet">
<script>
function onMailStatusChange() {
var listToDisables1 = ['mail_type','admin_enable','admin_address','mail_whitelist'];
var listToDisables2 = ['mail_server','mail_type','admin_enable','admin_address','mail_whitelist','mail_smtp_ip'];
var listToDisables3 = ['mail_server','mail_mdp2','mail_mdp','mail_address','mail_type','admin_enable','admin_address','mail_whitelist'];
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 listToDisables3 = ['mail_type','admin_enable','mail_admin','mail_whitelist','mail_server','mail_smtp_ip','mail_mdp2','mail_mdp','mail_address'];
var formSubmit = document.querySelector('form input[type="submit"]');
var btn_checkConf = document.getElementById('btn-checkconf');
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('auth_enable').value === 'on') {
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;
}
document.getElementById('mail_type').style.backgroundColor = null;
document.getElementById('mail_type').disabled = false;
if (document.getElementById('mail_type').value === 'on') {
if (document.getElementById('mail_type').value === '1') {
for (var i=0; i<listToDisables1.length; i++) {
document.getElementById(listToDisables1[i]).style.backgroundColor = null;
document.getElementById(listToDisables1[i]).disabled = false;
}
if (document.getElementById('admin_enable').value === '0') {
document.getElementById('admin_address').style.backgroundColor = '#c0c0c0';
document.getElementById('admin_address').disabled = true;
document.getElementById('mail_admin').style.backgroundColor = '#c0c0c0';
document.getElementById('mail_admin').disabled = true;
}
}
else if (document.getElementById('mail_type').value === '2') {
229,9 → 228,13
document.getElementById(listToDisables2[i]).disabled = false;
}
if (document.getElementById('admin_enable').value === '0') {
document.getElementById('admin_address').style.backgroundColor = '#c0c0c0';
document.getElementById('admin_address').disabled = true;
document.getElementById('mail_admin').style.backgroundColor = '#c0c0c0';
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;
}
}
else if (document.getElementById('mail_type').value === '3') {
for (var i=0; i<listToDisables3.length; i++) {
239,27 → 242,15
document.getElementById(listToDisables3[i]).disabled = false;
}
if (document.getElementById('admin_enable').value === '0') {
document.getElementById('admin_address').style.backgroundColor = '#c0c0c0';
document.getElementById('admin_address').disabled = true;
document.getElementById('mail_admin').style.backgroundColor = '#c0c0c0';
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;
}
}
formSubmit.style.display = null;
btn_checkConf.style.display = 'none';
} else {
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;
}
formSubmit.style.display = null;
btn_checkConf.style.display = 'none';
}
}
</script>
354,17 → 345,17
</dt>
<dd>
<select id="admin_enable" name="admin_enable" onchange="onMailStatusChange();">
<option value="1"<?= ($admin_address != '') ? ' selected="selected"' : '' ?>><?= $l_mail_YES ?></option>
<option value="0"<?= ($admin_address == '') ? ' selected="selected"' : '' ?>><?= $l_mail_NO ?></option>
<option value="1"<?= ($mail_admin != '') ? ' selected="selected"' : '' ?>><?= $l_mail_YES ?></option>
<option value="0"<?= ($mail_admin == '') ? ' selected="selected"' : '' ?>><?= $l_mail_NO ?></option>
</select>
</dd>
</dl>
<dl>
<dt>
<label for="admin_address"><?= $l_admin_address ?></label><br>
<label for="mail_admin"><?= $l_mail_admin ?></label><br>
</dt>
<dd>
<input type="text" id="admin_address" size="40" name="admin_address" value="<?= $admin_address ?>" oninput="onMailStatusChange();">
<input type="text" id="mail_admin" size="40" name="mail_admin" value="<?= $mail_admin ?>" oninput="onMailStatusChange();">
</dd>
</dl>
<dl>