From 32ac67d87f09e7b688d425df00c8102555b66250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20Fr=C3=B6hlich?= Date: Tue, 28 Jul 2015 21:40:12 +0200 Subject: [PATCH 1/3] Since we currently cannot handle requests for Certificates of Achievement the Donate-Button should be hidden to avoid later grievances... --- lang/english.php | 5 +++++ lang/french.php | 6 +++++- lang/german.php | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lang/english.php b/lang/english.php index e9bc379..d78effe 100755 --- a/lang/english.php +++ b/lang/english.php @@ -81,12 +81,17 @@ define("Class_Quiz_08","passed the test."); define("Class_Quiz_09","not passed the test.");/*Bsp:You have reached 0 % and so you did not pass */ define("Class_Quiz_10_AnonymousCert", "You did the test using an anonymous certificate so you can not request a printed or PDF certificate for passing the test.
"); define("Class_Quiz_11_RequestCert", "Request Certificate"); +/* Original text define("Class_Quiz_12_ExplainCert", "Due to privacy concerns we may not collect your personal data here.

". "To request a printed or PDF certificate send a mail to education@cacert.org and tell us if you want the printed or PDF version. If you'd like a printed certificate please include your postal address.
". "The mail may be encrypted and must be signed by the certificate you used to do the test so we can verify that you did pass the test by checking its serial number. ". "Have a look at the \"logged in as:\" box at the upper right corner to find out something about the certificate you are using.
". "
For a printed certificate we'd ask you for a donation of about 5 EUR for mailing inside Europe and 10 EUR for global mail to cover the cost of handling and postage.
". "To make a donation using PayPal click the button below, https://www.cacert.org/index.php?id=13 shows you all methods to donate to CAcert.
". + "
We are sorry for the inconvenience.
");*/ +/* Replacement for the time we cannot handle certificate requests */ +define("Class_Quiz_12_ExplainCert", "Due to privacy concerns we may not collect your personal data here.

". + "We currently cannot process requests for Certificates of Achievement. You may nevertheless request on by mailing to education@cacert.org but please expect that handling the request may need a very long time!
". "
We are sorry for the inconvenience.
"); define("Class_Quiz_13_Donate5", "5 EUR for postage inside Europe"); define("Class_Quiz_14_Donate10", "10 EUR for postage outside Europe"); diff --git a/lang/french.php b/lang/french.php index 5dcfe45..1531ecf 100755 --- a/lang/french.php +++ b/lang/french.php @@ -81,13 +81,17 @@ define("Class_Quiz_08","r define("Class_Quiz_09","n'à pas réussit le test.");/*Bsp:You have reached 0 % and so you did not pass */ define("Class_Quiz_10_AnonymousCert", "Vous avez fait le test à l'aide d'un certificat anonyme, donc vous ne pouvez pas demander une version imprimé ou PDF certification de la réussite du test.
"); define("Class_Quiz_11_RequestCert", "Demander un certificat"); +/* define("Class_Quiz_12_ExplainCert", "En raison de problèmes de confidentialité, nous ne recueillons pas vos données personnelles ici.

". "Pour demander une version papier ou PDF certification envoyer un mail à education@cacert.org et nous dire si vous souhaitez en version papier ou en version PDF. Si vous désirez un certificat imprimé Veuillez inclure votre adresse postale.
". "Le courrier peut être chiffré et doit être signé par le certificat que vous avez utilisé pour effectuer le test ainsi, nous pouvons vérifier qui avée réussi le test en vérifiant son numéro de série. ". "Jetez un oeil à \"connecté en tant que:\" zone située dans le coin supérieur droit pour voir les infos sur le certificat que vous utilisez.
". "
Pour un certificat imprimé nous vous demandons pour un don d'environ 5 euros pour la diffusion à l'intérieur de l'Europe et 10 euros pour le courrier mondial pour couvrir les frais de manutention et d'expédition.
". "Faire un don à l'aide de PayPal, cliquez sur le bouton ci-dessous, https://www.cacert.org/index.php?id=13 vous affiche toutes les méthodes pour faire un don à CAcert.
". - "
Nous sommes désolés pour le désagrément..
"); + "
Nous sommes désolés pour le désagrément..
");*/ +define("Class_Quiz_12_ExplainCert", "Due to privacy concerns we may not collect your personal data here.

". + "We currently cannot process requests for Certificates of Achievement. You may nevertheless request on by mailing to education@cacert.org but please expect that handling the request may need a very long time!
". + "
We are sorry for the inconvenience.
"); define("Class_Quiz_13_Donate5", "5 Euros pour les frais d'expédition à l'intérieur de l'Europe"); define("Class_Quiz_14_Donate10", "10 Euros pour les frais hors d'Europe"); define("Class_Topic_01","nom"); diff --git a/lang/german.php b/lang/german.php index 0d34f87..91a23c0 100755 --- a/lang/german.php +++ b/lang/german.php @@ -81,12 +81,16 @@ define("Class_Quiz_08","bestanden"); define("Class_Quiz_09","nicht bestanden");/*Bsp:You have reached 0 % and so you did not pass */ define("Class_Quiz_10_AnonymousCert", "Sie haben ein anonymes Zertifikat zum Anmelden verwendet, deshalb können Sie keine Bestätigung beantragen.
"); define("Class_Quiz_11_RequestCert", "Bestätigung beantragen"); +/* define("Class_Quiz_12_ExplainCert", "Aus Datenschutzgründen dürfen wir hier keine persönlichen Daten von Ihnen abfragen.

". "Um eine Bestätigung ausgedruckt oder als PDF zu beantragen schicken Sie bitte eine EMail an education@cacert.org in der Sie uns sagen, ob Sie eine gedrucktes oder eine elektronische (PDF-)Bestätigung beantragen. Falls Sie eine gedruckte Bestätigung wünschen geben Sie bitte auch Ihre Postanschrift an.
". "Die Mail kann verschlüsselt und muss mit dem Zertifikat signiert sein, dass Sie zum Login für diesen Test verwendet haben, damit wir anhand der Seriennummer prüfen können, ob Sie den Test tatsächlich bestanden haben. ". "Ein Blick auf den \"eingelogged als:\" Kasten an der oberen rechten Ecke gibt Ihnen Informationen über das Zertifikat, das Sie gerade benutzen.
". "
Für eine gedruckte Bestätigung bitten wir Sie um eine Spende in Höhe von etwa 5 EUR für Versand innerhalb Europas und 10 EUR für weltweiten Versand um die Kosten für Herstellung und Versand zu abzudecken.
". "Um über PayPal zu spenden können Sie den Button unten verwenden, https://www.cacert.org/index.php?id=13 zeigt Ihnen alle Möglichkeiten, wie Sie CAcert Spenden zukommen lassen können.
". + "
Wir bitten Sie, die Unannehmlichkeiten zu entschuldigen.
");*/ +define("Class_Quiz_12_ExplainCert", "Aus Datenschutzgründen dürfen wir hier keine persönlichen Daten von Ihnen abfragen.

". + "Wir können momentan keine Anfragen nach Urkunden bearbeiten. Sie können trotzdem eines beantragen indem Sie eine Mail an education@cacert.org schicken, aber Sie sollten davon ausgehen dass die Bearbeitung sehr lange dauern wird!
". "
Wir bitten Sie, die Unannehmlichkeiten zu entschuldigen.
"); define("Class_Quiz_13_Donate5", "5 EUR für Versand innerhalb Europas"); define("Class_Quiz_14_Donate10", "10 EUR für Versand außerhalb Europas"); From fa27e3da5f86512b2b2d0719d0b6e28f5565fc21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20Fr=C3=B6hlich?= Date: Tue, 28 Jul 2015 21:50:15 +0200 Subject: [PATCH 2/3] Remove PayPal buttons --- start_test.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/start_test.php b/start_test.php index 4ff0749..1a10bf6 100755 --- a/start_test.php +++ b/start_test.php @@ -81,7 +81,8 @@ if($_SESSION['profile']['loggedin']==1){ if ($haspassed) { // A paper/PDF certificate for passing the test has been requested. echo "
".Class_Quiz_12_ExplainCert; - echo "
\n". + // PayPal-Buttons. Removed while we cannot process certificate requests +/* echo "
\n". "\n". "\n". "\n". "\n". "\n". - "
\n". @@ -105,7 +106,7 @@ if($_SESSION['profile']['loggedin']==1){ "".Class_Quiz_13_Donate5."".Class_Quiz_14_Donate10."
\n"; + "\n";*/ } else { // Test wurde nie bestanden echo "
" . Class_Quiz_09; From 1d06e8556d8e8094fc4570a5709c7b87c3b38ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20Fr=C3=B6hlich?= Date: Fri, 16 Oct 2015 22:48:07 +0200 Subject: [PATCH 3/3] Removed login_with_api.php --- login_with_api.php | 117 --------------------------------------------- 1 file changed, 117 deletions(-) delete mode 100755 login_with_api.php diff --git a/login_with_api.php b/login_with_api.php deleted file mode 100755 index bef71c0..0000000 --- a/login_with_api.php +++ /dev/null @@ -1,117 +0,0 @@ -"; - } - - //} - // else if($_SESSION['profile']['OCSP']==2 )echo "

".Login_01."

"; - //else if($_SESSION['profile']['OCSP']==0)echo "

".Login_02."

"; - } else { - echo "Fehler beim Loginvorgang
\n"; - // Debug prints for isolating login problems - // echo "Data: $data
\n"; - // echo "
".join("", @$x)."
"; - } - } - else { - echo '

'.Global_17.'
'; - } - } - /* $query = "select * from `emailcerts` where `serial`='${_SERVER['SSL_CLIENT_M_SERIAL']}' and `revoked`=0 and - UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() > 0"; - $res = mysql_query($query); - if(mysql_num_rows($res) > 0){ - $row = mysql_fetch_assoc($res); - $_SESSION['profile']['loggedin'] = 0; - $_SESSION['profile'] = ""; - foreach($_SESSION as $key){ - if($key == '_config') - continue; - if(is_int($key) || is_string($key)) - unset($_SESSION[$key]); - unset($key); - session_unregister($key); - } - $sql=mysql_query("select * from `users` where `id`='".$row['memid']."'"); - if (mysql_num_rows($sql) ==1){ - $_SESSION['profile'] = mysql_fetch_assoc($sql); - if($_SERVER['SSL_CLIENT_S_DN_Email']!=$_SESSION['profile']['email']){ - $sql_email=mysql_query("SELECT * FROM email WHERE email='${_SERVER['SSL_CLIENT_S_DN_Email']}'AND memid=".$_SESSION['profile']['id']." AND deleted='0000-00-00 00:00:00'"); - if (mysql_num_rows($sql_email) ==1)$_SESSION['profile']['loggedin'] = 1; - else unset($_SESSION['profile']); - } - else $_SESSION['profile']['loggedin'] = 1; - } - else unset($_SESSION['profile']); - } else { - $_SESSION['profile']['loggedin'] = 0; - $_SESSION['profile'] = ""; - foreach($_SESSION as $key) - { - if($key == '_config') - continue; - unset($_SESSION[$key]); - unset($key); - session_unregister($key); - } - exit; - } - } - } - if($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] && $_SESSION['profile']['id'] > 0 && $_SESSION['profile']['loggedin'] > 0) - { - $_SESSION['_config']['language'] = $_SESSION['profile']['language']; - putenv("LANG=".$_SESSION['_config']['language']); - setlocale(LC_ALL, $_SESSION['_config']['language']); - $domain = 'messages'; - bindtextdomain("$domain", $_SESSION['_config']['filepath']."/locale"); - textdomain("$domain"); - // echo" "; - }*/ - - if($_REQUEST['id'] == "logout") - { - if(isset($_SESSION['profile']['language'])){ - $sql="UPDATE user SET lang='".$_SESSION['profile']['language']."' WHERE user_id='".$_SESSION['profile']['id']."'"; - $query = mysql_query($sql); - } - $_SESSION['profile']['loggedin'] = 0; - $_SESSION['profile'] = ""; - echo" "; - session_destroy(); - exit; - } - -?>