editor_editor_url

diff --git a/ipf/admin/templates/admin/filebrowser.html b/ipf/admin/templates/admin/filebrowser.html
index 4f62a70df3a01fe069987b75184864349080d51e..f8028659253c35d81c5646d3c735d3b5367c5eb6 100644 (file)
--- a/ipf/admin/templates/admin/filebrowser.html
+++ b/ipf/admin/templates/admin/filebrowser.html
@@ -17,7 +17,7 @@ a{color:#2B6FB6}
 
 <script type="text/javascript">
 var curr_dir = '{$curr_dir}';
-var upload_url = '{$UPLOAD_URL}';
+var upload_url = '{$upload_url}';
 var admin_media_url = '{$ADMIN_MEDIA_URL}';
 {literal}
 function click_file(filename, image, w, h){

diff --git a/ipf/admin/views.php b/ipf/admin/views.php
index 2ce79748aabf7c982a5109a57847d00ac3038554..70165495f81a9adc84bf8e372280c1a26049ce1b 100644 (file)
--- a/ipf/admin/views.php
+++ b/ipf/admin/views.php
@@ -264,7 +264,14 @@ function IPF_Admin_Views_FileBrowser($request, $match){
     if ($ca!==true) return $ca;
     
     $curr_dir = urldecode(substr($match[1],1));
-    $dir = IPF::get('upload_path').$curr_dir;
+    $upload_path = IPF::get('editor_upload_path','');
+    if ($upload_path=='')
+        $upload_path = IPF::get('upload_path','');
+    $upload_url = IPF::get('editor_upload_url','');
+    if ($upload_url=='')
+        $upload_url = IPF::get('upload_url','');
+
+    $dir = $upload_path.$curr_dir;
 
     if ($request->method=="GET"){
        if (@$request->GET['delete']){
@@ -288,7 +295,7 @@ function IPF_Admin_Views_FileBrowser($request, $match){
     $files = array();
     if ($dh = @opendir($dir)) {
         while (($file = readdir($dh)) !== false) {
-               if ($file=='.')
+            if ($file=='.')
                        continue;
                if (($curr_dir=='') && ($file=='..'))
                        continue;
@@ -335,6 +342,7 @@ function IPF_Admin_Views_FileBrowser($request, $match){
         'dirs' => $dirs,
         'files' => $files,
        'path' => $path,
+        'upload_url' => $upload_url,
        'curr_dir' => $curr_dir,
     );
     return IPF_Shortcuts::RenderToResponse('admin/filebrowser.html', $context, $request);