filebrowser sub-dir fix

diff --git a/ipf/admin/templates/admin/filebrowser.html b/ipf/admin/templates/admin/filebrowser.html
index 98a69096e77f557499938c13fa72dde9ee8d9588..74be9d321f31473a609a620803084cb47f76ffd6 100644 (file)
--- a/ipf/admin/templates/admin/filebrowser.html
+++ b/ipf/admin/templates/admin/filebrowser.html
@@ -25,41 +25,41 @@ var mouseY = 0;
 {literal}
 
 $().mousemove( function(e) {
-       mouseX = e.pageX;
-       mouseY = e.pageY;
-       $('#prop').css('top',mouseY+5);
-       $('#prop').css('left',mouseX+10);
+    mouseX = e.pageX;
+    mouseY = e.pageY;
+    $('#prop').css('top',mouseY+5);
+    $('#prop').css('left',mouseX+10);
 });
 
 function click_file(filename, image, w, h){
-       var fname = upload_url+curr_dir+filename;
-       $('#picname').show();
+    var fname = upload_url+curr_dir+filename;
+    $('#picname').show();
     $('#id_old_name').val(filename);
     $('#id_old_name2').val(filename);
     $('#id_curr_dir').val(curr_dir);
     $('#id_new_name').val(filename);
-       if (image=='1')
-               $('#pic').attr('src',fname);
-       else
-               $('#pic').attr('src',admin_media_url+'img/zero.gif');
-       $('#pic').attr('width',w);
-       $('#pic').attr('height',h);
-       return false;
+    if (image=='1')
+        $('#pic').attr('src',fname);
+    else
+        $('#pic').attr('src',admin_media_url+'img/zero.gif');
+    $('#pic').attr('width',w);
+    $('#pic').attr('height',h);
+    return false;
 }
 
 function line_over(id, is_dir, is_image, type, size, filename){
-       if (is_image==1){
-               $('#prop').hide();
-               var fname = upload_url+curr_dir+filename;
-               $('#prop').html('<img src="'+fname+'" width="100" />');
-               $('#prop').css('top',mouseY+5);
-               $('#prop').css('left',mouseX+10);
-               $('#prop').show();
-       }
+    if (is_image==1){
+        $('#prop').hide();
+        var fname = upload_url+curr_dir+filename;
+        $('#prop').html('<img src="'+fname+'" width="100" />');
+        $('#prop').css('top',mouseY+5);
+        $('#prop').css('left',mouseX+10);
+        $('#prop').show();
+    }
 }
 
 function line_out(id){
-       $('#prop').hide();
+    $('#prop').hide();
 }
 
 var FileBrowserDialogue = {
@@ -67,7 +67,7 @@ var FileBrowserDialogue = {
         // Here goes your code for setting your custom things onLoad.
     },
     mySubmit : function () {
-               var URL = upload_url + curr_dir + $('#id_old_name').val(); 
+        var URL = upload_url + curr_dir + $('#id_old_name').val(); 
         var win = tinyMCEPopup.getWindowArg("window");
         // insert information now
         win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
@@ -111,21 +111,21 @@ tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
 <div id="picname" style="display:none;">
 <h3 style="border-top:1px dashed #a0a0a0; padding:5px 0;">File Option</h3>
 <form method="post">
-       <input type="hidden" name="old_name" id="id_old_name" />
-       <input type="hidden" name="curr_dir" id="id_curr_dir" />
-       <table cellpadding="0" cellspacing="0"><tr>
-       <td> <input name="new_name" id="id_new_name" /></td><td>
-       <div class="submit-row" style="float:left;"><input class="default" type="submit" value="Rename"/></div>
-       </td></tr></table>
+    <input type="hidden" name="old_name" id="id_old_name" />
+    <input type="hidden" name="curr_dir" id="id_curr_dir" />
+    <table cellpadding="0" cellspacing="0"><tr>
+    <td> <input name="new_name" id="id_new_name" /></td><td>
+    <div class="submit-row" style="float:left;"><input class="default" type="submit" value="Rename"/></div>
+    </td></tr></table>
 </form>
 
 <form method="post">
-       <table cellpadding="0" cellspacing="0"><tr>
-       <input type="hidden" name="action" value="move" />
-       <input type="hidden" name="old_name" id="id_old_name2" />
-       <td><select name="move">{foreach $dirtree as $dir}<option value="{$dir['path']}">{$dir['name']}</option>{/foreach}</select></td><td>
-       <div class="submit-row" style="float:left;"><input class="default" type="submit" value="Move To"/></div>
-       </td></tr></table>
+    <table cellpadding="0" cellspacing="0"><tr>
+    <input type="hidden" name="action" value="move" />
+    <input type="hidden" name="old_name" id="id_old_name2" />
+    <td><select name="move">{foreach $dirtree as $dir}<option value="{$dir['path']}">{$dir['name']}</option>{/foreach}</select></td><td>
+    <div class="submit-row" style="float:left;"><input class="default" type="submit" value="Move To"/></div>
+    </td></tr></table>
 </form>
 
 
@@ -146,26 +146,26 @@ tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
 <table>
 <thead>
 <tr>
-       <th>Filename</th>
-       <th>Type</th>
-       <th>Size</th>
-       <th>delete</th>
+    <th>Filename</th>
+    <th>Type</th>
+    <th>Size</th>
+    <th>delete</th>
 </tr>
 </thead>
 <tbody>
 {foreach $dirs as $dir}
 <tr id="id_{$dir['id']}" onmouseover="line_over({$dir['id']},1,0,'SUB-DIR',0,'{$dir['name']}')" onmouseout="line_out({$dir['id']})">
-       <td><a href="{$dir['name']}">{$dir['name']}</a></td>
-       <td colspan="2">SUB-DIR</td>
-       <td>{if $dir['name']!='..'}<a href="?delete={$dir['name']}">delete</a>{/if}</td>
+    <td><a href="{$dir['name']}/">{$dir['name']}</a></td>
+    <td colspan="2">SUB-DIR</td>
+    <td>{if $dir['name']!='..'}<a href="?delete={$dir['name']}">delete</a>{/if}</td>
 </tr>
 {/foreach}
 {foreach $files as $file}
 <tr id="id_{$file['id']}" onmouseover="line_over({$file['id']},0,{$file['image']}, '{$file['type']}', {$file['size']}, '{$file['name']}')" onmouseout="line_out({$dir['id']})">
-       <td><a href="#" onclick="return click_file('{$file['name']}', '{$file['image']}', {$file['zw']}, {$file['zh']})">{$file['name']}</a></td>
-       <td>{$file['type']}</td>
-       <td>{$file['size']}</td>
-       <td><a href="?delete={$file['name']}">delete</a></td>
+    <td><a href="#" onclick="return click_file('{$file['name']}', '{$file['image']}', {$file['zw']}, {$file['zh']})">{$file['name']}</a></td>
+    <td>{$file['type']}</td>
+    <td>{$file['size']}</td>
+    <td><a href="?delete={$file['name']}">delete</a></td>
 </tr>
 {/foreach}
 </tbody>

diff --git a/ipf/admin/views.php b/ipf/admin/views.php
index 86fcefb6114bca89fedb2ab603d02128c09a098c..d027a9880b4cf8a2468c7e3de270a1412a3e60e3 100644 (file)
--- a/ipf/admin/views.php
+++ b/ipf/admin/views.php
@@ -294,8 +294,11 @@ function dir_recursive($dir, $path=DIRECTORY_SEPARATOR, $level=''){
 function IPF_Admin_Views_FileBrowser($request, $match){
     $ca = IPF_Admin_App::checkAdminAuth($request);
     if ($ca!==true) return $ca;
-    
+
     $curr_dir = urldecode(substr($match[1],1));
+    if (substr($curr_dir, -1) == '/')
+      $curr_dir = substr($curr_dir, 0, strlen($curr_dir)-1);
+
     $upload_path = IPF::get('editor_upload_path','');
     if ($upload_path=='')
         $upload_path = IPF::get('upload_path','');
@@ -332,18 +335,19 @@ function IPF_Admin_Views_FileBrowser($request, $match){
     $dirs = array();
     $files = array();
     if ($dh = @opendir($dir)) {
+        $_dir = substr($dir, -1) !== DIRECTORY_SEPARATOR ? $dir.DIRECTORY_SEPARATOR : $dir;
         while (($file = readdir($dh)) !== false) {
             if ($file=='.')
                 continue;
             if (($curr_dir=='') && ($file=='..'))
                 continue;
-            if (filetype($dir . $file)=='dir'){
+            if (filetype($_dir . $file)=='dir'){
                 $dirs[] = array('id'=>$id, 'name'=>$file);
                 $id++;
             }
             else{
                 
-                $sx = getimagesize($dir.$file);
+                $sx = getimagesize($_dir.$file);
                 if ($sx){
                     $image = '1';
                     $type = str_replace('image/','',$sx['mime']).' '.$sx[0].'x'.$sx[1];
@@ -363,7 +367,7 @@ function IPF_Admin_Views_FileBrowser($request, $match){
                     $zw = 200;
                     $zh = 150;
                 }
-                $files[] = array('id'=>$id, 'name'=>$file, 'image'=>$image, 'type'=>$type, 'zw'=>$zw, 'zh'=>$zh, 'size'=>filesize($dir . $file));
+                $files[] = array('id'=>$id, 'name'=>$file, 'image'=>$image, 'type'=>$type, 'zw'=>$zw, 'zh'=>$zh, 'size'=>filesize($_dir . $file));
                 $id++;
             }
         }
@@ -374,11 +378,11 @@ function IPF_Admin_Views_FileBrowser($request, $match){
     
     $dirtree = dir_recursive($upload_path);
 
-    $pth = explode(DIRECTORY_SEPARATOR,$curr_dir);
+    $pth = explode('/',$curr_dir);
     $path = array();
     $cd = '/admin/filebrowser/';
     foreach($pth as $p){
-        $cd.=$p.DIRECTORY_SEPARATOR;
+        $cd.=$p.'/';
         $path[] = array('cd'=>$cd, 'name'=>$p);
     }