Changeset 1063


Ignore:
Timestamp:
May 10, 2020, 7:33:28 PM (5 years ago)
Author:
Alex Taylor
Message:

Disable non-functional Open context submenu.
Disable 'webdav' mount option.
Fix non-working 'Undo' button on SW_SMBCONF dialog.
Add 'Use default setting' option for certain smb.conf settings.

Location:
branches/guitools-arcamap-2.5/evfsgui
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/guitools-arcamap-2.5/evfsgui/evfsgui.vrp

    r1062 r1063  
    1212VRXWindow: __VREFileListWindow,1,711,14020,2665,3358
    1313VRXWindow: __VRESectionListWindow,1,1421,15659,12238,6914
    14 VRXWindow: __VREToolsWindow,1,2951,12479,5468,1665
     14VRXWindow: __VREToolsWindow,1,2951,12479,5468,1661
    1515VRXWindow: __VREWindListWindow,1,566,10262,4963,3150
    1616UserFile: 1
    1717UserWindow: Main,1
    18 UserWindow: SW_ADVANCED,1
    19 UserWindow: SW_PROGRESS,1
    2018UserWindow: SW_SMBCONF,1

  • branches/guitools-arcamap-2.5/evfsgui/evfsgui.vrx

    r1062 r1063  
    17101710
    17111711    if options.!debug == 1 then say '  initializing mtype. '
    1712     mtype.0 = 5
     1712    mtype.0 = 4     /* Disable item 5 (webdav) -- ALT 20200510 */
    17131713    mtype.1 = NLVGetMessage( 15 )
    17141714    mtype.2 = NLVGetMessage( 16 )
    … …  
    18491849return
    18501850
     1851/*:VRX         CB_client_ipc_signing_default_Click
     1852*/
     1853CB_client_ipc_signing_default_Click:
     1854    advanced.!smbconfchanged = 1
     1855    set = VRGet("CB_client_ipc_signing_default", "Set")
     1856    ok = VRSet( "SPIN_client_ipc_signing", "Enabled", \set )
     1857return
     1858
    18511859/*:VRX         CB_client_lanman_auth_Click
    18521860*/
    18531861CB_client_lanman_auth_Click:
    18541862    advanced.!smbconfchanged = 1
     1863return
     1864
     1865/*:VRX         CB_client_max_protocol_default_Click
     1866*/
     1867CB_client_max_protocol_default_Click:
     1868    advanced.!smbconfchanged = 1
     1869    set = VRGet("CB_client_max_protocol_default", "Set")
     1870    ok = VRSet( "SPIN_client_max_protocol", "Enabled", \set )
     1871return
     1872
     1873/*:VRX         CB_client_min_protocol_default_Click
     1874*/
     1875CB_client_min_protocol_default_Click:
     1876    advanced.!smbconfchanged = 1
     1877    set = VRGet("CB_client_min_protocol_default", "Set")
     1878    ok = VRSet( "SPIN_client_min_protocol", "Enabled", \set )
    18551879return
    18561880
    … …  
    18761900CB_client_plaintext_auth_Click:
    18771901    advanced.!smbconfchanged = 1
     1902return
     1903
     1904/*:VRX         CB_client_signing_default_Click
     1905*/
     1906CB_client_signing_default_Click:
     1907    advanced.!smbconfchanged = 1
     1908    set = VRGet("CB_client_signing_default", "Set")
     1909    ok = VRSet( "SPIN_client_signing", "Enabled", \set )
    18781910return
    18791911
    … …  
    21632195        CALL VRSet 'PB_DETACH',               'Enabled', 1
    21642196        CALL VRSet 'MENU_CONTEXT_DETACH',     'Visible', 1
    2165         CALL VRSet 'MENU_CONTEXT_OPEN',       'Visible', 1
     2197/*        CALL VRSet 'MENU_CONTEXT_OPEN',       'Visible', 1  -- (ALT) */
    21662198/*      CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 1 */
    21672199        CALL VRSet 'MENU_CONTEXT_DETACH_ALL', 'Visible', 1
    … …  
    21722204        CALL VRSet 'PB_DETACH',               'Enabled', 0
    21732205        CALL VRSet 'MENU_CONTEXT_DETACH',     'Visible', 0
    2174         CALL VRSet 'MENU_CONTEXT_OPEN',       'Visible', 0
     2206/*        CALL VRSet 'MENU_CONTEXT_OPEN',       'Visible', 0  -- (ALT) */
    21752207/*      CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 0 */
    21762208        CALL VRSet 'MENU_CONTEXT_DETACH_ALL', 'Visible', 0
    … …  
    22522284    CALL VRSet "CN_CURRENT", 'HintText',infotext
    22532285
    2254     CALL VRSet 'MENU_CONTEXT_OPEN', 'Visible', 1
     2286/*    CALL VRSet 'MENU_CONTEXT_OPEN', 'Visible', 1 -- This doesn't work and TTBOMK never has (ALT) */
    22552287/*  CALL VRSet 'MENU_CONTEXT_SEP1', 'Visible', 1
    22562288    CALL VRSet 'MENU_CONTEXT_SEP2', 'Visible', 1
    22572289    CALL VRSet 'MENU_CONTEXT_SEP3', 'Visible', 1 */
    2258     CALL VRSet 'Menu_Context_Open_Default', "Visible", 1
     2290/*    CALL VRSet 'Menu_Context_Open_Default', "Visible", 1  */
    22592291
    22602292    IF p_mounts > 0 THEN DO
    … …  
    22762308        CALL VRSet 'PB_DETACH',               'Enabled', 1
    22772309        CALL VRSet 'MENU_CONTEXT_DETACH',     'Visible', 1
    2278         CALL VRSet 'MENU_CONTEXT_OPEN',       'Visible', 1
     2310/*        CALL VRSet 'MENU_CONTEXT_OPEN',       'Visible', 1  -- (ALT) */
    22792311/*      CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 1 */
    22802312        CALL VRSet 'MENU_CONTEXT_DETACH_ALL', 'Visible', 1
    … …  
    22852317        CALL VRSet 'PB_DETACH',               'Enabled', 0
    22862318        CALL VRSet 'MENU_CONTEXT_DETACH',     'Visible', 0
    2287         CALL VRSet 'MENU_CONTEXT_OPEN',       'Visible', 0
     2319/*        CALL VRSet 'MENU_CONTEXT_OPEN',       'Visible', 0  -- (ALT) */
    22882320/*      CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 0 */
    22892321        CALL VRSet 'MENU_CONTEXT_DETACH_ALL', 'Visible', 0
    … …  
    46874719        client_use_spnego           = VRGet("CB_client_use_spnego","Set")
    46884720        client_use_spnego_principal = VRGet("CB_client_use_spnego_principal","Set")
    4689         client_signing              = VRGet("SPIN_client_signing","Value")
    4690         client_ipc_signing          = VRGet("SPIN_client_ipc_signing","Value")
    4691 
    4692         if VRGet("SPIN_client_max_protocol","Enabled") = 1 then do
    4693             client_max_protocol         = VRGet("SPIN_client_max_protocol","Value")
    4694             client_min_protocol         = VRGet("SPIN_client_min_protocol","Value")
    4695         end
    4696 
     4721
     4722        client_signing              = ''
     4723        client_ipc_signing          = ''
     4724        client_max_protocol         = ''
     4725        client_min_protocol         = ''
     4726
     4727        if VRGet("SPIN_client_signing","Enabled") = 1 then
     4728            client_signing          = VRGet("SPIN_client_signing","Value")
     4729        if VRGet("SPIN_client_ipc_signing","Enabled") = 1 then
     4730            client_ipc_signing      = VRGet("SPIN_client_ipc_signing","Value")
     4731        if VRGet("SPIN_client_max_protocol","Enabled") = 1 then
     4732            client_max_protocol     = VRGet("SPIN_client_max_protocol","Value")
     4733        if VRGet("SPIN_client_min_protocol","Enabled") = 1 then
     4734            client_min_protocol     = VRGet("SPIN_client_min_protocol","Value")
    46974735
    46984736        handle = IniOpen('global', samba.!smbconf)
    … …  
    47024740        call IniSet 'client use spnego',           YesNo(client_use_spnego), handle
    47034741        call IniSet 'client use spnego principal', YesNo(client_use_spnego_principal), handle
    4704         call IniSet 'client signing',              client_signing, handle
    4705         call IniSet 'client ipc signing',          client_ipc_signing, handle
    4706 
    4707         if VRGet("SPIN_client_max_protocol","Enabled") = 1 then do
    4708             call IniSet 'client max protocol',         client_max_protocol, handle
     4742
     4743        if client_signing == '' then
     4744            call IniDel 'client signing',     handle
     4745        else
     4746            call IniSet 'client signing',     client_signing, handle
     4747        if client_ipc_signing == '' then
     4748            call IniDel 'client ipc signing', handle
     4749        else
     4750            call IniSet 'client ipc signing', client_ipc_signing, handle
     4751        if client_max_protocol == '' then
     4752            call IniDel 'client max protocol', handle
     4753        else
     4754            call IniSet 'client max protocol', client_max_protocol, handle
     4755        if client_min_protocol == '' then
     4756            call IniDel 'client min protocol', handle
     4757        else
    47094758            call IniSet 'client min protocol',         client_min_protocol, handle
    4710         end
    47114759
    47124760        call IniSave handle
    … …  
    47264774*/
    47274775PB_SMBCONF_UNDO_Click:
    4728     call SW_SETTINGS_Init_Content
     4776    call SW_SMBCONF_Init_Content
    47294777return
    47304778
    … …  
    56725720    call NLVSetText "PB_SMBCONF_HELP",   "Caption", 4
    56735721
     5722    call NLVSetText "CB_client_signing_default",      "Caption", 149
     5723    call NLVSetText "CB_client_ipc_signing_default",  "Caption", 149
     5724    call NLVSetText "CB_client_min_protocol_default", "Caption", 149
     5725    call NLVSetText "CB_client_max_protocol_default", "Caption", 149
     5726
    56745727    CALL SW_SMBCONF_Init_Content
    56755728return
    … …  
    56795732SW_SMBCONF_Init_Content:
    56805733    call _SmbConfCreateShadowCopy
    5681 say 'Populating current smb.conf settings'
     5734
    56825735    client_NTLMv2_auth          = ZeroOne(IniGet('client NTLMv2 auth', 'global', samba.!shadowsmbconf))
    56835736    if client_NTLMv2_auth = 1 then do
    … …  
    57215774    client_signing         = IniGet('client signing', 'global', samba.!shadowsmbconf)
    57225775    client_ipc_signing     = IniGet('client ipc signing', 'global', samba.!shadowsmbconf)
    5723 say "client_signing ="client_signing
     5776
    57245777    ok = VRSet("SPIN_client_signing","Value",client_signing)
    57255778    ok = VRSet("SPIN_client_ipc_signing","Value",client_signing)
     5779
     5780    if IniGet('client signing', 'global', samba.!smbconf) == '' then
     5781        isdef = 1
     5782    else
     5783        isdef = 0
     5784    CALL VRSet "CB_client_signing_default", "Set", isdef
     5785    CALL VRSet "SPIN_client_signing", "Enabled", \isdef
     5786
     5787    if IniGet('client ipc signing', 'global', samba.!smbconf) == '' then
     5788        isdef = 1
     5789    else
     5790        isdef = 0
     5791    CALL VRSet "CB_client_ipc_signing_default", "Set", isdef
     5792    CALL VRSet "SPIN_client_ipc_signing", "Enabled", \isdef
     5793
     5794    if IniGet('client min protocol', 'global', samba.!smbconf) == '' then
     5795        isdef = 1
     5796    else
     5797        isdef = 0
     5798    CALL VRSet "CB_client_min_protocol_default", "Set", isdef
     5799    CALL VRSet "SPIN_client_min_protocol", "Enabled", \isdef
     5800
     5801    if IniGet('client max protocol', 'global', samba.!smbconf) == '' then
     5802        isdef = 1
     5803    else
     5804        isdef = 0
     5805    CALL VRSet "CB_client_max_protocol_default", "Set", isdef
     5806    CALL VRSet "SPIN_client_max_protocol", "Enabled", \isdef
    57265807
    57275808    advanced.!smbconfchanged = 0

  • branches/guitools-arcamap-2.5/evfsgui/rc/lang/evfsi_en.mkm

    r1062 r1063  
    158158EVG0147?:
    159159EVG0148?:
    160 EVG0149?:
     160EVG0149I: Use default setting
    161161EVG0150I: For security reasons, the latest Samba software does not enable the SMB1 protocol by default.
    162162EVG0151I: This may cause some LAN devices and/or servers (especially those older than 2013) to no longer be visible.
Note: See TracChangeset for help on using the changeset viewer.