Changeset 2785

Timestamp:

Oct 20, 2008, 11:04:17 PM (16 years ago)

Author:

plg

Message:

bug 897 fixed: controls added in pwg.images.add to have clear error messages
if permission is denied or any error occur during file write.

File:

• branches/2.0/include/ws_functions.inc.php (modified) (6 diffs)

branches/2.0/include/ws_functions.inc.php

@@ -935 +935 @@
     umask(0000);
     $recursive = true;
-    mkdir($upload_dir, 0777, $recursive);
+    if (!@mkdir($upload_dir, 0777, $recursive))
+    {
+      return new PwgError(500, 'error during 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, 'directory has no write access');
+    }
   }
 
@@ -946 +960 @@
   // dump the photo file
   $fh_file = fopen($file_path, 'w');
-  fwrite($fh_file, base64_decode($params['file_content']));
+  if (!fwrite($fh_file, base64_decode($params['file_content'])))
+  {
+    return new PwgError(500, 'error while writing file');
+  }
   fclose($fh_file);
   chmod($file_path, 0644);
@@ -961 +978 @@
   if (!is_dir($thumbnail_dir)) {
     umask(0000);
-    mkdir($thumbnail_dir, 0777);
+    if (!@mkdir($thumbnail_dir, 0777))
+    {
+      return new PwgError(500, 'error during thumbnail directory creation');
+    }
+  }
+
+  if (!is_writable($thumbnail_dir))
+  {
+    // last chance to make the directory writable
+    @chmod($thumbnail_dir, 0777);
+
+    if (!is_writable($thumbnail_dir))
+    {
+      return new PwgError(500, 'thumbnail directory has no write access');
+    }
   }
 
@@ -976 +1007 @@
   // dump the thumbnail
   $fh_thumbnail = fopen($thumbnail_path, 'w');
-  fwrite($fh_thumbnail, base64_decode($params['thumbnail_content']));
+  if (!fwrite($fh_thumbnail, base64_decode($params['thumbnail_content'])))
+  {
+    return new PwgError(500, 'error while writing thumbnail');
+  }
   fclose($fh_thumbnail);
   chmod($thumbnail_path, 0644);
@@ -994 +1028 @@
     if (!is_dir($high_dir)) {
       umask(0000);
-      mkdir($high_dir, 0777);
-    }
-
+      if (!@mkdir($high_dir, 0777))
+      {
+        return new PwgError(500, 'error during high directory creation');
+      }
+    }
+
+    if (!is_writable($high_dir))
+    {
+      // last chance to make the directory writable
+      @chmod($high_dir, 0777);
+      
+      if (!is_writable($high_dir))
+      {
+        return new PwgError(500, 'high directory has no write access');
+      }
+    }
+    
     // high resolution path, same name as web size file
     $high_path = sprintf(
@@ -1007 +1055 @@
     // dump the high resolution file
     $fh_high = fopen($high_path, 'w');
-    fwrite($fh_high, base64_decode($params['high_content']));
+    if (!fwrite($fh_high, base64_decode($params['high_content'])))
+    {
+      return new PwgError(500, 'error while writing high');
+    }
     fclose($fh_high);
     chmod($high_path, 0644);