diff -Nur --no-dereference e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays
--- e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays	2022-04-16 02:17:57.222000000 -0400
+++ e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays	2022-04-16 02:42:53.058000000 -0400
@@ -28,63 +28,63 @@
             }
             elsif ($properties{'PublicAccess'} eq 'local')
             {
-                $allow   = $localAccess;
+                $allow   = "ip $localAccess";
                 $pass    = 0;
-                $satisfy = 'all';
+                $satisfy = 'All';
             }
             elsif ($properties{'PublicAccess'} eq 'local-pw')
             {
-                $allow   = $localAccess;
+                $allow   = "ip $localAccess";
                 $pass    = 1;
-                $satisfy = 'all';
+                $satisfy = 'All';
             }
             elsif ($properties{'PublicAccess'} eq 'global')
             {
-                $allow   = 'all';
+                $allow   = 'all granted';
                 $pass    = 0;
-                $satisfy = 'all';
+                $satisfy = 'All';
             }
             elsif ($properties{'PublicAccess'} eq 'global-pw')
             {
-                $allow   = 'all';
+                $allow   = 'all granted';
                 $pass    = 1;
-                $satisfy = 'all';
+                $satisfy = 'All';
             }
             elsif ($properties{'PublicAccess'} eq 'global-pw-remote')
             {
-                $allow   = $localAccess;
+                $allow   = "ip $localAccess";
                 $pass    = 1;
-                $satisfy = 'any';
+                $satisfy = 'Any';
             }
         }
         elsif ($properties {'ReadAccess'} eq 'global')
         {
             if ($properties {'UsePassword'} eq 'yes')
             {
-                $allow   = 'all';
+                $allow   = 'all granted';
                 $pass    = 1;
-                $satisfy = 'all';
+                $satisfy = 'All';
             }
             else
             {
-                $allow   = 'all';
+                $allow   = 'all granted';
                 $pass    = 0;
-                $satisfy = 'all';
+                $satisfy = 'All';
             }
         }
         else
         {
             if ($properties {'UsePassword'} eq 'yes')
             {
-                $allow   = $localAccess;
+                $allow   = "ip $localAccess";
                 $pass    = 1;
-                $satisfy = 'all';
+                $satisfy = 'All';
             }
             else
             {
-                $allow   = $localAccess;
+                $allow   = "ip $localAccess";
                 $pass    = 0;
-                $satisfy = 'all';
+                $satisfy = 'All';
             }
         }
 
@@ -120,23 +120,25 @@
             $OUT .= "    DirectoryIndex index.shtml index.htm index.html\n";
             $OUT .= "    Options +IncludesNOEXEC\n";
             $OUT .= "    <FilesMatch \"\\.(phar|php|phtml)\$\">\n";
-            $OUT .= "        order deny,allow\n";
-            $OUT .= "        Deny from all\n";
+            $OUT .= "        Require all denied\n";
             $OUT .= "    </FilesMatch>\n";
         }
         $OUT .= "    AllowOverride $allowOverride\n";
-        $OUT .= "    order deny,allow\n";
-        $OUT .= "    deny from all\n";
-        $OUT .= "    allow from $allow\n";
         if ($pass)
         {
             $OUT .= "    AuthName \"$properties{'Name'}\"\n";
             $OUT .= "    AuthType Basic\n";
             $OUT .= "    AuthBasicProvider external\n";
             $OUT .= "    AuthExternal pwauth\n";
-            $OUT .= "    require user $key\n";
-            $OUT .= "    Satisfy $satisfy\n";
-        }
+            $OUT .= "    <Require$satisfy>\n";
+            $OUT .= "        Require user $key\n";
+            $OUT .= "        Require $allow\n";
+            $OUT .= "    </Require$satisfy>\n";
+        }
+	else
+	{
+            $OUT .= "    Require $allow\n";
+	}
 
         $OUT .= "</Directory>\n";
 
@@ -151,18 +153,22 @@
             $OUT .= "    Options ExecCGI\n";
         }
         $OUT .= "    AllowOverride None\n";
-        $OUT .= "    order deny,allow\n";
-        $OUT .= "    deny from all\n";
-        $OUT .= "    allow from $allow\n";
         if ($pass)
         {
             $OUT .= "    AuthName \"$properties{'Name'}\"\n";
             $OUT .= "    AuthType Basic\n";
             $OUT .= "    AuthBasicProvider external\n";
             $OUT .= "    AuthExternal pwauth\n";
-            $OUT .= "    require user $key\n";
-            $OUT .= "    Satisfy $satisfy\n";
+            $OUT .= "    <Require$satisfy>\n";
+            $OUT .= "        Require user $key\n";
+            $OUT .= "        Require $allow\n";
+            $OUT .= "    </Require$satisfy>\n";
+        }
+        else
+        {
+            $OUT .= "    Require $allow\n";
         }
+
         $OUT .= "</Directory>\n";
 
         $OUT .= "\n";
@@ -172,17 +178,20 @@
             $OUT .= "    SSLRequireSSL\n";
         }
         $OUT .= "    AllowOverride None\n";
-        $OUT .= "    order deny,allow\n";
-        $OUT .= "    deny from all\n";
-        $OUT .= "    allow from $allow\n";
         if ($pass)
         {
             $OUT .= "    AuthName \"$properties{'Name'}\"\n";
             $OUT .= "    AuthType Basic\n";
             $OUT .= "    AuthBasicProvider external\n";
             $OUT .= "    AuthExternal pwauth\n";
-            $OUT .= "    require user $key\n";
-            $OUT .= "    Satisfy $satisfy\n";
+            $OUT .= "    <Require$satisfy>\n";
+            $OUT .= "        Require user $key\n";
+            $OUT .= "        Require $allow\n";
+            $OUT .= "    </Require$satisfy>\n";
+        }
+        else
+        {
+            $OUT .= "    Require $allow\n";
         }
         $OUT .= "</Directory>\n";
     }