e-smith-ibays/sme8/e-smith-ibays-2.2.0-force-https.patch

diff -Nur e-smith-ibays-2.4.0-original/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent e-smith-ibays-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent
--- e-smith-ibays-2.4.0-original/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent        2008-10-07 19:35:53.000000000 +0200
+++ e-smith-ibays-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent 2013-09-16 19:57:39.668598361 +0200
@@ -42,7 +42,12 @@
            $OUT .= "\n";
            $OUT .= "    # $key ibay ($name)\n";
            $OUT .= "\n";
-           
+           my $SSLPort = $modSSL{'TCPPort'} || '443';
+
+           if (( $port ne $SSLPort ) && (($ibay->prop('SSL') || 'enabled') eq 'enabled')){
+               $OUT .= "    RewriteEngine on\n";
+               $OUT .= "    RewriteRule ^/$key(/.*|\$) https://%{HTTP_HOST}/$key\$1 \[L,R\]\n";
+           }
            if ($cgiBin)
            {
                $OUT .= "    ScriptAlias /$key/cgi-bin $basedir/cgi-bin\n";
diff -Nur e-smith-ibays-2.4.0-original/root/etc/e-smith/web/functions/ibays e-smith-ibays-2.4.0/root/etc/e-smith/web/functions/ibays
--- e-smith-ibays-2.4.0-original/root/etc/e-smith/web/functions/ibays   2008-10-07 19:35:53.000000000 +0200
+++ e-smith-ibays-2.4.0/root/etc/e-smith/web/functions/ibays    2013-09-16 19:52:27.961524745 +0200
@@ -120,6 +120,9 @@
         <field type="select" id="CgiBin" options="'disabled' => 'DISABLED', 'enabled' => 'ENABLED'">
             <label>ALLOW_DYNAMIC_CONTENT</label>
         </field>
+        <field type="select" id="SSL" options="'disabled' => 'DISABLED', 'enabled' => 'ENABLED'">
+            <label>HTTPS_Only</label>
+        </field>
         <subroutine src="print_save_or_add_button()" />
     </page>
     <page name="Remove" pre-event="turn_off_buttons()" post-event="remove_ibay()">
diff -Nur e-smith-ibays-2.4.0-original/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm e-smith-ibays-2.4.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm
--- e-smith-ibays-2.4.0-original/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm  2013-01-31 22:31:37.000000000 +0100
+++ e-smith-ibays-2.4.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm   2013-09-16 19:49:43.576807649 +0200
@@ -248,6 +248,8 @@
                 $rec->prop('PublicAccess'));
             $q->param(-name=>'CgiBin',-value=>
                 $rec->prop('CgiBin'));
+           $q->param(-name=>'SSL',-value=>
+                $rec->prop('SSL'));
         }
     } else {
         print qq(
@@ -512,6 +514,7 @@
             CgiBin       => $self->cgi->param('CgiBin'),
             Group        => $self->cgi->param('group'),
             PublicAccess => $self->cgi->param('publicAccess'),
+            SSL          => $self->cgi->param('SSL'),
             UserAccess   => $self->cgi->param('userAccess'),
             Uid          => $uid,
             Gid          => $uid,
@@ -541,6 +544,7 @@
                 CgiBin       => $self->cgi->param('CgiBin'),
                 Group        => $self->cgi->param('group'),
                 PublicAccess => $self->cgi->param('publicAccess'),
+                SSL          => $self->cgi->param('SSL'),
                 UserAccess   => $self->cgi->param('userAccess'),
             );
 
1	diff -Nur e-smith-ibays-2.4.0-original/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent e-smith-ibays-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent
2	--- e-smith-ibays-2.4.0-original/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent 2008-10-07 19:35:53.000000000 +0200
3	+++ e-smith-ibays-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent 2013-09-16 19:57:39.668598361 +0200
4	@@ -42,7 +42,12 @@
5	$OUT .= "\n";
6	$OUT .= " # $key ibay ($name)\n";
7	$OUT .= "\n";
8	-
9	+ my $SSLPort = $modSSL{'TCPPort'} \|\| '443';
10	+
11	+ if (( $port ne $SSLPort ) && (($ibay->prop('SSL') \|\| 'enabled') eq 'enabled')){
12	+ $OUT .= " RewriteEngine on\n";
13	+ $OUT .= " RewriteRule ^/$key(/.*\|\$) https://%{HTTP_HOST}/$key\$1 \[L,R\]\n";
14	+ }
15	if ($cgiBin)
16	{
17	$OUT .= " ScriptAlias /$key/cgi-bin $basedir/cgi-bin\n";
18	diff -Nur e-smith-ibays-2.4.0-original/root/etc/e-smith/web/functions/ibays e-smith-ibays-2.4.0/root/etc/e-smith/web/functions/ibays
19	--- e-smith-ibays-2.4.0-original/root/etc/e-smith/web/functions/ibays 2008-10-07 19:35:53.000000000 +0200
20	+++ e-smith-ibays-2.4.0/root/etc/e-smith/web/functions/ibays 2013-09-16 19:52:27.961524745 +0200
21	@@ -120,6 +120,9 @@
22	<field type="select" id="CgiBin" options="'disabled' => 'DISABLED', 'enabled' => 'ENABLED'">
23	<label>ALLOW_DYNAMIC_CONTENT</label>
24	</field>
25	+ <field type="select" id="SSL" options="'disabled' => 'DISABLED', 'enabled' => 'ENABLED'">
26	+ <label>HTTPS_Only</label>
27	+ </field>
28	<subroutine src="print_save_or_add_button()" />
29	</page>
30	<page name="Remove" pre-event="turn_off_buttons()" post-event="remove_ibay()">
31	diff -Nur e-smith-ibays-2.4.0-original/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm e-smith-ibays-2.4.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm
32	--- e-smith-ibays-2.4.0-original/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm 2013-01-31 22:31:37.000000000 +0100
33	+++ e-smith-ibays-2.4.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm 2013-09-16 19:49:43.576807649 +0200
34	@@ -248,6 +248,8 @@
35	$rec->prop('PublicAccess'));
36	$q->param(-name=>'CgiBin',-value=>
37	$rec->prop('CgiBin'));
38	+ $q->param(-name=>'SSL',-value=>
39	+ $rec->prop('SSL'));
40	}
41	} else {
42	print qq(
43	@@ -512,6 +514,7 @@
44	CgiBin => $self->cgi->param('CgiBin'),
45	Group => $self->cgi->param('group'),
46	PublicAccess => $self->cgi->param('publicAccess'),
47	+ SSL => $self->cgi->param('SSL'),
48	UserAccess => $self->cgi->param('userAccess'),
49	Uid => $uid,
50	Gid => $uid,
51	@@ -541,6 +544,7 @@
52	CgiBin => $self->cgi->param('CgiBin'),
53	Group => $self->cgi->param('group'),
54	PublicAccess => $self->cgi->param('publicAccess'),
55	+ SSL => $self->cgi->param('SSL'),
56	UserAccess => $self->cgi->param('userAccess'),
57	);
58