Changeset 662


Ignore:
Timestamp:
Nov 13, 2011, 4:25:35 PM (14 years ago)
Author:
Herwig Bauernfeind
Message:

GUI-Tools: EVFSGUI 2.5.x: Start implementing server based logon script support

Location:
trunk/guitools
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/guitools/evfsgui/evfsgui.vrx

    r661 r662  
    9898#append U:\Develop\Samba\trunk\guitools\shared\textini.vrs
    9999#append U:\Develop\Samba\trunk\guitools\shared\usercredmem.vrs
     100#append U:\Develop\Samba\trunk\guitools\shared\rxrpclib.vrs
    100101*/
    101102return
    … …  
    16021603*/
    16031604CN_CONDET_Click:
    1604     ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText"))
     1605    /* ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText")) */
    16051606return
    16061607
    … …  
    16421643CN_CURRENT_Click:
    16431644    IF options.!debug == 1 THEN SAY time()' CN_CURRENT_Click started'
    1644     ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText"))
     1645    /* ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText")) */
    16451646
    16461647    /* Herwig B. */
    … …  
    16531654    options.currentdata = data
    16541655
    1655     ok = VRset("DT_StatusBar","Caption", data' - 'VRGet("Main", "HintText"))
     1656    /* ok = VRset("DT_StatusBar","Caption", data' - 'VRGet("Main", "HintText")) */
    16561657
    16571658    PARSE VAR data p_node ';' p_mounts ';' p_string
    … …  
    17731774
    17741775    CALL VRSet 'MENU_CONTEXT_OPEN', 'Visible', 1
    1775     CALL VRSet 'MENU_CONTEXT_SEP1', 'Visible', 1
     1776/*  CALL VRSet 'MENU_CONTEXT_SEP1', 'Visible', 1
    17761777    CALL VRSet 'MENU_CONTEXT_SEP2', 'Visible', 1
    1777     CALL VRSet 'MENU_CONTEXT_SEP3', 'Visible', 1
     1778    CALL VRSet 'MENU_CONTEXT_SEP3', 'Visible', 1 */
    17781779    CALL VRSet 'Menu_Context_Open_Default', "Visible", 1
    17791780
    … …  
    17971798        CALL VRSet 'MENU_CONTEXT_DETACH',     'Visible', 1
    17981799        CALL VRSet 'MENU_CONTEXT_OPEN',       'Visible', 1
    1799         CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 1
     1800/*      CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 1 */
    18001801        CALL VRSet 'MENU_CONTEXT_DETACH_ALL', 'Visible', 1
    1801         CALL VRSet 'MENU_CONTEXT_SEP2',       'Visible', 1
    1802         CALL VRSet 'MENU_CONTEXT_SEP3',       'Visible', 1
     1802/*      CALL VRSet 'MENU_CONTEXT_SEP2',       'Visible', 1 */
     1803/*      CALL VRSet 'MENU_CONTEXT_SEP3',       'Visible', 1 */
    18031804    END
    18041805    ELSE DO
    … …  
    18061807        CALL VRSet 'MENU_CONTEXT_DETACH',     'Visible', 0
    18071808        CALL VRSet 'MENU_CONTEXT_OPEN',       'Visible', 0
    1808         CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 0
     1809/*      CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 0 */
    18091810        CALL VRSet 'MENU_CONTEXT_DETACH_ALL', 'Visible', 0
    1810         CALL VRSet 'MENU_CONTEXT_SEP2',       'Visible', 0
    1811         CALL VRSet 'MENU_CONTEXT_SEP3',       'Visible', 0
     1811/*      CALL VRSet 'MENU_CONTEXT_SEP2',       'Visible', 0 */
     1812/*      CALL VRSet 'MENU_CONTEXT_SEP3',       'Visible', 0 */
    18121813    END
    18131814
    … …  
    19791980
    19801981        ok = VRSet("EF_DIRECTORY","Value", "")
    1981 
    1982         window = VRLoadSecondary( "SW_MOUNTPOINT", "W" )
    1983 
    1984         if VRGet("CB_DRIVES","Value") = "" then return
    19851982    end
    19861983    else do
    1987 
    19881984        TargetString = VRMethod(trgCtn, "GetRecordAttr", trgRec, "Caption")
    19891985
    … …  
    19981994        ok = VRSet("CB_DRIVES","Value", left(TargetString,2))
    19991995        ok = VRSet("EF_DIRECTORY","Value", substr(TargetString,4))
    2000         window = VRLoadSecondary( "SW_MOUNTPOINT", "W" )
    2001         if VRGet("CB_DRIVES","Value") = "" then return
    2002     end
     1996    end
     1997
     1998    window = VRLoadSecondary( "SW_MOUNTPOINT", "W" )
     1999    if VRGet("CB_DRIVES","Value") = "" then return
     2000
    20032001    window = VRLoadSecondary( "SW_LOGIN", "W" )
    20042002    if credentials.!entered = 1 then call PB_MOUNT_CLICK
    … …  
    20132011CN_SMBTREE_Click:
    20142012    IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_Click started'
    2015     ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText"))
     2013    /* ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText")) */
    20162014
    20172015    call _dropdeprecated
    … …  
    37293727    credentials.!entered = 1
    37303728
     3729    ok = _rpcqueryuser(p_server, VRGet("EF_USER1","Value"), VRGet("EF_PASSWORD1","Value"), VRGet("EF_USER1","Value"))
     3730
     3731    LogonRetVal = word(ok,1)
     3732
     3733    if LogonRetVal = "1" then do
     3734        Msg.Type ="I"
     3735        ok = VRSet("DT_STATUSBAR","Caption", "Welcome "rpc.queryuser.FULL_NAME"!")
     3736    end
     3737    else do
     3738        Msg.Type ="E"
     3739        CALL VRMessage 'Main', Credentials.!username" at "p_server": "rpc.queryuser.LOGONSTATUS, "Login failure", Msg.Type
     3740    end
     3741
    37313742    call SW_LOGIN_Close
    37323743RETURN
    … …  
    45234534        when pos("PDC",VRMethod("CN_smbtree", "GetFieldData", SMBObj.rh, MBFH)) > 0 then LoginIcon = "#63:PMWP.DLL" /* icons.!pdc */
    45244535        when SMBObj.udatatype = "WORKGROUP" then LoginIcon = SMBObj.Icon
    4525         when SMBObj.udatatype = "SERVER" then LoginIcon = SMBObj.Icon
     4536        when SMBObj.udatatype = "SERVER"    then LoginIcon = SMBObj.Icon
     4537        when SMBObj.udatatype = "DISK"      then do
     4538            if pos("PDC",VRMethod("CN_smbtree", "GetFieldData", SMBObj.parentrh, MBFH)) > 0
     4539                then LoginIcon = "#63:PMWP.DLL" /* icons.!pdc */
     4540                else LoginIcon = "#35:PMWP.DLL" /* icons.!pdc */
     4541        end
    45264542        otherwise LoginIcon = "#35:PMWP.DLL" /* icons.!machine_awake */
    45274543    end
    … …  
    45954611    ok = VRMethod("EF_DIRECTORY1","AddString",p_share)
    45964612
    4597     IF advanced.!easupport \= "" THEN ok = VRSet("CB_EAS1",     "Set",   advanced.!easupport)
    4598     IF advanced.!readonly  \= "" THEN ok = VRSet("CB_READONLY1","Set",   advanced.!readonly)
    4599     IF advanced.!alwaysmp  \= "" THEN ok = VRSet("CB_ALWAYSMP1","Set",   advanced.!alwaysmp)
     4613    IF advanced.!easupport     \= "" THEN ok = VRSet("CB_EAS1",            "Set",   advanced.!easupport)
     4614    IF advanced.!readonly      \= "" THEN ok = VRSet("CB_READONLY1",       "Set",   advanced.!readonly)
     4615    IF advanced.!alwaysmp      \= "" THEN ok = VRSet("CB_ALWAYSMP1",       "Set",   advanced.!alwaysmp)
    46004616    IF advanced.!cachetimeout  \= "" THEN ok = VRSet("SPIN_CACHETIMEOUT1", "Value", advanced.!cachetimeout)
    46014617    IF advanced.!cachelistings \= "" THEN ok = VRSet("SPIN_CACHELISTINGS1","Value", advanced.!cachelistings)

  • trunk/guitools/shared/rxrpclib.vrs

    r638 r662  
    11/* REXX Function Library for RPC calls */
    22
    3 /* Currently implemented functions:
    4    _rpcenumdomgroups(server,username,password)
    5    _rpcenumdomusers(server,username,password) 
    6    _rpcenumprinters(server,username,password) 
    7    _rpcnetshareenum(server,username,password)
    8    _rpcnetsharegetinfo(server,username,password,share)
    9    _rpcquerygroupmem(server,username,password,grouprid)
    10    _rpcqueryuser(server,username,password,userrid)
    11  */
     3/* Currently implemented functions:                        */
     4/*   _rpcenumdomgroups(server,username,password)           */
     5/*   _rpcenumdomusers(server,username,password)            */
     6/*   _rpcenumprinters(server,username,password)            */ 
     7/*   _rpcnetshareenum(server,username,password)            */
     8/*   _rpcnetsharegetinfo(server,username,password,share)   */
     9/*   _rpcquerygroupmem(server,username,password,grouprid)  */
     10/*   _rpcqueryuser(server,username,password,userrid)       */
    1211
    1312/*:VRX         _rpcenumdomgroups
    1413*/
    15 _rpcenumdomgroups: procedure expose rpc. samba. options.
     14_rpcenumdomgroups: procedure expose rpc. samba. options. debuglevel
    1615    IF options.!debug == 1 THEN SAY time()" _rpcenumdomgroups() started"
    1716    server   = arg(1)
    … …  
    1918    password = arg(3)
    2019
    21     say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumdomgroups"'
    22     address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumdomgroups" >'samba.!msg
     20    say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumdomgroups" 'debuglevel' '
     21    address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumdomgroups" 'debuglevel' >'samba.!msg
    2322
    2423    rpc.enumdomgroups. = ""
    … …  
    6463    IF options.!debug == 1 THEN SAY time()" _rpcenumdomgroups() done, "retval" "rpc.enumdomgroups.LOGONSTATUS
    6564return retval
     65
    6666/*:VRX         _rpcenumdomusers
    6767*/
    68 _rpcenumdomusers:  procedure expose rpc. samba. options.
     68_rpcenumdomusers:  procedure expose rpc. samba. options.  debuglevel
    6969    IF options.!debug == 1 THEN SAY time()" _rpcenumdomusers() started"
    7070    server   = arg(1)
    … …  
    7272    password = arg(3)
    7373
    74     say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumdomusers"'
    75     address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumdomusers" >'samba.!msg
     74    say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumdomusers" 'debuglevel' '
     75    address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumdomusers" 'debuglevel' >'samba.!msg
    7676
    7777    rpc.enumdomusers. = ""
    … …  
    120120/*:VRX         _rpcenumprinters
    121121*/
    122 _rpcenumprinters: procedure expose rpc. samba. options.
     122_rpcenumprinters: procedure expose rpc. samba. options. debuglevel
    123123    IF options.!debug == 1 THEN SAY time()" _rpcenumprinters() started"
    124124    server   = arg(1)
    … …  
    126126    password = arg(3)
    127127
    128     say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumprinters"'
    129     address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumprinters" >'samba.!msg
     128    say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumprinters" 'debuglevel' '
     129    address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumprinters" 'debuglevel' >'samba.!msg
    130130
    131131    rpc.enumprinters. = ""
    … …  
    168168/*:VRX         _rpcnetshareenum
    169169*/
    170 _rpcnetshareenum: procedure expose rpc. samba. options.
     170_rpcnetshareenum: procedure expose rpc. samba. options.  debuglevel
    171171    IF options.!debug == 1 THEN SAY time()" _rpcnetshareenum() started"
    172172    server   = arg(1)
    … …  
    174174    password = arg(3)
    175175
    176     say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="netshareenum"'
    177     address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="netshareenum" >'samba.!msg
     176    say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="netshareenum" 'debuglevel' '
     177    address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="netshareenum" 'debuglevel' >'samba.!msg
    178178
    179179    rpc.netshareenum. = ""
    … …  
    217217/*:VRX         _rpcnetsharegetinfo
    218218*/
    219 _rpcnetsharegetinfo:  procedure expose rpc. samba. options.
     219_rpcnetsharegetinfo:  procedure expose rpc. samba. options.  debuglevel
    220220    IF options.!debug == 1 THEN SAY time()" _rpcnetsharegetinfo() started"
    221221    server   = arg(1)
    … …  
    224224    share    = arg(4)
    225225
    226     say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="netsharegetinfo 'share'"'
    227     address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="netsharegetinfo 'share'" >'samba.!msg
     226    say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="netsharegetinfo 'share'" 'debuglevel' '
     227    address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="netsharegetinfo 'share'" 'debuglevel' >'samba.!msg
    228228
    229229    rpc.netsharegetinfo. = ""
    … …  
    268268/*:VRX         _rpcquerygroupmem
    269269*/
    270 _rpcquerygroupmem: procedure expose rpc. samba. options.
     270_rpcquerygroupmem: procedure expose rpc. samba. options.  debuglevel
    271271    IF options.!debug == 1 THEN SAY time()" _rpcquerygroupmem() started"
    272272    server   = arg(1)
    … …  
    275275    grouprid = arg(4)
    276276
    277     say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="querygroupmem 'grouprid'"'
    278     address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="querygroupmem 'grouprid'" >'samba.!msg
     277    say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="querygroupmem 'grouprid'" 'debuglevel' '
     278    address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="querygroupmem 'grouprid'" 'debuglevel' >'samba.!msg
    279279
    280280    rpc.querygroupmem. = ""
    … …  
    322322/*:VRX         _rpcqueryuser
    323323*/
    324 _rpcqueryuser: procedure expose rpc. samba. options.
     324_rpcqueryuser: procedure expose rpc. samba. options.  debuglevel
    325325    IF options.!debug == 1 THEN SAY time()" _rpcqueryuser() started"
    326326    server   = arg(1)
    … …  
    329329    userrid  = arg(4)
    330330
    331     say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="queryuser 'userrid'"'
    332     address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="queryuser 'userrid'" >'samba.!msg
     331    say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="queryuser 'userrid'" 'debuglevel' '
     332    address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="queryuser 'userrid'" 'debuglevel' >'samba.!msg
    333333
    334334    rpc.queryuser. = ""
    … …  
    375375/*:VRX         _rpcsrvinfo
    376376*/
    377 _rpcsrvinfo:
     377_rpcsrvinfo:  procedure expose rpc. samba. options.  debuglevel
    378378    IF options.!debug == 1 THEN SAY time()" _rpcsrvinfo() started"
    379379    server   = arg(1)
    … …  
    381381    password = arg(3)
    382382
    383     say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="srvinfo"'
    384     address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="srvinfo" >'samba.!msg
     383    say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="srvinfo" 'debuglevel' '
     384    address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="srvinfo" 'debuglevel' >'samba.!msg
    385385
    386386    rpc.srvinfo. = ""
Note: See TracChangeset for help on using the changeset viewer.