language updates

pages/wot/6.php

@@ -14,6 +14,8 @@
 */ ?>
 <?
 	$row = $_SESSION['_config']['notarise'];
+
+	$methods = array("Face to Face Meeting", "Trusted 3rd Parties", "Thawte Points Transfer", "Administrative Increase");
 ?>
 <? if($_SESSION['_config']['error'] != "") { ?><div color="orange">ERROR: <?=$_SESSION['_config']['error']?></div><? unset($_SESSION['_config']['error']); } ?>
 <form method="post" action="wot.php">
@@ -36,10 +38,10 @@
   <tr>
     <td class="DataTD"><?=_("Method")?>:</td>
     <td class="DataTD"><select name="method">
-		<option value="Face to Face Meeting">Face to Face Meeting</option>
-		<option value="Trusted 3rd Parties">Trusted 3rd Parties</option>
-		<option value="Thawte Points Transfer">Thawte Points Transfer</option>
-		</select>
+<? foreach($methods as $val) { ?>
+		<option value="<?=$val?>"<? if($val == $_POST['method']) echo " selected"; ?>><?=$val?></option>
+<? } ?>
+	  </select>
 	</td>
   </tr>
 <? } else { ?>

www/wot.php

@@ -156,7 +156,14 @@
 
 	if($oldid == 6)
 	{
-		if($_POST['certify'] != 1 || $_POST['assertion'] != 1 || $_POST['rules'] != 1)
+		if($_POST['assertion'] != 1 || $_POST['rules'] != 1)
+		{
+			$id = $oldid;
+			unset($oldid);
+			$_SESSION['_config']['error'] = _("You failed to check all boxes to validate your adherence to the rules and policies of CAcert");
+		}
+
+		if($_POST['certify'] != 1 && $_SESSION['profile']['admin'] != 1)
 		{
 			$id = $oldid;
 			unset($oldid);
@@ -164,7 +171,7 @@
 		}
 	}
 
-	if($oldid == 6)
+	if($oldid == 6 && $_SESSION['profile']['admin'] != 1)
 	{
 		if($_POST['location'] == "" || $_POST['date'] == "")
 		{
@@ -193,6 +200,8 @@
 						`points`='".intval($_POST['points'])."',
 						`location`='".mysql_escape_string($_POST['location'])."',
 						`date`='".mysql_escape_string($_POST['date'])."'";
+		if($_SESSION['profile']['admin'] == 1)
+			$query .= ",\n`method`='".mysql_escape_string($_POST['method'])."'";
 		mysql_query($query);
 
 		if($_SESSION['_config']['notarise']['language'] != "")