bug fixes + translation updates + new translations

includes/general.php

@@ -36,7 +36,8 @@
 	$_SESSION['_config']['translations'] = array("da_DK" => "Dansk", "de_DE" => "Deutsch", "en_AU" => "English",
 				"es_ES" => "Español", "fr_FR" => "Français", "it_IT" => "Italiano",
 				"hu_HU" => "Magyar", "nl_NL" => "Nederlands", "pt_PT" => "Português",
-				"pt_BR" => "Português Brasileiro", "zh_CN" => "Chinese");
+				"pt_BR" => "Português Brasileiro", "sv_SE" => "Svenska",
+				"tr_TR" => "Türkçe", "zh_CN" => "Chinese");
 
 	if($_SESSION['_config']['language'] == "")
 	{
@@ -276,14 +277,15 @@
 				}
 			}
 
-			if($_SESSION['_config']['row'] == "")
+			if($_SESSION['_config']['row'] != "")
+				$rows[] = $CN;
+		}
+		if(count($rows) <= 0)
 		{
 			showheader(_("My CAcert.org Account!"));
-				printf(_("Unable to match '%s' against any domain validated against your account."), $CN);
+			echo _("There were no valid CommonName fields on the CSR, or I was unable to match any of these against your account. Please review your CSR, or add and verify domains contained in it to your account before trying again.");
 			showfooter();
 			exit;
-			} else
-				$rows[] = $CN;
 		}
 		$_SESSION['_config']['rows'] = $rows;
 		$_SESSION['_config']['rowid'] = $rowid;
@@ -295,12 +297,7 @@
 		{
 			$subalt = $_SESSION['_config']["$altc.subjectAltName"];
 			if(substr($subalt, 0, 4) != "DNS:")
-			{
+				continue;
-				showheader(_("My CAcert.org Account!"));
-				printf(_("Malformed subjectAltName '%s', must be in form DNS:my.isp.com or DNS:*.isp.com"), $subalt);
-				showfooter();
-				exit;
-			}
 
 			$alt = substr($subalt, 4);
 			$bits = explode(".", $alt);
@@ -322,13 +319,7 @@
 				}
 			}
 
-			if($_SESSION['_config']['altrow'] == "")
+			if($_SESSION['_config']['altrow'] != "")
-			{
-				showheader(_("My CAcert.org Account!"));
-				printf(_("Malformed subjectAltName, must be in form DNS:my.isp.com or DNS:*.isp.com OR '%s' can't be matched to any current domain validated against your account."), $alt);
-				showfooter();
-				exit;
-			} else
 				$altrows[] = $subalt;
 		}
 		$_SESSION['_config']['altrows'] = $altrows;
@@ -363,14 +354,15 @@
 				}
 			}
 
-			if($_SESSION['_config']['row'] == "")
+			if($_SESSION['_config']['row'] != "")
+				$rows[] = $CN;
+		}
+		if(count($rows) <= 0)
 		{
 			showheader(_("My CAcert.org Account!"));
-				printf(_("Unable to match '%s' against any domain validated against your account."), $CN);
+			echo _("There were no valid CommonName fields on the CSR, or I was unable to match any of these against your account. Please review your CSR, or add and verify domains contained in it to your account before trying again.");
 			showfooter();
 			exit;
-			} else
-				$rows[] = $CN;
 		}
 		$_SESSION['_config']['rows'] = $rows;
 		$_SESSION['_config']['rowid'] = $rowid;
@@ -382,12 +374,7 @@
 		{
 			$subalt = $_SESSION['_config']["$altc.subjectAltName"];
 			if(substr($subalt, 0, 4) != "DNS:")
-			{
+				continue;
-				showheader(_("My CAcert.org Account!"));
-				printf(_("Malformed subjectAltName '%s', must be in form DNS:my.isp.com or DNS:*.isp.com"), $subalt);
-				showfooter();
-				exit;
-			}
 
 			$alt = substr($subalt, 4);
 			$bits = explode(".", $alt);
@@ -413,13 +400,7 @@
 				}
 			}
 
