CAcert Code Development list.

[Benny Baumann <benbe AT cacert.org>]

Hi folks,

We have some fixes for:
- https://bugs.cacert.org/view.php?id=1280
  "WOT: Contact Assurer form does not print preferred language"
- https://bugs.cacert.org/view.php?id=1281
  "Internal Error on training page"
- https://bugs.cacert.org/view.php?id=1283
  "WoT Contact form shows additional locales double-HTML-encoded"
- https://bugs.cacert.org/view.php?id=1226
  "add DoB to selection of assuree"

The fixes were reviewed by me (BenBE), Dirk Astrath (dastrath) and
Michael Tänzer (NEOatNHNG).

The fixes were tested by Eva Stöwe (katzazi), Felix Dörre (felixd),
Marcus Mängel (INOPIAE), Mario Lipinski (law) and Martin Gummi (magu).

I want to thank Felix Dörre and Eva Stöwe for providing the foundation
for some of these patches.

Find the patches attached to this mail.

Please run the scripts to update the translations on the server.

Furthermore update the bugtracker to reflect the recent updates.

Regards,
Benny Baumann
CAcert SoftWare Assessment Team

P.S.: Please note the update of my keys which can be found in the CAcert
Wiki at https://wiki.cacert.org/Community/HomePagesMembers/BenBE
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index b568ccb..f15e09e 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -1055,7 +1055,7 @@ function get_user_agreements($memid, $type=null, $active=null){
 <?
 		} else {
 ?>
-	<input type="hidden" name="<?=$val?>" value="<?=$methods[0]?>" />
+	<input type="hidden" name="method" value="<?=$methods[0]?>" />
 <?
 		}
 	}
diff --git a/pages/wot/5.php b/pages/wot/5.php
index c1a6438..565dd6a 100644
--- a/pages/wot/5.php
+++ b/pages/wot/5.php
@@ -18,14 +18,24 @@
 	include_once("../includes/shutdown.php");
 	require_once("../includes/lib/l10n.php");
 ?>
-<? 
-  if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") 
+<?
+  if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "")
   {
     ?><font color="orange" size="+1">
       <? echo _("ERROR").": ".$_SESSION['_config']['error'] ?>
     </font>
     <?unset($_SESSION['_config']['error']);
-  } 
+  }
+
+  if (!isset($_SESSION['assuresomeone']['year'])) {
+      $_SESSION['assuresomeone']['year'] = 0;
+  }
+  if (!isset($_SESSION['assuresomeone']['month'])) {
+      $_SESSION['assuresomeone']['month'] = 0;
+  }
+  if (!isset($_SESSION['assuresomeone']['day'])) {
+      $_SESSION['assuresomeone']['day'] = 0;
+  }
 ?>
 <? if(array_key_exists('noemailfound',$_SESSION['_config']) && $_SESSION['_config']['noemailfound'] == 1) { ?>
 <form method="post" action="wot.php">
@@ -60,6 +70,37 @@
     <td class="DataTD"><input type="text" name="email" id="email" value="<?=array_key_exists('email',$_POST)?sanitizeHTML($_POST['email']):""?>"></td>
 <? } ?>
   </tr>
+    <tr>
+    <td class="DataTD">
+        <?=_("Date of Birth")?><br/>
+        (<?=_("yyyy/mm/dd")?>)</td>
+    <td class="DataTD">
+        <input type="text" name="year" value="<?=array_key_exists('year',$_SESSION['assuresomeone']) && intval($_SESSION['assuresomeone']['year']) >= 1900 ? intval($_SESSION['assuresomeone']['year']):''?>" size="4" autocomplete="off"></nobr>
+        <select name="month">
+<?
+for($i = 1; $i <= 12; $i++)
+{
+    echo "<option value='$i'";
+    if(array_key_exists('month',$_SESSION['assuresomeone']) && intval($_SESSION['assuresomeone']['month']) === $i)
+        echo " selected=\"selected\"";
+    echo ">".ucwords(strftime("%B", mktime(0,0,0,$i,1,date("Y"))))." ($i)</option>\n";
+}
+?>
+        </select>
+        <select name="day">
+<?
+for($i = 1; $i <= 31; $i++)
+{
+    echo "<option";
+    if(array_key_exists('day',$_SESSION['assuresomeone']) && intval($_SESSION['assuresomeone']['day']) === $i)
+        echo " selected=\"selected\"";
+    echo ">$i</option>";
+}
+?>
+        </select>
+    </td>
+  </tr>
+
   <tr>
     <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>"></td>
   </tr>
