Changeset 17676 for branches/2.4/include/ws_functions.inc.php

Timestamp:

Aug 30, 2012, 9:20:50 PM (12 years ago)

Author:

rvelices

Message:

bug 2725: Piwigo isn't compatible with suPHP + better handling of watermark upload errors merge from trunk to branch 2.4

File:

• branches/2.4/include/ws_functions.inc.php (modified) (1 diff)

branches/2.4/include/ws_functions.inc.php

@@ -1508 +1508 @@
 
   // create the upload directory tree if not exists
-  if (!is_dir($upload_dir)) {
-    umask(0000);
-    if (!@mkdir($upload_dir, 0777, true))
-    {
-      return new PwgError(500, 'error during buffer directory creation');
-    }
-  }
-
-  if (!is_writable($upload_dir))
-  {
-    // last chance to make the directory writable
-    @chmod($upload_dir, 0777);
-
-    if (!is_writable($upload_dir))
-    {
-      return new PwgError(500, 'buffer directory has no write access');
-    }
-  }
-
-  secure_directory($upload_dir);
+  if (!mkgetdir($upload_dir, MKGETDIR_DEFAULT&~MKGETDIR_DIE_ON_ERROR))
+  {
+    return new PwgError(500, 'error during buffer directory creation');
+  }
 
   $filename = sprintf(