Changeset 1029

Timestamp:

Jun 7, 2017, 5:15:14 PM (8 years ago)

Author:

Herwig Bauernfeind

Message:

EVGSGUI More work on ACLS browser

Location:

trunk/guitools/evfsgui

Files:

• evfsgui.vrp (modified) (1 diff)
• evfsgui.vrx (modified) (16 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,4011,4963,6986,1661
+VRXWindow: __VREToolsWindow,1,2867,337,6989,1667
 VRXWindow: __VREWindListWindow,1,458,14695,4866,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_ACLS,1
+UserWindow: SW_LOGIN,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -109 +109 @@
 __VXREXX____APPENDS__:
 /*
+#append ..\shared\browse.vrs
 #append ..\shared\cltinit.vrs
 #append ..\shared\inittempdir.vrs
@@ -249 +250 @@
     VolTplRH = VRMethod("CN_CURRENT", 'AddRecord', , 'First', 'Volume template', icons.!template )
     MpTplRH  = VRMethod("CN_CURRENT", 'AddRecord',  VolTplRH, 'First', 'Mountpoint template', icons.!template )
-return
-
-/*:VRX         _BrowseBuildPath
-*/
-_BrowseBuildPath: procedure expose options. icons. samba. sharerh
-    if options.!debug == 1 then say time()' _BrowseBuildPath started'
-    rh = arg(1)
-
-    finished = 0
-    BrowsePathStr = ''
-
-    do while \finished
-        parentrh = VRMethod("CN_SMBTREE","GetRecordAttr",rh,"Parent")
-        resname  = VRMethod("CN_SMBTREE","GetRecordAttr",rh,"caption")
-        userdata = VRMethod("CN_SMBTREE","GetRecordAttr",rh,"userdata")
-        parse var userdata udatatype '|' udatamsg
-        parse var resname resname '0D0A'x .
-        resname = strip(resname)
-        /* say "  Not connected - cannot open!" */
-        select
-            when udatatype = "SERVER" then do
-                BrowsePathStr = '\\'resname'\'BrowsePathStr
-                finished = 1
-            end
-            when udatatype = "DISK" then do
-                BrowsePathStr = resname'\'BrowsePathStr
-                sharerh =rh
-                rh = parentrh
-            end
-            otherwise do
-                BrowsePathStr = resname'\'BrowsePathStr
-                rh = parentrh
-            end
-        end
-        /* say '  BrowsePathStr = "'BrowsePathStr'"' */
-    end
-    BrowsePathStr = strip(BrowsePathStr,'T','\')
-    if options.!debug == 1 then say time()' _BrowseBuildPath done, returning "'BrowsePathStr'"'
-return BrowsePathStr
-
-/*:VRX         _BrowseDirectory
-*/
-_BrowseDirectory: /* This must not be a procedure */
-    if options.!debug == 1 then say time()' _BrowseDirectory started'
-
-    /* Turn off painting */
-    ok = VRSet("CN_SMBTREE","Painting", 0 )
-    call VRSet VRWindow(), 'Pointer', 'Wait'
-
-    /* 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
-        call lineout "debug", "  Strip double %%!!!"
-    end
-
-    say '  'samba.!smbclientexe' \\'machine'\'sharename' 'UserCred' --command="dir 'browsepath'"'
-    address cmd samba.!smbclientexe' \\'machine'\'sharename' 'UserCred' --command="dir 'browsepath'" 'debuglevel' 2>NUL 1>'samba.!msg
-
-    if UserCred   = '-N' then UserCred = ''
-
-    if OldUserCred <> "" then do
-        UserCred = OldUserCred
-        OldUserCred = ""
-        say "  Restore double %%!!!"
-    end
-
-    I = 0
-    ok = VRSet("DT_STATUSBAR","Caption", "")
-    do until lines(samba.!msg) = 0
-        infoline = linein(samba.!msg)
-        select
-            when pos('blocks',infoline) > 0 then do /* Last line */
-                /* we should handle size information here */
-                iterate
-            end
-            when I = 0 & length(infoline) > 0 & left(infoline,2) <> "  " then do /* Login message */
-                say '  Login message "'Infoline'"'
-                ok = VRMethod("CN_SMBTREE", "SetRecordAttr", SMBObj.rh, "Userdata", SMBObj.udatatype'|'infoline )
-                ok = VRSet("DT_STATUSBAR","Caption", infoline)
-            end
-            when left(infoline,2) = "  " & length(infoline) > 0 then do /* file or DIR */
-                wn       = words(infoline)
-                fyear    = word(infoline,wn)
-                ftime    = word(infoline,wn-1)
-                fday     = word(infoline,wn-2)
-                fmonth   = word(infoline,wn-3)
-                fwday    = word(infoline,wn-4)
-                /* FIXME: This is flaky! */
-                pos_attr = max(pos(fwday,infoline)-16,4)
-                fsize    = word(infoline,wn-5)
-                fattr    = substr(infoline,pos_attr,6)
-                fname    = strip( substr(infoline,3,pos_attr-3))
-                if fname = '.' | fname = '..' then iterate /* we do not display these */
-                if pos('H',fattr) > 0  then iterate /* we do not display hidden files */
-                if pos('S',fattr) > 0  then iterate /* we do not display system files */
-                I = I + 1
-                fh.I = VRMethod( "CN_SMBTREE", "AddRecord", SMBObj.rh, , fname)
-                if pos('D',fattr) = 0 then do
-                    Ext = translate(VRParseFIleName(fname,'E'))
-                    select
-                        when Ext = 'EXE' then ficon = icons.!exe /* executable */
-                        when Ext = 'CMD' then ficon = icons.!cmd /* OS/2 or NT batch */
-                        when Ext = 'BAT' then ficon = icons.!bat /* DOS batch */
-                        when Ext = 'PDF' then ficon = icons.!pdf /* PDF document */
-                        when wordpos(Ext, 'XLS SXC ODS') > 0         then ficon = icons.!spreadsheet
-                        when wordpos(Ext, 'DOC SXW ODT') > 0         then ficon = icons.!textdocument
-                        when wordpos(Ext, 'FW2 FW3 FW4') > 0         then ficon = icons.!framework
-                        when wordpos(Ext, 'JPG BMP PNG GIF TIF') > 0 then ficon = icons.!image
-                        when wordpos(Ext, 'AVI MPG FLV WMV') > 0     then ficon = icons.!movie
-                        when wordpos(Ext, 'WAV MP3 OGG MID') > 0     then ficon = icons.!sound
-                        when wordpos(Ext, 'WPI') > 0                 then ficon = icons.!warpin
-                        when wordpos(Ext, 'ZIP') > 0                 then ficon = icons.!zip
-                        when wordpos(Ext, 'INF HLP') > 0             then ficon = icons.!view
-                        when wordpos(Ext, 'TXT') > 0                 then ficon = icons.!plaintext
-                        otherwise ficon = icons.!defaultfile /* default file icon */
-                    end
-                    ftype = 'FILE'
-                end
-                else do
-                    ficon = icons.!folder
-                    ftype = 'DIRECTORY'
-                end
-
-                ok = VRmethod("CN_SMBTREE", "SetRecordAttr", fh.I, "userdata", ftype'|'fsize' Bytes 'fday'-'fmonth'-'fyear' 'ftime,'icon',Ficon)
-
-            end
-            otherwise nop /* no other line type */
-        end
-    end
-    if I > 0 then ok = VRMethod("CN_SMBTREE","SetRecordAttr",SMBObj.rh, "Icon", icons.!folder_open)
-    ok = stream(samba.!msg,'c','close')
-    ok = SysFileDelete(samba.!msg)
-
-    ok = VRMethod( "CN_SMBTREE", "SetRecordAttr", SMBObj.rh,"Collapsed", 0)
-    /* Turn on painting */
-    call VRSet VRWindow(), 'Pointer', '<default>'
-    ok = VRSet("CN_SMBTREE","Painting", 1 )
-    if options.!debug == 1 then say time()' _BrowseDirectory done'
-return
-
-/*:VRX         _BrowseObjectOpen
-*/
-_BrowseObjectOpen: procedure expose samba. options. cd. icons.
-    machine    = arg(1)
-    sharename  = arg(2)
-    browsepath = arg(3)
-
-    CALL VRMethod "CN_CONDET", 'GetRecordList', 'All', 'records.'
-
-    OpenOk = 0
-
-    DO i = 1 TO records.0
-        if VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.StatusFH) = icons.!active then do
-            if options.!debug == 1 then say '  'VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.StatusFH)' 'VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.MPointFH)' 'VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.ServerFH)' 'VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.ShareFH)
-            if machine = VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.ServerFH) &,
-               sharename = VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.ShareFH) then do
-                Object = strip(VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.MPointFH),'T','\')'\'browsepath
-                if options.!debug == 1 then say '  Non UNC object: "'Object'"'
-                ID = VRMethod( "Application", "StartThread", "wps_open", Object, "DEFAULT" )
-                OpenOK = 1
-            end
-        end
-        if OpenOK = 1 then leave
-    end
-return OpenOK
-
-/*:VRX         _BrowseResetObject
-*/
-_BrowseResetObject: procedure
-    ok = VRSet("CN_SMBTREE","Painting", 0 )
-    rh = arg(1)
-
-    /* Remove all files and directories whose parent is our share */
-    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "All", "AllRH." )
-    do I = 1 to AllRH.0
-        AllParentRH  = VRMethod("CN_SMBTREE","GetRecordAttr",AllRH.I,"Parent")
-        if AllParentRH = rh then ok = VRMethod( "CN_SMBTREE", "RemoveRecord", AllRH.I )
-    end
-    ok = VRSet("CN_SMBTREE","Painting", 1 )
 return
 
