Changeset 797

Timestamp:

Aug 17, 2013, 11:55:30 AM (12 years ago)

Author:

Herwig Bauernfeind

Message:

EVFSGUI 2.5: Browsing enhancements

Location:

trunk/guitools

Files:

• evfsgui/changes (modified) (4 diffs)
• evfsgui/evfsgui.vrp (modified) (1 diff)
• shared/smbtree.vrs (modified) (5 diffs)
• smbmon/smbmon.vrp (modified) (1 diff)
• smbmon/smbmon.vrx (modified) (1 diff)

trunk/guitools/evfsgui/changes ¶

@@ -14 +14 @@
   
 Version 2.5.0 2013-??-??
++ Added: Detect when master browser suffers from broken databases
++ Added: If browsing is not allowed for user, retry as guest (useful for print 
+         servers)
 + Added: Detect eComStation OS Version
 + Added: Show for who we are waiting
@@ -43 +46 @@
            convert global settings and advanced connection options 
            from windows into notebook pages
-* Changed: Removed %% in user credential string again 
 ! Fixed: Ticket #185 (create %ETC%/samba/pid and fix the EA of 
          %ETC%/samba/lock)
@@ -57 +59 @@
 ! Fixed: Numerous small bugs/omissions
 ! Fixed: "Creating lame upcase tables" filtered
+! Fixed: "TDB(" filtered
 ! Fixed: Do not run nmblookup.exe twice in the foreground
 ! Fixed: Errorhandler for parsing errors in RPC library (still not perfect)
@@ -69 +72 @@
 ! Fixed: Never add local link addresses and localhost to LMHosts file 
          (Ticket #200)
+! Fixed: Add workaround for % vs. %% issue on smbclient.exe
+! Fixed: Populate TabbedDialog pages earlier during startup
 - Removed: Bottom button row
 - Removed: View Menu

trunk/guitools/evfsgui/evfsgui.vrp ¶

@@ -11 +11 @@
 VRXWindow: __VREFileListWindow,1,2204,7950,2665,3358
 VRXWindow: __VRESectionListWindow,1,1168,12382,12238,6914
-VRXWindow: __VREToolsWindow,0,3108,8528,5474,1669
+VRXWindow: __VREToolsWindow,1,3084,12479,5477,1659
 VRXWindow: __VREWindListWindow,1,952,11611,4963,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_SETTINGS,1
-UserWindow: SW_SMBTREE,1
-UserWindow: SW_DIALOG,1

trunk/guitools/shared/smbtree.vrs ¶

@@ -7 +7 @@
     if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption", "Refreshing network")
     ok = SysFileDelete(samba.!msg)
+    parse var debuglevel .'='level
+    if level = 0 then debuglevel = ' --debuglevel=1'
 
     if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' | UserCred = '--user=%%' then UserCred = '-N'
@@ -20 +22 @@
     say       '  detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!serverlist
     address cmd 'detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!serverlist
+
+    if level = 0 then debuglevel = ' --debuglevel=0'
 
     /* strip username from caption */
@@ -137 +141 @@
                 end
                 if ThrowMsg = 1 then do
+                call beep 2400, 500
                     ThrowMsg = 0
                     Msg.Type = "W"
@@ -253 +258 @@
         if stat = "READY:" then do /* we found a readable output file */
             OneWorkGroupOnly = 0
+            GuestRetry = 0
             
             Machine = substr(smbmachine.I,pos('.',smbmachine.I)+1)
+            if right(Machine,4) = '$rt$' then do
+                Machine = left(Machine, length(Machine) - 4)
+                GuestRetry = 1
+            end
+
 
             smbtree.!machine = _GetMachinehandle(Machine)
@@ -289 +300 @@
                 ok = stream(smbmachine.I,'c','close')
                 ok = SysFileDelete(smbmachine.I)
+                /* Try with guest account once */
+
+                if GuestRetry = 0 & UserCred <> '-N' then do
+                    say       '  detach 'samba.!smbclientexe' -L "'machine'" -N 'debuglevel' 2>'smbmachine.I'$rt$ 1>&2'
+                    address cmd 'detach 'samba.!smbclientexe' -L "'machine'" -N 'debuglevel' 2>'smbmachine.I'$rt$ 1>&2'
+                end
+
                 iterate
             end

trunk/guitools/smbmon/smbmon.vrp ¶

@@ -8 +8 @@
 VRXWindow: __VREMainWindow,1,2180,3614,1024,6769
 VRXWindow: __VRESectionListWindow,1,4083,11226,7372,6589
-VRXWindow: __VREToolsWindow,1,2156,1494,5471,1659
+VRXWindow: __VREToolsWindow,1,2156,1494,5474,1661
 VRXWindow: __VREWindListWindow,1,964,11708,3132,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_DAEMONS,1
-UserWindow: SW_SETTINGS,1

trunk/guitools/smbmon/smbmon.vrx ¶

@@ -1474 +1474 @@
     Msg.Type = 'Q'
     if _MsgYesNo() = 1 then do
-        say 'kill -9 'DaemonName
-        address cmd 'kill -9 'DaemonName
+        ok = PRKillProcess("1",DaemonName )
+        if ok = 0 then say ", success!"; else say ", error "ok
+
+/*      say 'kill -9 'DaemonName
+        address cmd 'kill -9 'DaemonName */
     end
     ok = VRSet("TM_Refresh","Enabled", 1)