Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2608 → Rev 2609

/web/acc/admin/network.php
75,8 → 75,7
$l_empty = "Vide";
$l_yes = "Oui";
$l_no = "Non";
$l_allow_unsecured_login = "Autoriser les utilisateurs à se connecter de manière non sécurisée (HTTP) :";
$l_unsecured_login_warning = "/!\\ Les identifiants de connexion seront envoyés en clair.";
$l_ssl_title = "Chiffrer les flux réseau entre les utilisateurs et ALCASAR";
$l_cert_expiration = "Date d'expiration :";
$l_cert_commonname = "Nom commun :";
$l_cert_organization = "Organisation :";
130,8 → 129,7
$l_empty = "Empty";
$l_yes = "Yes";
$l_no = "No";
$l_allow_unsecured_login = "Allow users to login with insecure connection (HTTP):";
$l_unsecured_login_warning = "/!\\ Credentials will be sent in plain text.";
$l_ssl_title = "Cypher the network flows between users and ALCASAR";
$l_cert_expiration = "Expiration date:";
$l_cert_commonname = "Common name:";
$l_cert_organization = "Organization:";
758,6 → 756,26
<br>
 
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr><th><?= $l_ssl_title?></th></tr>
<tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1" height="2"></td></tr>
</table>
<table width="100%" cellspacing="0" cellpadding="5" border="1">
<tr><td valign="middle" align="left">
<form method="post" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>">
<input type="hidden" name="choix" value="https_login">
<span><?= $l_allow_unsecured_login ?></span><br>
<select name="https_login">
<option value="on"<?= (($conf['HTTPS_LOGIN'] === 'on') ? ' selected' : '') ?>><?= $l_yes ?></option>
<option value="off"<?= (($conf['HTTPS_LOGIN'] === 'off') ? ' selected' : '') ?>><?= $l_no ?></option>
</select>
<input type="submit" value="<?= $l_apply ?>"><br>
</form>
<br>
</td></tr>
</table>
<br>
 
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr><th><?= $l_import_cert ?></th></tr>
<tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1" height="2"></td></tr>
</table>
764,23 → 782,6
<table width="100%" cellspacing="0" cellpadding="5" border="1">
<tr>
<td width="50%" valign="top">
<form method="post" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>">
<input type="hidden" name="choix" value="https_login">
<span><?= $l_allow_unsecured_login ?></span><br>
<select name="https_login">
<option value="on"<?= (($conf['HTTPS_LOGIN'] === 'on') ? ' selected' : '') ?>><?= $l_no ?></option>
<option value="off"<?= (($conf['HTTPS_LOGIN'] === 'off') ? ' selected' : '') ?>><?= $l_yes ?></option>
</select>
<input type="submit" value="<?= $l_apply ?>"><br>
<span><?= $l_unsecured_login_warning ?></span>
</form>
<br>
<form method="post" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>">
<input type="hidden" name="choix" value="default_cert">
<input type="submit" value="<?= $l_default_cert ?>" <?= (!file_exists('/etc/pki/tls/certs/alcasar.crt.old') || !file_exists('/etc/pki/tls/private/alcasar.key.old')) ? ' disabled' : '' ?>>
</form>
</td>
<td width="50%" valign="top">
<?php
$certificateInfos = openssl_x509_parse(file_get_contents('/etc/pki/tls/certs/alcasar.crt'));
 
798,6 → 799,12
<?= $l_cert_commonname ?> <?= $CAdomain ?><br>
<?= $l_cert_organization ?> <?= $CAorganization ?><br>
</td>
<td width="50%" valign="center">
<form method="post" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>">
<input type="hidden" name="choix" value="default_cert">
<input type="submit" value="<?= $l_default_cert ?>" <?= (!file_exists('/etc/pki/tls/certs/alcasar.crt.old') || !file_exists('/etc/pki/tls/private/alcasar.key.old')) ? ' disabled' : '' ?>>
</form>
</td>
</tr>
<tr>
<td width="50%" valign="top">
/web/index.php
45,6 → 45,7
 
$organisme = $conf["ORGANISM"];
$hostname = $conf["HOSTNAME"].'.'.$conf["DOMAIN"];
$ssl_enable = $conf["HTTPS_LOGIN"];
$useHTTPS = ((isset($_SERVER['HTTPS'])) && (!empty($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] !== 'off'));
$network_pb = false; // "alcasar-watchdog.sh" changes this value if a network issue is detected
$diagnostic = "can't contact the default router"; // "alcasar-watchdog.sh" changes this value if a network issue is detected
154,7 → 155,7
$l_contact_net_pb = "Contactez votre responsable informatique ou votre prestataire Internet pour plus d'information.";
$l_sms_access = "<a href=\"//$hostname/autoregistrationinfo.php\">Auto Enregistrement par SMS</a>";
$l_install_certif = "Installer le certificat racine";
$l_install_certif_more = "Installation du certificat de l'autorité; racine d'ALCASAR";
$l_install_certif_more = "Installation du certificat de l'autorité racine d'ALCASAR";
$l_certif_explain = "Permet l'échange de données sécurisées entre votre station de consultation et le portail captif ALCASAR.<BR>Si ce certificat n'est pas enregistré sur votre station de consultation, il est possible que des alertes de sécurité soient émises par votre navigateur.<br><br>";
$l_certif_explain_help = "<a href=\"alcasar-certificat.pdf\" target=\"_blank\">Aide complémentaire</a>";
$l_category = "catégorie :";
531,11 → 532,12
</div>
<?php endif; ?>
 
<div class="box_menu" id="box_certif" onmouseover="setBoxInfoContent('text_certif');">
<span><a href="<?= $certCa_link ?>"><?= $l_install_certif ?></a></span>
<img src="<?= $img_rep.$img_certificate ?>">
</div>
 
<?php if ($ssl_enable == "on"): ?>
<div class="box_menu" id="box_certif" onmouseover="setBoxInfoContent('text_certif');">
<span><a href="<?= $certCa_link ?>"><?= $l_install_certif ?></a></span>
<img src="<?= $img_rep.$img_certificate ?>">
</div>
<?php endif; ?>
<div class="box_menu" id="box_mdp" onmouseover="setBoxInfoContent('text_mdp');">
<img src="<?= $img_rep.$img_pwd ?>">
<span><?= $l_password_change ?></span>