Changeset 1039

Timestamp:

Dec 14, 2017, 11:01:02 AM (8 years ago)

Author:

Herwig Bauernfeind

Message:

EVFSGUI: Fix AN Ticket #1594

Location:

trunk/guitools/evfsgui

Files:

• evfsgui.vrp (modified) (1 diff)
• evfsgui.vrx (modified) (5 diffs)
• evfsgui.vry (modified) ( previous)

trunk/guitools/evfsgui/evfsgui.vrp

@@ -12 +12 @@
 VRXWindow: __VREFileListWindow,1,3300,14695,2665,3358
 VRXWindow: __VRESectionListWindow,1,2867,14020,10889,5035
-VRXWindow: __VREToolsWindow,1,2867,337,6989,1667
+VRXWindow: __VREToolsWindow,1,2867,337,6986,1661
 VRXWindow: __VREWindListWindow,1,458,14695,4866,3150
 UserFile: 1
-UserWindow: Main,1
-UserWindow: SW_LOGIN,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -3664 +3664 @@
     if options.!debug == 1 then say time()' '||'Create "'vfs.!mountpoint'" = 'CreateMP
 
+    /* encrypt password if necessary - fix for AN Ticket #1594 */
+    if options.!password <> '' & options.!spassword = '' then do
+        options.!spassword = c2x(options.!password)
+        options.!password = ''
+    end
 
     /* Build the resource parameter string */
@@ -3671 +3676 @@
     IF options.!share      \= '' THEN src = src';SHARE='options.!share
     IF options.!user       \= '' THEN src = src';USER='options.!user
-    IF options.!password   \= '' THEN src = src';PASSWORD='options.!password
+/* fix for AN Ticket #1594 */
+/*  IF options.!password   \= '' THEN src = src';PASSWORD='options.!password */
     IF options.!spassword  \= '' THEN src = src';SPASSWORD='options.!spassword
     IF options.!master     \= '' THEN src = src';MASTER='options.!master
@@ -3694 +3700 @@
     if options.!cachelistings = "" then options.!cachelistings = "32"
     if options.!easupport= "" | options.!easupport= " " then options.!easupport = strip(options.!easupport)
-    if options.!password <> "" & options.!spassword = "" then do
-        options.!spassword = c2x(options.!password)
-        options.!password = ""
-    end
 
     hashstr = mpoint' 'translate(options.!workgroup)' 'translate(options.!server)' 'translate(options.!share)' 'options.!user' 'options.!spassword' 'options.!easupport' 'rwFlag
@@ -4667 +4669 @@
 RETURN
 
+/*:VRX         RB_ACLS_NUMERIC_Click
+*/
+RB_ACLS_NUMERIC_Click: 
+    aclsnumeric = '--numeric'
+    ok = VRSet("DT_REV_CONT","Caption","")
+    ok = VRMethod("CN_ACLS","RemoveRecord","ALL")
+    ok = VRMethod("CN_ACLS","SetFieldAttr", ACL.userFH, "Visible", 0 )
+    call _ACLSBrowse
+return
+
+/*:VRX         RB_ACLS_TEXT_Click
+*/
+RB_ACLS_TEXT_Click: 
+    aclsnumeric = ''
+    ok = VRSet("DT_REV_CONT","Caption","")
+    ok = VRMethod("CN_ACLS","RemoveRecord","ALL")
+    ok = VRMethod("CN_ACLS","SetFieldAttr", ACL.userFH, "Visible", 1 )
+    call _ACLSBrowse
+return
+
 /*:VRX         Refresh
 */
@@ -4848 +4870 @@
 SW_ACLS_Create: 
     call SW_ACLS_Init
-
-    ok = VRSet("SW_ACLS","Caption",'ACLS \\'machine'\'sharename' "'browsepath'"')
-
-    ACL.typeFH  = VRMethod( "CN_ACLS", "AddField", "String", "Type" )
-    ACL.valueFH = VRMethod( "CN_ACLS", "AddField", "String", "Value" )
-
-    /* Make sure credentials are usable */
-    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'
-
-    /* We have to remove the double % for smbclient.exe - not entirely clear why */
-    OldUserCred = ""
-    if pos('%%',UserCred) > 0 & pos("4OS2", value("COMSPEC",,"OS2ENVIRONMENT")) = 0  then do
-        OldUserCred = UserCred
-        parse var UserCred '--user='username'%%'password
-        UserCred = '--user='username'%'password
-        say "  Strip double %%!!!"
-    end
-
-    say '  'samba.!smbcaclsexe' \\'machine'\'sharename' "'browsepath'" 'UserCred
-    address cmd samba.!smbcaclsexe' \\'machine'\'sharename' "'browsepath'" 'UserCred' 'debuglevel' 2>'samba.!error' 1>'samba.!msg
-
-    ok = file2stem(samba.!error,"aclserror.","DEL")
-
-    if aclserror.0 = 0 then do
-        call _StatusBarWrapper "NT_STATUS_OK"
-
-        ok = file2stem(samba.!msg,"aclsmsg.","DEL")     
-        do I = 1 to aclsmsg.0
-            parse var aclsmsg.I aclstype':'aclsvalue
-            DummyRH = VRMethod('CN_ACLS', 'AddRecord')
-            ok = VRMethod("CN_ACLS", "SetFieldData", DummyRH, ACL.typeFH, aclstype, ACL.valueFH, aclsvalue)
-        end
-    end
-    else do
-        call _StatusBarWrapper aclserror.1
-        call SW_ACLS_close
-    end
+    ACL.typeFH   = VRMethod( "CN_ACLS", "AddField", "String", "Type" )
+    ACL.groupFH  = VRMethod( "CN_ACLS", "AddField", "String", "Group" )
+    ACL.userFH   = VRMethod( "CN_ACLS", "AddField", "String", "User" )
+    ACL.ADFH     = VRMethod( "CN_ACLS", "AddField", "String", "A/D" )
+    ACL.flagsFH  = VRMethod( "CN_ACLS", "AddField", "String", "Flags" )
+    ACL.accessFH = VRMethod( "CN_ACLS", "AddField", "String", "Access" )
+    ok = VRMethod( "CN_ACLS", "RemoveRecord", "ALL")
+    aclsnumeric = ''
+    call _ACLSBrowse
 return