Changeset 697


Ignore:
Timestamp:
Apr 14, 2012, 7:10:43 PM (13 years ago)
Author:
Herwig Bauernfeind
Message:

GUI-Tools: Updates in EVFSGUI

Location:
trunk/guitools/evfsgui
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/guitools/evfsgui/changes

    r688 r697  
    2121+ Added: Error handler for missing REXX DLLs
    2222+ Added: Identify user using RPC library
     23+ Added: Indicate by "LED" whether credentials are stored or not
     24+ Added: Click on "LED" to remove credentials from memory
    2325+ Added: Icon on login window depends upon connection type
    2426+ Added: Allow removing stored credentials from memory
    … …  
    5153         added machines
    5254! Fixed: Loginbox was not NLS aware
     55! Fixed: Do not crash upon authenticitation if we are unable to determine the
     56         connection type (yet)
    5357! Fixed: Numerous small bugs/omissions
    5458! Fixed: "Creating lame upcase tables" filtered

  • trunk/guitools/evfsgui/evfsgui.vrp

    r688 r697  
    1010VRXWindow: __VREMainWindow,1,1951,2361,891,7841
    1111VRXWindow: __VREFileListWindow,1,1253,11033,2665,3358
    12 VRXWindow: __VRESectionListWindow,1,3927,11033,8082,7986
    13 VRXWindow: __VREToolsWindow,0,3084,8528,6486,1669
     12VRXWindow: __VRESectionListWindow,0,3927,11033,8082,7986
     13VRXWindow: __VREToolsWindow,0,3096,8528,6486,1669
    1414VRXWindow: __VREWindListWindow,1,723,11708,3686,3150
    1515UserFile: 1
    1616UserWindow: Main,1
     17UserWindow: SW_LOGIN,1
     18UserWindow: SW_INFO,1
     19UserWindow: SW_SMBTREE,1
     20UserWindow: SW_DIALOG,1

  • trunk/guitools/evfsgui/evfsgui.vrx

    r688 r697  
    205205*/
    206206_BrowseBuildPath: procedure expose options. icons. sharerh
    207     IF options.!debug == 1 THEN SAY time()' _BrowseBuildPath started'
     207    if options.!debug == 1 then say time()' _BrowseBuildPath started'
    208208    rh = arg(1)
    209209
    … …  
    237237    end
    238238    BrowsePathStr = strip(BrowsePathStr,'T','\')
    239     IF options.!debug == 1 THEN SAY time()' _BrowseBuildPath done, returning "'BrowsePathStr'"'
     239    if options.!debug == 1 then say time()' _BrowseBuildPath done, returning "'BrowsePathStr'"'
    240240return BrowsePathStr
    241241
    … …  
    243243*/
    244244_BrowseDirectory: /* This must not be a procedure */
    245     IF options.!debug == 1 THEN SAY time()' _BrowseDirectory started'
     245    if options.!debug == 1 then say time()' _BrowseDirectory started'
    246246
    247247    /* Turn off painting */
    … …  
    327327    call VRSet VRWindow(), 'Pointer', '<default>'
    328328    ok = VRSet("CN_SMBTREE","Painting", 1 )
    329     IF options.!debug == 1 THEN SAY time()' _BrowseDirectory done'
     329    if options.!debug == 1 then say time()' _BrowseDirectory done'
    330330return
    331331
    … …  
    343343    DO i = 1 TO records.0
    344344        if VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.StatusFH) = icons.!active then do
    345             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)
     345            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)
    346346            if machine = VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.ServerFH) &,
    347347               sharename = VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.ShareFH) then do
    348348                Object = strip(VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.MPointFH),'T','\')'\'browsepath
    349                 IF options.!debug == 1 THEN SAY '  Non UNC object: "'Object'"'
     349                if options.!debug == 1 then say '  Non UNC object: "'Object'"'
    350350                ID = VRMethod( "Application", "StartThread", "wps_open", Object, "DEFAULT" )
    351351                OpenOK = 1
    … …  
    374374*/
    375375_ContainersInit:
    376     IF options.!debug == 1 THEN SAY time()' _ContainersInit started'
     376    if options.!debug == 1 then say time()' _ContainersInit started'
    377377    /* Connection details */
    378378    CD.StatusFH    = VRMethod( "CN_CONDET", "AddField", "Icon", "Status" )
    … …  
    438438    ok = VRMethod("CN_smbtree","SetfieldAttr",MacFH,      "ReadOnly", 1)
    439439
    440     IF options.!debug == 1 THEN SAY time()' _ContainersInit done'
     440    if options.!debug == 1 then say time()' _ContainersInit done'
    441441return
    442442/*:VRX         _ContextMenuSelectedSet
    … …  
    486486*/
    487487_CreateSmbConf:
    488     IF options.!debug == 1 THEN SAY time()' '||"_CreateSmbConf started"
     488    if options.!debug == 1 then say time()' '||"_CreateSmbConf started"
    489489    call lineout samba.!smbconf, '# Samba config file created using EVFSGUI ver. 'word(VRGet("Main","Hinttext"),2)
    490490    call lineout samba.!smbconf, '# from 'value("USER",,'OS2ENVIRONMENT')'@'value("HOSTNAME",,'OS2ENVIRONMENT')
    … …  
    499499    call lineout samba.!smbconf, '09'x||'log level = 0'
    500500    ok = stream(samba.!smbconf,'c','close')
    501     IF options.!debug == 1 THEN SAY time()' '||"_CreateSmbConf done"
     501    if options.!debug == 1 then say time()' '||"_CreateSmbConf done"
    502502return
    503503
    … …  
    586586_Dynamic:
    587587    dyn_code = arg(1)
    588     IF options.!debug == 1 THEN SAY '  Dynamic code: 'dyn_code
     588    if options.!debug == 1 then say '  Dynamic code: 'dyn_code
    589589    interpret dyn_code; drop dyn_code
    590590return
    … …  
    593593*/
    594594_GetSMBObjectProperties: procedure expose options. SMBObj. rh icon resname udatatype udatamsg parentrh icons.
    595     IF options.!debug == 1 THEN SAY time()' _GetSMBObjectProperties started'
     595    if options.!debug == 1 then say time()' _GetSMBObjectProperties started'
    596596
    597597    /* Purpose of this subroutine:
    … …  
    616616
    617617    if VRMethod( "CN_SMBTREE", "ValidateRecord", SMBObj.rh) <> 1 | SMBObj.rh = "" then do
    618         IF options.!debug == 1 THEN SAY time()' _GetSMBObjectProperties aborted'
     618        if options.!debug == 1 then say time()' _GetSMBObjectProperties aborted'
    619619        return
    620620    end
    … …  
    637637    SMBObj.udatamsg  = strip(SMBObj.udatamsg)
    638638
    639     IF options.!debug == 1 THEN do
    640         SAY '  Handle:   "'SMBObj.rh'"'
     639    if options.!debug == 1 then do
     640        say '  Handle:   "'SMBObj.rh'"'
    641641        say '  GParentrh "'SMBObj.gparentrh'"'
    642         SAY '  Resource: "'SMBObj.resname'"'
    643         SAY '  Comment:  "'SMBObj.comment'"'
    644         SAY '  Type:     "'SMBObj.udatatype'"'
    645         SAY '  Message:  "'SMBObj.udatamsg'"'
    646         SAY '  Icon:     "'SMBObj.icon'"'
    647     end
    648 
    649     IF options.!debug == 1 THEN SAY time()' _GetSMBObjectProperties done'
     642        say '  Resource: "'SMBObj.resname'"'
     643        say '  Comment:  "'SMBObj.comment'"'
     644        say '  Type:     "'SMBObj.udatatype'"'
     645        say '  Message:  "'SMBObj.udatamsg'"'
     646        say '  Icon:     "'SMBObj.icon'"'
     647    end
     648
     649    if options.!debug == 1 then say time()' _GetSMBObjectProperties done'
    650650return
    651651
    … …  
    684684*/
    685685_GUIInit:
    686     IF options.!debug == 1 THEN SAY time()' _GUIInit started'
     686    if options.!debug == 1 then say time()' _GUIInit started'
    687687    CALL VRSet 'Main', 'HelpFile', settings.!helpfile
    688688
    … …  
    771771    margin = ((VRGet("Main", "InteriorLeft") / 3) * 2) + 2
    772772
    773     IF options.!debug == 1 THEN SAY time()' _GUIInit done'
     773    if options.!debug == 1 then say time()' _GUIInit done'
    774774return
    775775
    … …  
    777777*/
    778778_INILoad:
    779     IF options.!debug == 1 THEN SAY time()' _INILoad started'
     779    if options.!debug == 1 then say time()' _INILoad started'
    780780
    781781    /* Locate the profile */
    … …  
    785785    settings.!ini = inipath'\evfsgui.ini'
    786786    drop os2_ini inipath
    787     IF options.!debug == 1 THEN SAY '  EVFSGUI INIfile = "'settings.!ini'"'
     787    if options.!debug == 1 then say '  EVFSGUI INIfile = "'settings.!ini'"'
    788788
    789789    settings.!network = ""
    … …  
    797797    IF STREAM( settings.!ini, 'C', 'QUERY EXISTS') == '' THEN DO
    798798        /* First start */
    799         IF options.!debug == 1 THEN say "  First start!"
     799        if options.!debug == 1 then say "  First start!"
    800800
    801801        advanced.!browseauth = 0
    … …  
    880880        options.!debug = VRGetIni('Settings', 'Debug', settings.!ini)
    881881        IF options.!debug == '' THEN options.!debug = 0       /* Turn off debug by default for release builds */
    882         IF options.!debug == 1 THEN ok = VRRedirectStdIO("ON")
     882        if options.!debug == 1 then ok = VRRedirectStdIO("ON")
    883883                               else ok = VRRedirectStdio("OFF")
    884884
    … …  
    945945
    946946    /* in non debug versions this is normally not visible */
    947     IF options.!debug == 1 THEN SAY '  NLV MessageFile = "'settings.!messages'"'
    948     IF options.!debug == 1 THEN SAY '  NLV HelpFile    = "'settings.!helpfile'"'
    949 
    950     IF options.!debug == 1 THEN SAY time()' _INILoad done'
     947    if options.!debug == 1 then say '  NLV MessageFile = "'settings.!messages'"'
     948    if options.!debug == 1 then say '  NLV HelpFile    = "'settings.!helpfile'"'
     949
     950    if options.!debug == 1 then say time()' _INILoad done'
    951951RETURN
    952952
    … …  
    954954*/
    955955_INISave: PROCEDURE EXPOSE settings. options. icons. fs. advanced. cd. samba.
    956     IF options.!debug == 1 THEN SAY time()' '||"SaveSettings started"
     956    if options.!debug == 1 then say time()' '||"SaveSettings started"
    957957
    958958    if advanced.!savepassive then call _PassiveSave
    … …  
    10101010    CALL VRSetIni 'Settings', 'S', settings.!s, settings.!ini
    10111011
    1012     IF options.!debug == 1 THEN SAY time()' '||"SaveSettings done"
     1012    if options.!debug == 1 then say time()' '||"SaveSettings done"
    10131013RETURN
    10141014
    … …  
    11271127*/
    11281128_ParseCommandLine:
    1129     IF options.!debug == 1 THEN SAY time()' _ParseCommandLine() started'
     1129    if options.!debug == 1 then say time()' _ParseCommandLine() started'
    11301130    CmdLine = VRGet("Application","Commandline")
    11311131    upCmdLine = translate(CmdLine)
    1132     IF options.!debug == 1 THEN SAY '  Commandline = "'CmdLine'"'
     1132    if options.!debug == 1 then say '  Commandline = "'CmdLine'"'
    11331133
    11341134    ForceNDFS = 0
    11351135    if wordpos('-NDFS',upCmdLine) > 0 then do
    1136         IF options.!debug == 1 THEN SAY "  NDFS switch detected"
     1136        if options.!debug == 1 then say "  NDFS switch detected"
    11371137        CmdLine = delWord(CmdLine,wordpos('-NDFS',upCmdLine),1)
    11381138        upCmdLine = translate(CmdLine)
    … …  
    11431143    if wordpos('-AUTOCLOSE',upCmdLine) > 0 then do
    11441144        options.!autoclose = 1
    1145         IF options.!debug == 1 THEN SAY "  AutoClose switch detected"
     1145        if options.!debug == 1 then say "  AutoClose switch detected"
    11461146        CmdLine = delWord(CmdLine,wordpos('-AUTOCLOSE',upCmdLine),1)
    11471147        upCmdLine = translate(CmdLine)
    … …  
    11501150        options.!nogui = 1
    11511151        options.!autoclose = 1
    1152         IF options.!debug == 1 THEN SAY "  -NOGUI switch detected"
     1152        if options.!debug == 1 then say "  -NOGUI switch detected"
    11531153        CmdLine = delWord(CmdLine,wordpos('-NOGUI',upCmdLine),1)
    11541154        upCmdLine = translate(CmdLine)
    … …  
    11571157    if wordpos('-TIMESYNC',upCmdLine) > 0 then do
    11581158        options.!timesync = 1
    1159         IF options.!debug == 1 THEN SAY "  -TIMESYNC switch detected"
     1159        if options.!debug == 1 then say "  -TIMESYNC switch detected"
    11601160        dwpos = wordpos('-TIMESYNC',upCmdLine)
    11611161        if dwpos = words(upCmdLine) then do /* TIMESYNC was last parm - assume automatic */
    … …  
    11771177
    11781178    if wordpos('-DELAY',upCmdLine) > 0 then do
    1179         IF options.!debug == 1 THEN SAY "  DELAY switch detected"
     1179        if options.!debug == 1 then say "  DELAY switch detected"
    11801180        dwpos = wordpos('-DELAY',upCmdLine)
    11811181        if dwpos = words(upCmdLine) then do /* DELAY was last parm - assume 60 seconds */
    … …  
    11941194        end
    11951195        upCmdLine = translate(CmdLine)
    1196         IF options.!debug == 1 THEN SAY "  DELAY set to "options.!delay" seconds."
     1196        if options.!debug == 1 then say "  DELAY set to "options.!delay" seconds."
    11971197    end
    11981198
    … …  
    12011201        Profile = strip(VRParseFilename(Profile,"DPNE"))
    12021202        options.!autoload   = 1
    1203         IF options.!debug == 1 THEN SAY '  Profile = "'Profile'"'
     1203        if options.!debug == 1 then say '  Profile = "'Profile'"'
    12041204        if \VRFileExists(Profile) then do
    12051205            CALL VRMessage 'Main', NLVGetMessage( 102, Profile ), NLVGetMessage( 1 ), 'E'
    … …  
    12111211        end
    12121212    end
    1213     IF options.!debug == 1 THEN SAY time()' _ParseCommandLine done'
     1213    if options.!debug == 1 then say time()' _ParseCommandLine done'
    12141214return
    12151215
    … …  
    12171217*/
    12181218_PassiveLoad:
    1219     IF options.!debug == 1 THEN SAY time()' '||"_PassiveLoad started"
     1219    if options.!debug == 1 then say time()' '||"_PassiveLoad started"
    12201220
    12211221    do cnt = 1 to 255
    … …  
    12241224
    12251225        PARSE Var resdata p_mpoint resource rwFlag
    1226         IF options.!debug == 1 THEN do
     1226        if options.!debug == 1 then do
    12271227            say "  resdata  ="resdata
    12281228            say "  p_mpoint ="p_mpoint
    … …  
    12441244
    12451245        cd.lastrh = VRMethod("CN_CONDET","AddRecord")
    1246         IF options.!debug == 1 THEN say "  cd.lastrh = "cd.lastrh
     1246        if options.!debug == 1 then say "  cd.lastrh = "cd.lastrh
    12471247
    12481248        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.mpointFH, p_mpoint, cd.mpidxfh, p_mpidx)
    … …  
    12641264
    12651265    end
    1266     IF options.!debug == 1 THEN SAY time()' '||"_PassiveLoad done"
     1266    if options.!debug == 1 then say time()' '||"_PassiveLoad done"
    12671267return
    12681268/*:VRX         _PassiveSave
    12691269*/
    12701270_PassiveSave:
    1271     IF options.!debug == 1 THEN SAY time()' '||"_PassiveSave started"
     1271    if options.!debug == 1 then say time()' '||"_PassiveSave started"
    12721272    ok = VRDelIni( "PassiveConnections", "ALL", settings.!ini )
    12731273
    … …  
    13051305        else iterate
    13061306    end
    1307     IF options.!debug == 1 THEN SAY time()' '||"_PassiveSave done"
     1307    if options.!debug == 1 then say time()' '||"_PassiveSave done"
    13081308return
    13091309
    … …  
    13941394*/
    13951395_SmbConfCreateShadowCopy:
    1396     IF options.!debug == 1 THEN SAY time()' _SmbConfCreateShadowCopy started'
     1396    if options.!debug == 1 then say time()' _SmbConfCreateShadowCopy started'
    13971397    /* we create a complete version of smb.conf in temporary directory for reading purposes */
    13981398    /* as we can only determine a default value from this complete version of the file */
    … …  
    14011401    say     '  'samba.!testparmexe' -v -s 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
    14021402    address cmd samba.!testparmexe' -v -s 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
    1403     IF options.!debug == 1 THEN SAY time()' _SmbConfCreateShadowCopy done'
     1403    if options.!debug == 1 then say time()' _SmbConfCreateShadowCopy done'
    14041404return
    14051405
    … …  
    14131413*/
    14141414_StemsInit:
    1415     IF options.!debug == 1 THEN SAY time()' _StemsInit started'
    1416     IF options.!debug == 1 THEN SAY '  initializing options.'
     1415    if options.!debug == 1 then say time()' _StemsInit started'
     1416    if options.!debug == 1 then say '  initializing options.'
    14171417    options.!workgroup  = ''
    14181418    options.!server     = ''
    … …  
    14411441    options.!timesrv    = ''
    14421442
    1443     IF options.!debug == 1 THEN SAY '  initializing vfs. '
     1443    if options.!debug == 1 then say '  initializing vfs. '
    14441444    vfs.!drive      = ''
    14451445    vfs.!mountpoint = ''
    14461446
    1447     IF options.!debug == 1 THEN SAY '  initializing advanced. '
     1447    if options.!debug == 1 then say '  initializing advanced. '
    14481448    advanced.!browseauth = ''
    14491449    advanced.!browseimme = ''
    … …  
    14661466    advanced.!logfile    = ''
    14671467
    1468     IF options.!debug == 1 THEN SAY '  initializing credentials. '
     1468    if options.!debug == 1 then say '  initializing credentials. '
    14691469    credentials.!username = ""
    14701470    credentials.!password = ""
    … …  
    14741474    RefreshMode = ""
    14751475
    1476     IF options.!debug == 1 THEN SAY '  initializing mtype. '
     1476    if options.!debug == 1 then say '  initializing mtype. '
    14771477    mtype.0 = 4
    14781478    mtype.1 = NLVGetMessage( 15 )
    … …  
    14811481    mtype.4 = NLVGetMessage( 18 )
    14821482
    1483     IF options.!debug == 1 THEN SAY '  initializing icons. '
     1483    if options.!debug == 1 then say '  initializing icons. '
    14841484    icons.!bat              = '#1:PMWP.DLL'
    14851485    icons.!cmd              = '#2:PMWP.DLL'
    … …  
    15101510    icons.!plaintext        = '#94'
    15111511
    1512     IF options.!debug == 1 THEN SAY time()' _StemsInit done'
     1512    if options.!debug == 1 then say time()' _StemsInit done'
    15131513return
    15141514/*:VRX         _TabbedDialogSetup
    15151515*/
    15161516_TabbedDialogSetup:
    1517     IF options.!debug == 1 THEN SAY time()' _TabbedDialogSetup started'
     1517    if options.!debug == 1 then say time()' _TabbedDialogSetup started'
    15181518
    15191519    w = VRLoad( "TDL_1", VRWindowPath(), "SW_DIALOG" )
    … …  
    15311531    w = VRLoad( "TDL_1", VRWindowPath(), "SW_SETTINGS" )
    15321532    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(47)" ")
    1533     IF options.!debug == 1 THEN SAY time()' _TabbedDialogSetup done'
     1533    if options.!debug == 1 then say time()' _TabbedDialogSetup done'
    15341534return
    15351535
    … …  
    15541554*/
    15551555_TimeSync:
    1556     IF options.!debug == 1 THEN SAY time()' _TimeSync started, "'options.!timesrv'"'
     1556    if options.!debug == 1 then say time()' _TimeSync started, "'options.!timesrv'"'
    15571557    if options.!timesrv <> '' then do
    15581558        say     '  'samba.!netexe' time set -S 'options.!timesrv
    … …  
    15641564    end
    15651565    options.!timesync = ''
    1566     IF options.!debug == 1 THEN SAY time()' _TimeSync done'
     1566    if options.!debug == 1 then say time()' _TimeSync done'
    15671567return
    15681568
    … …  
    15781578*/
    15791579_UserCredUpdate:
    1580     IF options.!debug == 1 THEN SAY time()' _UserCredUpdate started'
     1580    if options.!debug == 1 then say time()' _UserCredUpdate started'
    15811581    credentials.!username = VRGet("EF_USER","Value")
    15821582    credentials.!password = VRGet("EF_PASSWORD","Value")
    … …  
    15881588    if options.!storecreds = 1 & \(UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' | UserCred = '-N') then do
    15891589        ok = _ucSetUc()
    1590         call beep 2400, 10
    1591     end
    1592     else call beep 200, 20
    1593     IF options.!debug == 1 THEN SAY time()' _UserCredUpdate done'
     1590        ok = VRSet("Pict_PWINMEM","PicturePath","#36")
     1591        if options.!debug == 1 then call beep 2400, 10
     1592    end
     1593    else do
     1594        if options.!debug == 1 then call beep 200, 20
     1595        ok = VRSet("Pict_PWINMEM","PicturePath","#37")
     1596    end
     1597    if options.!debug == 1 then say time()' _UserCredUpdate done'
    15941598return
    15951599
    … …  
    16161620*/
    16171621CB_MOUNT_Change:
    1618     IF options.!debug == 1 THEN SAY time()' '||"CB_MOUNT_Change started"
     1622    if options.!debug == 1 then say time()' '||"CB_MOUNT_Change started"
    16191623
    16201624    mount = VRGet("CB_MOUNT", "Value")
    … …  
    16541658        END
    16551659    END
    1656     IF options.!debug == 1 THEN SAY time()' '||"CB_MOUNT_Change done"
     1660    if options.!debug == 1 then say time()' '||"CB_MOUNT_Change done"
    16571661RETURN
    16581662
    … …  
    17091713*/
    17101714CN_CURRENT_Click:
    1711     IF options.!debug == 1 THEN SAY time()' CN_CURRENT_Click started'
     1715    if options.!debug == 1 then say time()' CN_CURRENT_Click started'
    17121716    /* ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText")) */
    17131717
    … …  
    17251729    PARSE VAR data p_node ';' p_mounts ';' p_string
    17261730
    1727     IF options.!debug == 1 THEN do
    1728         SAY '  data     = "'data'"'
    1729         SAY '  p_node   = "'p_node'"'
    1730         SAY '  p_mounts = "'p_mounts'"'
    1731         SAY '  p_string = "'p_string'"'
     1731    if options.!debug == 1 then do
     1732        say '  data     = "'data'"'
     1733        say '  p_node   = "'p_node'"'
     1734        say '  p_mounts = "'p_mounts'"'
     1735        say '  p_string = "'p_string'"'
    17321736    end
    17331737
    … …  
    17971801        end
    17981802    end
    1799     IF options.!debug == 1 THEN SAY time()' CN_CURRENT_Click done'
     1803    if options.!debug == 1 then say time()' CN_CURRENT_Click done'
    18001804RETURN
    18011805
    … …  
    18031807*/
    18041808CN_CURRENT_ContextMenu: /* PROCEDURE EXPOSE existrec. options. icons. fs. */
    1805     IF options.!debug == 1 THEN SAY time()' '||"CN_CURRENT_ContextMenu started"
     1809    if options.!debug == 1 then say time()' '||"CN_CURRENT_ContextMenu started"
    18061810
    18071811    CALL VRSet "TM_AUTOCLOSE", "ENABLED", 0
    … …  
    18131817       removed */
    18141818    if VRMethod( "CN_CURRENT", "ValidateRecord", rh) <> 1 then do
    1815         IF options.!debug == 1 THEN SAY time()' '||"CN_CURRENT_ContextMenu aborted"
     1819        if options.!debug == 1 then say time()' '||"CN_CURRENT_ContextMenu aborted"
    18161820        return
    18171821    end
    … …  
    18201824    PARSE VAR data p_node ';' p_mounts ';' p_string
    18211825
    1822     IF options.!debug == 1 THEN do
    1823         SAY '  data =     "'data'"'
    1824         SAY '  p_node =   "'p_node'"'
    1825         SAY '  p_mounts = "'p_mounts'"'
    1826         SAY '  p_string = "'p_string'"'
     1826    if options.!debug == 1 then do
     1827        say '  data =     "'data'"'
     1828        say '  p_node =   "'p_node'"'
     1829        say '  p_mounts = "'p_mounts'"'
     1830        say '  p_string = "'p_string'"'
    18271831    end
    18281832/*
    … …  
    18811885
    18821886    ok = VRMethod( "Menu_Context", "Popup", , , "", "" )
    1883     IF options.!debug == 1 THEN SAY time()' '||"CN_CURRENT_ContextMenu done"
     1887    if options.!debug == 1 then say time()' '||"CN_CURRENT_ContextMenu done"
    18841888return
    18851889
    … …  
    18871891*/
    18881892CN_CURRENT_DoubleClick:
    1889     IF options.!debug == 1 THEN SAY time()' '||"CN_CURRENT_DoubleClick started"
     1893    if options.!debug == 1 then say time()' '||"CN_CURRENT_DoubleClick started"
    18901894
    18911895    CALL VRSet "TM_AUTOCLOSE", "ENABLED", 0
    … …  
    18971901       removed */
    18981902    if VRMethod( "CN_CURRENT", "ValidateRecord", rh) <> 1 then do
    1899         IF options.!debug == 1 THEN SAY time()' '||"CN_CURRENT_DoubleClick aborted"
     1903        if options.!debug == 1 then say time()' '||"CN_CURRENT_DoubleClick aborted"
    19001904        return
    19011905    end
    … …  
    19041908    PARSE VAR data p_node ';' p_mounts ';' p_string
    19051909
    1906     IF options.!debug == 1 THEN do
    1907         SAY '  data =     "'data'"'
    1908         SAY '  p_node =   "'p_node'"'
    1909         SAY '  p_mounts = "'p_mounts'"'
    1910         SAY '  p_string = "'p_string'"'
     1910    if options.!debug == 1 then do
     1911        say '  data =     "'data'"'
     1912        say '  p_node =   "'p_node'"'
     1913        say '  p_mounts = "'p_mounts'"'
     1914        say '  p_string = "'p_string'"'
    19111915    end
    19121916    call Menu_Context_Open_Default_Click
    19131917
    1914     IF options.!debug == 1 THEN SAY time()' '||"CN_CURRENT_DoubleClick done"
     1918    if options.!debug == 1 then say time()' '||"CN_CURRENT_DoubleClick done"
    19151919return
    19161920
    … …  
    19181922*/
    19191923CN_CURRENT_DragDrop:
    1920     IF options.!debug == 1 THEN SAY time()' CN_CURRENT_DragDrop started'
     1924    if options.!debug == 1 then say time()' CN_CURRENT_DragDrop started'
    19211925    ok = VRSet("TM_RefreshCurrentDisplay","Enabled", 0)
    1922     IF options.!debug == 1 THEN say "  settings.!network = "settings.!network
     1926    if options.!debug == 1 then say "  settings.!network = "settings.!network
    19231927
    19241928    p_workgroup = ''
    … …  
    19321936    trgRec  = VRInfo( "TargetRecord" )
    19331937
    1934     IF options.!debug == 1 THEN do
     1938    if options.!debug == 1 then do
    19351939        say '  srcFile     = "'srcFile'"'
    19361940        say '  srcCtn      = "'srcCtn'"'
    … …  
    19431947
    19441948    if srcFile <> "" then do /* A file was dropped onto the container - attempt to load it */
    1945         IF options.!debug == 1 THEN say '  Possible profile dropped: "'srcFile'"'
     1949        if options.!debug == 1 then say '  Possible profile dropped: "'srcFile'"'
    19461950
    19471951        /* was it really a profile ? */
    … …  
    19571961            ok = VRMessage('Main', NLVGetMessage(103,srcFile ), NLVGetMessage(5), 'E','buttons.')
    19581962        end
    1959         IF options.!debug == 1 THEN SAY time()' CN_CURRENT_DragDrop done (load profile)'
     1963        if options.!debug == 1 then say time()' CN_CURRENT_DragDrop done (load profile)'
    19601964        return
    19611965    end
    … …  
    20292033    end /* Drag from CN_SMBTREE */
    20302034
    2031     IF options.!debug == 1 THEN do
     2035    if options.!debug == 1 then do
    20322036        say 'p_workgroup = "'p_workgroup'"'
    20332037        say 'p_server    = "'p_server'"'
    … …  
    20722076        if VRMethod("CN_CONDET", "GetRecordAttr", srcRec, "Icon") = icons.!passive then ok = VRMethod( "CN_CONDET", "RemoveRecord", srcRec)
    20732077    end
    2074     IF options.!debug == 1 THEN SAY time()' CN_CURRENT_DragDrop done'
     2078    if options.!debug == 1 then say time()' CN_CURRENT_DragDrop done'
    20752079return
    20762080/*:VRX         CN_SMBTREE_Click
    20772081*/
    20782082CN_SMBTREE_Click:
    2079     IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_Click started'
     2083    if options.!debug == 1 then say time()' CN_SMBTREE_Click started'
    20802084    /* ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText")) */
    20812085
    … …  
    20862090    ok = VRset("DT_Statusbar", "Caption", SMBObj.udatamsg)
    20872091
    2088     IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_Click done'
     2092    if options.!debug == 1 then say time()' CN_SMBTREE_Click done'
    20892093return
    20902094/*:VRX         CN_SMBTREE_ContextMenu
    20912095*/
    20922096CN_SMBTREE_ContextMenu:
    2093     IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_ContextMenu started'
     2097    if options.!debug == 1 then say time()' CN_SMBTREE_ContextMenu started'
    20942098
    20952099    call _dropdeprecated
    … …  
    20992103    ok = VRMethod( "Menu_Selected", "Popup", , , "", "" )
    21002104
    2101     IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_ContextMenu done'
     2105    if options.!debug == 1 then say time()' CN_SMBTREE_ContextMenu done'
    21022106return
    21032107/*:VRX         CN_SMBTREE_DoubleClick
    21042108*/
    21052109CN_SMBTREE_DoubleClick:
    2106     IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_DoubleClick started'
     2110    if options.!debug == 1 then say time()' CN_SMBTREE_DoubleClick started'
    21072111
    21082112    call _dropdeprecated
    21092113    call _GetSmbObjectProperties VRInfo('Record')
    21102114
    2111 /*  IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_DoubleClick done'
     2115/*  if options.!debug == 1 then say time()' CN_SMBTREE_DoubleClick done'
    21122116return */
    21132117    /* Enable last 2 lines for 2.0.x (to disable on the fly browsing) */
    21142118
    2115     IF options.!debug == 1 THEN SAY '  Browsing "'SMBObj.udatatype'"'
     2119    if options.!debug == 1 then say '  Browsing "'SMBObj.udatatype'"'
    21162120
    21172121    If SMBObj.udatatype = "DIRECTORY" then do
    … …  
    21602164        call _BrowseDirectory
    21612165    end       
    2162     IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_DoubleClick done'
     2166    if options.!debug == 1 then say time()' CN_SMBTREE_DoubleClick done'
    21632167return
    21642168/*:VRX         CN_SMBTREE_DragFile
    21652169*/
    21662170CN_SMBTREE_DragFile:
    2167     IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_DragFile started'
     2171    if options.!debug == 1 then say time()' CN_SMBTREE_DragFile started'
    21682172
    21692173    obj = VRInfo( "object" )
    … …  
    21712175    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "SourceOrSelected", "SelRH." )
    21722176    if SelRH.0 = 0 then do
    2173         IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_DragStart aborted'
     2177        if options.!debug == 1 then say time()' CN_SMBTREE_DragStart aborted'
    21742178        return
    21752179    end
    … …  
    21882192    end
    21892193
    2190     IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_DragFile done'
     2194    if options.!debug == 1 then say time()' CN_SMBTREE_DragFile done'
    21912195return
    21922196
    … …  
    21942198*/
    21952199CN_SMBTREE_DragStart:
    2196     IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_DragStart started'
     2200    if options.!debug == 1 then say time()' CN_SMBTREE_DragStart started'
    21972201
    21982202    obj = VRInfo( "object" )
    … …  
    22002204    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "SourceOrSelected", "SelRH." )
    22012205    if SelRH.0 = 0 then do
    2202         IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_DragStart aborted'
     2206        if options.!debug == 1 then say time()' CN_SMBTREE_DragStart aborted'
    22032207        return
    22042208    end
    … …  
    22172221    end
    22182222
    2219     IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_DragStart done'
     2223    if options.!debug == 1 then say time()' CN_SMBTREE_DragStart done'
    22202224return
    22212225/*:VRX         CreateObject
    … …  
    22232227CreateObject: procedure
    22242228    Parse Arg Class, Title, Location, Setup, Collision
    2225     /* Say 'Creating ['Title']' */
     2229    /* say 'Creating ['Title']' */
    22262230say Setup
    22272231    rc = SysCreateObject( Class, Title, Location, Setup, Collision )
    … …  
    22412245*/
    22422246EF_PASSWORD1_KeyPress:
    2243     IF options.!debug == 1 THEN SAY time()' EF_PASSWORD1_KeyPress started'   
     2247    if options.!debug == 1 then say time()' EF_PASSWORD1_KeyPress started'   
    22442248    obj = VRInfo( "Object" )
    22452249    keystr = VRGet( obj, "KeyString" )
    … …  
    22512255        otherwise nop
    22522256    end
    2253     IF options.!debug == 1 THEN SAY time()' EF_PASSWORD1_KeyPress done'   
     2257    if options.!debug == 1 then say time()' EF_PASSWORD1_KeyPress done'   
    22542258return
    22552259
    … …  
    22682272*/
    22692273EF_SERVER_Change:
    2270     IF options.!debug == 1 THEN SAY time()' EF_SERVER_Change started'
     2274    if options.!debug == 1 then say time()' EF_SERVER_Change started'
    22712275    Now = VRGet("EF_SERVER","value")
    22722276say now' 'LastServer
    … …  
    23142318
    23152319    LastServer = VRGet("EF_SERVER","value")
    2316     IF options.!debug == 1 THEN SAY time()' EF_SERVER_Change done'
     2320    if options.!debug == 1 then say time()' EF_SERVER_Change done'
    23172321return
    23182322
    … …  
    23202324*/
    23212325EF_USER1_KeyPress:
    2322     IF options.!debug == 1 THEN SAY time()' EF_USER1_KeyPress started'   
     2326    if options.!debug == 1 then say time()' EF_USER1_KeyPress started'   
    23232327    obj = VRInfo( "Object" )
    23242328    keystr = VRGet( obj, "KeyString" )
    … …  
    23302334        otherwise nop
    23312335    end
    2332     IF options.!debug == 1 THEN SAY time()' EF_USER1_KeyPress done'   
     2336    if options.!debug == 1 then say time()' EF_USER1_KeyPress done'   
    23332337return
    23342338
    … …  
    23372341EF_USER_Change:
    23382342    Now = VRGet("EF_USER","value")
    2339     if Now = "" | Now = LastUser then return
     2343    if Now = "" | Now = LastUser  then return
    23402344    ok = SysSleep(1)
    23412345    LastUser = Now
    … …  
    23612365*/
    23622366GetChildren: PROCEDURE EXPOSE existrec. exc options. icons. fs. cd. samba.
    2363     IF options.!debug == 1 THEN SAY time()' GetChildren started'
     2367    if options.!debug == 1 then say time()' GetChildren started'
    23642368    PARSE ARG node, parec
    23652369
    … …  
    23882392        CALL GetChildren childnode, rh
    23892393    END
    2390     IF options.!debug == 1 THEN SAY time()' GetChildren done'
     2394    if options.!debug == 1 then say time()' GetChildren done'
    23912395RETURN
    23922396
    … …  
    23942398*/
    23952399GetMountPoints: PROCEDURE EXPOSE existrec. options. icons. fs. cd. samba.
    2396     IF options.!debug == 1 THEN SAY time()' GetMountPoints started'
     2400    if options.!debug == 1 then say time()' GetMountPoints started'
    23972401/*  CALL VRSet "CN_CURRENT", 'Painting', 0 */
    2398 /*  IF options.!debug == 1 THEN SAY time()' '||"GetMountPoints: SysDriveMap(USED) started"  */
     2402/*  if options.!debug == 1 then say time()' '||"GetMountPoints: SysDriveMap(USED) started"  */
    23992403    drvs = SysDriveMap('C:', 'USED') /* was "REMOTE" */
    2400 /*  IF options.!debug == 1 THEN SAY time()' '||"GetMountPoints: SysDriveMap(USED) done" */
     2404/*  if options.!debug == 1 then say time()' '||"GetMountPoints: SysDriveMap(USED) done" */
    24012405    ac = 0
    24022406    DO i = 1 TO WORDS( drvs )
    … …  
    24292433            userdata = ParseResourceData( userdata, res.j )
    24302434        END
    2431 /*      IF options.!debug == 1 THEN say '  "'attached.i'" "'userdata'"' */
     2435/*      if options.!debug == 1 then say '  "'attached.i'" "'userdata'"' */
    24322436        CALL VRMethod "CN_CURRENT", 'SetRecordAttr', rh, 'UserData', userdata
    24332437        if options.currentdata = userdata then ok = VRMethod("CN_CURRENT", 'SetRecordAttr', rh, 'Selected', 1)
    … …  
    24432447    existrec.0 = exc
    24442448/*  CALL VRSet "CN_CURRENT", 'Painting', 1 */
    2445     IF options.!debug == 1 THEN SAY time()' '||"GetMountPoints done"
     2449    if options.!debug == 1 then say time()' '||"GetMountPoints done"
    24462450RETURN
    24472451
    … …  
    24682472*/
    24692473LoadFileSysFuncs:
    2470     IF options.!debug == 1 THEN SAY time()' LoadFileSysFuncs() started'
     2474    if options.!debug == 1 then say time()' LoadFileSysFuncs() started'
    24712475
    24722476    Fatal = 1
    … …  
    24902494
    24912495ForceNDFS:
    2492     IF options.!debug == 1 THEN SAY '  NDFS check entered'
     2496    if options.!debug == 1 then say '  NDFS check entered'
    24932497    call RxFuncAdd 'NdRxLoadFuncs', 'NDCALLS', 'NdRxLoadFuncs'
    24942498    SIGNAL ON SYNTAX NAME NoNetdrive
    … …  
    25012505    signal CommonToBothFS
    25022506NoNetdrive:
    2503     IF options.!debug == 1 THEN SAY '  NDFS not found'
     2507    if options.!debug == 1 then say '  NDFS not found'
    25042508    CALL RxFuncAdd 'EvfsRxLoadFuncs', 'EVFSCALL.DLL', 'EvfsRxLoadFuncs'
    25052509    SIGNAL ON SYNTAX NAME NoEVFSCALL
    … …  
    25112515    fs.!profileext     = "evp"
    25122516CommonToBothFS:
    2513     IF options.!debug == 1 THEN SAY '  Common version check'
     2517    if options.!debug == 1 then say '  Common version check'
    25142518    CALL _Dynamic "fsstat = "fs.!prefix"RxQueryIFS()"
    25152519    if fsstat = 252 then CALL _Dynamic "Found"fs.!prefix" = 0"
    … …  
    25202524        fs.!version = fsver
    25212525
    2522         IF options.!debug == 1 THEN DO
     2526        if options.!debug == 1 then DO
    25232527            say '  fs.!prefix = 'fs.!prefix
    25242528            say '  fs.!name   = 'fs.!Name
    … …  
    25492553    Fatal = 0
    25502554
    2551     IF options.!debug == 1 THEN SAY time()' LoadFileSysFuncs() done'
     2555    if options.!debug == 1 then say time()' LoadFileSysFuncs() done'
    25522556return
    25532557
    … …  
    25622566Main_Create:
    25632567    options.!debug    = 0
    2564     IF options.!debug == 1 THEN do
     2568    if options.!debug == 1 then do
    25652569        ok = VRRedirectStdIO("ON")
    25662570        say time()' Main_Create started'
    … …  
    26112615    end
    26122616
    2613     IF options.!debug == 1 THEN SAY time()' Main_Create done'
     2617    if options.!debug == 1 then say time()' Main_Create done'
    26142618return
    26152619
    … …  
    26242628*/
    26252629Main_Resize:
    2626     IF options.!debug == 1 THEN SAY time()' Main_Resize started'
     2630    if options.!debug == 1 then say time()' Main_Resize started'
    26272631    ok = VRset("Main","Painting", 0)
    26282632
    … …  
    28382842    if TrashedResize then CALL Main_Resize
    28392843
    2840     IF options.!debug == 1 THEN SAY time()' Main_Resize done'
     2844    if options.!debug == 1 then say time()' Main_Resize done'
    28412845return
    28422846/*:VRX         Menu_Context_ChangeView_Click
    … …  
    28662870*/
    28672871Menu_Context_Edit_Click:
    2868     IF options.!debug == 1 THEN SAY time()' Menu_Context_Edit_Click started'
     2872    if options.!debug == 1 then say time()' Menu_Context_Edit_Click started'
    28692873    /* call VRMethod "TDL_1", 'PostEvent', 'PageSelected', 'Page', 1 */
    28702874    ok = VRset("TDL_1", 'Selected', 1)
    … …  
    28832887    parse var p_string p_workgroup':\\'p_server'\'p_share
    28842888
    2885     /* IF options.!debug == 1 THEN SAY time()' '||p_workgroup */
    2886 
    2887     IF options.!debug == 1 THEN SAY time()' data   '||data
    2888     IF options.!debug == 1 THEN SAY time()' domain '||p_workgroup
    2889     IF options.!debug == 1 THEN SAY time()' server '||p_server
    2890     IF options.!debug == 1 THEN SAY time()' share  '||p_share
    2891     IF options.!debug == 1 THEN SAY time()' string '||p_string
     2889    /* if options.!debug == 1 then say time()' '||p_workgroup */
     2890
     2891    if options.!debug == 1 then say time()' data   '||data
     2892    if options.!debug == 1 then say time()' domain '||p_workgroup
     2893    if options.!debug == 1 then say time()' server '||p_server
     2894    if options.!debug == 1 then say time()' share  '||p_share
     2895    if options.!debug == 1 then say time()' string '||p_string
    28922896
    28932897
    … …  
    28962900    CALL VRSet "EF_NETWORK","VALUE", p_workgroup
    28972901
    2898     /* IF options.!debug == 1 THEN SAY time()' '||p_node */
     2902    /* if options.!debug == 1 then say time()' '||p_node */
    28992903    parse var p_node p_drive'\'p_directory'\'
    29002904    CALL VRSet "CB_DRIVES", "Value", p_drive
    29012905    CALL VRSet "EF_DIRECTORY", "Value", p_directory
    2902     IF options.!debug == 1 THEN SAY time()' Menu_Context_Edit_Click done'
     2906    if options.!debug == 1 then say time()' Menu_Context_Edit_Click done'
    29032907return
    29042908
    … …  
    29122916*/
    29132917Menu_Context_Open_Default_Click:
    2914     IF options.!debug == 1 THEN SAY time()' '||"Menu_Context_Open_Click started"
     2918    if options.!debug == 1 then say time()' '||"Menu_Context_Open_Click started"
    29152919    userdata = VRMethod( "CN_CURRENT", 'GetRecordAttr', rh, 'UserData')
    29162920    PARSE VAR userdata mountpoint ';' mounts ';' .
    … …  
    29202924    ID = VRMethod( "Application", "StartThread", "wps_open", mountpoint, "DEFAULT" )
    29212925
    2922     IF options.!debug == 1 THEN SAY time()' '||"Menu_Context_Open_Click done"
     2926    if options.!debug == 1 then say time()' '||"Menu_Context_Open_Click done"
    29232927return
    29242928
    … …  
    29262930*/
    29272931Menu_Context_Open_Detail_Click:
    2928     IF options.!debug == 1 THEN SAY time()' '||"Menu_Context_Open_Details_Click started"
     2932    if options.!debug == 1 then say time()' '||"Menu_Context_Open_Details_Click started"
    29292933    userdata = VRMethod( "CN_CURRENT", 'GetRecordAttr', rh, 'UserData')
    29302934    PARSE VAR userdata mountpoint ';' mounts ';' .
    … …  
    29342938    ID = VRMethod( "Application", "StartThread", "wps_open", mountpoint, "DETAILS" )
    29352939
    2936     IF options.!debug == 1 THEN SAY time()' '||"Menu_Context_Open_Details_Click done"
     2940    if options.!debug == 1 then say time()' '||"Menu_Context_Open_Details_Click done"
    29372941return
    29382942
    … …  
    29402944*/
    29412945Menu_Context_Open_Icon_Click:
    2942     IF options.!debug == 1 THEN SAY time()' '||"Menu_Context_Open_Icon_Click started"
     2946    if options.!debug == 1 then say time()' '||"Menu_Context_Open_Icon_Click started"
    29432947    userdata = VRMethod( "CN_CURRENT", 'GetRecordAttr', rh, 'UserData')
    29442948    PARSE VAR userdata mountpoint ';' mounts ';' .
    … …  
    29482952    ID = VRMethod( "Application", "StartThread", "wps_open", mountpoint, "ICON" )
    29492953
    2950     IF options.!debug == 1 THEN SAY time()' '||"Menu_Context_Open_Icon_Click done"
     2954    if options.!debug == 1 then say time()' '||"Menu_Context_Open_Icon_Click done"
    29512955return
    29522956
    … …  
    29542958*/
    29552959Menu_Context_Open_Settings_Click:
    2956     IF options.!debug == 1 THEN SAY time()' '||"Menu_Context_Open_DetailsClick started"
     2960    if options.!debug == 1 then say time()' '||"Menu_Context_Open_DetailsClick started"
    29572961    userdata = VRMethod( "CN_CURRENT", 'GetRecordAttr', rh, 'UserData')
    29582962    PARSE VAR userdata mountpoint ';' mounts ';' .
    … …  
    29622966    ID = VRMethod( "Application", "StartThread", "wps_open", mountpoint, "SETTINGS" )
    29632967
    2964     IF options.!debug == 1 THEN SAY time()' '||"Menu_Context_Open_Details_Click done"
     2968    if options.!debug == 1 then say time()' '||"Menu_Context_Open_Details_Click done"
    29652969return
    29662970
    … …  
    29682972*/
    29692973Menu_Context_Open_Splitview_Click:
    2970     IF options.!debug == 1 THEN SAY time()' '||"Menu_Context_Open_Splitview_Click started"
     2974    if options.!debug == 1 then say time()' '||"Menu_Context_Open_Splitview_Click started"
    29712975    userdata = VRMethod( "CN_CURRENT", 'GetRecordAttr', rh, 'UserData')
    29722976    PARSE VAR userdata mountpoint ';' mounts ';' .
    … …  
    29762980    ID = VRMethod( "Application", "StartThread", "wps_open", mountpoint, "SPLITVIEW" )
    29772981
    2978     IF options.!debug == 1 THEN SAY time()' '||"Menu_Context_Open_Splitview_Click done"
     2982    if options.!debug == 1 then say time()' '||"Menu_Context_Open_Splitview_Click done"
    29792983return
    29802984
    … …  
    29822986*/
    29832987Menu_Context_Open_Tree_Click:
    2984     IF options.!debug == 1 THEN SAY time()' '||"Menu_Context_Open_Tree_Click started"
     2988    if options.!debug == 1 then say time()' '||"Menu_Context_Open_Tree_Click started"
    29852989    userdata = VRMethod( "CN_CURRENT", 'GetRecordAttr', rh, 'UserData')
    29862990    PARSE VAR userdata mountpoint ';' mounts ';' .
    … …  
    29902994    ID = VRMethod( "Application", "StartThread", "wps_open", mountpoint, "TREE" )
    29912995
    2992     IF options.!debug == 1 THEN SAY time()' '||"Menu_Context_Open_Tree_Click done"
     2996    if options.!debug == 1 then say time()' '||"Menu_Context_Open_Tree_Click done"
    29932997return
    29942998
    … …  
    30893093*/
    30903094Menu_File_Daemon_Start_Click:
    3091     IF options.!debug == 1 THEN SAY time()' Menu_File_Daemon_Start_Click started'
     3095    if options.!debug == 1 then say time()' Menu_File_Daemon_Start_Click started'
    30923096    if VRFileExists(SysBootDrive()"\ndpsmb.dbg") then do
    30933097        btns.0 = 2
    … …  
    31113115    ok = VRSet("Menu_File_Daemon_Start","Enabled",0)
    31123116    ok = VRSet("Menu_File_Daemon_Stop","Enabled",1)
    3113     IF options.!debug == 1 THEN SAY time()' Menu_File_Daemon_Start_Click done'
     3117    if options.!debug == 1 then say time()' Menu_File_Daemon_Start_Click done'
    31143118return
    31153119
    … …  
    31173121*/
    31183122Menu_File_Daemon_Stop_Click:
    3119     IF options.!debug == 1 THEN SAY time()' Menu_File_Daemon_Stop_Click started'
     3123    if options.!debug == 1 then say time()' Menu_File_Daemon_Stop_Click started'
    31203124    ok = PRProcessList(proc)
    31213125    do I = 1 to proc.0
    … …  
    31313135    ok = VRSet("Menu_File_Daemon_Start","Enabled",1)
    31323136    ok = VRSet("Menu_File_Daemon_Stop","Enabled",0)
    3133     IF options.!debug == 1 THEN SAY time()' Menu_File_Daemon_Stop_Click stopped'
     3137    if options.!debug == 1 then say time()' Menu_File_Daemon_Stop_Click stopped'
    31343138return
    31353139/*:VRX         Menu_File_LMHosts_Reset_Click
    … …  
    32023206Menu_File_ucCred_Reset_Click:
    32033207    ok = _ucDelUc()
     3208    ok = VRSet("Pict_PWINMEM","PicturePath","#37")
     3209    ok = VRSet("EF_USER","Value","")
     3210    ok = VRSet("EF_PASSWORD","Value","")
    32043211    /* FIXME: Add a message box here */
    32053212return
    … …  
    32403247*/
    32413248Menu_Selected_Info_Click:
    3242     IF options.!debug == 1 THEN SAY time()' Menu_Selected_Info_Click started'
     3249    if options.!debug == 1 then say time()' Menu_Selected_Info_Click started'
    32433250
    32443251    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "SourceOrSelected", "SelRH." )
    32453252    if SelRH.0 = 0 then do
    3246         IF options.!debug == 1 THEN SAY time()' Menu_Selected_Info_Click aborted'
     3253        if options.!debug == 1 then say time()' Menu_Selected_Info_Click aborted'
    32473254        return
    32483255    end
    … …  
    32513258
    32523259    window = VRLoadSecondary( "SW_INFO", "W" )
    3253     IF options.!debug == 1 THEN SAY time()' Menu_Selected_Info_Click done'
     3260    if options.!debug == 1 then say time()' Menu_Selected_Info_Click done'
    32543261return
    32553262
    … …  
    33433350*/
    33443351Menu_Selected_TimeSync_Click:
    3345     IF options.!debug == 1 THEN SAY time()' Menu_Selected_TimeSync_Click started'
     3352    if options.!debug == 1 then say time()' Menu_Selected_TimeSync_Click started'
    33463353
    33473354    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "SourceOrSelected", "SelRH." )
    33483355    if SelRH.0 = 0 then do
    3349         IF options.!debug == 1 THEN SAY time()' Menu_Selected_TimeSync_Click aborted'
     3356        if options.!debug == 1 then say time()' Menu_Selected_TimeSync_Click aborted'
    33503357        return
    33513358    end
    … …  
    33563363    call _TimeSync
    33573364
    3358     IF options.!debug == 1 THEN SAY time()' Menu_Selected_TimeSync_Click done'
     3365    if options.!debug == 1 then say time()' Menu_Selected_TimeSync_Click done'
    33593366return
    33603367
    … …  
    33683375*/
    33693376Mount: PROCEDURE EXPOSE settings. options. icons. vfs. fs. advanced. cd. samba.
    3370     IF options.!debug == 1 THEN SAY time()' Mount procedure started'
     3377    if options.!debug == 1 then say time()' Mount procedure started'
    33713378    /* Set mouse pointer to wait - this operation might take a few seconds */
    33723379    call VRSet VRWindow(), 'Pointer', 'Wait'
    … …  
    33793386    IF options.!autoload then do
    33803387        CALL _Dynamic "ok = "fs.!prefix"RxDetach('"vfs.!drive"')"
    3381         IF options.!debug == 1 THEN SAY time()' '||'Autoload Detach "'vfs.!drive'" =' ok
     3388        if options.!debug == 1 then say time()' '||'Autoload Detach "'vfs.!drive'" =' ok
    33823389    end */
    33833390
    … …  
    33863393        CALL _Dynamic "ok = "fs.!prefix"RxAttach('"vfs.!drive"')"
    33873394
    3388         IF options.!debug == 1 THEN SAY time()' '||'Attach "'vfs.!drive'" =' ok
     3395        if options.!debug == 1 then say time()' '||'Attach "'vfs.!drive'" =' ok
    33893396    end
    33903397
    … …  
    33923399    CALL _Dynamic "CreateMP = "fs.!prefix"RxCreateMountPoint('"vfs.!mountpoint"')"
    33933400
    3394     IF options.!debug == 1 THEN SAY time()' '||'Create "'vfs.!mountpoint'" = 'CreateMP
     3401    if options.!debug == 1 then say time()' '||'Create "'vfs.!mountpoint'" = 'CreateMP
    33953402
    33963403
    … …  
    34373444        hash = VRMethod("CN_CONDET","GetFieldData", records.i, cd.hashfh)
    34383445
    3439         IF options.!debug == 1 THEN say VRMethod("CN_CONDET","GetFieldData", records.i, CD.mpointFH)'->'hash
    3440         IF options.!debug == 1 THEN say mpoint'->'md5
     3446        if options.!debug == 1 then say VRMethod("CN_CONDET","GetFieldData", records.i, CD.mpointFH)'->'hash
     3447        if options.!debug == 1 then say mpoint'->'md5
    34413448
    34423449        if hash = md5 then do
    … …  
    34673474    CALL _Dynamic "ok = "fs.!prefix"RxMount('SMBFS','"vfs.!mountpoint"', '"src"', '"rwFlag"')"
    34683475
    3469     IF options.!debug == 1 THEN SAY time()' '||'Mount "'vfs.!mountpoint'" =' ok
     3476    if options.!debug == 1 then say time()' '||'Mount "'vfs.!mountpoint'" =' ok
    34703477    if ok <> 0 then do
    34713478        if options.!password <> "" then upw = ":********"
    … …  
    34873494        if CreateMP = 0 & advanced.!alwaysmp <> 1 then do
    34883495            CALL _Dynamic "ok = "fs.!prefix"RxDeleteMountPoint('"vfs.!mountpoint"')"
    3489             IF options.!debug == 1 THEN SAY time()' '||'Remove "'vfs.!mountpoint'" = 'ok
     3496            if options.!debug == 1 then say time()' '||'Remove "'vfs.!mountpoint'" = 'ok
    34903497        end
    34913498    end
    … …  
    35013508    The REXX function is present, but is has no counterpart in the plugin
    35023509    ok = EvfsRxIoctl( 100 , vfs.!mountpoint, outstring)
    3503     IF options.!debug == 1 THEN SAY time()' '||'RxIoctl "'vfs.!mountpoint'" = 'ok', 'outstring
     3510    if options.!debug == 1 then say time()' '||'RxIoctl "'vfs.!mountpoint'" = 'ok', 'outstring
    35043511 */
    35053512    /* Set mouse pointer to default again */
    35063513    call VRSet VRWindow(), 'Pointer', '<default>'
    3507     IF options.!debug == 1 THEN SAY time()' Mount procedure done'
     3514    if options.!debug == 1 then say time()' Mount procedure done'
    35083515RETURN ok
    35093516
    … …  
    35113518*/
    35123519MyFreeDriveMap: procedure expose options. icons. fs. samba.
    3513     IF options.!debug == 1 THEN SAY time()' MyFreeDriveMap(proc) started'
     3520    if options.!debug == 1 then say time()' MyFreeDriveMap(proc) started'
    35143521    alldrives = "C: D: E: F: G: H: I: J: K: L: M: N: O: P: Q: R: S: T: U: V: W: X: Y: Z:"
    3515 /*  IF options.!debug == 1 THEN SAY time()' '||"SysDriveMap(USED) started" */
     3522/*  if options.!debug == 1 then say time()' '||"SysDriveMap(USED) started" */
    35163523    useddrives= SysDriveMap("C:","USED")
    3517 /*  IF options.!debug == 1 THEN SAY time()' '||"SysDriveMap(USED) done" */
     3524/*  if options.!debug == 1 then say time()' '||"SysDriveMap(USED) done" */
    35183525
    35193526    Alldr = words(alldrives)
    … …  
    35293536        end
    35303537    end
    3531     IF options.!debug == 1 THEN SAY time()' MyFreeDriveMap(proc) done, result "'FreeDriveMap'"'
     3538    if options.!debug == 1 then say time()' MyFreeDriveMap(proc) done, result "'FreeDriveMap'"'
    35323539return FreeDriveMap
    35333540/*:VRX         NoEVFSCALL
    … …  
    35423549ParseResourceData: PROCEDURE EXPOSE userdata options. icons. advanced. fs. cd. samba.
    35433550    PARSE ARG userdata, resource
    3544     IF options.!debug == 1 THEN SAY time()' ParseResourceData started'
    3545     IF options.!debug == 1 THEN SAY '  receiving "'userdata'" "'resource'" length ('length(resource)')'
     3551    if options.!debug == 1 then say time()' ParseResourceData started'
     3552    if options.!debug == 1 then say '  receiving "'userdata'" "'resource'" length ('length(resource)')'
    35463553
    35473554/* WARNING! resource has a maximal length of 255 and is truncated otherwise */
    … …  
    35663573               p_easupport will most likely be also wrong (look below for workaround!) */
    35673574            p_rw ="W" /* this is guessed only!!! */
    3568             IF options.!debug == 1 THEN SAY '  WARNING! Detected truncated resource string - shorten workgroup name, server name, share name until this message goes away!'
     3575            if options.!debug == 1 then say '  WARNING! Detected truncated resource string - shorten workgroup name, server name, share name until this message goes away!'
    35693576        end
    35703577        /* this should be done unconditionally if the resource string is never truncated */
    … …  
    36193626    end
    36203627
    3621     IF options.!debug == 1 THEN SAY '  returning "'userdata'"'
    3622     IF options.!debug == 1 THEN SAY time()' ParseResourceData done'
     3628    if options.!debug == 1 then say '  returning "'userdata'"'
     3629    if options.!debug == 1 then say time()' ParseResourceData done'
    36233630RETURN userdata
    36243631
    … …  
    36513658PB_ABOUT_COPY_Click:
    36523659    ok = VRMethod( "Application", "PutClipboard", AboutStr )
    3653     call beep 880*2,10
     3660    if options.!debug == 1 then call beep 880*2,10
    36543661    CALL SW_ABOUT_Close
    36553662return
    … …  
    36893696*/
    36903697PB_CONDET_LOAD_Click:
    3691     IF options.!debug == 1 THEN SAY time()' '||"PB_CONDET_LOAD_Click started"
     3698    if options.!debug == 1 then say time()' '||"PB_CONDET_LOAD_Click started"
    36923699    call Menu_File_Load_Click
    3693     IF options.!debug == 1 THEN SAY time()' '||"PB_CONDET_LOAD_Click done"
     3700    if options.!debug == 1 then say time()' '||"PB_CONDET_LOAD_Click done"
    36943701RETURN
    36953702
    … …  
    36973704*/
    36983705PB_CONDET_SAVE_Click: PROCEDURE EXPOSE settings. options. icons. Profile fs.  cd. advanced. samba.
    3699     IF options.!debug == 1 THEN SAY time()' '||"PB_CONDET_SAVE_Click started"
     3706    if options.!debug == 1 then say time()' '||"PB_CONDET_SAVE_Click started"
    37003707
    37013708    if options.!autostart == 0 THEN filename = VRFileDialog('Main', NLVGetMessage( 50 ), 'S', '*.'fs.!profileext)
    … …  
    37563763    end
    37573764
    3758     IF options.!debug == 1 THEN SAY time()' '||"PB_CONDET_SAVE_Click done"
     3765    if options.!debug == 1 then say time()' '||"PB_CONDET_SAVE_Click done"
    37593766RETURN
    37603767
    … …  
    37623769*/
    37633770PB_DETACH_Click: PROCEDURE EXPOSE settings. options. icons. fs. cd. samba.
    3764     IF options.!debug == 1 THEN SAY time()' '||"PB_DETACH_Click started"
     3771    if options.!debug == 1 then say time()' '||"PB_DETACH_Click started"
    37653772    CALL VRMethod "CN_CURRENT", 'GetRecordList', 'Selected', 'select.'
    37663773    IF select.0 < 1 THEN RETURN
    … …  
    37853792        END
    37863793    end
    3787     else IF options.!debug == 1 THEN SAY ' '||"mounts = "mounts
     3794    else if options.!debug == 1 then say ' '||"mounts = "mounts
    37883795
    37893796    CALL _Dynamic "ok = "fs.!prefix"RxDetach('"drive"')"
    37903797
    37913798    CALL Refresh
    3792     IF options.!debug == 1 THEN SAY time()' '||"PB_DETACH_Click done"
     3799    if options.!debug == 1 then say time()' '||"PB_DETACH_Click done"
    37933800RETURN
    37943801
    … …  
    38503857*/
    38513858PB_MOUNT_Click:
    3852     IF options.!debug == 1 THEN SAY time()' '||"PB_MOUNT_Click started"
     3859    if options.!debug == 1 then say time()' '||"PB_MOUNT_Click started"
    38533860    ok = VRSet("TM_RefreshCurrentDisplay","Enabled", 0)
    38543861    say "  network = "network
    … …  
    39653972    CALL Refresh
    39663973    ok = VRSet("TM_RefreshCurrentDisplay","Enabled", 1)
    3967     IF options.!debug == 1 THEN SAY time()' '||"PB_MOUNT_Click done"
     3974    if options.!debug == 1 then say time()' '||"PB_MOUNT_Click done"
    39683975RETURN 0
    39693976
    … …  
    41024109*/
    41034110PB_SMBTREE_CONNECT_Click: PROCEDURE EXPOSE settings. options. icons. fs. advanced. cd. samba.
    4104     IF options.!debug == 1 THEN SAY time()' '||"PB_CONNECT_Click started"
     4111    if options.!debug == 1 then say time()' '||"PB_CONNECT_Click started"
    41054112
    41064113    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "SourceOrSelected", "SelRH." )
    41074114
    41084115    if SelRH.0 = 0 then do
    4109         IF options.!debug == 1 THEN SAY time()' '||"PB_CONNECT_Click aborted"
     4116        if options.!debug == 1 then say time()' '||"PB_CONNECT_Click aborted"
    41104117        return
    41114118    end
    … …  
    41214128    trgRec  = ""
    41224129
    4123     IF options.!debug == 1 THEN do
     4130    if options.!debug == 1 then do
    41244131        say '  srcCtn      = "'srcCtn'"'
    41254132        if srcCtn <> "" then say '  srcCtn name = "'VRGet(srcCtn,'Name')'"'
    … …  
    42124219    if credentials.!entered = 1 then call PB_MOUNT_CLICK
    42134220
    4214     IF options.!debug == 1 THEN SAY time()' '||"PB_CONNECT_Click done"
     4221    if options.!debug == 1 then say time()' '||"PB_CONNECT_Click done"
    42154222RETURN
    42164223
    … …  
    42244231*/
    42254232PB_SMBTREE_REFRESH_Click: /* PROCEDURE EXPOSE settings. options. icons. fs. samba. debuglevel advanced. UserCred Refreshmode Tempdir */
    4226     IF options.!debug == 1 THEN SAY time()' '||"PB_REFRESH_Click started"
     4233    if options.!debug == 1 then say time()' '||"PB_REFRESH_Click started"
    42274234
    42284235    if advanced.!browseauth = 1 & (UserCred = "--user=%" | UserCred = "" ) then do
    … …  
    42394246    ok = time('R')
    42404247    call _RefreshTree
    4241     IF options.!debug == 1 THEN SAY time()' '||"PB_REFRESH_Click done"
     4248    if options.!debug == 1 then say time()' '||"PB_REFRESH_Click done"
    42424249RETURN
    42434250
    … …  
    42454252*/
    42464253PB_UNMOUNT_Click: PROCEDURE EXPOSE settings. options. icons. fs. cd. samba.
    4247     IF options.!debug == 1 THEN SAY time()' '||"PB_UNMOUNT_Click started"
    4248     IF options.!debug == 1 THEN SAY time()' '||'options.!editmode = 'options.!editmode
     4254    if options.!debug == 1 then say time()' '||"PB_UNMOUNT_Click started"
     4255    if options.!debug == 1 then say time()' '||'options.!editmode = 'options.!editmode
    42494256    CALL VRMethod "CN_CURRENT", 'GetRecordList', 'Selected', 'select.'
    42504257    IF select.0 < 1 THEN RETURN
    … …  
    42734280
    42744281    CALL Refresh
    4275     IF options.!debug == 1 THEN SAY time()' '||"PB_UNMOUNT_Click done"
     4282    if options.!debug == 1 then say time()' '||"PB_UNMOUNT_Click done"
    42764283RETURN 0
     4284
     4285/*:VRX         Pict_PWINMEM_Click
     4286*/
     4287Pict_PWINMEM_Click:
     4288    if VRGet("Pict_PWINMEM","PicturePath") = "#36" then do
     4289        call Menu_File_ucCred_Reset_Click
     4290    end
     4291return
    42774292
    42784293/*:VRX         Quit
    … …  
    42894304*/
    42904305Refresh:
    4291     IF options.!debug == 1 THEN SAY time()' Refresh started'
     4306    if options.!debug == 1 then say time()' Refresh started'
    42924307    CALL VRSet "CN_CURRENT", 'Painting', 0
    42934308
    … …  
    43004315        /* This catches the bug we observed exactly once and were unable to reproduce! */
    43014316        if cd.statusfh = 'CD.STATUSFH' then do
    4302             call beep 880, 50
    4303             call beep 880, 50
    4304             IF options.!debug == 1 THEN say "  cd.statusfh is undefined - check why!!!!!!"
     4317            if options.!debug == 1 then call beep 880, 50
     4318            if options.!debug == 1 then call beep 880, 50
     4319            if options.!debug == 1 then say "  cd.statusfh is undefined - check why!!!!!!"
    43054320            leave
    43064321        end
    4307         IF options.!debug == 1 THEN say '  Icon.'i' = "'||VRMethod( "CN_CONDET", "GetFieldData", rh.i, cd.statusfh)'"'
     4322        if options.!debug == 1 then say '  Icon.'i' = "'||VRMethod( "CN_CONDET", "GetFieldData", rh.i, cd.statusfh)'"'
    43084323        if VRMethod("CN_CONDET","GetFieldData", rh.i, cd.statusfh) = icons.!active then CALL VRMethod "CN_CONDET", 'RemoveRecord', rh.i
    43094324    end
    … …  
    43224337    ok = VRSet("MENU_SELECTED_RETRY",  "Visible",  0)
    43234338
    4324     IF options.!debug == 1 THEN SAY '  Remove records, disable buttons done.'
     4339    if options.!debug == 1 then say '  Remove records, disable buttons done.'
    43254340
    43264341    CALL VRMethod 'CB_DRIVES', 'Clear'
    … …  
    43424357    CALL VRMethod "CB_DRIVES", "AddStringList", "drvstem."
    43434358    CALL VRSet "CN_CURRENT", 'Painting', 1
    4344     IF options.!debug == 1 THEN SAY time()' '||"Refresh done"
     4359    if options.!debug == 1 then say time()' '||"Refresh done"
    43454360RETURN 0
    43464361
    … …  
    45384553*/
    45394554SW_DIALOG_Init:
    4540 
     4555    ok = VRSet("Pict_PWINMEM","Width",  VRMethod( "Screen", "PixelsToTwips", 16 ))
     4556    ok = VRSet("Pict_PWINMEM","Height", VRMethod( "Screen", "PixelsToTwips", 16 ))
    45414557return
    45424558
    … …  
    45444560*/
    45454561SW_DIALOG_Init_Content:
     4562    /* obsolete */
    45464563    if VRGet("TM_Throbber","Enabled") = 1 then ok = VRset("Pict_Throbber", "Visible", 0)
    45474564
    … …  
    45624579*/
    45634580SW_INFO_Create:
    4564     IF options.!debug == 1 THEN SAY time()' SW_INFO_Create started'   
     4581    if options.!debug == 1 then say time()' SW_INFO_Create started'   
    45654582    call SW_INFO_Init
    45664583    CALL NLVSetText 'SW_INFO',    "Caption", 92
    … …  
    45694586    Info.ValueFH   = VRMethod( "CN_INFO", "AddField", "String", "Value" )
    45704587
    4571     IF options.!debug == 1 THEN do
    4572         SAY '  Handle:   "'SMBObj.rh'"'
    4573         SAY '  Resource: "'SMBObj.resname'"'
    4574         SAY '  Comment:  "'SMBObj.comment'"'
    4575         SAY '  Type:     "'SMBObj.udatatype'"'
    4576         SAY '  Message:  "'SMBObj.udatamsg'"'
    4577         SAY '  Icon:     "'SMBObj.icon'"'
     4588    if options.!debug == 1 then do
     4589        say '  Handle:   "'SMBObj.rh'"'
     4590        say '  Resource: "'SMBObj.resname'"'
     4591        say '  Comment:  "'SMBObj.comment'"'
     4592        say '  Type:     "'SMBObj.udatatype'"'
     4593        say '  Message:  "'SMBObj.udatamsg'"'
     4594        say '  Icon:     "'SMBObj.icon'"'
    45784595    end
    45794596
    … …  
    45934610
    45944611    if rpc_success = 1 then do
     4612        if rpc.srvinfo.OS_VERSION = 'RPC.SRVINFO.OS_VERSION' then rpc.srvinfo.OS_VERSION = ''
    45954613        ok = VRMethod( "CN_INFO", "SetFieldData", Info.!nbname, Info.TypeFH, strip(NLVGetMessage(137),'T',':'),Info.ValueFH, rpc.srvinfo.NETBIOSNAME)
    45964614        ok = VRMethod( "CN_INFO", "SetFieldData", Info.!comment,Info.TypeFH, strip(NLVGetMessage(125),'T',':'),Info.ValueFH, rpc.srvinfo.SERVERSTRING)
    … …  
    46124630    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!MAC,    Info.TypeFH, "MAC" ,Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, MacFH ))
    46134631
    4614     IF options.!debug == 1 THEN SAY time()' SW_INFO_Create done'   
     4632    if options.!debug == 1 then say time()' SW_INFO_Create done'   
    46154633return
    46164634
    … …  
    46514669    CALL NLVSetText 'PB_LOGIN_CANCEL',"Caption", 3
    46524670
    4653     select
    4654         when pos("PDC",VRMethod("CN_smbtree", "GetFieldData", SMBObj.rh, MBFH)) > 0 then LoginIcon = "#63:PMWP.DLL" /* icons.!pdc */
    4655         when SMBObj.udatatype = "WORKGROUP" then LoginIcon = SMBObj.Icon
    4656         when SMBObj.udatatype = "SERVER"    then LoginIcon = SMBObj.Icon
    4657         when SMBObj.udatatype = "DISK"      then do
    4658             if pos("PDC",VRMethod("CN_smbtree", "GetFieldData", SMBObj.parentrh, MBFH)) > 0
    4659                 then LoginIcon = "#63:PMWP.DLL" /* icons.!pdc */
    4660                 else LoginIcon = "#35:PMWP.DLL" /* icons.!pdc */
    4661         end
    4662         otherwise LoginIcon = "#35:PMWP.DLL" /* icons.!machine_awake */
    4663     end
    4664 say loginicon
    4665     ok = VRSet("Pict_Login","PicturePath", LoginIcon)
     4671    if VRIsValidObject(SMBObj.rh) then do
     4672        select
     4673            when pos("PDC",VRMethod("CN_smbtree", "GetFieldData", SMBObj.rh, MBFH)) > 0 then LoginIcon = "#63:PMWP.DLL" /* icons.!pdc */
     4674            when SMBObj.udatatype = "WORKGROUP" then LoginIcon = SMBObj.Icon
     4675            when SMBObj.udatatype = "SERVER"    then LoginIcon = SMBObj.Icon
     4676            when SMBObj.udatatype = "DISK"      then do
     4677                if pos("PDC",VRMethod("CN_smbtree", "GetFieldData", SMBObj.parentrh, MBFH)) > 0
     4678                    then LoginIcon = "#63:PMWP.DLL" /* icons.!pdc */
     4679                    else LoginIcon = "#35:PMWP.DLL" /* icons.!pdc */
     4680            end
     4681            otherwise LoginIcon = "#35:PMWP.DLL" /* icons.!machine_awake */
     4682        end
     4683        say loginicon
     4684        ok = VRSet("Pict_Login","PicturePath", LoginIcon)
     4685    end
    46664686    ok = VRSet("EF_USER1","Value",VRGet("EF_USER","Value"))
    46674687    ok = VRSet("EF_PASSWORD1","Value",VRGet("EF_PASSWORD","Value"))
Note: See TracChangeset for help on using the changeset viewer.