From 9eb084e460bb3552d7ecd27119163eda5890a29e Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Tue, 11 Apr 2006 10:33:55 +0000
Subject: [PATCH] mailing list converstion implemented

---
 ezmlm-web.cgi                               |  9 +++++++++
 lang/de.hdf                                 |  3 +++
 lang/en.hdf                                 |  3 +++
 template/config_options/gnupg_keyexpires.cs | 11 +++++++++++
 template/nav.cs                             |  6 ++++++
 template/ui/default/normal.hdf              |  1 +
 6 files changed, 33 insertions(+)
 create mode 100644 template/config_options/gnupg_keyexpires.cs

diff --git a/ezmlm-web.cgi b/ezmlm-web.cgi
index 16e2b0c..fd1f78b 100755
--- a/ezmlm-web.cgi
+++ b/ezmlm-web.cgi
@@ -219,6 +219,15 @@ elsif ($action eq '' || $action eq 'list_select') {
 		$error = 'ParameterMissing';
 		$pagename = 'list_select';
 	}
+} elsif ($action eq 'gnupg_convert') {
+	my $tlist = new Mail::Ezmlm::Gpg("$LIST_DIR/" . $q->param('list'));
+	if ($tlist->convert()) {
+		$pagename = 'subscribers';
+		$success = 'GnupgConvert';
+	} else {
+		$pagename = 'subscribers';
+		$warning = 'GnupgConvert';
+	}
 } elsif (($action eq 'gnupg_ask') || ($action eq 'gnupg_do')) {
 	# User wants to manage keys (only for encrypted mailing lists)
 	my $subset = $q->param('gnupg_subset');
diff --git a/lang/de.hdf b/lang/de.hdf
index ef3773c..e523656 100644
--- a/lang/de.hdf
+++ b/lang/de.hdf
@@ -23,6 +23,7 @@ Lang {
 		GnupgPublicKeys	= öffentliche Schlüssel
 		GnupgSecretKeys	= private Schlüssel
 		GnupgGenerateKey	= Schlüssel anlegen
+		GnupgConvert	= Verschlüsselung aktivieren
 		TextFiles	= Texte
 		ListSelect	= Auswahl einer Liste
 		Properties	= Eigenschaften von
@@ -119,6 +120,7 @@ Lang {
 		GnupgInvalidExpiration	= Das Verfallsdatum is ungültig!
 		GnupgInvalidKeySize	= Die Schlüssellänge ist ungültig!
 		GnupgExportKey		= Fehler beim Exportieren des Schlüssels!
+		GnupgConvert		= Beim umwandeln in eine verschlüsselte Mailingliste trat ein Fehler auf!
 	  }
 	
 
@@ -132,6 +134,7 @@ Lang {
 		SaveFile	= Die Datei wurde gespeichert.
 		ResetFile	= Der angepasste Textbaustein wurde entfernt. Zukünftig wird stattdessen der systemweite Standard-Baustein verwendet.
 		GnupgKeyImport	= Der Schlüssel wurde importiert.
+		GnupgConvert	= Verschlüsselung für die Mailingliste ist nun aktiv.
 	  }
 
 
diff --git a/lang/en.hdf b/lang/en.hdf
index 083135e..e81a523 100644
--- a/lang/en.hdf
+++ b/lang/en.hdf
@@ -23,6 +23,7 @@ Lang {
 		GnupgPublicKeys	= public keys
 		GnupgSecretKeys	= secret keys
 		GnupgGenerateKey	= generate key
+		GnupgConvert	= Enable encryption
 		TextFiles	= Text files
 		ListSelect	= Choose a list
 		Properties	= Properties of
@@ -119,6 +120,7 @@ Lang {
 		GnupgInvalidExpiration	= The expiration time is invalid!
 		GnupgInvalidKeySize	= The length of the key is invalid!
 		GnupgExportKey		= Export of key failed!
+		GnupgConvert		= Conversion to encrypted mailing list failed!
 	  }
 	
 
@@ -132,6 +134,7 @@ Lang {
 		SaveFile	= The file was saved.
 		ResetFile	= The customized text file was successfully removed. From now on, the system-wide default text file will be used instead of it.
 		GnupgKeyImport	= The key was successfully imported.
+		GnupgConvert	= Encryption is now enabled for this list.
 	  }
 
 
diff --git a/template/config_options/gnupg_keyexpires.cs b/template/config_options/gnupg_keyexpires.cs
new file mode 100644
index 0000000..6857852
--- /dev/null
+++ b/template/config_options/gnupg_keyexpires.cs
@@ -0,0 +1,11 @@
+<!-- expiration of the key (in years) -->
+
+<label for="gnupg_keyexpires"><?cs var:html_escape(Lang.Misc.GnupgKeyExpires) ?>:</label>
+	<select name="gnupg_keyexpires" id="gnupg_keyexpires" size="0">
+		<option value="0"><?cs var:html_escape(Lang.Misc.Never) ?></option>
+		<option value="1y">1</option>
+		<option value="2y">2</option>
+		<option value="3y">3</option>
+		<option value="5y">5</option>
+		<option value="10y">10</option>
+	</select>
diff --git a/template/nav.cs b/template/nav.cs
index 675f87c..e83d8ec 100644
--- a/template/nav.cs
+++ b/template/nav.cs
@@ -144,6 +144,12 @@
 					title="<?cs var:html_escape(Lang.Menue.TextFiles) ?>"><?cs
 					var:html_escape(Lang.Menue.TextFiles) ?></a></li><?cs /if ?>
 
+		<?cs if:UI.Navigation.GnupgConvert == 1
+			?><li><a <?cs if:Data.Action == "gnupg_convert" ?> class="nav_active"<?cs /if ?>
+			href="<?cs call:link("list",Data.List.Name,"action","gnupg_convert","","") ?>"
+				title="<?cs var:html_escape(Lang.Menue.GnupgConvert) ?>"><?cs
+					var:html_escape(Lang.Menue.GnupgConvert) ?></a></li><?cs /if ?>
+		
 		<?cs if:UI.Navigation.ListDelete == 1
 			?><li><a <?cs if:(Data.Action == "list_delete") ?> class="nav_active"<?cs /if ?>
 			href="<?cs call:link("list",Data.List.Name,"action","list_delete_ask","","") ?>"
diff --git a/template/ui/default/normal.hdf b/template/ui/default/normal.hdf
index eabe48c..c659d52 100644
--- a/template/ui/default/normal.hdf
+++ b/template/ui/default/normal.hdf
@@ -23,6 +23,7 @@ UI	{
 
 		TextEdit	= 1
 		ListDelete	= 1
+		GnupgConvert	= 1
 
 		Help	= 1
 	  }