diff --git a/pages/wot/6.php b/pages/wot/6.php
index a565aa7..200a526 100644
--- a/pages/wot/6.php
+++ b/pages/wot/6.php
@@ -24,6 +24,9 @@
 	}
 
 	$row = $_SESSION['_config']['notarise'];
+	$_SESSION['assuresomeone']['year'] = 0;
+	$_SESSION['assuresomeone']['month'] = 0;
+	$_SESSION['assuresomeone']['day'] = 0;
 
 	if($_SESSION['profile']['ttpadmin'] == 1)
 //		$methods = array("Face to Face Meeting", "Trusted 3rd Parties", "TopUP");
diff --git a/www/wot.php b/www/wot.php
index faa8339..89b0aac 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -198,6 +198,17 @@ function send_reminder()
 				show_page("EnterEmail","",_("User is not yet verified. Please try again in 24 hours!"));
 				exit;
 			}
+			if ($_SESSION['profile']['ttpadmin'] != 1) {
+				$_SESSION['assuresomeone']['year'] = intval($_POST['year']);
+				$_SESSION['assuresomeone']['month'] = intval($_POST['month']);
+				$_SESSION['assuresomeone']['day'] = intval($_POST['day']);
+				$dob = sprintf('%04d-%02d-%02d', $_SESSION['assuresomeone']['year'], $_SESSION['assuresomeone']['month'], $_SESSION['assuresomeone']['day']);
+
+				if (	$_SESSION['_config']['notarise']['dob'] != $dob) {
+					show_page("EnterEmail","",_("The data entered is not matching with an account."));
+					exit;
+				}
+			}
 		}
 		$query = "select * from `users` where `email`='".mysql_escape_string(stripslashes($_POST['email']))."' and `locked`=1";
 		$res = mysql_query($query);
