fixes on RDP transport

server/src/uds/static/modern/translations-fakejs.js

@@ -1,15 +1,9 @@
 // "Fake" javascript file for translations
 // Typescript
-gettext("We use cookies to track usage and preferences");
-gettext("I Understand");
-gettext("Learn more");
 gettext("Launching service");
 gettext("Please wait");
 gettext("Remember that UDS Plugin is required in order for this service to be launched");
 gettext("Error launching service");
-gettext("Warning");
-gettext("Service is in maintenance and cannot be executed");
-gettext("Invalid error string");
 gettext("seconds");
 gettext("Service is in maintenance");
 gettext("This service is currently not accessible due to schedule restrictions.");
@@ -22,7 +16,29 @@ gettext("Reset service: ");
 gettext("Service released");
 gettext("Service reseted");
 gettext("Are you sure?");
+gettext("Warning");
+gettext("Service is in maintenance and cannot be executed");
+gettext("Invalid error string");
+gettext("We use cookies to track usage and preferences");
+gettext("I Understand");
+gettext("Learn more");
 // HTML
+gettext("Close");
+gettext("Yes");
+gettext("No");
+gettext("Dashboard");
+gettext("Downloads");
+gettext("Logout");
+gettext("About");
+gettext("About");
+gettext("Release service");
+gettext("Reset service");
+gettext("Connections");
+gettext("Actions");
+gettext("Username");
+gettext("Password");
+gettext("Authenticator");
+gettext("Login");
 gettext("UDS Client");
 gettext("Download UDS client for your platform");
 gettext("You can access UDS Open Source code at");
@@ -35,22 +51,6 @@ gettext("To relaunch service, you will have to do it from origin.");
 gettext("If the service does not launchs automatically, probably you dont have the UDS plugin installed");
 gettext("You can obtain it from the");
 gettext("UDS Plugin download page");
-gettext("Username");
-gettext("Password");
-gettext("Authenticator");
-gettext("Login");
 gettext("Downloads");
 gettext("An error has occurred");
 gettext("Return");
-gettext("Dashboard");
-gettext("Downloads");
-gettext("Logout");
-gettext("About");
-gettext("About");
-gettext("Close");
-gettext("Yes");
-gettext("No");
-gettext("Release service");
-gettext("Reset service");
-gettext("Transports");
-gettext("Actions");

server/src/uds/transports/RDP/BaseRDPTransport.py

@@ -62,21 +62,21 @@ class BaseRDPTransport(Transport):
     allowSmartcards = gui.CheckBoxField(label=_('Allow Smartcards'), order=20, tooltip=_('If checked, this transport will allow the use of smartcards'), tab=gui.PARAMETERS_TAB)
     allowPrinters = gui.CheckBoxField(label=_('Allow Printers'), order=21, tooltip=_('If checked, this transport will allow the use of user printers'), tab=gui.PARAMETERS_TAB)
     allowDrives = gui.ChoiceField(
-        label=_('Allow Drives'),
+        label=_('Local drives policy'),
         order=22,
-        tooltip=_('Local drives redirection allowed'),
+        tooltip=_('Local drives redirection policy'),
         defvalue='false',
         values=[
-            {'id': 'false', 'text': 'None' },
-            {'id': 'dynamic', 'text': 'Only PnP drives' },
-            {'id': 'true', 'text': 'All drives' },
+            {'id': 'false', 'text': 'Allow none' },
+            {'id': 'dynamic', 'text': 'Allow PnP drives' },
+            {'id': 'true', 'text': 'Allow any drive' },
         ],
         tab=gui.PARAMETERS_TAB
     )
     enforceDrives = gui.TextField(
         label=_('Force drives'),
         order=23,
-        tooltip=_('If allowed drives, the ones listed will be enforced to be shared on Windows clients. Use comma separated values, for example "C:,D:"'),
+        tooltip=_('Use comma separated values, for example "C:,D:". If drives policy is disallowed, this will be ignored'),
         tab=gui.PARAMETERS_TAB
     )
 
@@ -133,7 +133,7 @@ class BaseRDPTransport(Transport):
         Checks if the transport is available for the requested destination ip
         Override this in yours transports
         """
-        logger.debug('Checking availability for {0}'.format(ip))
+        logger.debug('Checking availability for %s', ip)
         ready = self.cache.get(ip)
         if ready is None:
             # Check again for ready

server/src/uds/transports/RDP/RDPTransport.py

@@ -122,6 +122,7 @@ class RDPTransport(BaseRDPTransport):
         r.smartcardString = self.smartcardString.value
         r.printerString = self.printerString.value
         r.linuxCustomParameters = self.customParameters.value
+        r.enforcedShares = self.enforceDrives.value
 
         os = {
             OsDetector.Windows: 'windows',

server/src/uds/transports/RDP/TRDPTransport.py

@@ -149,6 +149,7 @@ class TRDPTransport(BaseRDPTransport):
         r.smartcardString = self.smartcardString.value
         r.printerString = self.printerString.value
         r.linuxCustomParameters = self.customParameters.value
+        r.enforcedShares = self.enforceDrives.value
 
         os = {
             OsDetector.Windows: 'windows',

server/src/uds/web/util/configjs.py

@@ -126,14 +126,15 @@ def udsJs(request):
         }
     }
 
+    # all plugins are under url clients...
     plugins = [
         {
-            'url': static(url.format(version=CLIENT_VERSION)),
+            'url': static('clients/' + url.format(version=CLIENT_VERSION)),
             'description': description,
             'name': name
         } for url, description, name in (
-            ('clients/UDSClientSetup-{version}.exe', gettext('Windows client'), 'Windows'),
-            ('clients/UDSClient-{version}.pkg', gettext('Mac OS X client'), 'MacOS'),
+            ('UDSClientSetup-{version}.exe', gettext('Windows client'), 'Windows'),
+            ('UDSClient-{version}.pkg', gettext('Mac OS X client'), 'MacOS'),
             ('udsclient_{version}_all.deb', gettext('Debian based Linux client') + ' ' + gettext('(requires Python-2.7)'), 'Linux'),
             ('udsclient-{version}-1.noarch.rpm', gettext('Red Hat based Linux client (RH, Fedora, Centos, ...)') + ' ' + gettext('(requires Python-2.7)'), 'Linux'),
             ('udsclient-opensuse-{version}-1.noarch.rpm', gettext('Suse based Linux client') + ' ' + gettext('(requires Python-2.7)'), 'Linux'),