@@ -673 +489 @@
 RETURN location
 
-/*:VRX         _dropdeprecated
-*/
-_dropdeprecated:
-    /* The stem-less counterparts of these variables are considered deprecated and should be removed wherever possible
-       The _dropdeprecated routine will drop any value in order to make sure the stem actually works
-       If another variable is added to the stem, ensure to also drop it in dropdeprecated otherwise it will not be exported
-     */
-    drop rh
-    drop parentrh
-    drop gparentrh
-    drop icon
-    drop resname
-    drop comment
-    drop udatatype
-    drop udatamsg
-return
-
 /*:VRX         _Dynamic
 */
@@ -883 +682 @@
 
     /* Statusbar */
-    ok = VRSet("DT_STATUSBAR", "Caption", VRGet("Main", "HintText"))
+    call _StatusBarWrapper VRGet("Main", "HintText")
 
     /* Common margin around controls */
@@ -1568 +1367 @@
     /* preliminary implementation - we just do not ignore it anymore -
        - ShowMsg from smbmon/smbusers should become a shared library */
-    ok = VRSet("DT_StatusBar", "Caption", Msg.Text)
+    call _StatusBarWrapper Msg.Text
 return
 
@@ -1674 +1473 @@
     mtype.5 = NLVGetMessage(110 )
 
