@@ -73,6 +73,7 @@ $twig_filters = array( // debugging 'inspect' => 'twig_inspect_filter', + 'uploaded' => 'uploaded', 'fallback' => 'oneof', 'selected' => 'twig_selected_filter', 'checked' => 'twig_checked_filter', includes/class/Twig/runtime.php @@ -929,7 +929,7 @@ */ function upload($file, $extension = null, $path = "", $put = false) { $file_split = explode(".", $file['name']); - $dir = MAIN_DIR.Config::current()->uploads_path.$path; + $dir = rtrim(MAIN_DIR.Config::current()->uploads_path.$path, "/"); if (!file_exists($dir)) mkdir($dir); @@ -969,12 +969,12 @@ $file_clean = sanitize($file_clean, false).".".$file_ext; $filename = unique_filename($file_clean, $path); - $message = __("Couldn't upload file. CHMOD <code>".MAIN_DIR.Config::current()->uploads_path."</code> to 777 and try again. If this problem persists, it's probably timing out; in which case, you must contact your system administrator to increase the maximum POST and upload sizes."); + $message = __("Couldn't upload file. CHMOD <code>".$dir."</code> to 777 and try again. If this problem persists, it's probably timing out; in which case, you must contact your system administrator to increase the maximum POST and upload sizes."); if ($put) { - if (!@copy($file['tmp_name'], $dir.$filename)) + if (!@copy($file['tmp_name'], $dir."/".$filename)) error(__("Error"), $message); - } elseif (!@move_uploaded_file($file['tmp_name'], $dir.$filename)) + } elseif (!@move_uploaded_file($file['tmp_name'], $dir."/".$filename)) error(__("Error"), $message); return $filename; includes/helpers.php 7266ecf9e8350a23eb169ace2817abfce6713520 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/311a2bf6645405323c51da7564880d83f0a44375 311a2bf6645405323c51da7564880d83f0a44375 2008-11-15T15:30:09-08:00 2008-11-15T15:30:09-08:00 * Added an "uploaded" Twig filter for referencing an uploaded file. * Fixed upload() and custom paths. 34bbd9d12ee38f9e65da0a9b49e792288a92d228 Alex Suraci i.am@toogeneric.com