summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Froehlich <bernhard@cacert.org>2019-03-01 22:36:39 +0000
committerBernhard Froehlich <bernhard@cacert.org>2019-03-01 22:36:39 +0000
commitbddeab7b0c31ddcbce9327745bda15bdc4d8763f (patch)
tree3dd7263348a9d3dbc6a1f98c9056e5415d59351a
parent9a4df7b2ba306d76dccc2dcf4aa0c57ec5039d0c (diff)
downloadcacert-devel-bddeab7b0c31ddcbce9327745bda15bdc4d8763f.tar.gz
cacert-devel-bddeab7b0c31ddcbce9327745bda15bdc4d8763f.tar.xz
cacert-devel-bddeab7b0c31ddcbce9327745bda15bdc4d8763f.zip
Re-enabled mail checking and other temporary (?) changes
-rw-r--r--includes/account.php8
-rw-r--r--pages/index/feed.rss1
-rw-r--r--stamp/report.php4
-rw-r--r--www/cats/cats_import.php2
-rw-r--r--www/index.php4
5 files changed, 14 insertions, 5 deletions
diff --git a/includes/account.php b/includes/account.php
index 141e20d..46bfeb3 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -136,7 +136,9 @@ function buildSubjectFromSession() {
showfooter();
exit;
}
- $checkemail = checkEmailDummy($_REQUEST['newemail']);
+ //Temporary (?) enabled mail checking
+ //$checkemail = checkEmailDummy($_REQUEST['newemail']);
+ $checkemail = checkEmail($_REQUEST['newemail']);
if($checkemail != "OK")
{
showheader(_("My CAcert.org Account!"));
@@ -642,7 +644,9 @@ function buildSubjectFromSession() {
showfooter();
exit;
}
- $checkemail = checkEmailDummy($authaddy);
+ // Temporary (?) re-enabled mail checking
+ //$checkemail = checkEmailDummy($authaddy);
+ $checkemail = checkEmail($authaddy);
if($checkemail != "OK")
{
showheader(_("My CAcert.org Account!"));
diff --git a/pages/index/feed.rss b/pages/index/feed.rss
index f706f71..fa6d213 100644
--- a/pages/index/feed.rss
+++ b/pages/index/feed.rss
@@ -15,6 +15,7 @@
Merged in children are bug-1442.
Additional changes:
+ 2019-03-01: Mail checking re-activated, improvements to error reporting
2019-01-18: Now bug-1305 is fully merged in, not only the cherry picked cap forms as before.
2019-01-03: Disabled mail address checking, so it is possible to create new accounts now
2018-12-16: More changes from bug-1305 (cap forms): CAcert address and fingerprint format
diff --git a/stamp/report.php b/stamp/report.php
index 2188de0..9f8f0aa 100644
--- a/stamp/report.php
+++ b/stamp/report.php
@@ -40,7 +40,9 @@
if($process != "")
{
- $checkemail = checkEmailDummy($email);
+ // Temporarily (?) re-enabled mail checking
+ //$checkemail = checkEmailDummy($email);
+ $checkemail = checkEmail($email);
if($checkemail != "OK")
{
$errmsg = $checkemail;
diff --git a/www/cats/cats_import.php b/www/cats/cats_import.php
index 6d044be..5e125a8 100644
--- a/www/cats/cats_import.php
+++ b/www/cats/cats_import.php
@@ -50,7 +50,7 @@ if (
$https == 'on' &&
// Comment (to be romeved): better to use preg_match matching the end of the line (since this is on the end of the line right?)
// Ted: Is this specified? I don't think so, therefore I'd keep stristr
- strlen(stristr($ssl_client_s_dn, '/emailAddress=cats@cacert.org')) > 0
+ strlen(stristr($ssl_client_s_dn, 'emailAddress=cats@cacert.org')) > 0 // Test to fix upload problems...
) $access = TRUE;
if ($access !== TRUE) {
diff --git a/www/index.php b/www/index.php
index e160e0d..afd613e 100644
--- a/www/index.php
+++ b/www/index.php
@@ -426,7 +426,9 @@ if ($oldid == 52 )
if($id == 2)
{
- $checkemail = checkEmailDummy($_SESSION['signup']['email']);
+ // Temporarily (?) enable mail checkin
+ //$checkemail = checkEmailDummy($_SESSION['signup']['email']);
+ $checkemail = checkEmail($_SESSION['signup']['email']);
if($checkemail != "OK")
{
$id = 1;