Fixed: "old" style folder protection without comment lines in htaccess (3.0.4.6) get removed, too.

mcramer · mcramer · commit 2cb656cf7af0 · 2012-09-05T08:52:45.000Z
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -1812,6 +1812,8 @@ function web_folder_delete($event_name,$data) {
             
             if(preg_match('/' . preg_quote($begin_marker, '/') . '(.*?)' . preg_quote($end_marker, '/') . '/s', $ht_file, $matches)) {
                 $ht_file = str_replace($matches[0], '', $ht_file);
+            } else {
+                $ht_file = str_replace("AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$folder_path.".htpasswd\nrequire valid-user", '', $ht_file);
             }
             
             if(trim($ht_file) == '') {
@@ -1890,6 +1892,8 @@ function web_folder_update($event_name,$data) {
                 
                 if(preg_match('/' . preg_quote($begin_marker, '/') . '(.*?)' . preg_quote($end_marker, '/') . '/s', $ht_file, $matches)) {
                     $ht_file = str_replace($matches[0], '', $ht_file);
+                } else {
+                    $ht_file = str_replace("AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$old_folder_path.".htpasswd\nrequire valid-user", '', $ht_file);
                 }
                 
                 if(trim($ht_file) == '') {
@@ -1930,6 +1934,8 @@ function web_folder_update($event_name,$data) {
             
             if(preg_match('/' . preg_quote($begin_marker, '/') . '(.*?)' . preg_quote($end_marker, '/') . '/s', $ht_file, $matches)) {
                 $ht_file = str_replace($matches[0], '', $ht_file);
+            } else {
+                $ht_file = str_replace("AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$new_folder_path.".htpasswd\nrequire valid-user", '', $ht_file);
             }
             
             if(trim($ht_file) == '') {

Original file line number	Diff line number	Diff line change
`@@ -1812,6 +1812,8 @@ function web_folder_delete($event_name,$data) {`
`1812`	`1812`
`1813`	`1813`	`if(preg_match('/' . preg_quote($begin_marker, '/') . '(.*?)' . preg_quote($end_marker, '/') . '/s', $ht_file, $matches)) {`
`1814`	`1814`	`$ht_file = str_replace($matches[0], '', $ht_file);`
	`1815`	`+ } else {`
	`1816`	`+ $ht_file = str_replace("AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$folder_path.".htpasswd\nrequire valid-user", '', $ht_file);`
`1815`	`1817`	`}`
`1816`	`1818`
`1817`	`1819`	`if(trim($ht_file) == '') {`
`@@ -1890,6 +1892,8 @@ function web_folder_update($event_name,$data) {`
`1890`	`1892`
`1891`	`1893`	`if(preg_match('/' . preg_quote($begin_marker, '/') . '(.*?)' . preg_quote($end_marker, '/') . '/s', $ht_file, $matches)) {`
`1892`	`1894`	`$ht_file = str_replace($matches[0], '', $ht_file);`
	`1895`	`+ } else {`
	`1896`	`+ $ht_file = str_replace("AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$old_folder_path.".htpasswd\nrequire valid-user", '', $ht_file);`
`1893`	`1897`	`}`
`1894`	`1898`
`1895`	`1899`	`if(trim($ht_file) == '') {`
`@@ -1930,6 +1934,8 @@ function web_folder_update($event_name,$data) {`
`1930`	`1934`
`1931`	`1935`	`if(preg_match('/' . preg_quote($begin_marker, '/') . '(.*?)' . preg_quote($end_marker, '/') . '/s', $ht_file, $matches)) {`
`1932`	`1936`	`$ht_file = str_replace($matches[0], '', $ht_file);`
	`1937`	`+ } else {`
	`1938`	`+ $ht_file = str_replace("AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$new_folder_path.".htpasswd\nrequire valid-user", '', $ht_file);`
`1933`	`1939`	`}`
`1934`	`1940`
`1935`	`1941`	`if(trim($ht_file) == '') {`