summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-05-08 00:16:34 +0200
committerBenny Baumann <BenBE@geshi.org>2013-05-08 00:16:34 +0200
commit905a1b07019e3ed6b9d0d1d58b9af6ae64de6545 (patch)
treebe5a73046d0efaa33d6eedc3ea73b3542878805b
parent00606f8ec3347f9fa43352338a03fc1d8f8098f2 (diff)
parent97dea8922675c16548252d63e91d7ad31f5ccad1 (diff)
downloadcacert-devel-905a1b07019e3ed6b9d0d1d58b9af6ae64de6545.tar.gz
cacert-devel-905a1b07019e3ed6b9d0d1d58b9af6ae64de6545.tar.xz
cacert-devel-905a1b07019e3ed6b9d0d1d58b9af6ae64de6545.zip
Merge branch 'bug-28' into testserver-stable
-rw-r--r--includes/account.php2
-rwxr-xr-xscripts/cron/warning.php4
-rw-r--r--www/disputes.php6
3 files changed, 6 insertions, 6 deletions
diff --git a/includes/account.php b/includes/account.php
index 05a0b62..ce4bb28 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -2613,7 +2613,7 @@
printf(_("The password for %s has been updated successfully in the system."), sanitizeHTML($row['email']));
$my_translation = L10n::get_translation();
- L10n::set__recipient_language(intval($_REQUEST['userid']));
+ L10n::set_recipient_language(intval($_REQUEST['userid']));
$body = sprintf(_("Hi %s,"),$row['fname'])."\n\n";
$body .= _("You are receiving this email because a CAcert administrator ".
"has changed the password on your account.")."\n\n";
diff --git a/scripts/cron/warning.php b/scripts/cron/warning.php
index 0d936df..0cffc02 100755
--- a/scripts/cron/warning.php
+++ b/scripts/cron/warning.php
@@ -35,7 +35,7 @@
$res = mysql_query($query);
while($row = mysql_fetch_assoc($res))
{
- L10n::set__recipient_language(intval($row['id']));
+ L10n::set_recipient_language(intval($row['id']));
if($row['subject'] == "")
{
$row['crt_name'] = str_replace("../", "www/", $row['crt_name']);
@@ -108,7 +108,7 @@ echo $row['fname']." ".$row['lname']." <".$row['email']."> (memid: ".$row['memid
$res = mysql_query($query);
while($row = mysql_fetch_assoc($res))
{
- L10n::set__recipient_language(intval($row['memid']));
+ L10n::set_recipient_language(intval($row['memid']));
if($row['subject'] == "")
$row['subject'] = $row['CN'];
diff --git a/www/disputes.php b/www/disputes.php
index 2aa7fe1..88a8525 100644
--- a/www/disputes.php
+++ b/www/disputes.php
@@ -272,7 +272,7 @@
mysql_query($query);
$my_translation = L10n::get_translation();
- L10n::set__recipient_language($oldmemid);
+ 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";
@@ -419,12 +419,12 @@
`oldmemid`='$oldmemid',`created`=NOW(),`hash`='$hash',`id`='$domainid'";
mysql_query($query);
$my_translation = L10n::get_translation();
- L10n::set__recipient_language($oldmemid);
+ 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);
+ L10n::set_recipient_language($my_translation);
sendmail($authaddy, "[CAcert.org] "._("Dispute Probe"), $body, "support@cacert.org", "", "", "CAcert Support");