-    if options.!debug == 1 then say '  initializing icons. '
-    icons.!bat              = '#1:PMWP.DLL'
-    icons.!cmd              = '#2:PMWP.DLL'
-    icons.!exe              = '#3:PMWP.DLL'
-    icons.!template         = '#10:PMWP.DLL'
-    icons.!drive            = '#16:PMWP.DLL'
-    icons.!defaultfile      = '#24:PMWP.DLL'
-    icons.!folder           = '#26:PMWP.DLL'
-    icons.!folder_open      = '#34:PMWP.DLL'
-    icons.!machine_awake    = '#35:PMWP.DLL'
-    icons.!machine_sleeping = '#61:PMWP.DLL'
-    icons.!workgroup        = '#62:PMWP.DLL'
-    icons.!pdc              = '#63:PMWP.DLL'
-    icons.!active           = '#64:PMWP.DLL'
-    icons.!passive          = '#68:PMWP.DLL'
-    icons.!printer          = '#65:PMWP.DLL'
-    icons.!drive_inactive   = '#70:PMWP.DLL'
-    icons.!pdf              = '#80'
-    icons.!spreadsheet      = '#82'
-    icons.!textdocument     = '#86'
-    icons.!framework        = '#87'
-    icons.!image            = '#88'
-    icons.!movie            = '#89'
-    icons.!sound            = '#90'
-    icons.!warpin           = '#91'
-    icons.!zip              = '#92'
-    icons.!view             = '#93'
-    icons.!plaintext        = '#94'
+    call _BrowseIconsInit
 
     p_workgroup             = "Unknown"
