Changeset 594166

Timestamp:

09/03/2012 08:24:14 PM (14 years ago)

Author:

ti2m

Message:

Directory create changes and writable checks

Location:

edge-suite/trunk

Files:

• admin/manage.php (modified) (1 diff)
• edge-suite.php (modified) (1 diff)
• includes/edge-suite-comp-builder.inc (modified) (6 diffs)
• includes/edge-suite-comp.inc (modified) (1 diff)
• includes/edge-suite-general.php (modified) (1 diff)

edge-suite/trunk/admin/manage.php

@@ -57 +57 @@
     }
 
+    // Init file system
+    WP_Filesystem();
 
-    //Here we check that $ok was not set to 0 by an error
     $tmp_file = EDGE_SUITE_PUBLIC_DIR . '/tmp/' . $_FILES['edge_suite_composition_upload']['name'];
     if (!is_dir(EDGE_SUITE_PUBLIC_DIR . '/tmp')) {
-      mkdir(EDGE_SUITE_PUBLIC_DIR . '/tmp');
+      if(!mkdir_recursive(EDGE_SUITE_PUBLIC_DIR . '/tmp')){
+        throw new Exception("Edge suite tmp could not be created.<br />");
+      }
+    }
+    if(!dir_is_writable(EDGE_SUITE_PUBLIC_DIR . '/tmp')){
+      throw new Exception("Edge suite tmp is not writable.<br />");
     }
 
     if (move_uploaded_file($_FILES['edge_suite_composition_upload']['tmp_name'], $tmp_file)) {
-      WP_Filesystem();
+
       edge_suite_comp_create($tmp_file, TRUE);
       echo '<div style="background-color: rgb(255, 251, 204);" id="message" class="updated fade">';

edge-suite/trunk/edge-suite.php

@@ -114 +114 @@
 
   //Check if dir is writable and create directory structure.
-  if (!wp_mkdir_p(EDGE_SUITE_COMP_PROJECT_DIR)) {
+  if (!mkdir_recursive(EDGE_SUITE_COMP_PROJECT_DIR)) {
     $message = sprintf(__('Unable to create directory %s. Is its parent directory writable by the server?'), EDGE_SUITE_COMP_PROJECT_DIR_REL);
     return array('error' => $message);

edge-suite/trunk/includes/edge-suite-comp-builder.inc

@@ -103 +103 @@
    */
   public function __construct($base_dir, $project_dir) {
-//    global $user;
     $this->edgeDir = $base_dir;
     $this->edgeProjectDir = $project_dir;
@@ -111 +110 @@
 
     if (!is_dir($base_dir . '/edge_tmp')) {
-      mkdir($base_dir . '/edge_tmp');
+      if(!mkdir_recursive($base_dir . '/edge_tmp')){
+        throw new Exception ("Can't create edge_tmp directory.");
+      };
     }
 
     if (!is_dir($this->tmpDirBase)) {
-      mkdir($this->tmpDirBase);
+      if(!mkdir_recursive($this->tmpDirBase)){
+        throw new Exception ("Can't create project tmp directory.");
+      }
     }
 
     if (!is_dir($this->edgeProjectDir)) {
-      mkdir($this->edgeProjectDir);
-    }
-
+      if(!mkdir_recursive($this->edgeProjectDir)){
+        throw new Exception ("Can't project directory.");
+      }
+    }
+
+    if(!dir_is_writable($base_dir . '/edge_tmp')){
+      throw new Exception("edge_tmp is not writable.<br />");
+    }
+
+    if(!dir_is_writable($this->tmpDirBase)){
+      throw new Exception("Project tmp directory is not writable.<br />");
+    }
+
+    if(!dir_is_writable($this->edgeProjectDir)){
+      throw new Exception("Specific project directory is not writable.<br />");
+    }
 
     $this->dimensions = array(
@@ -208 +224 @@
       }
     }
-    mkdir($this->destinationDir);
+    if(!mkdir_recursive($this->destinationDir)){
+      throw new Exception ('The project directory could not be created.');
+    }
 
     // Extract the archive.
@@ -496 +514 @@
     // Set up shared folder if it doesn't exist.
     if (!is_dir($this->edgeDir . '/edge_includes')) {
-      mkdir($this->edgeDir . '/edge_includes');
+      mkdir_recursive($this->edgeDir . '/edge_includes');
     }
 
@@ -570 +588 @@
     // Check if list is valid.
     if (!preg_match('/^([a-zA-Z0-9]{2,6}\|)*([a-zA-Z0-9]{2,6})$/', $allowed_extensions)) {
-      $allowed_extensions = 'js|png|jpg|gif|svg';
+      $allowed_extensions = 'js|png|jpg|gif|svg|css';
     }
 
@@ -582 +600 @@
       $rel_dir = substr($dir, strlen($src) + 1);
       if (!file_exists($dest . '/' . $rel_dir)) {
-        mkdir($dest . '/' . $rel_dir);
+        mkdir_recursive($dest . '/' . $rel_dir);
       }
       // TODO: Feedback if file couldn't be moved.

edge-suite/trunk/includes/edge-suite-comp.inc

@@ -39 +39 @@
   if (!is_dir(EDGE_SUITE_COMP_PROJECT_DIR)) {
     if (!is_dir(EDGE_SUITE_PUBLIC_DIR)) {
-      mkdir(EDGE_SUITE_PUBLIC_DIR);
-    }
-    mkdir(EDGE_SUITE_COMP_PROJECT_DIR);
+      mkdir_recursive(EDGE_SUITE_PUBLIC_DIR);
+    }
+    mkdir_recursive(EDGE_SUITE_COMP_PROJECT_DIR);
   }
 

edge-suite/trunk/includes/edge-suite-general.php

@@ -18 +18 @@
 }
 
+function mkdir_recursive($path){
+  if (wp_mkdir_p($path)) {
+    return true;
+  }
+  else{
+    return $path . " could not be created.";
+  }
+}
+
+function dir_is_writable($path){
+  global $wp_filesystem;
+  return $wp_filesystem->is_writable($path);
+}
 
 function check_plain($text) {