Changeset 3186518

Timestamp:

11/12/2024 01:03:05 PM (2 years ago)

Author:

ninjateam

Message:

Version 1.8.5

Location:

filester/trunk

Files:

• assets/js/file_manager_admin.js (modified) (2 diffs)
• includes/File_manager/FileManager.php (modified) (5 diffs)
• ninja-file-manager.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• views/pages/html-filemanager.php (modified) (1 diff)

filester/trunk/assets/js/file_manager_admin.js

@@ -302 +302 @@
         });
     })
+  },
+  fsConnector() {
+    jQuery('#njt-fs-file-manager').elfinder({
+      url: ajaxurl,
+      handlers : {
+        dblclick : function(event, elfinderInstance) {
+          event.preventDefault();
+          elfinderInstance.exec('getfile')
+          .done(function() { 
+            try {
+              elfinderInstance.exec('edit'); 
+            } catch (e) {
+              elfinderInstance.exec('quicklook'); 
+            }
+          })
+          .fail(function() { elfinderInstance.exec('open');});
+        }
+      },
+      // disable quicklook
+      // bootCallback : function(fm) {
+      //     fm.bind('init', function() {
+      //         fm._commands.quicklook.getstate = function() {
+      //             return -1;
+      //         }
+      //     });
+      // },
+      getFileCallback : function(files, fm) {
+        return false;
+      }, 
+      contextmenu: {
+        // current directory file menu
+        files: ['getfile', '|', 'open', 'opennew', 'download', 'opendir', 'quicklook', 'email', '|', 'upload',
+          'mkdir', '|', 'copy', 'cut', 'paste', 'duplicate', '|', 'rm', 'empty', 'hide', '|', 'rename', 'edit',
+          'resize', '|', 'archive', 'extract', '|', 'selectall', 'selectinvert', '|', 'places', 'info', 'chmod',
+          'netunmount'
+        ],
+        // navbarfolder menu
+        navbar: ['open', 'opennew', 'download', '|', 'upload', 'mkdir', '|', 'copy', 'cut', 'paste', 'duplicate',
+          '|', 'rm', 'empty', 'hide', '|', 'rename', '|', 'archive', '|', 'places', 'info', 'chmod',
+          'netunmount'
+        ],
+        // current directory menu
+        cwd: ['undo', 'redo', '|', 'back', 'up', 'reload', '|', 'upload', 'mkdir', 'mkfile', 'paste', '|',
+          'empty', 'hide', '|', 'view', 'sort', 'selectall', 'colwidth', '|', 'places', 'info', 'chmod',
+          'netunmount',
+          '|', 'fullscreen', '|'
+        ],
+      },
+      uiOptions: {
+        // toolbar configuration
+        toolbar: [
+          ['home', 'back', 'forward', 'up', 'reload'],
+          ['netmount'],
+          ['mkdir', 'mkfile', 'upload'],
+          ['open', 'download', 'getfile'],
+          ['undo', 'redo'],
+          ['copy', 'cut', 'paste', 'rm', 'empty'],
+          ['duplicate', 'rename', 'edit', 'resize', 'chmod'],
+          ['selectall', 'selectnone', 'selectinvert'],
+          ['quicklook', 'info'],
+          ['extract', 'archive'],
+          ['search'],
+          ['view', 'sort'],
+          ['help'],
+          ['fullscreen']
+        ],
+        toolbarExtra: {
+          // show Preference button into contextmenu of the toolbar (true / false)
+          preferenceInContextmenu: false
+        }
+      },
+      ui: ['toolbar', 'tree', 'path', 'stat'],
+      customData: {
+        action: 'fs_connector',
+        nonce: wpData.nonce_connector,
+      },
+      lang: wpData.lang,
+      requestType: 'get',
+      width: 'auto',
+      height: '600',
+    });
   }
 }
@@ -332 +413 @@
       jQuery(".elfinder-theme-ext").remove()
     }
+    njtFileManager.fsConnector();
+
   }
 });

filester/trunk/includes/File_manager/FileManager.php

@@ -248 +248 @@
                 $locale = $this->options['njt_fs_file_manager_settings']['fm_locale'];
                 if( !empty($locale) &&  $locale != 'en' ) {
+                    $locale = sanitize_file_name($locale);
                     wp_enqueue_script( 'njt_fs_fma_lang', plugins_url('lib/js/i18n/elfinder.'.$locale.'.js', __FILE__));
                 }
             }
-            
+
             wp_localize_script('njt_fs_elFinder', 'wpData', array(
                 'admin_ajax' => admin_url('admin-ajax.php'),
@@ -259 +260 @@
                 'PLUGIN_DIR'=> NJT_FS_BN_PLUGIN_DIR,
                 'ABSPATH'=> str_replace("\\", "/", ABSPATH),
-                'is_multisite' => is_multisite()
-
+                'is_multisite' => is_multisite(),
+                'lang' => !empty( $this->options['njt_fs_file_manager_settings']['fm_locale']) ? $this->options['njt_fs_file_manager_settings']['fm_locale'] : '',
+                'nonce_connector' => wp_create_nonce('file-manager-security-token'),
             ));
         }
@@ -285 +287 @@
                     'uploadMaxSize' =>  $uploadMaxSize .'M',
                     'winHashFix'    => DIRECTORY_SEPARATOR !== '/', 
-                    'uploadDeny'    => array(), 
-                    'uploadAllow'   => array('all'),
                     'uploadOrder'   => array('deny', 'allow'),
                     'disabled' => array(''),