@@ -2017 +1789 @@
 */
 CN_CONDET_Click:
-    /* ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText")) */
+    /* call _StatusBarWrapper VRGet("Main", "HintText") */
 return
 
@@ -2068 +1840 @@
 CN_CURRENT_Click:
     if options.!debug == 1 then say time()' CN_CURRENT_Click started'
-    /* ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText")) */
+    /* call _StatusBarWrapper VRGet("Main", "HintText") */
 
     /* Herwig B. */
@@ -2080 +1852 @@
     options.currentdata = data
 
-    /* ok = VRset("DT_StatusBar","Caption", data' - 'VRGet("Main", "HintText")) */
+    /* call _StatusBarWrapper data' - 'VRGet("Main", "HintText") */
 
     PARSE VAR data p_node ';' p_mounts ';' p_string
@@ -2449 +2221 @@
 CN_SMBTREE_Click:
     if options.!debug == 1 then say time()' CN_SMBTREE_Click started'
-    /* ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText")) */
+    /* call _StatusBarWrapper VRGet("Main", "HintText") */
 
     call _dropdeprecated
@@ -2455 +2227 @@
     call _ContextMenuSelectedSet
 
-    ok = VRset("DT_Statusbar", "Caption", SMBObj.udatamsg)
+    call _StatusBarWrapper SMBObj.udatamsg
 
     if options.!debug == 1 then say time()' CN_SMBTREE_Click done'
@@ -2463 +2235 @@
 CN_SMBTREE_ContextMenu:
     if options.!debug == 1 then say time()' CN_SMBTREE_ContextMenu started'
-
-    call _ContextMenuSelectedSet
-
     call _dropdeprecated
-    call _GetSmbObjectProperties VRInfo('Record')
-
-    BrowsePath = _browsebuildpath(SMBObj.rh)
-
-    call _BrowseResetObject(SmbObj.rh)
-
-    parse var browsepath '\\'machine'\'sharename '\' browsepath
-
-    ok = VRMethod( "Menu_Selected", "Popup", , , "", "" )
+    RH = VRInfo('Record')
+    if RH <> "" then do
+        call _GetSmbObjectProperties RH
+        call _ContextMenuSelectedSet
+
+        BrowsePath = _browsebuildpath(SMBObj.rh)
+
+        call _BrowseResetObject(SmbObj.rh)
+
+        parse var browsepath '\\'machine'\'sharename '\' browsepath
+
+        ok = VRMethod( "Menu_Selected", "Popup", , , "", "PositionOnItem" )
+    end
 
     if options.!debug == 1 then say time()' CN_SMBTREE_ContextMenu done'
@@ -2613 +2386 @@
 */
 DT_STATUSBAR_ContextMenu:
-    ok = VRSet("DT_STATUSBAR","Caption", VRGet("Main", "HintText"))
+    call _StatusBarWrapper VRGet("Main", "HintText")
 return
 
@@ -4372 +4145 @@
 
         if word(ok,1) = "1" then do
-            ok = VRSet("DT_STATUSBAR","Caption", NLVGetMessage(107, rpc.queryuser.FULL_NAME))
+            call _StatusBarWrapper NLVGetMessage(107, rpc.queryuser.FULL_NAME)
             say 'rpc.queryuser.DIR_DRIVE    = "'rpc.queryuser.DIR_DRIVE'"'
             say 'rpc.queryuser.LOGON_SCRIPT = "'rpc.queryuser.LOGON_SCRIPT'"'
@@ -5093 +4866 @@
     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)
+    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
 return
 
@@ -5873 +5653 @@
 return
 
+/*:VRX         TM_STATUSBAR_Trigger
+*/
+TM_STATUSBAR_Trigger: 
+    call _StatusbarReset
+return
+
 /*:VRX         TM_TheCloser_Trigger
 */