-			if($_SESSION['_config']['altrow'] == "")
+			if($_SESSION['_config']['altrow'] != "")
-			{
-				showheader(_("My CAcert.org Account!"));
-				printf(_("Malformed subjectAltName, must be in form DNS:my.isp.com or DNS:*.isp.com OR '%s' can't be matched to any current domain validated against your account."), $alt);
-				showfooter();
-				exit;
-			} else
 				$altrows[] = $subalt;
 		}
 		$_SESSION['_config']['altrows'] = $altrows;

pages/gpg/0.php

@@ -27,3 +27,4 @@
 <input type="submit" name="process" value="<?=_("Submit")?>">
 <input type="hidden" name="oldid" value="<?=$id?>">
 </form>
+<p><?=_("Please Note: To receive a high trust GPG signature you need at least 100 assurance points.")?>

pages/help/0.php

@@ -9,5 +9,5 @@
 <li><a href='logos.php'><?=_("How do I get a secured by CAcert emblem on my site?")?></a></li>
 <li><a href='help.php?id=6'><?=_("How do I get a Server certificate from CAcert?")?></a></li>
 <li><a href='help.php?id=7'><?=_("How does CAcert Protect it's root private key?")?></a></li>
-<li><a href='http://202.87.16.200/wiki/'><?=_("Unofficial FAQ/Wiki")?></a></li>
+<li><a href='http://wiki.cacert.org'><?=_("Unofficial FAQ/Wiki")?></a></li>
 </ul>

pages/wot/6.php

@@ -15,7 +15,7 @@
 <?
 	$row = $_SESSION['_config']['notarise'];
 
-	$methods = array("Face to Face Meeting", "Trusted 3rd Parties", "Thawte Points Transfer", "Administrative Increase");
+	$methods = array("Face to Face Meeting", "Trusted 3rd Parties", "Thawte Points Transfer", "Administrative Increase", "CT Magazine - Germany");
 ?>
 <? if($_SESSION['_config']['error'] != "") { ?><div color="orange">ERROR: <?=$_SESSION['_config']['error']?></div><? unset($_SESSION['_config']['error']); } ?>
 <form method="post" action="wot.php">

scripts/gpgcerts.php

@@ -49,14 +49,17 @@
 			putenv("LANG=en_AU");
 			setlocale(LC_ALL, "en_AU");
 		}
-		if(filesize($row[crt]) > 0)
+		if(filesize($row['crt']) > 0)
 		{
 			$query = "update `gpg` set `crt`='$row[crt]', `issued`=NOW(), `expire`=FROM_UNIXTIME(UNIX_TIMESTAMP(NOW()) + 31536000) where `id`='".$row['id']."'";
 			mysql_query($query);
 			$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']);
+			$body .= sprintf(_("Your CAcert signed key for %s is available online at:")."\n\n", $row['email']);
 			$body .= "https://www.cacert.org/gpg.php?id=3&cert=$row[id]\n\n";
-			$body .= _("Best regards")."\n"._("CAcert.org Support!");
+			$body .= _("To help improve the trust of CAcert in general, it's appreciated if you could also sign our key and upload it to a key server. Below is a copy of our primary key details:")."\n\n";
+			$body .= "pub 1024D/65D0FD58 2003-07-11 CA Cert Signing Authority (Root CA) <gpg@cacert.org>\n";
+			$body .= "Key fingerprint = A31D 4F81 EF4E BD07 B456 FA04 D2BB 0D01 65D0 FD58\n\n";
+			$body .= _("Best regards")."\n"._("CAcert.org Support!")."\n\n";
 			mail($user[email], "[CAcert.org] Your GPG/PGP Key", $body, "From: CAcert-Support <duane@cacert.org>");
 		} else {
 			$query = "delete from `gpg` where `id`='".$row['id']."'";