added default server and local directory

tab close and/or disconnect

Author: brainfoolong

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.12.0 - xx.xx.xxxx - alpha 4
+* restrict access to web ftp client root for local browser
+* allow self signed certs
+* added default root directory for server and local browser
+
+
 # v0.11.0 - 03.04.2017 - alpha 3
 * added DE translation
 * added dark/light theme

lang/de.json

@@ -117,5 +117,10 @@
   "user.add": "Neuen Benutzer hinzufügen",
   "usermanager": "Benutzermanager",
   "username": "Benutzername",
-  "yes": "Ja"
+  "yes": "Ja",
+  "tab.close.info" : "Was möchtest du tun?",
+  "tab.close.disconnect" : "Verbindung trennen",
+  "tab.close.remove" : "Tab schließen und Verbindung trennen",
+  "server.root.local" : "Root Verzeichnis im lokalen Browser",
+  "server.root.server" : "Root Verzeichnis im Serverbrowser"
 }

lang/en.json

@@ -117,5 +117,10 @@
   "user.add": "Add new user",
   "usermanager": "Usermanager",
   "username": "Username",
-  "yes": "Yes"
+  "yes": "Yes",
+  "tab.close.info" : "What do you want to do?",
+  "tab.close.disconnect" : "Disconnect",
+  "tab.close.remove" : "Close tab and disconnect",
+  "server.root.local" : "Root directory in local browser",
+  "server.root.server" : "Root directory in server browser"
 }

public/scripts/src/global.js

@@ -209,6 +209,7 @@ $(function () {
     gl.note('Your browser is not supported in this application (Outdated Browser). Please upgrade to the newest version')
     return
   }
+
   // add flag class for touch support
   const $body = $('body')
   const hasTouch = ('ontouchstart' in window || (typeof window.DocumentTouch !== 'undefined' && document instanceof window.DocumentTouch)) === true

public/scripts/src/splitbox.js

@@ -53,15 +53,34 @@ gl.splitbox.tabAdd = function (tpl, params, label) {
  * @param {jQuery} $tab
  */
 gl.splitbox.tabDelete = function ($tab) {
-  // if is a servertab the also disconnect
-  if ($tab.attr('data-template') === 'serverbrowser') {
+  const disconnect = function () {
     gl.socket.send('disconnectFtpServer', {'server': $tab.data('params').server})
+    gl.modalClose()
+  }
+  const remove = function () {
+    if ($tab.hasClass('active')) {
+      $('.splitbox').children().html('')
+    }
+    $tab.remove()
+    gl.splitbox.tabSave()
+    gl.modalClose()
   }
-  if ($tab.hasClass('active')) {
-    $('.splitbox').children().html('')
+  if ($tab.attr('data-template') === 'serverbrowser') {
+    const $footer = $('<div>')
+    $footer.append('<div class="btn btn-info remove" data-translate="tab.close.remove"></div>')
+    $footer.append('<div class="btn btn-info disconnect" data-translate="tab.close.disconnect"></div>')
+    $footer.on('click', '.disconnect', function () {
+      disconnect()
+    }).on('click', '.remove', function () {
+      disconnect()
+      remove()
+    })
+    gl.modal(null, gl.t('tab.close.info'), $footer, function () {
+
+    })
+  } else {
+    remove()
   }
-  $tab.remove()
-  gl.splitbox.tabSave()
 }
 
 /**

public/stylesheets/lib/sandstone/bootstrap.min.css

@@ -244,6 +244,6 @@
     gl.showContextmenu($contextmenuBoth, ev)
   })
 
-  loadServerDirectory(tabParams.serverDirectory || '/')
-  loadLocalDirectory(tabParams.localDirectory || '.')
+  loadServerDirectory(tabParams.serverDirectory)
+  loadLocalDirectory(tabParams.localDirectory)
 })()

public/tpl/src/serverbrowser.js

@@ -61,6 +61,14 @@
         'showIf': function (fields) {
           return fields.auth.val() === 'keyfile'
         }
+      },
+      'root_local': {
+        'type': 'text',
+        'label': 'server.root.local'
+      },
+      'root_server': {
+        'type': 'text',
+        'label': 'server.root.server'
       }
     }
   }

public/tpl/src/servermanager.js

@@ -2,6 +2,7 @@
 
 const path = require('path')
 const FtpServer = require(path.join(__dirname, '../ftpServer'))
+const Server = require(path.join(__dirname, '../server'))
 
 const action = {}
 
@@ -18,12 +19,16 @@ action.requireUser = true
  * @param {function} callback
  */
 action.execute = function (user, message, callback) {
-  FtpServer.get(message.server, function (server) {
-    if (!server) {
+  FtpServer.get(message.server, function (ftpServer) {
+    if (!ftpServer) {
       callback()
       return
     }
-    server.readdir(message.directory, function (list) {
+    const server = Server.get(message.server)
+    if (typeof message.directory === 'undefined' || message.directory === '') {
+      message.directory = server.getServerData().root_server || '/'
+    }
+    ftpServer.readdir(message.directory, function (list) {
       callback({
         'currentDirectory': message.directory,
         'files': list

src/actions/getFtpFilelist.js

@@ -20,9 +20,12 @@ action.requireUser = true
  */
 action.execute = function (user, message, callback) {
   let filesout = []
-  let server = Server.get(message.server)
+  const server = Server.get(message.server)
   const rootDir = path.join(__dirname, '../..')
   // special handler, dot refers to web client root
+  if (typeof message.directory === 'undefined' || message.directory === '') {
+    message.directory = server.getServerData().root_local || '.'
+  }
   if (message.directory === '.') {
     message.directory = path.join(__dirname, '../../..')
   }