@@ -294 +294 @@
             ),
         );
+
+        if (current_user_can('manage_options')) {
+            $opts['roots'][0]['uploadDeny'] = array('htaccess');
+            $opts['roots'][0]['uploadAllow'] = array('all');
+        }
+
         // .htaccess
         if(isset($this->options['njt_fs_file_manager_settings']['enable_htaccess']) && ($this->options['njt_fs_file_manager_settings']['enable_htaccess'] == '1')) {
@@ -314 +320 @@
                 'tmbURL'        => site_url() . '/includes/File_manager/lib/files/.trash/.tmb',
                 'winHashFix'    => DIRECTORY_SEPARATOR !== '/', 
-                'uploadDeny'    => array(), 
+                'uploadDeny'    => array('htaccess'), 
                 'uploadAllow'   => array('all'),
                 'uploadOrder'   => array('deny', 'allow'),

filester/trunk/ninja-file-manager.php

@@ -4 +4 @@
  * Plugin URI: https://ninjateam.org/filester
  * Description: Made to help you focus on WordPress file management and avoid being distracted.
- * Version: 1.8.4
+ * Version: 1.8.5
  * Author: Ninja Team
  * Author URI: https://ninjateam.org
@@ -32 +32 @@
 
 define('NJT_FS_BN_PREFIX', 'njt-fs');
-define('NJT_FS_BN_VERSION', '1.8.4');
+define('NJT_FS_BN_VERSION', '1.8.5');
 define('NJT_FS_BN_DOMAIN', 'filester');
 

filester/trunk/readme.txt

@@ -4 +4 @@
 Tags: file manager, wordpress file manager, wp file manager, files, download plugin
 Requires at least: 3.0
-Tested up to: 6.6
-Stable tag: 1.8.4
+Tested up to: 6.7
+Stable tag: 1.8.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -112 +112 @@
 == Changelog ==
 
+= 1.8.5 =
+Nov 12, 2024 - Version 1.8.5
+- Fixed: Security
+
 = 1.8.4 =
 Aug 7, 2024 - Version 1.8.4

filester/trunk/views/pages/html-filemanager.php

@@ -32 +32 @@
   </div>
 </div>
-
-
-<script>
-jQuery(document).ready(function() {
-  jQuery('#njt-fs-file-manager').elfinder({
-    url: ajaxurl,
-    handlers : {
-      dblclick : function(event, elfinderInstance) {
-        event.preventDefault();
-        elfinderInstance.exec('getfile')
-        .done(function() { 
-          try {
-            elfinderInstance.exec('edit'); 
-          } catch (e) {
-            elfinderInstance.exec('quicklook'); 
-          }
-        })
-        .fail(function() { elfinderInstance.exec('open');});
-      }
-    },
-    // disable quicklook
-    // bootCallback : function(fm) {
-    //     fm.bind('init', function() {
-    //         fm._commands.quicklook.getstate = function() {
-    //             return -1;
-    //         }
-    //     });
-    // },
-    getFileCallback : function(files, fm) {
-      return false;
-    }, 
-    contextmenu: {
-      // current directory file menu
-      files: ['getfile', '|', 'open', 'opennew', 'download', 'opendir', 'quicklook', 'email', '|', 'upload',
-        'mkdir', '|', 'copy', 'cut', 'paste', 'duplicate', '|', 'rm', 'empty', 'hide', '|', 'rename', 'edit',
-        'resize', '|', 'archive', 'extract', '|', 'selectall', 'selectinvert', '|', 'places', 'info', 'chmod',
-        'netunmount'
-      ],
-      // navbarfolder menu
-      navbar: ['open', 'opennew', 'download', '|', 'upload', 'mkdir', '|', 'copy', 'cut', 'paste', 'duplicate',
-        '|', 'rm', 'empty', 'hide', '|', 'rename', '|', 'archive', '|', 'places', 'info', 'chmod',
-        'netunmount'
-      ],
-      // current directory menu
-      cwd: ['undo', 'redo', '|', 'back', 'up', 'reload', '|', 'upload', 'mkdir', 'mkfile', 'paste', '|',
-        'empty', 'hide', '|', 'view', 'sort', 'selectall', 'colwidth', '|', 'places', 'info', 'chmod',
-        'netunmount',
-        '|', 'fullscreen', '|'
-      ],
-    },
-    uiOptions: {
-      // toolbar configuration
-      toolbar: [
-        ['home', 'back', 'forward', 'up', 'reload'],
-        ['netmount'],
-        ['mkdir', 'mkfile', 'upload'],
-        ['open', 'download', 'getfile'],
-        ['undo', 'redo'],
-        ['copy', 'cut', 'paste', 'rm', 'empty'],
-        ['duplicate', 'rename', 'edit', 'resize', 'chmod'],
-        ['selectall', 'selectnone', 'selectinvert'],
-        ['quicklook', 'info'],
-        ['extract', 'archive'],
-        ['search'],
-        ['view', 'sort'],
-        ['help'],
-        ['fullscreen']
-      ],
-      toolbarExtra: {
-        // show Preference button into contextmenu of the toolbar (true / false)
-        preferenceInContextmenu: false
-      }
-    },
-    ui: ['toolbar', 'tree', 'path', 'stat'],
-    customData: {
-      action: 'fs_connector',
-      nonce: '<?php echo wp_create_nonce( "file-manager-security-token" ); ?>'
-    },
-    lang: '<?php echo ($lang)?>',
-    requestType: 'post',
-    width: 'auto',
-    height: '600',
-  });
-});
-</script>