summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-11-23 15:21:16 +0100
committerBenny Baumann <BenBE@geshi.org>2014-11-23 15:21:16 +0100
commit1cc5257aba1e6ae883caf464eaadf25783d2279d (patch)
treec9274d32c2cdee6af9b7fafab759c3862f3f693f /www
parent0bae20ba9f726c964eaee62a3b41c2da65bb8f0b (diff)
parent0950de5691c8f3e6b3115413e54d4932a2c923c7 (diff)
downloadcacert-devel-1cc5257aba1e6ae883caf464eaadf25783d2279d.tar.gz
cacert-devel-1cc5257aba1e6ae883caf464eaadf25783d2279d.tar.xz
cacert-devel-1cc5257aba1e6ae883caf464eaadf25783d2279d.zip
Merge branch 'bug-28' into release
Conflicts: includes/account.php scripts/cron/warning.php www/disputes.php www/wot.php
Diffstat (limited to 'www')
-rw-r--r--www/disputes.php8
-rw-r--r--www/wot.php1
2 files changed, 8 insertions, 1 deletions
diff --git a/www/disputes.php b/www/disputes.php
index 34a447a..96c7c75 100644
--- a/www/disputes.php
+++ b/www/disputes.php
@@ -18,6 +18,7 @@
<?
require_once("../includes/loggedin.php");
require_once("../includes/notary.inc.php");
+ require_once("../includes/lib/l10n.php");
loadem("account");
@@ -287,11 +288,15 @@
`IP`='".$_SERVER['REMOTE_ADDR']."'";
mysql_query($query);
+ $my_translation = L10n::get_translation();
+ L10n::set_recipient_language($oldmemid);
+
$body = sprintf(_("You have been sent this email as the email address '%s' is being disputed. You have the option to accept or reject this request, after 2 days the request will automatically be discarded. Click the following link to accept or reject the dispute:"), $email)."\n\n";
$body .= "https://".$_SESSION['_config']['normalhostname']."/disputes.php?type=email&emailid=$emailid&hash=$hash\n\n";
$body .= _("Best regards")."\n"._("CAcert.org Support!");
sendmail($email, "[CAcert.org] "._("Dispute Probe"), $body, "support@cacert.org", "", "", "CAcert Support");
+ L10n::set_translation($my_translation);
showheader(_("Email Dispute"));
printf(_("The email address '%s' has been entered into the dispute system, the email address will now be sent an email which will give the recipent the option of accepting or rejecting the request, if after 2 days we haven't received a valid response for or against we will discard the request."), sanitizeHTML($email));
@@ -447,10 +452,13 @@
$query = "insert into `disputedomain` set `domain`='$domain',`memid`='".$_SESSION['profile']['id']."',
`oldmemid`='$oldmemid',`created`=NOW(),`hash`='$hash',`id`='$domainid'";
mysql_query($query);
+ $my_translation = L10n::get_translation();
+ L10n::set_recipient_language($oldmemid);
$body = sprintf(_("You have been sent this email as the domain '%s' is being disputed. You have the option to accept or reject this request, after 2 days the request will automatically be discarded. Click the following link to accept or reject the dispute:"), $domain)."\n\n";
$body .= "https://".$_SESSION['_config']['normalhostname']."/disputes.php?type=domain&domainid=$domainid&hash=$hash\n\n";
$body .= _("Best regards")."\n"._("CAcert.org Support!");
+ L10n::set_recipient_language($my_translation);
sendmail($authaddy, "[CAcert.org] "._("Dispute Probe"), $body, "support@cacert.org", "", "", "CAcert Support");
diff --git a/www/wot.php b/www/wot.php
index e6d180c..35dce1f 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -21,7 +21,6 @@ require_once("../includes/lib/l10n.php");
require_once("../includes/notary.inc.php");
-
function show_page($target,$message,$error)
{
showheader(_("My CAcert.org Account!"));