summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2019-02-25 21:53:22 +0100
committerBernhard Fröhlich <bernhard@cacert.org>2019-02-25 21:53:22 +0100
commitecbd493beb4d21b07bb0c41f3632a01af9d28b77 (patch)
tree9970fccf3c145b79b8e849eeaffec31e93f636cc
parent45aef2d553a191b94d04e95a8a91fec05c213049 (diff)
downloadcacert-devel-ecbd493beb4d21b07bb0c41f3632a01af9d28b77.tar.gz
cacert-devel-ecbd493beb4d21b07bb0c41f3632a01af9d28b77.tar.xz
cacert-devel-ecbd493beb4d21b07bb0c41f3632a01af9d28b77.zip
Initialized test-1459: Mail checking enabled and rss adjusted
-rw-r--r--includes/account.php4
-rw-r--r--pages/index/feed.rss15
-rw-r--r--stamp/report.php2
-rw-r--r--www/index.php2
4 files changed, 6 insertions, 17 deletions
diff --git a/includes/account.php b/includes/account.php
index 9a57daf..6dacf2d 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -136,7 +136,7 @@ function buildSubjectFromSession() {
showfooter();
exit;
}
- $checkemail = checkEmailDummy($_REQUEST['newemail']);
+ $checkemail = checkEmail($_REQUEST['newemail']);
if($checkemail != "OK")
{
showheader(_("My CAcert.org Account!"));
@@ -642,7 +642,7 @@ function buildSubjectFromSession() {
showfooter();
exit;
}
- $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 3605f26..1ce4dfd 100644
--- a/pages/index/feed.rss
+++ b/pages/index/feed.rss
@@ -9,20 +9,9 @@
<language>en</language>
<item>
- <title>Usage of integration branch</title>
+ <title>Test-1459/title>
<description>
- This is the <b>integration branch</b>. If it is not, please change this message in pages/index/feed.rss
-
- The integration branch is used as the base branch for the testserver. Ideally it should differ
- from the release branch only in the explicit changes for the testserver (other icon and styles).
-
- For a test campaign you should create a new branch (something like "testserver-&lt;campaign name&gt;")
- and merge in the bug-branches which are to be tested in the campaign. After the campaign is
- finished the testserver should be reverted to the integration branch.
-
- If a patch is handed off to critical to be installed on the production system, the patch is
- usually also merged into the release branch (so it continues to mirror the production system).
- Then the patch should also be merged into the integration branch for the same reason.
+ This is the <b>test-1459 branch</b>. Mail checking is enabled, but no other changes active in this commit.
</description>
<link>https://wiki.cacert.org/Software/Assessment/testserver/setup#Changes_to_the_release_branch</link>
</item>
diff --git a/stamp/report.php b/stamp/report.php
index 5b11569..519aa3a 100644
--- a/stamp/report.php
+++ b/stamp/report.php
@@ -40,7 +40,7 @@
if($process != "")
{
- $checkemail = checkEmailDummy($email);
+ $checkemail = checkEmail($email);
if($checkemail != "OK")
{
$errmsg = $checkemail;
diff --git a/www/index.php b/www/index.php
index c2e7af0..8c5560c 100644
--- a/www/index.php
+++ b/www/index.php
@@ -426,7 +426,7 @@ if ($oldid == 52 )
if($id == 2)
{
- $checkemail = checkEmailDummy($_SESSION['signup']['email']);
+ $checkemail = checkEmail($_SESSION['signup']['email']);
if($checkemail != "OK")
{
$id = 1;