Changeset 665


Ignore:
Timestamp:
Nov 19, 2011, 5:05:03 PM (14 years ago)
Author:
Herwig Bauernfeind
Message:

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

Location:
trunk/guitools
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/guitools/evfsgui/changes

    r661 r665  
    1616 
    1717Version 2.5.x 2011-??-??
     18+ Added: Error handler for missing REXX DLLs
     19+ Added: Identify user using RPC library
    1820+ Added: Icon on login window depends upon connection type
    1921+ Added: Allow removing stored credentials from memory
    … …  
    3032+ Added: Find domain master browser
    3133+ Added: Find local master browser
    32 + Added: Enhanced info box (MAC, IP-Address, server role)
     34+ Added: Enhanced info box (MAC, IP-Address, server role, capabilities)
    3335+ Added: Optionally add TRAC Wiki markup to "About"-data for clipboard
    3436* Changed: Use Rich Walsh's look4dll.exe to find the used ndpsmb.dll
    … …  
    3739           convert global settings and advanced connection options
    3840           from windows into notebook pages
     41! Fixed: Do not add a *-"server" to the networkneighbourhood if a workgroup
     42         was mounted.
    3943! Fixed: Extended Help menu item was broken
    4044! Fixed: Refreshing a single machine added shares 2x for automatically

  • trunk/guitools/evfsgui/evfsgui.vrp

    r661 r665  
    1212VRXWindow: __VRESectionListWindow,1,3903,10744,8082,4505
    1313VRXWindow: __VREToolsWindow,0,2987,8528,6486,1669
    14 VRXWindow: __VREWindListWindow,1,193,10841,3686,3150
     14VRXWindow: __VREWindListWindow,1,723,11708,3686,3150
    1515UserFile: 1
    1616UserWindow: Main,1
    1717UserWindow: SW_LOGIN,1
    18 UserWindow: SW_MOUNTPOINT,1

  • trunk/guitools/evfsgui/evfsgui.vrx

    r662 r665  
    10961096*/
    10971097_LoadOtherFuncs:
     1098    SIGNAL ON SYNTAX NAME DLLMissing
     1099
    10981100    call RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs'
    10991101    call SysLoadFuncs
    … …  
    11051107    call PRLoadFuncs
    11061108
    1107     call RxFuncAdd 'RxuInit','Rxu','RxuInit'
     1109    call RxFuncAdd 'RxuInit',      'RXU',     'RxuInit'
    11081110    call RxuInit
    1109 return
     1111
     1112    SIGNAL OFF SYNTAX
     1113return
     1114
     1115DLLMissing:
     1116    Fatal = 1
     1117    call VRMessage 'Main', 'REXX function library 'strip(translate(word(sourceline(SIGL-1),4),'  ',"',"))'.DLL is missing!', "EVFSGUI fatal error", "E"
     1118signal Quit
    11101119
    11111120/*:VRX         _ParseCommandLine
    … …  
    22152224    end
    22162225
     2226    /* do nothing if a workgroup was mounted */
     2227    if VRGet("EF_SERVER","value") = "*" then return
     2228
    22172229    machine = VRGet("EF_SERVER","value")   
    22182230    rh = _GetMachineHandle(machine)
    … …  
    37273739    credentials.!entered = 1
    37283740
    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
     3741    if p_server <> "" then do
     3742        ok = _rpcqueryuser(p_server, VRGet("EF_USER1","Value"), VRGet("EF_PASSWORD1","Value"), VRGet("EF_USER1","Value"))
     3743
     3744        if word(ok,1) = "1" then do
     3745            ok = VRSet("DT_STATUSBAR","Caption", NLVGetMessage(107, rpc.queryuser.FULL_NAME))
     3746            say 'rpc.queryuser.DIR_DRIVE    = "'rpc.queryuser.DIR_DRIVE'"'
     3747            say 'rpc.queryuser.LOGON_SCRIPT = "'rpc.queryuser.LOGON_SCRIPT'"'
     3748        end
     3749        else do
     3750            CALL VRMessage 'Main', VRGet("EF_USER1","Value")" \\"p_server": "rpc.queryuser.LOGONSTATUS, NLVGetMessage(5), "E"
     3751        end
    37403752    end
    37413753
    … …  
    44744486    end
    44754487
    4476     Info.!comment= VRMethod( "CN_INFO", "AddRecord")
    4477     Info.!domain = VRMethod( "CN_INFO", "AddRecord")
    4478     Info.!DMBLMB = VRMethod( "CN_INFO", "AddRecord")
    4479     Info.!os     = VRMethod( "CN_INFO", "AddRecord")
    4480     Info.!server = VRMethod( "CN_INFO", "AddRecord")
    4481     Info.!status = VRMethod( "CN_INFO", "AddRecord")
    4482     Info.!IP     = VRMethod( "CN_INFO", "AddRecord")
    4483     Info.!MAC    = VRMethod( "CN_INFO", "AddRecord")
    4484 
    4485 
    4486     ok = VRMethod( "CN_INFO", "SetFieldData", Info.!domain, Info.TypeFH, strip(NLVGetMessage(21),'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, WorkGroupFH ))
    4487     ok = VRMethod( "CN_INFO", "SetFieldData", Info.!os,     Info.TypeFH, strip(NLVGetMessage(93),'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, OSFH  ))
    4488     ok = VRMethod( "CN_INFO", "SetFieldData", Info.!server, Info.TypeFH, strip(NLVGetMessage(19),'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, VersionFH  ))
     4488    ok = _rpcsrvinfo(SMBObj.resname,credentials.!username,credentials.!password)
     4489
     4490    Info.!nbname       = VRMethod( "CN_INFO", "AddRecord")
     4491    Info.!comment      = VRMethod( "CN_INFO", "AddRecord")
     4492    Info.!domain       = VRMethod( "CN_INFO", "AddRecord")
     4493    Info.!DMBLMB       = VRMethod( "CN_INFO", "AddRecord")
     4494    Info.!capabilities = VRMethod( "CN_INFO", "AddRecord")
     4495    Info.!os           = VRMethod( "CN_INFO", "AddRecord")
     4496    Info.!server       = VRMethod( "CN_INFO", "AddRecord")
     4497    Info.!version      = VRMethod( "CN_INFO", "AddRecord")
     4498    Info.!status       = VRMethod( "CN_INFO", "AddRecord")
     4499    Info.!IP           = VRMethod( "CN_INFO", "AddRecord")
     4500    Info.!MAC          = VRMethod( "CN_INFO", "AddRecord")
     4501
     4502    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!nbname, Info.TypeFH, strip(NLVGetMessage(137),'T',':'),Info.ValueFH, rpc.srvinfo.NETBIOSNAME)
     4503    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!comment,Info.TypeFH, strip(NLVGetMessage(125),'T',':'),Info.ValueFH, rpc.srvinfo.SERVERSTRING)
     4504    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!domain, Info.TypeFH, strip(NLVGetMessage(21), 'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, WorkGroupFH ))
     4505    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!os,     Info.TypeFH, strip(NLVGetMessage(93), 'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, OSFH  ))
     4506    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!server, Info.TypeFH, strip(NLVGetMessage(19), 'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, VersionFH  ))
     4507    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!version,Info.TypeFH, strip(NLVGetMessage(139),'T',':'),Info.ValueFH, rpc.srvinfo.OS_VERSION)
     4508    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!capabilities, Info.TypeFH, strip(NLVGetMessage(138),'T',':'),Info.ValueFH, rpc.srvinfo.CAPABILITIES)
    44894509    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!DMBLMB, Info.TypeFH, strip(NLVGetMessage(124),'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, MBFH  ))
    44904510    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!IP,     Info.TypeFH, "IP"  ,Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, IPFH  ))
    44914511    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!MAC,    Info.TypeFH, "MAC" ,Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, MacFH ))
    4492     ok = VRMethod( "CN_INFO", "SetFieldData", Info.!comment,Info.TypeFH, strip(NLVGetMessage(125),'T',':'),Info.ValueFH, SMBObj.comment)
    4493     ok = VRMethod( "CN_INFO", "SetFieldData", Info.!status, Info.TypeFH, strip(NLVGetMessage(67),'T',':'),Info.ValueFH, SMBObj.udatamsg )
     4512
     4513    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!status, Info.TypeFH, strip(NLVGetMessage(67),'T',':'),Info.ValueFH, rpc.srvinfo.LOGONSTATUS ) /* SMBObj.udatamsg */
    44944514    IF options.!debug == 1 THEN SAY time()' SW_INFO_Create done'   
    44954515return

  • trunk/guitools/evfsgui/rc/lang/evfsi_de.mkm

    r661 r665  
    106106EVG0098I: Einstell~ungen
    107107EVG0099I: ~Geteilte Anzeige
    108 ; Fatal error messages
     108; Messages
    109109EVG0100I: Konnte EVFSCALL.DLL nicht laden - Fortsetzung nicht m”glich.
    110110EVG0101I: EVFS Steuerprogramm ist nicht gestartet - Fortsetzung nicht m”glich.
    … …  
    114114EVG0105I: Keine SMB Anschlsse installiert.
    115115EVG0106I: Der Anschluss ist installiert und konfiguriert, wird aber nicht benutzt.
    116 EVG0107?:
     116EVG0107I: Willkommen %1!
    117117EVG0108?:
    118118EVG0109?:
    … …  
    146146EVG0135I: Anmeldeinformationen speichern
    147147EVG0136I: Anmelden bei
     148EVG0137I: NetBIOS Name
     149EVG0138I: F„higkeiten
     150EVG0139I: Version

  • trunk/guitools/evfsgui/rc/lang/evfsi_en.mkm

    r661 r665  
    106106EVG0098I: ~Settings
    107107EVG0099I: S~plit view
    108 ; Fatal error messages
     108; Messages
    109109EVG0100I: Failed to load EVFSCALL.DLL - cannot continue.
    110110EVG0101I: EVFS Control Program is not running - cannot continue.
    … …  
    114114EVG0105I: No SMB ports installed.
    115115EVG0106I: Port is installked an configured, but not used by any printer.
    116 EVG0107?:
     116EVG0107I: Welcome %1!
    117117EVG0108?:
    118118EVG0109?:
    … …  
    146146EVG0135I: Store credentials until next reboot
    147147EVG0136I: Login
     148EVG0137I: NetBIOS name
     149EVG0138I: Capabilities
     150EVG0139I: Version

  • trunk/guitools/evfsgui/rc/lang/evfsi_fr.mkm

    r661 r665  
    111111EVG0098?: ~ParamŠtres
    112112EVG0099?: Vue ~scind‚e
    113 ; Fatal error messages
     113; Messages
    114114EVG0100I: chec au chargement de EVFSCALL.DLL - poursuite impossible.
    115115EVG0101I: Le programme de contr“le de EVFS n'est pas en cours d'ex‚cution - poursuite impossible.
    … …  
    120120EVG0105I: Aucun port SMB install‚.
    121121EVG0106I: La connexion est install‚ mais pas utilis‚.
    122 EVG0107?:
     122EVG0107I: Bienvenue %1!
    123123EVG0108?:
    124124EVG0109?:
    … …  
    152152EVG0135I: R‚f‚rences magasin jusqu'au prochain red‚marrage
    153153EVG0136I: Connexion
     154EVG0137I: Nom NetBIOS
     155EVG0138I: Compet‚nces
     156EVG0139I: Version

  • trunk/guitools/evfsgui/rc/lang/evfsi_it.mkm

    r661 r665  
    110110EVG0098?:
    111111EVG0099?:
    112 ; Fatal error messages
     112; Messages
    113113EVG0100I: Impossibile caricare EVFSCALL.DLL - impossibile continuare
    114114EVG0101I: Il programma di controllo di EVFS non Š in esecuzione - impossibile continuare
    … …  
    118118EVG0105I: Porte SMB non Š installato.
    119119EVG0106I: La connessione Š installata ma non utilizzata.
    120 EVG0107?:
     120EVG0107I: Benvenuto %1!
    121121EVG0108?:
    122122EVG0109?:
    … …  
    150150EVG0135I: Credenziali di memorizzare fino al riavvio successivo
    151151EVG0136I: Accesso
     152EVG0137I: Nome NetBIOS
     153EVG0138I: Abilit
     154
     155EVG0139I: Versione

  • trunk/guitools/shared/rxrpclib.vrs

    r662 r665  
    99/*   _rpcquerygroupmem(server,username,password,grouprid)  */
    1010/*   _rpcqueryuser(server,username,password,userrid)       */
     11/*   _rpcsrvinfo(server,username,password)                 */
    1112
    1213/*:VRX         _rpcenumdomgroups
    … …  
    126127    password = arg(3)
    127128
    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
     129    usercred = '--user='username'%'password
     130
     131    say     '  'samba.!rpcclientexe' 'server' 'usercred' --command="enumprinters" 'debuglevel' '
     132    address cmd samba.!rpcclientexe' 'server' 'usercred' --command="enumprinters" 'debuglevel' >'samba.!msg
    130133
    131134    rpc.enumprinters. = ""
    … …  
    381384    password = arg(3)
    382385
    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
     386    usercred = '--user='username'%'password
     387    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'
     388
     389    say     '  'samba.!rpcclientexe' 'server' 'usercred' --command="srvinfo" 'debuglevel' >'samba.!msg
     390    address cmd samba.!rpcclientexe' 'server' 'usercred' --command="srvinfo" 'debuglevel' >'samba.!msg
    385391
    386392    rpc.srvinfo. = ""
    … …  
    432438        rpc.srvinfo.LOGONSTATUS=substr(rpcline,pos("NT_STATUS",rpcline),)
    433439    end
     440    say '  rpc.srvinfo.LOGONSTATUS = "'rpc.srvinfo.LOGONSTATUS'"'
    434441    IF options.!debug == 1 THEN SAY time()" _rpcsrvinfo() done, "retval
    435442return retval
Note: See TracChangeset for help on using the changeset viewer.