diff options
| author | Sebastian Reichel <sre@ring0.de> | 2012-12-09 00:19:53 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sre@ring0.de> | 2012-12-09 00:19:53 +0100 |
| commit | 8f0e8e52887795199309edf114a849a7784451b2 (patch) | |
| tree | b8dc2e74549c76f1a44ca2ef7c421104126ddabe /src/web.vala | |
| parent | 79b7424746c7636cd23a7869169431afa6941b06 (diff) | |
| download | serial-barcode-scanner-8f0e8e52887795199309edf114a849a7784451b2.tar.bz2 | |
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
Diffstat (limited to 'src/web.vala')
| -rw-r--r-- | src/web.vala | 5 |
1 files changed, 3 insertions, 2 deletions
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"); |