smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge-2.0-add_rule.patch

diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/openvpnbridge mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/openvpnbridge
--- smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/openvpnbridge     2008-12-11 17:54:34.000000000 +0100
+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/openvpnbridge   2008-12-22 18:13:55.000000000 +0100
@@ -387,4 +387,9 @@
        <trans>The client has been disconnected</trans>
     </entry>
 
+       <entry>
+       <base>INVALID_CHARS</base>
+       <trans>"{$string}" contains forbiden characters</trans>
+    </entry>
+
 </lexicon>
diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge
--- smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge     2008-12-11 19:42:38.000000000 +0100
+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge   2008-12-22 18:14:29.000000000 +0100
@@ -385,4 +385,9 @@
        <trans>Le client a été déconnecté</trans>
     </entry>
 
+       <entry>
+       <base>INVALID_CHARS</base>
+       <trans>"{$string}" comporte des charactères non authorisés</trans>
+    </entry>
+
 </lexicon>
diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm mezzanine_patched_smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm
--- smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm  2008-12-22 18:14:48.000000000 +0100
+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm        2008-12-22 18:13:39.000000000 +0100
@@ -748,4 +748,16 @@
        }
 }
 
+sub validate_common_name
+{
+    my ($fm, $common_name) = @_;
+
+    unless ($common_name =~ /^([a-zA-Z0-9][\_\.\-a-zA-Z0-9]*)$/)
+    {
+        return $fm->localise('INVALID_CHARS',{string => $common_name});
+    }
+    return "OK";
+}
+
+
 1;
1	slords	1.1	diff -Nur -x '.orig' -x '.rej' smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/openvpnbridge mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/openvpnbridge
2			--- smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/openvpnbridge 2008-12-11 17:54:34.000000000 +0100
3			+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/openvpnbridge 2008-12-22 18:13:55.000000000 +0100
4			@@ -387,4 +387,9 @@
5			<trans>The client has been disconnected</trans>
6			</entry>
7
8			+ <entry>
9			+ <base>INVALID_CHARS</base>
10			+ <trans>"{$string}" contains forbiden characters</trans>
11			+ </entry>
12			+
13			</lexicon>
14			diff -Nur -x '.orig' -x '.rej' smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge
15			--- smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge 2008-12-11 19:42:38.000000000 +0100
16			+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge 2008-12-22 18:14:29.000000000 +0100
17			@@ -385,4 +385,9 @@
18			<trans>Le client a été déconnecté</trans>
19			</entry>
20
21			+ <entry>
22			+ <base>INVALID_CHARS</base>
23			+ <trans>"{$string}" comporte des charactères non authorisés</trans>
24			+ </entry>
25			+
26			</lexicon>
27			diff -Nur -x '.orig' -x '.rej' smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm mezzanine_patched_smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm
28			--- smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm 2008-12-22 18:14:48.000000000 +0100
29			+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm 2008-12-22 18:13:39.000000000 +0100
30			@@ -748,4 +748,16 @@
31			}
32			}
33
34			+sub validate_common_name
35			+{
36			+ my ($fm, $common_name) = @_;
37			+
38			+ unless ($common_name =~ /^([a-zA-Z0-9][\_\.\-a-zA-Z0-9]*)$/)
39			+ {
40			+ return $fm->localise('INVALID_CHARS',{string => $common_name});
41			+ }
42			+ return "OK";
43			+}
44			+
45			+
46			1;