@@ -236,7 +247,7 @@ function send_reminder()
 
 	if($oldid == 6)
 	{
-$iecho= "c";
+		$iecho= "c";
 		//date checks
 		if(trim($_REQUEST['date']) == '')
 		{
@@ -443,35 +454,7 @@ $iecho= "c";
 
 		sendmail($_SESSION['profile']['email'], "[CAcert.org] "._("You've Assured Another Member."), $body, "support AT cacert.org", "", "", "CAcert Support");
 
-		showheader(_("My CAcert.org Account!"));
-		echo "<p>"._("Shortly you and the person you were assuring will receive an email confirmation. There is no action on your behalf required to complete this.")."</p>";
-?><form method="post" action="wot.php">
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
-	<tr>
-		<td colspan="2" class="title"><?=_("Assure Someone")?></td>
-	</tr>
-	<tr>
-		<td class="DataTD"><?=_("Email")?>:</td>
-		<td class="DataTD"><input type="text" name="email" id="email" value=""></td>
-	</tr>
-	<tr>
-		<td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>"></td>
-	</tr>
-</table>
-<input type="hidden" name="oldid" value="5">
-</form>
-<SCRIPT LANGUAGE="JavaScript">
-//<![CDATA[
-	function my_init()
-	{
-		document.getElementById("email").focus();
-	}
-
-	window.onload = my_init();
-//]]>
-</script>
-<?
-		showfooter();
+		show_page('EnterEmail', _("Shortly you and the person you were assuring will receive an email confirmation. There is no action on your behalf required to complete this."));
 		exit;
 	}
 

diff --git a/includes/lib/l10n.php b/includes/lib/l10n.php
index 85b7aff..e325add 100644
--- a/includes/lib/l10n.php
+++ b/includes/lib/l10n.php
@@ -22,10 +22,10 @@
 class L10n {
 	/**
 	 * These are tranlations we currently support.
-	 * 
+	 *
 	 * If another translation is added, it doesn't suffice to have gettext set
 	 * up, you also need to add it here, because it acts as a white list.
-	 * 
+	 *
 	 * @var array("ISO-language code" => "native name of the language")
 	 */
 	public static $translations = array(
@@ -53,15 +53,15 @@ class L10n {
 				"zh-cn" => "&#x4e2d;&#x6587;(&#x7b80;&#x4f53;)",
 				"zh-tw" => "&#x4e2d;&#x6587;(&#33274;&#28771;)",
 			);
-	
+
 	/**
 	 * setlocale needs a language + region code for whatever reason so here's
 	 * the mapping from a translation code to locales with the region that
 	 * seemed the most common for this language
-	 * 
+	 *
 	 * You probably never need this. Use {@link set_translation()} to change the
 	 * language instead of manually calling setlocale().
-	 * 
+	 *
 	 * @var array(string => string)
 	 */
 	private static $locales = array(
@@ -101,11 +101,11 @@ class L10n {
 				"zh-cn" => "zh_CN",
 				"zh-tw" => "zh_TW",
 			);
-	
+
 	/**
 	 * Auto-detects the language that should be used and sets it. Only works for
 	 * HTTP, not in a command line script.
-	 * 
+	 *
 	 * Priority:
 	 * <ol>
 	 * 	<li>explicit parameter "lang" passed in HTTP (e.g. via GET)</li>
@@ -128,10 +128,10 @@ class L10n {
 				return;
 			}
 		}
-		
-		
+
+
 		$languages = array();
-		
+
 		// parse Accept-Language header
 		if (array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) {
 			$bits = explode(",", strtolower(
@@ -144,29 +144,29 @@ class L10n {
 					$c = floatval(substr($b[1], 2));
 				else
 					$c = 1;
-				
+
 				if ($c != 0)
 				{
 					$languages[trim($b[0])] = $c;
 				}
 			}
 		}
-		
+
 		// check if there is an explicit language given as parameter
 		if(array_key_exists("lang",$_REQUEST) && trim($_REQUEST["lang"]) != "")
 		{
 			// higher priority than those values in the header
 			$languages[strtolower(trim($_REQUEST["lang"]))] = 2.0;
 		}
-		
+
 		arsort($languages, SORT_NUMERIC);
-		
+
 		// this is used to be compatible with browsers like internet
 		// explorer which only provide the language code including the
 		// region not without. Also handles the fallback to English (qvalues
 		// may only have three digits after the .)
 		$fallbacks = array("en" => 0.0005);
-		
+
 		foreach($languages as $lang => $qvalue)
 		{
 			// ignore any non-conforming values (that's why we don't need to
@@ -179,7 +179,7 @@ class L10n {
 			}
 			$lang_prefix = $matches[1]; // usually two-letter language code
 			$fallbacks[$lang_prefix] = $qvalue;
-			
+
 			$chosen_translation = "";
 			if ($lang === '*') {
 				// According to the standard '*' matches anything but any
@@ -202,7 +202,7 @@ class L10n {
 					}
 				}
 			}
-			
+
 			if ($chosen_translation !== "")
 			{
 				if (self::set_translation($chosen_translation)) {
@@ -210,7 +210,7 @@ class L10n {
 				}
 			}
 		}
-		
+
 		// No translation found yet => try the prefixes
 		arsort($fallbacks, SORT_NUMERIC);
 		foreach ($fallbacks as $lang => $qvalue) {
@@ -218,16 +218,47 @@ class L10n {
 				return;
 			}
 		}
-		
+
 		// should not get here, as the fallback of "en" is provided and that
 		// should always work => log an error
 		trigger_error("L10n::detect_language(): could not set language",
 		        E_USER_WARNING);
 	}
-	
+
+	/**
+	 * Normalise the translation code (e.g. from the old codes to the new)
+	 *
+	 * @return string
+	 * 		a translation code or the empty string if it can't be normalised
+	 */
+	public static function normalise_translation($translation_code) {
+		// check $translation_code against whitelist
+		if (array_key_exists($translation_code, self::$translations) ) {
+			return $translation_code;
+		}
+
+		// maybe it's a locale as previously used in the system? e.g. en_AU
+		if (preg_match('/^([a-z][a-z])_([A-Z][A-Z])$/', $translation_code, $matches) !== 1) {
+			return '';
+		}
+
+		$lang_code = $matches[1];
+		$region_code = strtolower($matches[2]);
+
+		if (array_key_exists("${lang_code}-${region_code}", self::$translations)) {
+			return "${lang_code}-${region_code}";
+		}
+
+		if (array_key_exists($lang_code, self::$translations)) {
+			return $lang_code;
+		}
+
+		return '';
+	}
+
 	/**
 	 * Get the set translation
-	 * 
+	 *
 	 * @return string
 	 * 		a translation code or the empty string if not set
 	 */
@@ -238,13 +269,13 @@ class L10n {
 			return "";
 		}
 	}
-	
+
 	/**
 	 * Set the translation to use.
-	 * 
+	 *
 	 * @param string $translation_code
 	 * 		the translation code as specified in the keys of {@link $translations}
-	 * 
+	 *
 	 * @return bool
 	 * 		<ul>
 	 * 		<li>true if the translation has been set successfully</li>
@@ -255,27 +286,11 @@ class L10n {
 	 * 		</ul>
 	 */
 	public static function set_translation($translation_code) {
-		// check $translation_code against whitelist
-		if ( !array_key_exists($translation_code, self::$translations) ) {
-			// maybe it's a locale as previously used in the system? e.g. en_AU
-			if ( preg_match('/^([a-z][a-z])_([A-Z][A-Z])$/', $translation_code,
-			                    $matches) !== 1 ) {
-				return false;
-			}
-			
-			$lang_code = $matches[1];
-			$region_code = strtolower($matches[2]);
-			
-			if ( array_key_exists("${lang_code}-${region_code}",
-			                          self::$translations) ) {
-				$translation_code = "${lang_code}-${region_code}";
-			} elseif ( array_key_exists($lang_code, self::$translations) ) {
-				$translation_code = $lang_code;
-			} else {
-				return false;
-			}
+		$translation_code = self::normalise_translation($translation_code);
+		if (empty($translation_code)) {
+			return false;
 		}
-		
+
 		// map translation to locale
 		if ( !array_key_exists($translation_code, self::$locales) ) {
 			// weird. maybe you added a translation but haven't added a
@@ -285,7 +300,7 @@ class L10n {
 			return false;
 		}
 		$locale = self::$locales[$translation_code];
-		
+
 		// set up locale
 		if ( !putenv("LANG=$locale") ) {
 			trigger_error("L10n::set_translation(): could not set the ".
@@ -297,42 +312,42 @@ class L10n {
 				"LC_ALL to $locale", E_USER_WARNING);
 			return false;
 		}
-		
-		
+
+
 		// only set if we're running in a server not in a script
 		if (isset($_SESSION)) {
 			// save the setting
 			$_SESSION['_config']['language'] = $translation_code;
-			
-			
+
+
 			// Set up the recode settings needed e.g. in PDF creation
 			$_SESSION['_config']['recode'] = "html..latin-1";
-			
+
 			if($translation_code === "zh-cn" || $translation_code === "zh-tw")
 			{
 				$_SESSION['_config']['recode'] = "html..gb2312";
-				
+
 			} else if($translation_code === "pl" || $translation_code === "hu") {
 				$_SESSION['_config']['recode'] = "html..ISO-8859-2";
-				
+
 			} else if($translation_code === "ja") {
 				$_SESSION['_config']['recode'] = "html..SHIFT-JIS";
-				
+
 			} else if($translation_code === "ru") {
 				$_SESSION['_config']['recode'] = "html..ISO-8859-5";
-				
+
 			} else if($translation_code == "lt") { // legacy, keep for reference
 				$_SESSION['_config']['recode'] = "html..ISO-8859-13";
-				
+
 			}
 		}
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * Sets up the text domain used by gettext
-	 * 
+	 *
 	 * @param string $domain
 	 * 		the gettext domain that should be used, defaults to "messages"
 	 */
diff --git a/pages/wot/9.php b/pages/wot/9.php
index a8b9413..a04793f 100644
--- a/pages/wot/9.php
+++ b/pages/wot/9.php
@@ -26,7 +26,7 @@
 	} else {
 
 		$user = mysql_fetch_array($res);
-		$userlang = $user['language'];
+		$userlang = L10n::normalise_translation($user['language']);
 		$points = mysql_num_rows(mysql_query("select sum(`points`) as `total` from `notary`
 				where `to`='".intval($user['id'])."' and `deleted`=0 group by `to` HAVING SUM(`points`) > 0"));
 		if($points <= 0) {

diff --git a/pages/account/55.php b/pages/account/55.php
index 6793a71..24cc86d 100644
--- a/pages/account/55.php
+++ b/pages/account/55.php
@@ -1,113 +1,122 @@
-<? /*
-    LibreSSL - CAcert web application
-    Copyright (C) 2004-2008  CAcert Inc.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; version 2 of the License.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/ ?>
-<?
-  if ($_SESSION['profile']['admin'] != 1 || !array_key_exists('userid',$_REQUEST) || intval($_REQUEST['userid']) < 1) {
-    $user_id = intval($_SESSION['profile']['id']);
-?>
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
-  <tr>
-    <td colspan="5" class="title"><?=_("Your passed Tests")?></td>
-  </tr>
-  <tr>
-    <td class="DataTD"><?=_("The list of tests you did pass at").' <a href="https://cats.cacert.org/";>https://cats.cacert.org/</a>'?></td>
-  </tr>
-</table>
-<?
-  } else {
-    $user_id = intval($_REQUEST['userid']);
-    $query = "select * from `users` where `id`='$user_id' and `users`.`deleted`=0";
-    $res = mysql_query($query);
-    if(mysql_num_rows($res) <= 0)
-    {
-      echo _("I'm sorry, the user you were looking for seems to have disappeared! Bad things are afoot!");
-    } else {
-      $row = mysql_fetch_assoc($res);
-    }
-?>
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
-  <tr>
-    <td colspan="5" class="title"><?=_("Passed Tests of")." ".sanitizeHTML($row['fname'])." ".sanitizeHTML($row['mname'])." ".sanitizeHTML($row['lname'])?></td>
-  </tr>
-</table>
-
-<?
-  }
-?>
-<br>
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
-  <tr>
-    <td class="DataTD"><b><?=_("Date")?></b></td>
-    <td class="DataTD"><b><?=_("Test")?></b></td>
-    <td class="DataTD"><b><?=_("Variant")?></b></td>
-  </tr>
-<?
-        $query = "SELECT `CP`.`pass_date`, `CT`.`type_text`, `CV`.`test_text` ".
-                 " FROM `cats_passed` AS CP, `cats_variant` AS CV, `cats_type` AS CT ".
-                 " WHERE `CP`.`variant_id`=`CV`.`id` AND `CV`.`type_id`=`CT`.`id` AND `CP`.`user_id` ='".intval($user_id)."'".
-                 " ORDER BY `CP`.`pass_date`";
-
-        $res = mysql_query($query);
-
-        $HaveTest=0;
-        while($row = mysql_fetch_array($res, MYSQL_NUM))
-        {
-          if ($row[1] == "Assurer Challenge") {
-            $HaveTest=1;
-          }
-?>
-  <tr>
-    <td class="DataTD"><?=sanitizeHTML($row[0])?></td>
-    <td class="DataTD"><?=sanitizeHTML($row[1])?></td>
-    <td class="DataTD"><?=sanitizeHTML($row[2])?></td>
-  </tr>
-<?      }
-?>
-</table>
-<br>
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
-  <tr>
-<?
-      if ($_SESSION['profile']['admin'] == 1 && array_key_exists('userid',$_REQUEST) && intval($_REQUEST['userid']) > 0) {
-?>
-    <tr><td colspan="3" class="DataTD"><a href="account.php?id=43&amp;userid=<?=intval($user_id)?>">back</a></td></tr>
-<?
-    } else {
-        $query = 'SELECT `u`.id, `u`.`assurer`, SUM(`points`) FROM `users` AS `u`, `notary` AS `n` '.
-                 '  WHERE `u`.`id` = \''.(int)intval($_SESSION['profile']['id']).'\' AND `n`.`to` = `u`.`id` AND `expire` < now() and  and `n`.`deleted` = 0'.
-                 '  GROUP BY `u`.id, `u`.`assurer`';
-        $res = mysql_query($query);
-        if (!$res) {
-          print '<td colspan="3" class="DataTD">'._('Internal Error').'</td>'."\n";
-        } else {
-          $row = mysql_fetch_array($res, MYSQL_NUM);
-          if ($HaveTest && ($row[2]>=100)) {
-            if (!$row[1]) {
-              // This should not happen...
-              fix_assurer_flag($_SESSION['profile']['id']);
-            }
-?>  <td colspan="3" class="DataTD"><?=_("You have passed the Assurer Challenge and collected at least 100 Assurance Points, you are an Assurer.")?></td>
-<?        } elseif (($row[2]>=100) && !$HaveTest) {
-?>  <td colspan="3" class="DataTD"><?=_("You have at least 100 Assurance Points, if you want to become an assurer try the ").'<a href="https://cats.cacert.org";>'._("Assurer Challenge").'</a>!'?></td>
-<?        } elseif ($HaveTest && ($row[2]<100)) {
-?>  <td colspan="3" class="DataTD"><?=_("You have passed the Assurer Challenge, but to become an Assurer you still have to reach 100 Assurance Points!")?></td>
-<?        }
-        }
-      }
-?>  </tr>
-</table>
-
+<? /*
+    LibreSSL - CAcert web application
+    Copyright (C) 2004-2008  CAcert Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/ ?>
+<?
+  if ($_SESSION['profile']['admin'] != 1 || !array_key_exists('userid',$_REQUEST) || intval($_REQUEST['userid']) < 1) {
+    $user_id = intval($_SESSION['profile']['id']);
+?>
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr>
+    <td colspan="5" class="title"><?=_("Your passed Tests")?></td>
+  </tr>
+  <tr>
+    <td class="DataTD"><?=_("The list of tests you did pass at").' <a href="https://cats.cacert.org/";>https://cats.cacert.org/</a>'?></td>
+  </tr>
+</table>
+<?
+  } else {
+    $user_id = intval($_REQUEST['userid']);
+    $query = "select * from `users` where `id`='$user_id' and `users`.`deleted`=0";
+    $res = mysql_query($query);
+    if(mysql_num_rows($res) <= 0)
+    {
+      echo _("I'm sorry, the user you were looking for seems to have disappeared! Bad things are afoot!");
+    } else {
+      $row = mysql_fetch_assoc($res);
+    }
+?>
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr>
+    <td colspan="5" class="title"><?=_("Passed Tests of")." ".sanitizeHTML($row['fname'])." ".sanitizeHTML($row['mname'])." ".sanitizeHTML($row['lname'])?></td>
+  </tr>
+</table>
+
+<?
+  }
+?>
+<br>
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr>
+    <td class="DataTD"><b><?=_("Date")?></b></td>
+    <td class="DataTD"><b><?=_("Test")?></b></td>
+    <td class="DataTD"><b><?=_("Variant")?></b></td>
+  </tr>
+<?
+        $query = "SELECT `CP`.`pass_date`, `CT`.`type_text`, `CV`.`test_text` ".
+                 " FROM `cats_passed` AS CP, `cats_variant` AS CV, `cats_type` AS CT ".
+                 " WHERE `CP`.`variant_id`=`CV`.`id` AND `CV`.`type_id`=`CT`.`id` AND `CP`.`user_id` ='".intval($user_id)."'".
+                 " ORDER BY `CP`.`pass_date`";
+
+        $res = mysql_query($query);
+
+        $HaveTest=0;
+        while($row = mysql_fetch_array($res, MYSQL_NUM))
+        {
+          if ($row[1] == "Assurer Challenge") {
+            $HaveTest=1;
+          }
+?>
+  <tr>
+    <td class="DataTD"><?=sanitizeHTML($row[0])?></td>
+    <td class="DataTD"><?=sanitizeHTML($row[1])?></td>
+    <td class="DataTD"><?=sanitizeHTML($row[2])?></td>
+  </tr>
+<?      }
+?>
+</table>
+<br>
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr>
+<?
+      if ($_SESSION['profile']['admin'] == 1 && array_key_exists('userid',$_REQUEST) && intval($_REQUEST['userid']) > 0) {
+?>
+    <tr><td colspan="3" class="DataTD"><a href="account.php?id=43&amp;userid=<?=intval($user_id)?>">back</a></td></tr>
+<?
+    } else {
+        $query = '
+            SELECT  `u`.`id`,
+                    `u`.`assurer`,
+                    SUM(`points`)
+            FROM    `users` AS `u`,
+                    `notary` AS `n`
+            WHERE   `u`.`id` = \''.intval($_SESSION['profile']['id']).'\'
+            AND     `n`.`to` = `u`.`id`
+            AND     `expire` < NOW()
+            AND     `n`.`deleted` = 0
+            GROUP BY `u`.`id`, `u`.`assurer`
+            ';
+        $res = mysql_query($query);
+        if (!$res) {
+          print '<td colspan="3" class="DataTD">'._('Internal Error').'</td>'."\n";
+        } else {
+          $row = mysql_fetch_array($res, MYSQL_NUM);
+          if ($HaveTest && ($row[2]>=100)) {
+            if (!$row[1]) {
+              // This should not happen...
+              fix_assurer_flag($_SESSION['profile']['id']);
+            }
+?>  <td colspan="3" class="DataTD"><?=_("You have passed the Assurer Challenge and collected at least 100 Assurance Points, you are an Assurer.")?></td>
+<?        } elseif (($row[2]>=100) && !$HaveTest) {
+?>  <td colspan="3" class="DataTD"><?=_("You have at least 100 Assurance Points, if you want to become an assurer try the ").'<a href="https://cats.cacert.org";>'._("Assurer Challenge").'</a>!'?></td>
+<?        } elseif ($HaveTest && ($row[2]<100)) {
+?>  <td colspan="3" class="DataTD"><?=_("You have passed the Assurer Challenge, but to become an Assurer you still have to reach 100 Assurance Points!")?></td>
+<?        }
+        }
+      }
+?>  </tr>
+</table>
+
diff --git a/pages/account/56.php b/pages/account/56.php
index 348cc49..cabe8e0 100644
--- a/pages/account/56.php
+++ b/pages/account/56.php
@@ -1,41 +1,41 @@
-<? /*
-LibreSSL - CAcert web application
-Copyright (C) 2004-2008  CAcert Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/ ?>
-<?=_("List of Organisation Assurers:")?>
-
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
-  <tr>
-    <td colspan="1" class="title"><?=_("Name")?></td>
-    <td colspan="1" class="title"><?=_("Email")?></td>
-    <td colspan="1" class="title"><?=_("Country")?></td>
-  </tr>
-  <?
-    $query = "select users.fname,users.lname,users.email, countries.name from users left join countries on users.ccid=countries.id where orgadmin=1;";
-    $res = mysql_query($query);
-    while($row = mysql_fetch_assoc($res))
-    {
-  ?>
-    <tr>
-      <td><?=sanitizeHTML($row['fname'])." ".sanitizeHTML($row['lname'])?></td>
-      <td><a href="mailto:<?=sanitizeHTML($row['email'])?>"><?=sanitizeHTML($row['email'])?></a></td>
-      <td><?=sanitizeHTML($row['name'])?></td>
-    </tr>
-    <?
-    }
-?>
-</table>
-
+<? /*
+LibreSSL - CAcert web application
+Copyright (C) 2004-2008  CAcert Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/ ?>
+<?=_("List of Organisation Assurers:")?>
+
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr>
+    <td colspan="1" class="title"><?=_("Name")?></td>
+    <td colspan="1" class="title"><?=_("Email")?></td>
+    <td colspan="1" class="title"><?=_("Country")?></td>
+  </tr>
+  <?
+    $query = "select users.fname,users.lname,users.email, countries.name from users left join countries on users.ccid=countries.id where orgadmin=1;";
+    $res = mysql_query($query);
+    while($row = mysql_fetch_assoc($res))
+    {
+  ?>
+    <tr>
+      <td><?=sanitizeHTML($row['fname'])." ".sanitizeHTML($row['lname'])?></td>
+      <td><a href="mailto:<?=sanitizeHTML($row['email'])?>"><?=sanitizeHTML($row['email'])?></a></td>
+      <td><?=sanitizeHTML($row['name'])?></td>
+    </tr>
+    <?
+    }
+?>
+</table>
+

diff --git a/pages/wot/9.php b/pages/wot/9.php
index a04793f..20f2c6d 100644
--- a/pages/wot/9.php
+++ b/pages/wot/9.php
@@ -61,7 +61,7 @@
 ?>
   <tr>
     <td class="DataTD"><?=_("Additional Language")?>:</td>
-    <td class="DataTD" align="left"><? printf(_("%s will also accept email in %s - %s"), sanitizeHTML($user['fname']), sanitizeHTML($lang['lang']), sanitizeHTML($lang['country'])) ?></td>
+    <td class="DataTD" align="left"><? printf(_("%s will also accept email in %s - %s"), sanitizeHTML($user['fname']), $lang['lang'], $lang['country']) ?></td>
   </tr>
 <? } ?>
   <tr>

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature