summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-05-08 00:09:03 +0200
committerBenny Baumann <BenBE@geshi.org>2013-05-08 00:09:03 +0200
commit00606f8ec3347f9fa43352338a03fc1d8f8098f2 (patch)
treeb8e8bd814839f575ef031aeed454872f10c7bd50
parentf39ece18ca6c5736163f22b1da8cd8faac9105ae (diff)
parent06b04cd9e702279c371fd1d3f95fa22e08ffa49e (diff)
downloadcacert-devel-00606f8ec3347f9fa43352338a03fc1d8f8098f2.tar.gz
cacert-devel-00606f8ec3347f9fa43352338a03fc1d8f8098f2.tar.xz
cacert-devel-00606f8ec3347f9fa43352338a03fc1d8f8098f2.zip
Merge branch 'bug-28' into testserver-stable
-rw-r--r--includes/account.php2
-rw-r--r--includes/lib/l10n.php24
-rwxr-xr-xscripts/cron/warning.php4
-rw-r--r--www/disputes.php6
4 files changed, 22 insertions, 14 deletions
diff --git a/includes/account.php b/includes/account.php
index f98f67c..05a0b62 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_translation(get_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/includes/lib/l10n.php b/includes/lib/l10n.php
index 8325f4c..9bb5d52 100644
--- a/includes/lib/l10n.php
+++ b/includes/lib/l10n.php
@@ -340,13 +340,21 @@ class L10n {
bindtextdomain($domain, $_SESSION['_config']['filepath'].'/locale');
textdomain($domain);
}
-}
-function get_recipient_language($accoundid){
-//returns the language of a recipient to make sure that the language is correct
-//use together with
- $query = "select * from `users` where `id`='".$id."'";
- $res = mysql_query($query);
- $row = mysql_fetch_assoc($res);
- return $row['language'];
+ public static function set_recipient_language($accoundid) {
+ //returns the language of a recipient to make sure that the language is correct
+ //use together with
+ $query = "select `language` from `users` where `id`='".intval($accountid)."'";
+ $res = mysql_query($query);
+ if (mysql_num_rows($res)>=0) {
+ $row = mysql_fetch_assoc($res);
+ if ($row['language']==Null || $row['language']=='') {
+ $this->set_translation('en');
+ } else {
+ $this->set_translation($row['language']);
+ }
+ } else {
+ $this->set_translation('en');
+ }
+ }
}
diff --git a/scripts/cron/warning.php b/scripts/cron/warning.php
index e028249..0d936df 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_translation(get_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_translation(get_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 0d399e5..2aa7fe1 100644
--- a/www/disputes.php
+++ b/www/disputes.php
@@ -272,7 +272,7 @@
mysql_query($query);
$my_translation = L10n::get_translation();
- L10n::set_translation(get_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_translation(get_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_translation(get_recipient_language($my_translation));
+ L10n::set__recipient_language($my_translation);
sendmail($authaddy, "[CAcert.org] "._("Dispute Probe"), $body, "support@cacert.org", "", "", "CAcert Support");