Changeset 2917 for trunk

Timestamp:

Dec 3, 2008, 12:28:32 AM (16 years ago)

Author:

plg

Message:

merge r2916 from branch 2.0 to trunk

bug 904 fixed: an index.htm is created in directories created by
pwg.images.add web API method, only directories that contains pictures.

Location:

trunk/include

Files:

• functions.inc.php (modified) (1 diff)
• ws_functions.inc.php (modified) (3 diffs)

trunk/include/functions.inc.php

@@ -1541 +1541 @@
   return $str; //???
 }
+
+/**
+ * makes sure a index.htm protects the directory from browser file listing
+ *
+ * @param string dir directory
+ */
+function secure_directory($dir)
+{
+  $file = $dir.'/index.htm';
+  if (!file_exists($file))
+  {
+    @file_put_contents($file, 'Not allowed!');
+  }
+}
 ?>

trunk/include/ws_functions.inc.php

@@ -952 +952 @@
   }
 
+  secure_directory($upload_dir);
+
   // compute file path
   $date_string = preg_replace('/[^\d]/', '', $dbnow);
@@ -994 +996 @@
     }
   }
+
+  secure_directory($thumbnail_dir);
 
   // thumbnail path, the filename may use a prefix and the extension is
@@ -1044 +1048 @@
       }
     }
+    
+    secure_directory($high_dir);
     
     // high resolution path, same name as web size file