smeserver-certificate/contribs10/smeserver-certificate-0.0.4-Eliminate-Error-msg-on-blank-save.patch

diff -urN smeserver-certificate-0.0.4.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/certificate smeserver-certificate-0.0.4/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/certificate
--- smeserver-certificate-0.0.4.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/certificate 2022-03-29 09:05:33.234160837 +0100
+++ smeserver-certificate-0.0.4/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/certificate     2022-03-29 09:25:55.018379093 +0100
@@ -54,5 +54,16 @@
         <base>LABEL_CERTIFICATE_CHAINFILE</base>
         <trans>SSL intermediate chain certificate</trans>
     </entry> 
+    
+    <entry>
+        <base>SUCCESS-CERT-WRITTEN</base>
+        <trans>Success - New Certificate details written</trans>
+    </entry> 
+
+    <entry>
+        <base>SUCCESS-CERT-DEFAULTED</base>
+        <trans>Success - Certificate reverted to self-signed</trans>
+    </entry> 
+
 </lexicon>
 
diff -urN smeserver-certificate-0.0.4.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/certificate.pm smeserver-certificate-0.0.4/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/certificate.pm
--- smeserver-certificate-0.0.4.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/certificate.pm     2022-03-29 09:05:33.252161018 +0100
+++ smeserver-certificate-0.0.4/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/certificate.pm 2022-03-29 09:24:47.831709075 +0100
@@ -52,7 +52,7 @@
         $pem = "chain.pem";
     }
     if (! open (PEM, "<$dir/$pem")){
-        $fm->error('ERROR_OPEN_PEM','FIRST');
+        #$fm->error('ERROR_OPEN_PEM','FIRST');
         # Tell the user something bad has happened
         return;
     }
@@ -104,12 +104,14 @@
                 system("/bin/rm $ssl_key/$domain.key");
                 system("/bin/rm $ssl_crt/chain.pem");
                }
+        $fm->success('SUCCESS-CERT-DEFAULTED','FIRST');
+            
     }
 
 elsif (($domain_crt ne '') && ($domain_key ne ''))
     {
         if (! open (CRT, ">$ssl_crt/$domain.crt")){
-            $fm->error('ERROR_OPEN_CRT','FIRST');
+            $fm->error('ERROR_OPEN_KEY','FIRST');
             # Tell the user something bad has happened
             return;
             }
@@ -156,8 +158,8 @@
 
         system("/sbin/e-smith/signal-event ssl-update");
 
-        #$fm->success('SUCCESS','FIRST');
-        return undef;
+        $fm->success('SUCCESS-CERT-WRITTEN','FIRST');
+        #return undef;
     }
 }
 1;
1	diff -urN smeserver-certificate-0.0.4.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/certificate smeserver-certificate-0.0.4/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/certificate
2	--- smeserver-certificate-0.0.4.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/certificate 2022-03-29 09:05:33.234160837 +0100
3	+++ smeserver-certificate-0.0.4/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/certificate 2022-03-29 09:25:55.018379093 +0100
4	@@ -54,5 +54,16 @@
5	<base>LABEL_CERTIFICATE_CHAINFILE</base>
6	<trans>SSL intermediate chain certificate</trans>
7	</entry>
8	+
9	+ <entry>
10	+ <base>SUCCESS-CERT-WRITTEN</base>
11	+ <trans>Success - New Certificate details written</trans>
12	+ </entry>
13	+
14	+ <entry>
15	+ <base>SUCCESS-CERT-DEFAULTED</base>
16	+ <trans>Success - Certificate reverted to self-signed</trans>
17	+ </entry>
18	+
19	</lexicon>
20
21	diff -urN smeserver-certificate-0.0.4.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/certificate.pm smeserver-certificate-0.0.4/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/certificate.pm
22	--- smeserver-certificate-0.0.4.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/certificate.pm 2022-03-29 09:05:33.252161018 +0100
23	+++ smeserver-certificate-0.0.4/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/certificate.pm 2022-03-29 09:24:47.831709075 +0100
24	@@ -52,7 +52,7 @@
25	$pem = "chain.pem";
26	}
27	if (! open (PEM, "<$dir/$pem")){
28	- $fm->error('ERROR_OPEN_PEM','FIRST');
29	+ #$fm->error('ERROR_OPEN_PEM','FIRST');
30	# Tell the user something bad has happened
31	return;
32	}
33	@@ -104,12 +104,14 @@
34	system("/bin/rm $ssl_key/$domain.key");
35	system("/bin/rm $ssl_crt/chain.pem");
36	}
37	+ $fm->success('SUCCESS-CERT-DEFAULTED','FIRST');
38	+
39	}
40
41	elsif (($domain_crt ne '') && ($domain_key ne ''))
42	{
43	if (! open (CRT, ">$ssl_crt/$domain.crt")){
44	- $fm->error('ERROR_OPEN_CRT','FIRST');
45	+ $fm->error('ERROR_OPEN_KEY','FIRST');
46	# Tell the user something bad has happened
47	return;
48	}
49	@@ -156,8 +158,8 @@
50
51	system("/sbin/e-smith/signal-event ssl-update");
52
53	- #$fm->success('SUCCESS','FIRST');
54	- return undef;
55	+ $fm->success('SUCCESS-CERT-WRITTEN','FIRST');
56	+ #return undef;
57	}
58	}
59	1;