Changeset 1025

Timestamp:

Jun 5, 2017, 5:30:08 PM (8 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: EVFSGUI implement ACLS browser

Location:

trunk/guitools/evfsgui

Files:

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

trunk/guitools/evfsgui/evfsgui.vrp

@@ -5 +5 @@
 VXOFile: VRSPLIT
 ClassFile: VRSPLITB.DLL
-MacroPath: VRM:G:\netlabs\svn\samba\trunk\guitools\evfsgui
+MacroPath: VRM:U:\Develop\Samba\trunk\guitools\evfsgui
 EXEPath: 
-RunParameters: -NDFS
-RunDirectory: G:\netlabs\svn\samba\trunk\guitools\evfsgui
-VRXWindow: __VREMainWindow,1,1831,2457,1012,7841
-VRXWindow: __VREFileListWindow,1,711,14020,2665,3358
-VRXWindow: __VRESectionListWindow,1,1421,15659,12238,6914
-VRXWindow: __VREToolsWindow,1,2951,12479,6986,1661
-VRXWindow: __VREWindListWindow,1,566,10262,4963,3150
+RunParameters: 
+RunDirectory: U:\Develop\Samba\trunk\guitools\evfsgui
+VRXWindow: __VREMainWindow,1,2891,5637,1012,8000
+VRXWindow: __VREFileListWindow,1,3300,14695,2665,3358
+VRXWindow: __VRESectionListWindow,1,2867,14020,10889,5035
+VRXWindow: __VREToolsWindow,1,4011,4963,6992,1669
+VRXWindow: __VREWindListWindow,1,458,14695,4866,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_ADVANCED,1
-UserWindow: SW_PROGRESS,1
-UserWindow: SW_MOUNTPOINT,1
-UserWindow: SW_INFO,1
+UserWindow: SW_SMBTREE,1
+UserWindow: SW_ACLS,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -342 +342 @@
                 fmonth   = word(infoline,wn-3)
                 fwday    = word(infoline,wn-4)
-                pos_attr = pos(fwday,infoline)-16
+                /* FIXME: This is flaky! */
+                pos_attr = max(pos(fwday,infoline)-16,4)
                 fsize    = word(infoline,wn-5)
                 fattr    = substr(infoline,pos_attr,6)
@@ -522 +523 @@
     ok = VRSet("Menu_Selected_Retry",            "Visible", 0) /* CN_CONDET */
     ok = VRSet("Menu_Selected_Connect",          "Visible", 0) /* CN_SMBTREE */
+    ok = VRSet("Menu_Selected_ACLS",             "Visible", 0) /* CN_SMBTREE */
     ok = VRSet("Menu_Selected_Sep1",             "Visible", 0) /* CN_SMBTREE */
     ok = VRSet("Menu_Selected_Info",             "Visible", 0) /* CN_SMBTREE */
@@ -532 +534 @@
     ok = VRSet("Menu_Selected_DetailsView","Visible",1)
  */
+say SMBObj.udatatype
     select
         when SMBObj.udatatype = "DISK" then do
@@ -552 +555 @@
             /* CALL VRMessage 'Main', NLVGetMessage( 62 ), NLVGetMessage( 5 ), 'E' */
         end
-        otherwise nop /* FILE DIRECTORY */
+        when SMBObj.udatatype = "DIRECTORY" then do
+            ok = VRSet("Menu_Selected_ACLS",             "Visible", 1)
+        end
+        when SMBObj.udatatype = "FILE" then do
+            ok = VRSet("Menu_Selected_ACLS",             "Visible", 1)
+        end
+        otherwise nop /* No other value known */
     end
 return
@@ -2455 +2464 @@
     if options.!debug == 1 then say time()' CN_SMBTREE_ContextMenu started'
 
+    call _ContextMenuSelectedSet
+
     call _dropdeprecated
     call _GetSmbObjectProperties VRInfo('Record')
 
-    call _ContextMenuSelectedSet
+    BrowsePath = _browsebuildpath(SMBObj.rh)
+
+    call _BrowseResetObject(SmbObj.rh)
+
+    parse var browsepath '\\'machine'\'sharename '\' browsepath
+
     ok = VRMethod( "Menu_Selected", "Popup", , , "", "" )
 
@@ -3662 +3678 @@
 Menu_Help_Extended_Click:
     ok = VRMethod( "Main", "InvokeHelp" )
+return
+
+/*:VRX         Menu_Selected_ACLS_Click
+*/
+Menu_Selected_ACLS_Click: 
+    if options.!debug == 1 then say '  List ACLS for  "'SMBObj.udatatype'"'
+    window = VRLoadSecondary( "SW_ACLS", "W" )
 return
 
@@ -4148 +4171 @@
 return
 
+/*:VRX         PB_ACLS_OK_Click
+*/
+PB_ACLS_OK_Click: 
+    call SW_ACLS_Close
+return
+
 /*:VRX         PB_ADVANCED_APPLY_Click
 */
@@ -5029 +5058 @@
 return
 
+/*:VRX         SW_ACLS_Close
+*/
+SW_ACLS_Close: 
+    call SW_ACLS_Fini
+return
+
+/*:VRX         SW_ACLS_Create
+*/
+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
+
+    /* FIXME: We do not show a logon failure - just nothing */
+    say '  'samba.!smbcaclsexe' \\'machine'\'sharename' "'browsepath'" 'UserCred
+    address cmd samba.!smbcaclsexe' \\'machine'\'sharename' "'browsepath'" 'UserCred' 'debuglevel' 2>NUL 1>'samba.!msg
+
+    do until lines(samba.!msg) = 0
+        infoline = linein(samba.!msg)
+        parse var infoline aclstype':'aclsvalue
+        DummyRH = VRMethod('CN_ACLS', 'AddRecord')
+        ok = VRMethod("CN_ACLS", "SetFieldData", DummyRH, ACL.typeFH, aclstype, ACL.valueFH, aclsvalue)
+    end
+    ok = stream(samba.!msg,'c','close')
+    ok = SysFileDelete(samba.!msg)
+return
+
+/*:VRX         SW_ACLS_Fini
+*/
+SW_ACLS_Fini: 
+    window = VRInfo( "Window" )
+    call VRDestroy window
+    drop window
+return
+/*:VRX         SW_ACLS_Init
+*/
+SW_ACLS_Init: 
+    window = VRInfo( "Object" )
+    if( \VRIsChildOf( window, "Notebook" ) ) then do
+        call VRMethod window, "CenterWindow"
+        call VRSet window, "Visible", 1
+        call VRMethod window, "Activate"
+    end
+    drop window
+return
+
 /*:VRX         SW_ADVANCED_Close
 */