summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINOPIAE <inopiae@cacert.org>2014-02-22 21:58:21 +0100
committerINOPIAE <inopiae@cacert.org>2014-02-22 21:58:21 +0100
commit64f46c5e376072f239edd6084e049295c536a6f3 (patch)
tree4788a676ed089bdb5bb5c63b939e5444ef697514
parent051e79ae0d64048b692d4d88b32637d4a8d3e94a (diff)
downloadcacert-devel-64f46c5e376072f239edd6084e049295c536a6f3.tar.gz
cacert-devel-64f46c5e376072f239edd6084e049295c536a6f3.tar.xz
cacert-devel-64f46c5e376072f239edd6084e049295c536a6f3.zip
bug 649: added a dropdown box for the reason why the assurance check is needed.
-rw-r--r--pages/wot/16.php32
-rw-r--r--www/wot.php15
2 files changed, 25 insertions, 22 deletions
diff --git a/pages/wot/16.php b/pages/wot/16.php
index c9a9806..cf88c9a 100644
--- a/pages/wot/16.php
+++ b/pages/wot/16.php
@@ -28,24 +28,6 @@ if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error
}
?>
<? if(array_key_exists('noemailfound',$_SESSION['_config']) && $_SESSION['_config']['noemailfound'] == 1) { ?>
-<!--<form method="post" action="wot.php">
-<input type="hidden" name="email" value="<?=sanitizeHTML($_POST['email'])?>"><br>
-<select name="reminder-lang">
- <?
-//if($_SESSION['_config']['reminder-lang'] == "")
-// $_SESSION['_config']['reminder-lang'] = L10n::get_translation();
-// foreach(L10n::$translations as $key => $val)
-// {
-// echo "<option value='$key'";
-// if($key == $_SESSION['_config']['reminder-lang'])
-// echo " selected";
-// echo ">$val</option>\n";
-// }
- ?>
- </select><br>
-<input type="hidden" name="oldid" value="<?=$id?>">
-<input type="submit" name="reminder" value="<?=_("Send reminder notice")?>">
-</form> -->
<? unset($_SESSION['_config']['noemailfound']); } ?>
<form method="post" action="wot.php" name="form1">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
@@ -61,6 +43,20 @@ if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error
<? } ?>
</tr>
<tr>
+ <td class="DataTD"><?=_('Reason why the assurer status is needed')?>:</td>
+ <td class="DataTD"><select name="reason"><option>--</option>
+ <option><?=_('Assurance')?></option>
+ <option><?=_('Event Preparation')?></option>
+ <option><?=_('Arbitration')?></option>
+ <option><?=_('CARS check')?></option>
+ <option><?=_('CATS certificate creation')?></option>
+ <option><?=_('Organisation Assurance')?></option>
+ </select></td>
+ </tr>
+ <tr>
+ <td class="DataTD" colspan="2"><?=_('If you request the assurer status the result is send to yourself as well as to the person of whom you request the status of.')?></td>
+ </tr>
+ <tr>
<td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>"></td>
</tr>
</table>
diff --git a/www/wot.php b/www/wot.php
index e6efc46..8085749 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -575,11 +575,16 @@ $iecho= "c";
$oldid=0;
$id = 0;
$email = trim(mysql_real_escape_string($_REQUEST['email']));
+ $reason = trim(mysql_real_escape_string($_REQUEST['reason']));
$uid = get_user_id_from_mail($email);
if ($uid == 0) {
show_page("AssurerCheck","",_("I'm sorry, there was no email matching what you entered in the system. Please double check your information."));
exit;
}
+ if ($reason == "--") {
+ show_page("AssurerCheck","",_("I'm sorry, there was no reason given why you need to check the assurer status."));
+ exit;
+ }
if (is_assurer($uid)) {
$status = _('Is assurer');
} else {
@@ -593,10 +598,11 @@ $iecho= "c";
$subject = "[CAcert.org] ".sprintf(_("Assurer status report for you"));
$body = sprintf(_("Hi %s,"), $assurer['fname'])."\n\n";
- $body .= sprintf(_("%s %s (%s) has requested your assurer status."),
+ $body .= sprintf(_("%s %s (%s) has requested your assurer status for %s."),
$_SESSION['profile']['fname'],
$_SESSION['profile']['lname'],
- $_SESSION['profile']['email'])."\n\n";
+ $_SESSION['profile']['email'],
+ $reason)."\n\n";
$body .= sprintf(_("The transmitted result: %s"), $status)."\n";
$body .= _("Best regards")."\n";
$body .= _("CAcert Support Team");
@@ -613,10 +619,11 @@ $iecho= "c";
$subject = "[CAcert.org] ".sprintf(_("Assurer status report that you requested"));
$body = sprintf(_("Hi %s,"), $_SESSION['profile']['fname'])."\n\n";
- $body .= sprintf(_("you requested the assurer status of %s %s (%s)."),
+ $body .= sprintf(_("you requested the assurer status of %s %s (%s) for %s."),
$assurer['fname'],
$assurer['lname'],
- $assurer['email'])."\n\n";
+ $assurer['email'],
+ $reason)."\n\n";
$body .= sprintf(_("The transmitted result: %s"), $status)."\n";
$body .= _("Best regards")."\n";
$body .= _("CAcert Support Team");