Some newlines removed from htaccess

Author: mcramer

server/plugins-available/apache2_plugin.inc.php

@@ -1745,8 +1745,8 @@ function web_folder_user($event_name,$data) {
 		//* Create the .htaccess file
 		//if(!is_file($folder_path.'.htaccess')) {
 			$begin_marker = '### ISPConfig folder protection begin ###';
-            $end_marker = '### ISPConfig folder protection end ###';
-            $ht_file = $begin_marker."\nAuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$folder_path.".htpasswd\nrequire valid-user\n".$end_marker."\n\n";
+            $end_marker = "### ISPConfig folder protection end ###\n\n";
+            $ht_file = $begin_marker."\nAuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$folder_path.".htpasswd\nrequire valid-user\n".$end_marker;
 
             if(file_exists($folder_path.'.htaccess')) {
                 $old_content = $app->system->file_get_contents($folder_path.'.htaccess');
@@ -1806,7 +1806,7 @@ function web_folder_delete($event_name,$data) {
 		//* Remove .htaccess file
 		if(is_file($folder_path.'.htaccess')) {
             $begin_marker = '### ISPConfig folder protection begin ###';
-            $end_marker = '### ISPConfig folder protection end ###';
+            $end_marker = "### ISPConfig folder protection end ###\n\n";
 
             $ht_file = $app->system->file_get_contents($folder_path.'.htaccess');
 
@@ -1873,7 +1873,7 @@ function web_folder_update($event_name,$data) {
 		if(!is_dir($new_folder_path)) $app->system->mkdirpath($new_folder_path);
 
         $begin_marker = '### ISPConfig folder protection begin ###';
-        $end_marker = '### ISPConfig folder protection end ###';
+        $end_marker = "### ISPConfig folder protection end ###\n\n";
 
 		if($data['old']['path'] != $data['new']['path']) {
 
@@ -1905,7 +1905,7 @@ function web_folder_update($event_name,$data) {
 
 		//* Create the .htaccess file
 		if($data['new']['active'] == 'y') {
-            $ht_file = $begin_marker."\nAuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$new_folder_path.".htpasswd\nrequire valid-user\n".$end_marker."\n\n";
+            $ht_file = $begin_marker."\nAuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$new_folder_path.".htpasswd\nrequire valid-user\n".$end_marker;
 
             if(file_exists($new_folder_path.'.htaccess')) {
                 $old_content = $app->system->file_get_contents($new_folder_path.'.htaccess');