1 |
vip-ire |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' phpki/phpki-0.82/ca/manage_certs.php mezzanine_patched_phpki/phpki-0.82/ca/manage_certs.php |
2 |
|
|
--- phpki/phpki-0.82/ca/manage_certs.php 2008-12-09 08:58:06.000000000 +0100 |
3 |
|
|
+++ mezzanine_patched_phpki/phpki-0.82/ca/manage_certs.php 2008-12-09 08:57:40.000000000 +0100 |
4 |
|
|
@@ -92,19 +92,19 @@ |
5 |
|
|
|
6 |
|
|
switch ($dl_type) { |
7 |
|
|
case 'PKCS#12': |
8 |
|
|
- upload("$config[pfx_dir]/$serial.pfx", "$rec[common_name] ($rec[email]).p12", 'application/x-pkcs12'); |
9 |
|
|
+ upload("$config[pfx_dir]/$serial.pfx", "$rec[common_name].p12", 'application/x-pkcs12'); |
10 |
|
|
break; |
11 |
|
|
case 'PEMCERT': |
12 |
|
|
- upload("$config[new_certs_dir]/$serial.pem", "$rec[common_name] ($rec[email]).pem",'application/pkix-cert'); |
13 |
|
|
+ upload("$config[new_certs_dir]/$serial.pem", "$rec[common_name].pem",'application/pkix-cert'); |
14 |
|
|
break; |
15 |
|
|
case 'PEMKEY': |
16 |
|
|
- upload("$config[private_dir]/$serial-key.pem", "$rec[common_name] ($rec[email])-key.pem",'application/octet-stream'); |
17 |
|
|
+ upload("$config[private_dir]/$serial-key.pem", "$rec[common_name]-key.pem",'application/octet-stream'); |
18 |
|
|
break; |
19 |
|
|
case 'PEMBUNDLE': |
20 |
|
|
- upload(array("$config[private_dir]/$serial-key.pem","$config[new_certs_dir]/$serial.pem"), "$rec[common_name] ($rec[email]).pem",'application/octet-stream'); |
21 |
|
|
+ upload(array("$config[private_dir]/$serial-key.pem","$config[new_certs_dir]/$serial.pem"), "$rec[common_name].pem",'application/octet-stream'); |
22 |
|
|
break; |
23 |
|
|
case 'PEMCABUNDLE': |
24 |
|
|
- upload(array("$config[private_dir]/$serial-key.pem","$config[new_certs_dir]/$serial.pem",$config['cacert_pem']), "$rec[common_name] ($rec[email]).pem",'application/octet-stream'); |
25 |
|
|
+ upload(array("$config[private_dir]/$serial-key.pem","$config[new_certs_dir]/$serial.pem",$config['cacert_pem']), "$rec[common_name].pem",'application/octet-stream'); |
26 |
|
|
break; |
27 |
|
|
default: |
28 |
|
|
header("Location: ${PHP_SELF}?$qstr_sort&$qstr_filter"); |