Changeset 759 for trunk/guitools/shared

Timestamp:

Feb 17, 2013, 4:34:32 PM (13 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI 2.5 final stuff (including helpfiles EN and DE)

Location:

trunk/guitools/shared

Files:

• masterpasswd.vrs (modified) (2 diffs)
• smbtree.vrs (modified) (2 diffs)

trunk/guitools/shared/masterpasswd.vrs

@@ -72 +72 @@
     newmasterpasswd = TempDir'master.passwd'
     ok = SysFileDelete(newmasterpasswd)
-    call lineout newmasterpasswd, '# Created by smbusers Version 'word(VRGet("Main", "Hinttext"),2)
+    call lineout newmasterpasswd, '# Created by Samba GUI Tools 'date('E')' 'time(''))
     call lineout newmasterpasswd, '# syntax:'
     call lineout newmasterpasswd, '# username:passwd:UID:GID:login-class:chg pw x sec:deact x sec:GECOS:home:shell'
@@ -121 +121 @@
     IF options.!debug == 1 then say time()" _PasswordDBRewrite() done ("pwd_mkdbrc")"
 return
+
+_MasterPasswdFindUser: procedure expose username.
+    IF options.!debug == 1 THEN say '_MasterpasswdFindUser("'arg(1)'") started'
+    FindUser = arg(1)
+    Idx = 0
+    do I = 1 to username.0
+        if translate(username.I) = translate(FindUser) then do
+            Idx = I
+            leave
+        end
+    end
+    IF options.!debug == 1 THEN say '_MasterpasswdFindUser("'FindUser'") done, returning 'Idx
+return idx

trunk/guitools/shared/smbtree.vrs

@@ -19 +19 @@
     address cmd 'detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!serverlist
 
-    if UserCred = '-N' then ok = VRSet("CN_SMBTREE","Caption","User context: Guest")
+    /* strip username from caption */
+    UserContext = VRGet("CN_SMBTREE","Caption")
+    UserContext = DelWord(UserContext,words(UserContext))
+    
+    if UserCred = '-N' then ok = VRSet("CN_SMBTREE","Caption",UserContext': Guest')
     else do
         parse var UserCred '--user='username'%'.
-        ok = VRSet("CN_SMBTREE","Caption","User context: "username)
+        ok = VRSet("CN_SMBTREE","Caption",UserContext": "username)
     end
 
@@ -165 +169 @@
 
     say       '  detach 'samba.!smbclientexe' -L "'machine'" 'UserCred' 'debuglevel' 2>'smbmachine' 1>&2'
+    call lineout "y:\debugger", '  detach 'samba.!smbclientexe' -L "'machine'" 'UserCred' 'debuglevel' 2>'smbmachine' 1>&2'
     address cmd 'detach 'samba.!smbclientexe' -L "'machine'" 'UserCred' 'debuglevel' 2>'smbmachine' 1>&2'