@@ -23,16 +23,11 @@ $this->respondTo("filter_post", "filter_post"); } public function submit() { - $filename = ""; if (isset($_FILES['audio']) and $_FILES['audio']['error'] == 0) $filename = upload($_FILES['audio'], "mp3"); - elseif (!empty($_POST['from_url'])) { - $file = tempnam(sys_get_temp_dir(), "chyrp"); - file_put_contents($file, get_remote($_POST['from_url'])); - $fake_file = array("name" => basename(parse_url($_POST['from_url'], PHP_URL_PATH)), - "tmp_name" => $file); - $filename = upload($fake_file, "mp3", "", true); - } else + elseif (!empty($_POST['from_url'])) + $filename = upload_from_url($_POST['from_url'], "mp3"); + else error(__("Error"), __("Couldn't upload audio file.")); $post = Post::add(array("filename" => $filename, @@ -46,6 +41,9 @@ if (isset($_FILES['audio']) and $_FILES['audio']['error'] == 0) { $this->delete_file($post); $filename = upload($_FILES['audio'], "mp3"); + } elseif (!empty($_POST['from_url'])) { + $this->delete_file($post); + $filename = upload_from_url($_POST['from_url'], "mp3"); } else $filename = $post->filename; feathers/audio/audio.php @@ -23,16 +23,11 @@ $this->respondTo("edit_post_options", "alt_text_field"); } public function submit() { - $filename = ""; if (isset($_FILES['photo']) and $_FILES['photo']['error'] == 0) $filename = upload($_FILES['photo'], array("jpg", "jpeg", "png", "gif", "tiff", "bmp")); - elseif (!empty($_POST['from_url'])) { - $file = tempnam(sys_get_temp_dir(), "chyrp"); - file_put_contents($file, get_remote($_POST['from_url'])); - $fake_file = array("name" => basename(parse_url($_POST['from_url'], PHP_URL_PATH)), - "tmp_name" => $file); - $filename = upload($fake_file, array("jpg", "jpeg", "png", "gif", "tiff", "bmp"), "", true); - } else + elseif (!empty($_POST['from_url'])) + $filename = upload_from_url($_POST['from_url'], array("jpg", "jpeg", "png", "gif", "tiff", "bmp")); + else error(__("Error"), __("Couldn't upload photo.")); $post = Post::add(array("filename" => $filename, @@ -45,7 +40,10 @@ public function update() { if (isset($_FILES['photo']) and $_FILES['photo']['error'] == 0) { $this->delete_file($post); - $filename = upload($_FILES['photo']); + $filename = upload($_FILES['photo'], array("jpg", "jpeg", "png", "gif", "tiff", "bmp")); + } elseif (!empty($_POST['from_url'])) { + $this->delete_file($post); + $filename = upload_from_url($_POST['from_url'], array("jpg", "jpeg", "png", "gif", "tiff", "bmp")); } else $filename = $post->filename; feathers/photo/photo.php @@ -881,6 +881,7 @@ * $file - The $_FILES value. * $extension - An array of valid extensions (case-insensitive). * $path - A sub-folder in the uploads directory (optional). + * $put - Use copy() instead of move_uploaded_file()? * * Returns: * $filename - The resulting filename from the upload. @@ -932,6 +933,28 @@ } /** + * Function: upload_from_url + * Copy a file from a specified URL to their upload directory. + * + * Parameters: + * $url - The URL to copy. + * $extension - An array of valid extensions (case-insensitive). + * $path - A sub-folder in the uploads directory (optional). + * + * See Also: + * <upload> + */ + function upload_from_url($url, $extension = null, $path = "") { + $file = tempnam(sys_get_temp_dir(), "chyrp"); + file_put_contents($file, get_remote($url)); + + $fake_file = array("name" => basename(parse_url($url, PHP_URL_PATH)), + "tmp_name" => $file); + + return upload($fake_file, $extension, $path, true); + } + + /** * Function: timer_start * Starts the timer. */ includes/helpers.php c09a91241e56f9dd1c42940f91622499a820bf61 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/73c320260b0db0abf712fd8759d1d05859875f52 73c320260b0db0abf712fd8759d1d05859875f52 2008-07-01T11:49:51-07:00 2008-07-01T11:49:51-07:00 Added upload_from_url() function. 6dd4a549ddb0668edb370f1ba980100353e85b41 Alex Suraci i.am@toogeneric.com