Changeset 1580

Timestamp:

09/01/2004 04:13:35 PM (21 years ago)

Author:

michelvaldrighi

Message:

added Emmanuel Frecon's fix to create directories in mw.newMediaObject, removed some useless (and/or potentially dangerous) debug strings

File:

• trunk/xmlrpc.php (modified) (6 diffs)

trunk/xmlrpc.php

@@ -35 +35 @@
 logIO("I", $HTTP_RAW_POST_DATA);
 
+
 function printr($var, $do_not_echo = false) {
     // from php.net/print_r user contributed notes 
@@ -46 +47 @@
     return $code;
 }
+
+function mkdir_p($target) {
+    // from php.net/mkdir user contributed notes 
+    if (file_exists($target)) {
+      if (!is_dir($target)) {
+        return false;
+      } else {
+        return true;
+      }
+    }
+
+    // Attempting to create the directory may clutter up our display.
+    if (@mkdir($target)) {
+      return true;
+    }
+
+    // If the above failed, attempt to create the parent node, then try again.
+    if (mkdir_p(dirname($target))) {
+      return mkdir_p($target);
+    }
+
+    return false;
+}
+
 
 class wp_xmlrpc_server extends IXR_Server {
@@ -85 +110 @@
     function login_pass_ok($user_login, $user_pass) {
       if (!user_pass_ok($user_login, $user_pass)) {
-        $this->error = new IXR_Error(403, 'Bad login/pass combination.'.$user_login);
+        $this->error = new IXR_Error(403, 'Bad login/pass combination.');
         return false;
       }
@@ -616 +641 @@
                 'postid' => $postdata['ID'],
                 'content' => $postdata['post_content'],
-                'permalink' => $link,
+                'permaLink' => $link,
                 'categories' => $categories,
                 'mt_excerpt' => $postdata['post_excerpt'],
@@ -759 +784 @@
         // User has not enough privileges
         logIO('O', '(MW) Not enough privilege: user level too low');
-        $this->error = new IXR_Error(401, 'You are not allowed to upload files to this site.sdff'.$user_data->user_level);
+        $this->error = new IXR_Error(401, 'You are not allowed to upload files to this site.');
         return $this->error;
       }
@@ -777 +802 @@
         $url = $file_url.$prefix.$name;
 
-        /* encode & write data (binary) */
-        $ifp = fopen($localpath, 'wb');
-        $success = fwrite($ifp, $bits);
-        fclose($ifp);
-        @chmod($localpath, 0666);
-
-        if($success) {
-          $resp = array($url);
-          return $resp;
+        if (mkdir_p(dirname($localpath))) {
+
+          /* encode & write data (binary) */
+          $ifp = fopen($localpath, 'wb');
+          $success = fwrite($ifp, $bits);
+          fclose($ifp);
+          @chmod($localpath, 0666);
+
+          if($success) {
+            $resp = array($url);
+            return $resp;
+          } else {
+            logIO('O', '(MW) Could not write file '.$name.' to '.$localpath);
+            return new IXR_Error(500, 'Could not write file '.$name);
+          }
+
         } else {
-          logIO('O', '(MW) Could not write file '.$name.' to '.$localpath);
-          return new IXR_Error(500, 'Could not write file '.$name.' to '.$localpath);
+          return new IXR_Error(500, 'Could not create directories for '.$name);
         }
       }