From 5059b82164d1ef675af6e66b996d012bd5b32e53 Mon Sep 17 00:00:00 2001
From: Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>
Date: Thu, 1 Jun 2006 21:54:48 +0000
Subject: fixing stuff

---
 includes/file.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'includes')

diff --git a/includes/file.inc b/includes/file.inc
index 802df5656..7d23d4a7c 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -113,17 +113,17 @@ function file_check_directory(&$directory, $mode = 0, $form_item = NULL) {
   }
 
   if ((file_directory_path() == $directory || file_directory_temp() == $directory) && !is_file("$directory/.htaccess")) {
-    if (($fp = fopen("$directory/.htaccess", 'w')) && fputs($fp, 'SetHandler This_is_a_Drupal_security_line_do_not_remove')) {
+    $htaccess_lines = "SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006\nOptions None\n<IfModule mod_rewrite.c>\n  RewriteEngine off\n</IfModule>";
+    if (($fp = fopen("$directory/.htaccess", 'w')) && fputs($fp, $htaccess_lines)) {
       fclose($fp);
     }
     else {
-      $message = t("Security warning: Couldn't write .htaccess. Please create a .htaccess file in your %directory directory which contains the following line: <code>SetHandler This_is_a_Drupal_security_line_do_not_remove</code>", array('%directory' => $directory));
+      $message = t("Security warning: Couldn't write .htaccess file. Please create a .htaccess file in your %directory directory which contains the following lines: <code>%htaccess</code>", array('%directory' => theme('placeholder', $directory), '%htaccess' => '<br />'. str_replace("\n", '<br />', check_plain($htaccess_lines))));
       form_set_error($form_item, $message);
-      watchdog('file system', $message, WATCHDOG_ERROR);
+      watchdog('security', $message, WATCHDOG_ERROR);
     }
   }
 
-
   return true;
 }
 
-- 
cgit v1.2.3