From 8f0e8e52887795199309edf114a849a7784451b2 Mon Sep 17 00:00:00 2001
From: Sebastian Reichel <sre@ring0.de>
Date: Sun, 9 Dec 2012 00:19:53 +0100
Subject: Prepare PGP support

 - add database field for PGP Key ID
 - add PGP Key ID support to CSV import
 - show PGP Key ID in user profile
---
 src/web.vala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/web.vala')

diff --git a/src/web.vala b/src/web.vala
index 2bb59f8..14c9604 100644
--- a/src/web.vala
+++ b/src/web.vala
@@ -139,10 +139,10 @@ public class WebServer {
 				foreach(var member in csvimport.get_members()) {
 					if(member.exists_in_db() && !member.equals_db()) {
 						var dbmember = db.get_user_info(member.id);
-						data1 += @"<tr class=\"error\"><td><i class=\"icon-minus-sign\"></i><td>$(dbmember.id)</td><td>$(dbmember.firstname)</td><td>$(dbmember.lastname)</td><td>$(dbmember.email)</td><td>$(dbmember.gender)</td><td>$(dbmember.street)</td><td>$(dbmember.postcode)</td><td>$(dbmember.city)</td></tr>";
+						data1 += @"<tr class=\"error\"><td><i class=\"icon-minus-sign\"></i><td>$(dbmember.id)</td><td>$(dbmember.firstname)</td><td>$(dbmember.lastname)</td><td>$(dbmember.email)</td><td>$(dbmember.gender)</td><td>$(dbmember.street)</td><td>$(dbmember.postcode)</td><td>$(dbmember.city)</td><td>$(dbmember.pgp)</td></tr>";
 					}
 					if(!member.exists_in_db() || !member.equals_db()) {
-						data1 += @"<tr class=\"success\"><td><i class=\"icon-plus-sign\"></td><td>$(member.id)</td><td>$(member.firstname)</td><td>$(member.lastname)</td><td>$(member.email)</td><td>$(member.gender)</td><td>$(member.street)</td><td>$(member.postcode)</td><td>$(member.city)</td></tr>";
+						data1 += @"<tr class=\"success\"><td><i class=\"icon-plus-sign\"></td><td>$(member.id)</td><td>$(member.firstname)</td><td>$(member.lastname)</td><td>$(member.email)</td><td>$(member.gender)</td><td>$(member.street)</td><td>$(member.postcode)</td><td>$(member.city)</td><td>$(member.pgp)</td></tr>";
 					}
 				}
 				t.replace("DATA1", data1);
@@ -219,6 +219,7 @@ public class WebServer {
 			t.replace("STREET", userinfo.street);
 			t.replace("POSTALCODE", "%d".printf(userinfo.postcode));
 			t.replace("CITY", userinfo.city);
+			t.replace("PGPKEYID", userinfo.pgp);
 
 			var userauth = db.get_user_auth(id);
 			t.replace("DISABLED", userauth.disabled ? "true" : "false");
-- 
cgit v1.2.3