summaryrefslogtreecommitdiff
path: root/post.php
diff options
context:
space:
mode:
Diffstat (limited to 'post.php')
-rw-r--r--post.php45
1 files changed, 44 insertions, 1 deletions
diff --git a/post.php b/post.php
index 074aa0dc..cfec5430 100644
--- a/post.php
+++ b/post.php
@@ -268,6 +268,46 @@ if (isset($_POST['delete'])) {
$_POST['subject'] = '';
}
+ if ($config['allow_upload_by_url'] && isset($_POST['file_url']) && !empty($_POST['file_url'])) {
+ $post['file_url'] = $_POST['file_url'];
+ if (!preg_match($config['url_regex'], $post['file_url']))
+ error($config['error']['invalidimg']);
+
+
+ $post['extension'] = strtolower(mb_substr($post['file_url'], mb_strrpos($post['file_url'], '.') + 1));
+ if (!in_array($post['extension'], $config['allowed_ext']) && !in_array($post['extension'], $config['allowed_ext_files']))
+ error($config['error']['unknownext']);
+
+ $post['file_tmp'] = tempnam($config['tmp'], 'url');
+ register_shutdown_function('unlink', $post['file_tmp']);
+
+ $fp = fopen($post['file_tmp'], 'w');
+
+ $curl = curl_init();
+ curl_setopt($curl, CURLOPT_URL, $post['file_url']);
+ curl_setopt($curl, CURLOPT_FAILONERROR, true);
+ curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
+ curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 5);
+ curl_setopt($curl, CURLOPT_TIMEOUT, 15);
+ curl_setopt($curl, CURLOPT_USERAGENT, 'Tinyboard');
+ curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
+ curl_setopt($curl, CURLOPT_FILE, $fp);
+
+ if (curl_exec($curl) === false)
+ error($config['error']['nomove']);
+
+ curl_close($curl);
+
+ fclose($fp);
+
+ $_FILES['file'] = array(
+ 'name' => basename($post['file_url']),
+ 'tmp_name' => $post['file_tmp'],
+ 'error' => 0,
+ 'size' => filesize($post['file_tmp'])
+ );
+ }
+
// Check for a file
if ($post['op'] && !isset($post['no_longer_require_an_image_for_op'])) {
if (!isset($_FILES['file']['tmp_name']) || $_FILES['file']['tmp_name'] == '' && $config['force_image_op'])
@@ -545,7 +585,10 @@ if (isset($_POST['delete'])) {
}
if (!isset($dont_copy_file) || !$dont_copy_file) {
- if (!@move_uploaded_file($upload, $post['file']))
+ if (isset($post['file_tmp'])) {
+ if (!@rename($upload, $post['file']))
+ error($config['error']['nomove']);
+ } elseif (!@move_uploaded_file($upload, $post['file']))
error($config['error']['nomove']);
}
}