smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin-4.0.10.2-bz11408-httpport.patch

diff -Nur --no-dereference smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias
--- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias       2022-07-23 23:55:34.292000000 -0400
+++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias   2022-07-23 23:57:06.421000000 -0400
@@ -7,13 +7,13 @@
     my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');
     my $multiaccess = ($phpmyadmin{'multiaccess'} || 'disabled');
 
-    if (($port eq "80") && ($haveSSL eq 'yes')  && ("$adminaccess" eq "enabled" || "$multiaccess" eq "enabled"))
+    if (($port eq $httpPort) && ($haveSSL eq 'yes')  && ("$adminaccess" eq "enabled" || "$multiaccess" eq "enabled"))
         {
             $OUT .= "    RewriteRule ^/phpmyadmin(/.*|\$)    https://%{HTTP_HOST}/phpmyadmin\$1 [L,R]\n";
         }
 
 
-    if (($port eq "80") && ($haveSSL eq 'yes') && ( "$multiaccess" eq "enabled"))
+    if (($port eq $httpPort) && ($haveSSL eq 'yes') && ( "$multiaccess" eq "enabled"))
         {
             $OUT .= "    RewriteRule ^/phpmyadmin-multi(/.*|\$)    https://%{HTTP_HOST}/phpmyadmin-multi\$1 [L,R]\n";
         }
1	jpp	1.1	diff -Nur --no-dereference smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias
2			--- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias 2022-07-23 23:55:34.292000000 -0400
3			+++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias 2022-07-23 23:57:06.421000000 -0400
4			@@ -7,13 +7,13 @@
5			my $adminaccess = ($phpmyadmin{'adminaccess'} \|\| 'enabled');
6			my $multiaccess = ($phpmyadmin{'multiaccess'} \|\| 'disabled');
7
8			- if (($port eq "80") && ($haveSSL eq 'yes') && ("$adminaccess" eq "enabled" \|\| "$multiaccess" eq "enabled"))
9			+ if (($port eq $httpPort) && ($haveSSL eq 'yes') && ("$adminaccess" eq "enabled" \|\| "$multiaccess" eq "enabled"))
10			{
11			$OUT .= " RewriteRule ^/phpmyadmin(/.*\|\$) https://%{HTTP_HOST}/phpmyadmin\$1 [L,R]\n";
12			}
13
14
15			- if (($port eq "80") && ($haveSSL eq 'yes') && ( "$multiaccess" eq "enabled"))
16			+ if (($port eq $httpPort) && ($haveSSL eq 'yes') && ( "$multiaccess" eq "enabled"))
17			{
18			$OUT .= " RewriteRule ^/phpmyadmin-multi(/.*\|\$) https://%{HTTP_HOST}/phpmyadmin-multi\$1 [L,R]\n";
19			}