Merge pull request #244 from glyptodon/sftp-default-directory

GUAC-1292: Add "sftp-directory" parameter for VNC and RDP.

guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json

@@ -223,6 +223,10 @@
                 {
                     "name"  : "sftp-passphrase",
                     "type"  : "PASSWORD"
+                },
+                {
+                    "name"  : "sftp-directory",
+                    "type"  : "TEXT"
                 }
             ]
         }

guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json

@@ -97,6 +97,10 @@
                 {
                     "name"  : "sftp-passphrase",
                     "type"  : "PASSWORD"
+                },
+                {
+                    "name"  : "sftp-directory",
+                    "type"  : "TEXT"
                 }
             ]
         },

guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js

@@ -250,7 +250,11 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
 
             // Refresh file browser when any upload completes
             $scope.$on('guacUploadComplete', function uploadComplete(event, filename) {
-                ManagedFilesystem.refresh($scope.filesystem, $scope.filesystem.currentDirectory);
+
+                // Refresh filesystem, if it exists
+                if ($scope.filesystem)
+                    ManagedFilesystem.refresh($scope.filesystem, $scope.filesystem.currentDirectory);
+
             });
 
         }]

guacamole/src/main/webapp/translations/en.json

@@ -277,6 +277,7 @@
         "FIELD_HEADER_REMOTE_APP"      : "Program:",
         "FIELD_HEADER_SECURITY"        : "Security mode:",
         "FIELD_HEADER_SERVER_LAYOUT"   : "Keyboard layout:",
+        "FIELD_HEADER_SFTP_DIRECTORY"   : "Default upload directory:",
         "FIELD_HEADER_SFTP_HOSTNAME"    : "Hostname:",
         "FIELD_HEADER_SFTP_PASSPHRASE"  : "Passphrase:",
         "FIELD_HEADER_SFTP_PASSWORD"    : "Password:",
@@ -404,6 +405,7 @@
         "FIELD_HEADER_PASSWORD"         : "Password:",
         "FIELD_HEADER_PORT"             : "Port:",
         "FIELD_HEADER_READ_ONLY"        : "Read-only:",
+        "FIELD_HEADER_SFTP_DIRECTORY"   : "Default upload directory:",
         "FIELD_HEADER_SFTP_HOSTNAME"    : "Hostname:",
         "FIELD_HEADER_SFTP_PASSPHRASE"  : "Passphrase:",
         "FIELD_HEADER_SFTP_PASSWORD"    : "Password:",