From 3d6c4ebbebd10e6ab6c2e952b07a6eea2f0a5626 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 5 Jul 2011 23:39:53 +0200 Subject: bug-948 removed two more ' ' ... hopefully we now found all occurences --- CommModule/client.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CommModule') diff --git a/CommModule/client.pl b/CommModule/client.pl index 7b417d1..4e09c46 100755 --- a/CommModule/client.pl +++ b/CommModule/client.pl @@ -670,13 +670,13 @@ sub sendmail($$$$$$$) SysLog "SMTP: ".<$smtp>; print $smtp "HELO hlin.cacert.org\r\n"; SysLog "SMTP: ".<$smtp>; - print $smtp "MAIL FROM: \r\n"; + print $smtp "MAIL FROM:\r\n"; SysLog "MAIL FROM: ".<$smtp>; @bits = split(",", $to); foreach my $user (@bits) { - print $smtp "RCPT TO: <".trim($user).">\r\n"; + print $smtp "RCPT TO:<".trim($user).">\r\n"; SysLog "RCPT TO: ".<$smtp>; } print $smtp "DATA\r\n"; -- cgit v1.2.1 From a8ae57cb93783b7a786a821d484cd106820f8517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Tue, 19 Jul 2011 23:23:56 +0200 Subject: bug 911: Fix the regex to parse the output from gpg, sigclass seems to be a hexadecimal number in newer versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- CommModule/client.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CommModule') diff --git a/CommModule/client.pl b/CommModule/client.pl index 7b417d1..690d947 100755 --- a/CommModule/client.pl +++ b/CommModule/client.pl @@ -540,7 +540,7 @@ sub OpenPGPextractExpiryDate ($) print OUT $_; unless ($r) { - if ( /^\s*version \d+, created (\d+), md5len 0, sigclass \d+\s*$/ ) + if ( /^\s*version \d+, created (\d+), md5len 0, sigclass (?:0x[0-9a-fA-F]+|\d+)\s*$/ ) { SysLog "Detected CTS: $1\n"; $cts = int($1); -- cgit v1.2.1 From 248be6ffcdbc6de89208e685361c7437c27f4f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Tue, 27 Sep 2011 23:53:15 +0200 Subject: bug 985: Remove special non-ASCII character from msgid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- CommModule/client.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CommModule') diff --git a/CommModule/client.pl b/CommModule/client.pl index 323ee27..44be6f2 100755 --- a/CommModule/client.pl +++ b/CommModule/client.pl @@ -887,7 +887,7 @@ sub HandleCerts($$) my $body = _("Hi")." $user{fname},\n\n"; $body .= sprintf(_("You can collect your certificate for %s by going to the following location:")."\n\n", $row{'email'}.$row{'CN'}); $body .= "https://www.cacert.org/account.php?id=".($server?"15":"6")."&cert=$row{id}\n\n"; - $body .= _("If you have not imported CAcert´s root certificate, please go to:")."\n"; + $body .= _("If you have not imported CAcert's root certificate, please go to:")."\n"; $body .= "https://www.cacert.org/index.php?id=3\n"; $body .= "Root cert fingerprint = A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B\n"; $body .= "Root cert fingerprint = 135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33\n\n"; -- cgit v1.2.1 From 883ea6270b45e2d712a71d8361fb4a4daffb12a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Sun, 16 Oct 2011 22:47:02 +0200 Subject: bug 985: move binding to a gettext domain into a separate method and update some more legacy language handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit removed screenshot() as it's never used and language dependent still open: translation in PDFs Signed-off-by: Michael Tänzer --- CommModule/client.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CommModule') diff --git a/CommModule/client.pl b/CommModule/client.pl index 44be6f2..bf92b27 100755 --- a/CommModule/client.pl +++ b/CommModule/client.pl @@ -595,7 +595,7 @@ sub OpenPGPextractExpiryDate ($) # Sets the locale according to the users preferred language sub setUsersLanguage($) { - my $lang="de_DE"; + my $lang="en_US"; print "Searching for the language of the user $_[0]\n"; my @a=$dbh->selectrow_array("select language from users where id='".int($_[0])."'"); $lang = $1 if($a[0]=~m/(\w+_[\w.@]+)/); -- cgit v1.2.1