Changeset 333


Ignore:
Timestamp:
Sep 22, 2009, 4:17:24 PM (16 years ago)
Author:
Herwig Bauernfeind
Message:

GUI-Tools: Fix problem in smbusers

Location:
branches/guitools-1.0
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • branches/guitools-1.0/install/sscc.vrp

    r304 r333  
    33MacroPath: VRM:U:\Develop\Samba\guitools-1.0\install
    44EXEPath:
    5 RunParameters: /Install
     5RunParameters: /install
    66RunDirectory: E:\Dev\REXX\VXREXX\Projects\Samba\install
    77VRXWindow: __VREMainWindow,1,2180,4481,891,7263
    88VRXWindow: __VRESectionListWindow,1,3011,12286,8974,3144
    9 VRXWindow: __VREToolsWindow,1,3211,10648,7495,1667
     9VRXWindow: __VREToolsWindow,1,3211,10648,6986,1661
    1010VRXWindow: __VREWindListWindow,1,385,12286,2650,3150
    1111UserFile: 1

  • branches/guitools-1.0/install/sscc.vrx

    r304 r333  
    114114*/
    115115_CfgPageSetupSize:
    116     if arg(1) = "GB_Global" then     ok = VRset(arg(1), "Top", 0)
    117     else ok = VRset(arg(1), "Top", 72)
    118     ok = VRset(arg(1), "Left",VRGet("GB_SmbConfTree","width")+72+72)
    119     if arg(1) = "GB_Global" then ok = VRset(arg(1), "Height",VRGet("GB_SmbConfTree","height")+72)
    120     else ok = VRset(arg(1), "Height",VRGet("GB_SmbConfTree","height"))
    121     ok = VRset(arg(1), "Width", VRGet("Main","Width")-72-VRGet("GB_SmbConfTree","width")-72 )
     116    if arg(1) = "GB_Global"
     117        then ok = VRset(arg(1), "Top", 0)
     118        else ok = VRset(arg(1), "Top", Fwidth)
     119
     120    ok = VRset(arg(1), "Left",VRGet("GB_SmbConfTree","Width") + 60)
     121
     122    if arg(1) = "GB_Global"
     123        then ok = VRset(arg(1), "Height",VRGet("GB_SmbConfTree","height")+FWidth)
     124        else ok = VRset(arg(1), "Height",VRGet("GB_SmbConfTree","height"))
     125
     126    ok = VRset(arg(1), "Width", VRGet("Main", "Width") - VRGet("GB_SmbConfTree","width") - 60- FWidth*2-24*2)
    122127return
    123128
    … …  
    270275    else ok = VRset("Main","Width", 9250)
    271276
     277    settings.!curfcolor = VRGetIni('PM_Default_Colors', 'ActiveTitleText', 'User', 'NoClose')
     278    settings.!curbcolor = VRGetIni('PM_Default_Colors', 'ActiveTitleTextBgnd', 'User')
     279
     280    ok = VRSet("DT_SmbConfTree","BACKCOLOR", settings.!curbcolor )
     281    ok = VRSet("DT_SmbConfTree","FORECOLOR", settings.!curfcolor )
     282/*  ok = VRSet("DT_DIALOG","BACKCOLOR",  settings.!curbcolor )
     283    ok = VRSet("DT_DIALOG","FORECOLOR",  settings.!curfcolor )
     284    ok = VRSet("DT_SMBTREE","BACKCOLOR", settings.!curbcolor )
     285    ok = VRSet("DT_SMBTREE","FORECOLOR", settings.!curfcolor ) */
     286
     287
    272288    ok = VRSet("EF_Binaries_Version","value",samba.!version)
    273289    ok = VRSet("EF_Binaries_Path","value",samba.!bin)
    … …  
    275291    ok = VRSet("EF_UnixRoot_Path","value",UnixRoot)
    276292    ok = VRSet("EF_ETC_Path","value",ETC)
    277     ok = VRSet("DT_SmbConfTree","Caption", smbconf)
     293    ok = VRSet("CN_SmbConf","Caption", smbconf)
    278294    ok = VRSet("IPB_ChooseDir","Width" ,VRMethod( "Screen", "PixelsToTwips", 20 ))
    279295    ok = VRSet("IPB_ChooseDir","Height",VRMethod( "Screen", "PixelsToTwips", 20 ))
    … …  
    299315*/
    300316_GUIInitNLV:
     317    say '_GUIInitNLV started'
    301318    CALL NLVSetup
    302319    CALL NLVSetText 'Main', 'Caption', 1
    … …  
    352369    CALL NLVSetText 'DT_Binaries_Path',               'Caption', 83
    353370    CALL NLVSetText 'DT_Scripts_Path',                'Caption', 84
    354 
     371/*  CALL NLVSetText 'DT_SmbConfTree',                 'Caption', 73 */
     372say NLVGetMessage(73)
     373    ok = VRSet("DT_SmbConfTree","Caption", NLVGetMessage(73))
    355374    Drive = NLVGetMessage(38)
     375    say '_GUIInitNLV done'
    356376return
    357377
    … …  
    395415    UseTDBSam = 0   /* only for installermode */
    396416    CreatePDC = 0   /* only for installermode */
     417
     418    advanced.!bigicons = 0
     419
     420    FWidth = 32
     421
    397422    IF options.!builddir == 1 THEN say '_INIRead() done'
    398423return
    … …  
    21402165
    21412166    call _LoadOtherFuncs
     2167
    21422168    call _INIRead
     2169
     2170    call _ParseCommandLine
     2171
     2172    call _InitTempDir
     2173    call _SambaInit
     2174    call _SambaExtendSearchPath
    21432175    call _GUIInitNLV
    2144     call _InitTempDir
    2145     call _ParseCommandLine
    2146 
    2147 
    2148     call _SambaInit
    2149     call _SambaExtendSearchPath 
     2176
    21502177    call _FindHtpasswd
    21512178    call _SambaCheckComponents
    … …  
    21632190    IF options.!debug == 1 THEN SAY "Main_Resize() started"
    21642191    Ok = VRset("Main", "Painting", 0)
    2165     ok = VRSet("GB_SmbConfTree", "Height", VRGet("Main", "Height") -1500)
    2166     ok = VRSet("GB_SmbConfTree2","Height", VRGet("GB_SmbConfTree", "Height")-361-72)
    2167     ok = VRSet("CN_SmbConf","Height", VRGet("GB_SmbConfTree2", "Height") - 144)
    2168 
    2169     ok = VRSet("GB_Help",   "Height", VRGet("Main", "Height") -1500)
    2170     ok = VRSet("GB_Help",   "Width",  VRGet("Main", "Width") -72 -VRGet("GB_SmbConfTree","width")-72*3)
    2171     ok = VRSet("GB_Help2",  "Height", VRGet("GB_help","Height")-361-72)
    2172     ok = VRSet("GB_Help2",  "Width",  VRGet("GB_help","Width")-72*2)
    2173     ok = VRSet("DT_Help" ,  "Width",  VRGet("GB_help","Width")-72*2)
    2174 
    2175     ok = VRSet("GB_Shares" ,"Height", VRGet("Main", "Height") -1500)
    2176     ok = VRSet("GB_Shares" ,"Width", VRGet("Main", "Width") -72-VRGet("GB_SmbConfTree","width")-72*3)
    2177     ok = VRSet("GB_Shares2", "Height", VRGet("GB_Shares","Height")-361-72)
    2178     ok = VRSet("GB_Shares2", "Width",  VRGet("GB_Shares","Width")-72*2)
    2179     ok = VRSet("DT_Shares" , "Width",  VRGet("GB_Shares","Width")-72*2)
    2180 
    2181     ok = VRSet("GB_Global", "Height", VRGet("Main", "Height") -1500+72)
    2182     ok = VRSet("GB_Global", "Width", VRGet("Main", "Width") -72-VRGet("GB_SmbConfTree","width")-72*3)
    2183 
    2184     ok = VRSet("PB_Create", "Left", VRGet("GB_SmbConfTree","width")+72*2)
    2185     ok = VRSet("PB_Create", "Top", VRGet("GB_SmbConfTree","height")+72*2-30)
    2186     ok = VRSet("PB_Create", "Width", VRGet("GB_Shares","width")/4 -72)
    2187 
    2188     ok = VRSet("PB_Reload", "Left", VRGet("GB_SmbConfTree","width")-VRGet("PB_Create", "Width")+72)
    2189     ok = VRSet("PB_Reload", "Top", VRGet("GB_SmbConfTree","height")+72*2-30)
    2190     ok = VRSet("PB_Reload", "Width", VRGet("GB_Shares","width")/4 -72)
    2191 
    2192     ok = VRSet("PB_Undo", "Left", VRGet("PB_Create", "Left")+VRGet("PB_Create", "Width")+72)
    2193     ok = VRSet("PB_Undo", "Top",  VRGet("GB_SmbConfTree","height")+72*2-30)
    2194     ok = VRSet("PB_Undo", "Width", VRGet("GB_Shares","width")/4 -72)
    2195 
    2196     ok = VRSet("PB_Cancel", "Left", VRGet("PB_Create", "Left")+VRGet("PB_Create", "Width")*2+72*2)
    2197     ok = VRSet("PB_Cancel", "Top",  VRGet("GB_SmbConfTree","height")+72*2-30)
    2198     ok = VRSet("PB_Cancel", "Width", VRGet("GB_Shares","width")/4 -72)
    2199 
    2200     ok = VRSet("PB_Help", "Left", VRGet("PB_Create", "Left")+VRGet("PB_Create", "Width")*3+72*3)
    2201     ok = VRSet("PB_Help", "Top",  VRGet("GB_SmbConfTree","height")+72*2-30)
    2202     ok = VRSet("PB_Help", "Width", VRGet("GB_Shares","width")/4 -72)
     2192    ok = VRSet("GB_SmbConfTree","Top",    FWidth)
     2193    ok = VRSet("GB_SmbConfTree","Left",   FWidth-24)
     2194    ok = VRSet("GB_SmbConfTree","Height", VRGet("Main", "Height") -1350)
     2195
     2196    ok = VRset("GB_SmbConfTree3","Top",     FWidth)
     2197    ok = VRset("GB_SmbConfTree3","Left",    FWidth)
     2198    ok = VRset("GB_SmbConfTree3","Height",  245  )
     2199    ok = VRset("GB_SmbConfTree3","Width",   VRGet("GB_SmbConfTree","Width") -(FWidth*2))
     2200
     2201    ok = VRset("DT_SmbConfTree","Top",     8)
     2202    ok = VRset("DT_SmbConfTree","Left",    8)
     2203    ok = VRset("DT_SmbConfTree","Height",  213)
     2204    ok = VRset("DT_SmbConfTree","Width",   VRGet("GB_SmbConfTree3","Width") - 24)
     2205
     2206    ok = VRset("GB_SmbConfTree2","Left",   FWidth)
     2207    ok = VRset("GB_SmbConfTree2","Top",    245 + FWidth*2)
     2208    ok = VRset("GB_SmbConfTree2","Width",  VRGet("GB_SmbConfTree","Width")-FWidth*2)
     2209    ok = VRset("GB_SmbConfTree2","Height", VRGet("GB_SmbConfTree","Height")-FWidth*3-245)
     2210
     2211    ok = VRset("CN_SmbConf", "Top",    FWidth)
     2212    ok = VRset("CN_SmbConf", "Left",   FWidth)
     2213    ok = VRset("CN_SmbConf", "Width",  VRGet("GB_SmbConfTree2","Width") -(FWidth*2))
     2214    ok = VRset("CN_SmbConf", "Height", VRGet("GB_SmbConfTree2","Height")-(FWidth*2))
     2215
     2216    ok = VRset("GB_Help",   "Top",    FWidth)
     2217    ok = VRset("GB_Help",   "Left",   VRGet("GB_SmbConfTree","Width") + 60)
     2218    ok = VRSet("GB_Help",   "Height", VRGet("GB_SmbConfTree","Height"))
     2219    ok = VRSet("GB_Help",   "Width",  VRGet("Main", "Width") - VRGet("GB_SmbConfTree","width") - 60- FWidth*2-24*2)
     2220
     2221    ok = VRset("GB_Help3","Top",     FWidth)
     2222    ok = VRset("GB_Help3","Left",    FWidth)
     2223    ok = VRset("GB_Help3","Height",  245  )
     2224    ok = VRset("GB_Help3","Width",   VRGet("GB_Help","Width") -(FWidth*2))
     2225
     2226    ok = VRset("GB_Help2","Left",   FWidth)
     2227    ok = VRset("GB_Help2","Top",    245 + FWidth*2)
     2228    ok = VRset("GB_Help2","Width",  VRGet("GB_Help","Width")-FWidth*2)
     2229    ok = VRset("GB_Help2","Height", VRGet("GB_Help","Height")-FWidth*3-245)
     2230
     2231    ok = VRset("DT_Help","Top",     8)
     2232    ok = VRset("DT_Help","Left",    8)
     2233    ok = VRset("DT_Help","Height",  213)
     2234    ok = VRset("DT_Help","Width",   VRGet("GB_Help3","Width") - 24)
     2235
     2236    ok = VRset("GB_Shares",   "Top",    FWidth)
     2237    ok = VRset("GB_Shares",   "Left",   VRGet("GB_SmbConfTree","Width") + 60)
     2238    ok = VRSet("GB_Shares",   "Height", VRGet("GB_SmbConfTree","Height"))
     2239    ok = VRSet("GB_Shares",   "Width",  VRGet("Main", "Width") - VRGet("GB_SmbConfTree","width") - 60- FWidth*2-24*2)
     2240
     2241    ok = VRset("GB_Shares3","Top",     FWidth)
     2242    ok = VRset("GB_Shares3","Left",    FWidth)
     2243    ok = VRset("GB_Shares3","Height",  245  )
     2244    ok = VRset("GB_Shares3","Width",   VRGet("GB_Shares","Width") -(FWidth*2))
     2245
     2246    ok = VRset("GB_Shares2","Left",   FWidth)
     2247    ok = VRset("GB_Shares2","Top",    245 + FWidth*2)
     2248    ok = VRset("GB_Shares2","Width",  VRGet("GB_Shares","Width")-FWidth*2)
     2249    ok = VRset("GB_Shares2","Height", VRGet("GB_Shares","Height")-FWidth*3-245)
     2250
     2251    ok = VRset("DT_Shares", "Top",    8)
     2252    ok = VRset("DT_Shares", "Left",   8)
     2253    ok = VRset("DT_Shares", "Height", 213)
     2254    ok = VRset("DT_Shares", "Width",  VRGet("GB_Shares3","Width") - 24)
     2255
     2256    ok = VRSet("GB_Global", "Height", VRGet("GB_SmbConfTree","Height"))
     2257    ok = VRSet("GB_Global", "Width",  VRGet("GB_Shares",     "Width"))
     2258
     2259    ok = VRSet("PB_Create", "Left",   VRGet("GB_SmbConfTree","width")+FWidth*2)
     2260    ok = VRSet("PB_Create", "Top",    VRGet("GB_SmbConfTree","height")+FWidth*2)
     2261    ok = VRSet("PB_Create", "Width",  VRGet("GB_Shares",     "width")/4 -FWidth)
     2262
     2263    ok = VRSet("PB_Reload", "Left",   VRGet("GB_SmbConfTree","width")-VRGet("PB_Create", "Width")+FWidth)
     2264    ok = VRSet("PB_Reload", "Top",    VRGet("GB_SmbConfTree","height")+FWidth*2)
     2265    ok = VRSet("PB_Reload", "Width",  VRGet("GB_Shares",     "width")/4 -FWidth)
     2266
     2267    ok = VRSet("PB_Undo",   "Left",   VRGet("PB_Create",     "Left")+VRGet("PB_Create", "Width")+FWidth)
     2268    ok = VRSet("PB_Undo",   "Top",    VRGet("GB_SmbConfTree","height")+FWidth*2)
     2269    ok = VRSet("PB_Undo",   "Width",  VRGet("GB_Shares",     "width")/4 -FWidth)
     2270
     2271    ok = VRSet("PB_Cancel", "Left",   VRGet("PB_Create",     "Left")+VRGet("PB_Create", "Width")*2+FWidth*2)
     2272    ok = VRSet("PB_Cancel", "Top",    VRGet("GB_SmbConfTree","height")+FWidth*2)
     2273    ok = VRSet("PB_Cancel", "Width",  VRGet("GB_Shares",     "Width")/4 -FWidth)
     2274
     2275    ok = VRSet("PB_Help",   "Left",   VRGet("PB_Create",     "Left")+VRGet("PB_Create", "Width")*3+FWidth*3)
     2276    ok = VRSet("PB_Help",   "Top",    VRGet("GB_SmbConfTree","height")+FWidth*2)
     2277    ok = VRSet("PB_Help",   "Width",  VRGet("GB_Shares",     "Width")/4 -FWidth)
     2278
     2279    Top    = VRGet("Main","Top")
     2280    Left   = VRGet("Main","Left")
     2281    Width  = VRGet("Main","Width")
     2282    Height = VRGet("Main","Height")
    22032283
    22042284    if ActiveGroup = "Global" then do
    … …  
    23822462    call Main_Resize
    23832463say 'ExpertMode_Click done'
     2464return
     2465
     2466/*:VRX         Menu_Options_MiniIcons_Click
     2467*/
     2468Menu_Options_MiniIcons_Click:
     2469    advanced.!bigicons = \advanced.!bigicons
     2470    ok = VRset("CN_SMBCONF", "MiniIcons", \advanced.!bigicons)
     2471    ok = VRset("Menu_Options_MiniIcons",  "Checked", \advanced.!bigicons)
    23842472return
    23852473

  • branches/guitools-1.0/install/sscc_de.mkm

    r304 r333  
    7878SSC0071I: Transiente TDB Dateien wirklich entfernen?
    7979SSC0072I: Die Leute hinter Samba Server fr eComStation (OS/2)
    80 SSC0073?:
     80SSC0073I: Aktuelle Konfiguration
    8181SSC0074?:
    8282SSC0075?:

  • branches/guitools-1.0/install/sscc_en.mkm

    r304 r333  
    7878SSC0071I: Really remove transient TDB files?
    7979SSC0072I: Samba Server for eComStation is brought to you by
    80 SSC0073?:
     80SSC0073I: Current configuration
    8181SSC0074?:
    8282SSC0075?:

  • branches/guitools-1.0/install/sscc_es.mkm

    r306 r333  
    7878SSC0071I: šEliminar realmente los archivos transitorios TDB?
    7979SSC0072I: Servidor Samba para eComStation proporcionado por
    80 SSC0073?:
     80SSC0073I: Configuraci¢n actual
    8181SSC0074?:
    8282SSC0075?:

  • branches/guitools-1.0/install/sscc_fr.mkm

    r304 r333  
    8484SSC0071I: Voulez-vous r‚ellement supprimer les fichiers TDB transitoires ?
    8585SSC0072I: Serveur Samba pour eComStation vous est propos‚ par
    86 SSC0073?:
     86SSC0073I: Configuration actuelle
    8787SSC0074?:
    8888SSC0075?:

  • branches/guitools-1.0/install/sscc_sv.mkm

    r304 r333  
    7878SSC0071?:
    7979SSC0072?:
    80 SSC0073?:
     80SSC0073I: Aktuella konfigurationen
    8181SSC0074?:
    8282SSC0075?:

  • branches/guitools-1.0/shared/nlv.vrs

    r288 r333  
    6969    if execPath = "" then parse source . . execPath
    7070    execDir  = VRParseFileName( execPath, "DP")
     71    say '  NLV execDir = "'execDir'"'
    7172
    7273    filestem = VRParseFileName( execPath, "N")'_'

  • branches/guitools-1.0/shared/sambainit.vrs

    r302 r333  
    123123    if \VRFileExists(samba.!smbclientexe) then call _ErrorBinaryNotFound "Could not find smbclient.exe!"
    124124    IF options.!debug == 1 THEN say '  smbclient.exe  = "'samba.!smbclientexe'"'
     125
     126    /* nmblookup.exe */
     127    samba.!nmblookupexe = samba.!bin'\nmblookup.exe'
     128    if \VRFileExists(samba.!nmblookupexe) then call _ErrorBinaryNotFound "Could not find nmblookup.exe!"
     129    IF options.!debug == 1 THEN say '  nmblookup.exe  = "'samba.!nmblookupexe'"'
    125130
    126131    /* pwd_mkdb */
    … …  
    265270    end
    266271    drop old_path
     272
     273    /* Add binary and tools path to the DPATH variable */
     274    old_dpath = value('DPATH',, 'OS2ENVIRONMENT')
     275    if pos(translate(samba.!bin';'),translate(old_dpath)) = 0 then do
     276        if samba.!bin = samba.!tools then new_dpath = samba.!bin';'
     277        else new_dpath = samba.!bin';'samba.!tools';'
     278        ok = value('DPATH', new_dpath || old_dpath, 'OS2ENVIRONMENT')
     279        drop new_dpath
     280    end
     281    drop old_dpath
    267282   
    268283    /* Add binary and tools path to the BEGINLIBPATH variable */
    … …  
    275290    end
    276291    drop old_beginlibpath
     292
    277293
    278294    /* Set LIBPATHSTRICT (this is an option - disabled by default) */

  • branches/guitools-1.0/sharewiz/changes

    r296 r333  
    11Version 0.3.0 02-07-2009
    2                          *Changed: Style is now similar to scc.exe
     2                         *Changed: Style is now similar to sscc.exe
    33                         *Changed: Use latest shared code
    44Version 0.2.0 07-11-2008

  • branches/guitools-1.0/smbmon/readme.smbmon

    r288 r333  
    1 SmbMon - Samba Server Status Monitor Version 0.9.24
     1SmbMon - Samba Server Status Monitor Version 0.9.25
    22===================================================
    33

  • branches/guitools-1.0/smbmon/smbmon.vrp

    r302 r333  
    77VRXWindow: __VREMainWindow,1,2180,3710,940,8000
    88VRXWindow: __VRESectionListWindow,1,2650,12093,9359,3300
    9 VRXWindow: __VREToolsWindow,1,2204,1590,7498,1661
     9VRXWindow: __VREToolsWindow,1,2204,1590,7501,1663
    1010VRXWindow: __VREWindListWindow,1,265,12093,2650,3150
    1111UserFile: 1

  • branches/guitools-1.0/smbusers/changes

    r305 r333  
     1Version 0.9.5 21-09-2009
     2                         *Changed: Login dialog looks like the one from
     3                                   EVFSGUI 2 (required another modification)
     4                         !Fixed: SmbPasswdRead() is more robust now
     5                         Note: Version number was accidentally bumped
     6Version 0.9.4 06-08-2009
     7                         *Changed: Login dialog looks like the one from
     8                                   EVFSGUI 2
    19Version 0.9.3 26-07-2009
    210                         !Fixed: Password change now also respects minimum

  • branches/guitools-1.0/smbusers/readme.smbusers

    r287 r333  
    1 Local Samba users and groups 0.9.1
     1Local Samba users and groups 0.9.3
    22==================================
    33

  • branches/guitools-1.0/smbusers/smbusers.VRP

    r305 r333  
    77VRXWindow: __VREMainWindow,1,2180,3710,891,8000
    88VRXWindow: __VRESectionListWindow,1,2951,11130,8949,3342
    9 VRXWindow: __VREToolsWindow,1,2457,1012,7498,1669
     9VRXWindow: __VREToolsWindow,1,2457,1012,6995,1667
    1010VRXWindow: __VREWindListWindow,1,446,11130,2650,3150
    1111UserFile: 1
    1212UserWindow: Main,1
    13 UserWindow: AddUser,1
    14 UserWindow: Credentials,1
    15 UserWindow: UserProperties,1
     13UserWindow: SW_LOGIN,1

  • branches/guitools-1.0/smbusers/smbusers.VRX

    r305 r333  
    642642
    643643EnterCredentials:
    644     if Credentials.!username = "" | Credentials.!password = "" then window = VRLoadSecondary( "Credentials", "W" )
     644    if Credentials.!username = "" | Credentials.!password = "" then window = VRLoadSecondary( "SW_LOGIN", "W" )
    645645
    646646    if pos("4OS2", value("COMSPEC",,"OS2ENVIRONMENT")) = 0
    … …  
    12351235                call _ShowMsg
    12361236            end
    1237             otherwise do
     1237            when pos(':[',translate(sline.i)) > 0 & pos(']:LCT-',translate(sline.i)) > 0 then do
     1238                /* we guess a valid smbdpasswd user entry here */
    12381239                parse var sline.i name':'.
    12391240                sname.i = translate(name)
    1240                 if sname.i = '' then
     1241                /* still something wrong - we got no name, trash this line */
     1242                if sname.i = '' then i = i - 1
     1243            end
     1244            otherwise do
     1245                /* if we did not find a valid line in the previous check this line is garbage, likely debug output.. */
    12411246                i = i - 1
    12421247            end
    … …  
    25632568return
    25642569
    2565 /*:VRX         Credentials_Close
    2566 */
    2567 Credentials_Close:
    2568     call Credentials_Fini
    2569 return
    2570 
    2571 /*:VRX         Credentials_Create
    2572 */
    2573 Credentials_Create:
    2574     call Credentials_Init
    2575     CALL NLVSetText 'Credentials',     'Caption', 31
    2576     CALL NLVSetText 'DT_LoginUser',    'Caption', 32
    2577     CALL NLVSetText 'DT_LoginPassword','Caption', 33
    2578     CALL NLVSetText 'PB_LoginOK',      'Caption', 2
    2579     CALL NLVSetText 'PB_LoginAbort',   'Caption', 3
    2580 
    2581     if Credentials.!Username = ""
    2582         then ok = VRSet("EF_LoginUser","Value", value("USER",,"OS2ENVIRONMENT"))
    2583         else ok = VRSet("EF_LoginUser","Value", Credentials.!Username)
    2584 
    2585     if \_UserIsValid(VRGet("EF_LoginUser","Value")) & value("USER",,"OS2ENVIRONMENT") <> "" then do
    2586         Msg.Title =VRGet("Main", "caption")
    2587         Msg.Type = "E"
    2588         Msg.Text = NLVGetMessage(111, VRGet("EF_LoginUser","Value"))
    2589         call _ShowMsg
    2590         ok = VRSet("EF_LoginUser","Value","root")
    2591     end
    2592 
    2593     if VRGet("EF_LoginUser","Value") <> "" then ok = VRMethod("EF_LoginPassword","Setfocus")
    2594 return
    2595 
    2596 /*:VRX         Credentials_Fini
    2597 */
    2598 Credentials_Fini:
    2599     window = VRInfo( "Window" )
    2600     call VRDestroy window
    2601     drop window
    2602 return
    2603 /*:VRX         Credentials_Init
    2604 */
    2605 Credentials_Init:
    2606     window = VRInfo( "Object" )
    2607     if( \VRIsChildOf( window, "Notebook" ) ) then do
    2608         call VRMethod window, "CenterWindow"
    2609         call VRSet window, "Visible", 1
    2610         call VRMethod window, "Activate"
    2611     end
    2612     drop window
    2613 return
    2614 
    26152570/*:VRX         DDCB_GID_Change
    26162571*/
    … …  
    26972652/*  say keystr */
    26982653    select
    2699         when keystr = "{Enter}" then call PB_LoginOK_Click
    2700         when keystr = "{Newline}" then call PB_LoginOK_Click
    2701         when keystr  = "{Esc}" then call PB_LoginAbort_Click
     2654        when keystr = "{Enter}" then call PB_LOGIN_OK_Click
     2655        when keystr = "{Newline}" then call PB_LOGIN_OK_Click
     2656        when keystr  = "{Esc}" then call PB_LOGIN_CANCEL_Click
    27022657        otherwise nop
    27032658    end
    … …  
    27132668        when keystr = "{Enter}" then ok = VRMethod( "EF_LoginPassword", "SetFocus" )
    27142669        when keystr = "{Newline}" then ok = VRMethod( "EF_LoginPassword", "SetFocus" )
    2715         when keystr  = "{Esc}" then call PB_LoginAbort_Click
     2670        when keystr  = "{Esc}" then call PB_LOGIN_CANCEL_Click
    27162671        otherwise nop
    27172672    end
    … …  
    34373392    end
    34383393
    3439     if length(VRGet("EF_password","Value")) < MinPWLength then do
     3394    if length(VRGet("EF_password","Value")) < MinPWLength & \(VRGet("CB_NoPassword","Set") | VRGet("CB_MachineAccount","Set")) then do
    34403395        Msg.type  = "E"
    34413396        Msg.Text  = NLVGetMessage( 117 )
    … …  
    36583613return
    36593614
    3660 /*:VRX         PB_LoginAbort_Click
    3661 */
    3662 PB_LoginAbort_Click:
     3615/*:VRX         PB_LOGIN_CANCEL_Click
     3616*/
     3617PB_LOGIN_CANCEL_Click:
    36633618    say "  Login Abort"
    3664     call Credentials_Close
     3619    call SW_LOGIN_Close
    36653620    exit 0
    36663621return
    36673622
    3668 /*:VRX         PB_LoginOK_Click
    3669 */
    3670 PB_LoginOK_Click:
    3671     IF options.!debug == 1 THEN say "  Credentials OK started"
     3623/*:VRX         PB_LOGIN_OK_Click
     3624*/
     3625PB_LOGIN_OK_Click:
     3626    IF options.!debug == 1 THEN say "  SW_LOGIN OK started"
    36723627    Credentials.!Username = VRGet("EF_LoginUser","Value")
    36733628    Credentials.!Password = VRGet("EF_LoginPassword","Value")
    … …  
    36773632        else UserCred = '--user='Credentials.!username'%%'Credentials.!password
    36783633
    3679     Call Credentials_Close
    3680     IF options.!debug == 1 THEN say "  Credentials OK done"
     3634    Call SW_LOGIN_Close
     3635    IF options.!debug == 1 THEN say "  SW_LOGIN OK done"
    36813636return
    36823637
    … …  
    39053860return
    39063861
     3862/*:VRX         SW_LOGIN_Close
     3863*/
     3864SW_LOGIN_Close:
     3865    call SW_LOGIN_Fini
     3866return
     3867
     3868/*:VRX         SW_LOGIN_Create
     3869*/
     3870SW_LOGIN_Create:
     3871    call SW_LOGIN_Init
     3872    CALL NLVSetText 'SW_LOGIN',     'Caption', 31
     3873    CALL NLVSetText 'DT_LoginUser',    'Caption', 32
     3874    CALL NLVSetText 'DT_LoginPassword','Caption', 33
     3875    CALL NLVSetText 'PB_LOGIN_OK',      'Caption', 2
     3876    CALL NLVSetText 'PB_LOGIN_CANCEL',   'Caption', 3
     3877
     3878    if Credentials.!Username = ""
     3879        then ok = VRSet("EF_LoginUser","Value", value("USER",,"OS2ENVIRONMENT"))
     3880        else ok = VRSet("EF_LoginUser","Value", Credentials.!Username)
     3881
     3882    if \_UserIsValid(VRGet("EF_LoginUser","Value")) & value("USER",,"OS2ENVIRONMENT") <> "" then do
     3883        Msg.Title =VRGet("Main", "caption")
     3884        Msg.Type = "E"
     3885        Msg.Text = NLVGetMessage(111, VRGet("EF_LoginUser","Value"))
     3886        call _ShowMsg
     3887        ok = VRSet("EF_LoginUser","Value","root")
     3888    end
     3889
     3890    if VRGet("EF_LoginUser","Value") <> "" then ok = VRMethod("EF_LoginPassword","Setfocus")
     3891return
     3892
     3893/*:VRX         SW_LOGIN_Fini
     3894*/
     3895SW_LOGIN_Fini:
     3896    window = VRInfo( "Window" )
     3897    call VRDestroy window
     3898    drop window
     3899return
     3900/*:VRX         SW_LOGIN_Init
     3901*/
     3902SW_LOGIN_Init:
     3903    window = VRInfo( "Object" )
     3904    if( \VRIsChildOf( window, "Notebook" ) ) then do
     3905        call VRMethod window, "CenterWindow"
     3906        call VRSet window, "Visible", 1
     3907        call VRMethod window, "Activate"
     3908    end
     3909    drop window
     3910return
     3911
    39073912/*:VRX         TAB_1_Click
    39083913*/
Note: See TracChangeset for help on using the changeset viewer.