mediaupload fixed

darcs-hash:20050422204004-9977f-28121470068f795e42ecc861e33af76613f1ab81.gz

2 files changed, 23 insertions, 16 deletions

diff --git a/inc/template.php b/inc/template.php
index 62f20c5e1..3188dd07d 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -492,15 +492,18 @@ function tpl_mediafilelist(){
          utf8_decodeFN($item['file']).
          '</a>',6);
     if($item['isimg']){
-      ptln('('.$item['info'][0].'&#215;'.$item['info'][1].
-           ' '.filesize_h($item['size']).')<br />',6);
-
-      # build thumbnail
-      $link=array();
-      $link['name']=$item['id'];
-      if($item['info'][0]>120) $link['name'] .= '?120';
-      $link = format_link_media($link);
-      ptln($link['name'],6);
+      $w = $item['info'][0];
+      $h = $item['info'][1];
+
+      ptln('('.$w.'&#215;'.$h.' '.filesize_h($item['size']).')<br />',6);
+      ptln('<a href="javascript:mediaSelect(\''.$item['id'].'\')">');
+
+      if($w>120){
+        print '<img src="'.DOKU_BASE.'fetch.php?w=120&amp;media='.urlencode($item['id']).'" width="120" />';
+      }else{
+        print '<img src="'.DOKU_BASE.'fetch.php?media='.urlencode($item['id']).'" width="'.$w.'" height="'.$h.'" />';
+      }
+      print '</a>';
 
     }else{
       ptln ('('.filesize_h($item['size']).')',6);
diff --git a/media.php b/media.php
index b6d33ce26..e10161abe 100644
--- a/media.php
+++ b/media.php
@@ -6,7 +6,6 @@
   require_once(DOKU_INC.'lang/'.$conf['lang'].'/lang.php');
   require_once(DOKU_INC.'inc/html.php');
   require_once(DOKU_INC.'inc/search.php');
-  require_once(DOKU_INC.'inc/format.php');
   require_once(DOKU_INC.'inc/template.php');
   require_once(DOKU_INC.'inc/auth.php');
 
@@ -44,7 +43,7 @@
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function media_upload($NS){
-  global $conf;
+	require_once(DOKU_INC.'inc/confutils.php');
   global $lang;
 
   // get file
@@ -54,13 +53,18 @@ function media_upload($NS){
   if(empty($id)) $id = $file['name'];
   $id   = cleanID($NS.':'.$id);
   // get filename
-  $fn   = utf8_encodeFN(str_replace(':','/',$id));
-  $fn   = $conf['mediadir'].'/'.$fn;
-  // prepare directory
-  io_makeFileDir($fn);
+  $fn   = mediaFN($id);
+
+  // get filetype regexp
+	$types = array_keys(getMimeTypes());
+	$types = array_map(create_function('$q','return preg_quote($q,"/");'),$types);
+  $regex = join('|',$types);
+
 
   umask($conf['umask']);
-  if(preg_match('/\.('.$conf['uploadtypes'].')$/i',$fn)){
+  if(preg_match('/\.('.$regex.')$/i',$fn)){
+  	// prepare directory
+  	io_makeFileDir($fn);
     if (move_uploaded_file($file['tmp_name'], $fn)) {
       msg($lang['uploadsucc'],1);
       return true;