mirror of
https://github.com/CAcertOrg/cats.git
synced 2024-11-03 04:34:04 +00:00
Merge branch 'bug-1149' into testserver
Conflicts: lang/french.php
This commit is contained in:
commit
f2c0a7300c
6 changed files with 12 additions and 0 deletions
|
@ -140,6 +140,8 @@ define("Index_01","aangemeld als :");
|
|||
define("Login_01","Uw certificaat kon niet gecontroleerd worden.");
|
||||
define("Login_02","Uw certificaat is ingetrokken.");
|
||||
define("Login_03_No_Org_Certs","Organisatie (OA) certificaten worden niet aanvaard door CATS omdat deze niet eenvoudig naar een gebruikersaccount te herleiden zijn.");
|
||||
define("Login_04_No_Server_Certs","Your certificate does not contain an Email field, you are probably using a server certificate.<br />".
|
||||
"Server certificates cannot be used to log in to CATS since they do not identify a person.");
|
||||
define("Menue_01","Help");
|
||||
define("Menue_02","Aanmelden");
|
||||
define("Menue_03","Afmelden");
|
||||
|
|
|
@ -144,6 +144,8 @@ define("Index_01","logged in as :");
|
|||
define("Login_01","Your certificate could not be validated.");
|
||||
define("Login_02","Your certificate has been revoked.");
|
||||
define("Login_03_No_Org_Certs","Organisation certificates are not accepted for CATS since they cannot be easily traced to a user account.");
|
||||
define("Login_04_No_Server_Certs","Your certificate does not contain an Email field, you are probably using a server certificate.<br />".
|
||||
"Server certificates cannot be used to log in to CATS since they do not identify a person.");
|
||||
define("Menue_01","Help");
|
||||
define("Menue_02","Login");
|
||||
define("Menue_03","Logout");
|
||||
|
|
|
@ -144,6 +144,8 @@ define("Index_01","Connect
|
|||
define("Login_01","Votre certificat n'a pas pu être validé.");
|
||||
define("Login_02","Votre certificat a été révoqué.");
|
||||
define("Login_03_No_Org_Certs","Les certificats d'organisation ne sont pas acceptés pour le CATS car ils ne sont pas directement liés à un compte utilisateur.");
|
||||
define("Login_04_No_Server_Certs","Your certificate does not contain an Email field, you are probably using a server certificate.<br />".
|
||||
|
||||
define("Menue_01","Aide");
|
||||
define("Menue_02","connexion");
|
||||
define("Menue_03","déconnexion");
|
||||
|
|
|
@ -143,6 +143,8 @@ define("Index_01","eingeloggt als :");
|
|||
define("Login_01","Ihr Zertifikat konnte nicht überprüft werden");
|
||||
define("Login_02","Ihr Zertifikat wurde wiederrufen");
|
||||
define("Login_03_No_Org_Certs","Organisations-Zertifikate werden von CATS nicht akzeptiert, da sie sich nicht einfach einem Benutzerkonto zuordnen lassen.");
|
||||
define("Login_04_No_Server_Certs","Ihr Zertifikat enthält kein Email-Feld, vermutlich handelt es sich um ein Server-Zertifikat.<br />".
|
||||
"Server-Zertifikate werden von CATS nicht akzeptiert, da sie keine Person identifizieren.");
|
||||
define("Menue_01","Hilfe");
|
||||
define("Menue_02","Login");
|
||||
define("Menue_03","Logout");
|
||||
|
|
|
@ -139,6 +139,8 @@ define("Index_01","registrado como :");
|
|||
define("Login_01","Su certificado no pudo ser validado.");
|
||||
define("Login_02","Su certificado ha sido revocado.");
|
||||
define("Login_03_No_Org_Certs","No se aceptan certificados de organizaciones para los CATS ya que no pueden ser relacionados fácilmente con una cuenta de usuario.");
|
||||
define("Login_04_No_Server_Certs","Your certificate does not contain an Email field, you are probably using a server certificate.<br />".
|
||||
"Server certificates cannot be used to log in to CATS since they do not identify a person.");
|
||||
define("Menue_01","Ayuda");
|
||||
define("Menue_02","Iniciar sesión");
|
||||
define("Menue_03","Salir");
|
||||
|
|
|
@ -13,6 +13,8 @@ include ("functions/acceptLogin.php");
|
|||
|
||||
if (isset($_SERVER["SSL_CLIENT_S_DN_O"])) {
|
||||
echo '<h5 class="centered"><br />'.Login_03_No_Org_Certs.'</h5>';
|
||||
} elseif(!isset($_SERVER["SSL_CLIENT_S_DN_Email"]) {
|
||||
echo '<h5 class="centered"><br />'.Login_04_No_Server_Certs.'</h5>';
|
||||
} elseif( $user_id ){
|
||||
$sql="SELECT * FROM user where `user_id`='".$user_id."' and `root`='".$root."' ";
|
||||
$query = mysql_query($sql);
|
||||
|
|
Loading…
Reference in a new issue