Merge branch 'release' into bug-1131bug-1131

Conflicts:
	pages/wot/6.php
	www/policy/CAcertCommunityAgreement.php

The conflict in the CCA document page was introduced due to the rename of the file.
This instance can be safely ignored, as bug 1131 introduces a new version
superseeding the old document.

The instance in pages/wot/6.php is a bit more complicated, but basically
results from a change of bug 1137 and the modified paths to the policy documents.

2 files changed, 49 insertions, 48 deletions

diff --git a/stamp/common.php b/stamp/common.php
index ff814dd..d99a23a 100644
--- a/stamp/common.php
+++ b/stamp/common.php
@@ -41,9 +41,9 @@
 				if($row['certid'] > 0)
 				{
 					if($row['org'] == 0)
-						$query = "select * from `domaincerts` where `id`='$row[certid]' and `expire`>NOW() and `revoked`=0";
+						$query = "select * from `domaincerts` where `id`='".intval($row['certid'])."' and `expire`>NOW() and `revoked`=0";
 					else
-						$query = "select * from `orgdomaincerts` where `id`='$row[certid]' and `expire`>NOW() and `revoked`=0";
+						$query = "select * from `orgdomaincerts` where `id`='".intval($row['certid'])."' and `expire`>NOW() and `revoked`=0";
 					if($_REQUEST['debug'] == 1)
 						echo $query."<br>\n";
 					$res = mysql_query($query);
@@ -117,7 +117,7 @@
 			if($org == 0)
 			{
 				$query = "SELECT *, sum(`points`) AS `total` FROM `users`, `notary` WHERE `users`.`id` = '$cert[memid]' AND
-						`notary`.`to` = `users`.`id` and `notary`.`when` <= '$cert[issued]' GROUP BY `notary`.`to`";
+						`notary`.`to` = `users`.`id` and `notary`.`when` <= '$cert[issued]' and `notary`.`deleted`=0 GROUP BY `notary`.`to`";
 				$user = mysql_fetch_assoc(mysql_query($query));
 			} else {
 				$query = "select * from `orginfo` where `id`='$cert[orgid]'";
diff --git a/stamp/style.css b/stamp/style.css
index 79d3c35..c00a4c7 100644
--- a/stamp/style.css
+++ b/stamp/style.css
@@ -6,94 +6,95 @@
 /***********************************************/
 /* HTML tag styles                             */
 /***********************************************/
-body{
+body {
 	font-family: Arial,sans-serif;
 	color: #333333;
-	line-height: 1.166;	
+	line-height: 1.166;
 	margin: 0px;
 	padding: 0px;
-	background: #cccccc; 
+	background: #cccccc;
 /*      url("/siteimages/bg_grad.jpg") fixed;   */
 }
 
+
 /******* hyperlink and anchor tag styles *******/
 
-a:link, a:visited{
+a:link, a:visited {
 	color: #005FA9;
 	text-decoration: none;
 }
 
-a:hover{
+a:hover {
 	text-decoration: underline;
 }
 
 /************** header tag styles **************/
 
-h1{
- font: bold 120% Arial,sans-serif;
- color: #334d55;
- margin: 0px;
- padding: 0px;
+h1 {
+	font: bold 120% Arial,sans-serif;
+	color: #334d55;
+	margin: 0px;
+	padding: 0px;
 }
 
-h2{
- font: bold 114% Arial,sans-serif;
- color: #006699;
- margin: 0px;
- padding: 0px;
+h2 {
+	font: bold 114% Arial,sans-serif;
+	color: #006699;
+	margin: 0px;
+	padding: 0px;
 }
 
-h3{
- font: bold 100% Arial,sans-serif;
- color: #334d55;
- margin: 0px;
- padding: 0px;
- cursor: pointer;
-/* cursor: hand; */
+h3 {
+	font: bold 100% Arial,sans-serif;
+	color: #334d55;
+	margin: 0px;
+	padding: 0px;
+	cursor: pointer;
+	/* cursor: hand; */
 }
 
-h4{
- font: bold 100% Arial,sans-serif;
- color: #333333;
- margin: 0px;
- padding: 0px;
+h4 {
+	font: bold 100% Arial,sans-serif;
+	color: #333333;
+	margin: 0px;
+	padding: 0px;
 }
 
-h5{
- font: 100% Arial,sans-serif;
- color: #334d55;
- margin: 0px;
- padding: 0px;
+h5 {
+	font: 100% Arial,sans-serif;
+	color: #334d55;
+	margin: 0px;
+	padding: 0px;
 }
 
 
 /*************** list tag styles ***************/
 
 ul.menu {
-list-style: none;
-margin :0px 0px 0px 15px;
-padding-left: 5px;
-border-left: 1px dotted #000;
+	list-style: none;
+	margin :0px 0px 0px 15px;
+	padding-left: 5px;
+	border-left: 1px dotted #000;
 }
 
 ul.top {
-list-style: none;
-margin: 0px 0px 0px 15px;
-padding-left: 5px;
-border-left: 0px;
+	list-style: none;
+	margin: 0px 0px 0px 15px;
+	padding-left: 5px;
+	border-left: 0px;
 }
 
 ul {
-list-style: none;
-margin: 0px 0px 0px 15px;
-padding-left: 5px;
-border-left: 1px dotted #000;
+	list-style: none;
+	margin: 0px 0px 0px 15px;
+	padding-left: 5px;
+	border-left: 1px dotted #000;
 }
 
 /***********************************************/
 /* Layout Divs                                 */
 /***********************************************/
-#pagecell1{
+#pagecell1 {
 	position:absolute;
 	top: 2%;
 	left: 2%;