phpki/contribs10/phpki-0.82-remove_email_from_upload_file_name.patch2

diff -Nur -x '*.orig' -x '*.rej' phpki/phpki-0.82/search.php mezzanine_patched_phpki/phpki-0.82/search.php
--- phpki/phpki-0.82/search.php 2005-11-16 00:54:37.000000000 +0100
+++ mezzanine_patched_phpki/phpki-0.82/search.php       2009-01-07 11:42:58.000000000 +0100
@@ -36,7 +36,12 @@
 
 case 'download':
        $rec = CAdb_get_entry($serial);
-       upload("$config[cert_dir]/$serial.der", "$rec[common_name] ($rec[email]).cer", 'application/pkix-cert');
+       upload("$config[cert_dir]/$serial.der", "$rec[common_name].cer", 'application/pkix-cert');
+        break;
+
+case 'download_pem':
+        $rec = CAdb_get_entry($serial);
+        upload("$config[new_certs_dir]/$serial.pem", "$rec[common_name].pem", 'application/pkix-cert');
         break;
 
 case search:
@@ -97,6 +102,7 @@
                if ($rec['status'] != 'Revoked') {
                        ?>
                        <a href=<?=$PHP_SELF?>?stage=download&serial=<?=htvar($rec['serial'])?>><img src=images/download.png alt="Download" title="Download the certificate so that you may send encrypted e-mail"></a>
+                       <a href=<?=$PHP_SELF?>?stage=download_pem&serial=<?=htvar($rec['serial'])?>><img src=images/download.png alt="Download (in PEM format)" title="Download in PEM format"></a>
                        <?
                }
                print '</td></tr>';
1	brianr	1.1	diff -Nur -x '.orig' -x '.rej' phpki/phpki-0.82/search.php mezzanine_patched_phpki/phpki-0.82/search.php
2			--- phpki/phpki-0.82/search.php 2005-11-16 00:54:37.000000000 +0100
3			+++ mezzanine_patched_phpki/phpki-0.82/search.php 2009-01-07 11:42:58.000000000 +0100
4			@@ -36,7 +36,12 @@
5
6			case 'download':
7			$rec = CAdb_get_entry($serial);
8			- upload("$config[cert_dir]/$serial.der", "$rec[common_name] ($rec[email]).cer", 'application/pkix-cert');
9			+ upload("$config[cert_dir]/$serial.der", "$rec[common_name].cer", 'application/pkix-cert');
10			+ break;
11			+
12			+case 'download_pem':
13			+ $rec = CAdb_get_entry($serial);
14			+ upload("$config[new_certs_dir]/$serial.pem", "$rec[common_name].pem", 'application/pkix-cert');
15			break;
16
17			case search:
18			@@ -97,6 +102,7 @@
19			if ($rec['status'] != 'Revoked') {
20			?>
21			<a href=<?=$PHP_SELF?>?stage=download&serial=<?=htvar($rec['serial'])?>><img src=images/download.png alt="Download" title="Download the certificate so that you may send encrypted e-mail"></a>
22			+ <a href=<?=$PHP_SELF?>?stage=download_pem&serial=<?=htvar($rec['serial'])?>><img src=images/download.png alt="Download (in PEM format)" title="Download in PEM format"></a>
23			<?
24			}
25			print '</td></tr>';