Changeset 333 for branches/guitools-1.0/smbusers/smbusers.VRX

Timestamp:

Sep 22, 2009, 4:17:24 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: Fix problem in smbusers

File:

• branches/guitools-1.0/smbusers/smbusers.VRX (modified) (9 diffs)

branches/guitools-1.0/smbusers/smbusers.VRX

@@ -642 +642 @@
 
 EnterCredentials:
-    if Credentials.!username = "" | Credentials.!password = "" then window = VRLoadSecondary( "Credentials", "W" )
+    if Credentials.!username = "" | Credentials.!password = "" then window = VRLoadSecondary( "SW_LOGIN", "W" )
 
     if pos("4OS2", value("COMSPEC",,"OS2ENVIRONMENT")) = 0 
@@ -1235 +1235 @@
                 call _ShowMsg
             end
-            otherwise do
+            when pos(':[',translate(sline.i)) > 0 & pos(']:LCT-',translate(sline.i)) > 0 then do
+                /* we guess a valid smbdpasswd user entry here */
                 parse var sline.i name':'.
                 sname.i = translate(name)
-                if sname.i = '' then
+                /* still something wrong - we got no name, trash this line */ 
+                if sname.i = '' then i = i - 1
+            end
+            otherwise do
+                /* if we did not find a valid line in the previous check this line is garbage, likely debug output.. */
                 i = i - 1
             end
@@ -2563 +2568 @@
 return
 
-/*:VRX         Credentials_Close
-*/
-Credentials_Close: 
-    call Credentials_Fini
-return
-
-/*:VRX         Credentials_Create
-*/
-Credentials_Create: 
-    call Credentials_Init
-    CALL NLVSetText 'Credentials',     'Caption', 31
-    CALL NLVSetText 'DT_LoginUser',    'Caption', 32
-    CALL NLVSetText 'DT_LoginPassword','Caption', 33
-    CALL NLVSetText 'PB_LoginOK',      'Caption', 2
-    CALL NLVSetText 'PB_LoginAbort',   'Caption', 3
-
-    if Credentials.!Username = "" 
-        then ok = VRSet("EF_LoginUser","Value", value("USER",,"OS2ENVIRONMENT"))
-        else ok = VRSet("EF_LoginUser","Value", Credentials.!Username)
-
-    if \_UserIsValid(VRGet("EF_LoginUser","Value")) & value("USER",,"OS2ENVIRONMENT") <> "" then do
-        Msg.Title =VRGet("Main", "caption")
-        Msg.Type = "E"
-        Msg.Text = NLVGetMessage(111, VRGet("EF_LoginUser","Value"))
-        call _ShowMsg
-        ok = VRSet("EF_LoginUser","Value","root")
-    end
-
-    if VRGet("EF_LoginUser","Value") <> "" then ok = VRMethod("EF_LoginPassword","Setfocus")
-return
-
-/*:VRX         Credentials_Fini
-*/
-Credentials_Fini: 
-    window = VRInfo( "Window" )
-    call VRDestroy window
-    drop window
-return
-/*:VRX         Credentials_Init
-*/
-Credentials_Init: 
-    window = VRInfo( "Object" )
-    if( \VRIsChildOf( window, "Notebook" ) ) then do
-        call VRMethod window, "CenterWindow"
-        call VRSet window, "Visible", 1
-        call VRMethod window, "Activate"
-    end
-    drop window
-return
-
 /*:VRX         DDCB_GID_Change
 */
@@ -2697 +2652 @@
 /*  say keystr */
     select 
-        when keystr = "{Enter}" then call PB_LoginOK_Click
-        when keystr = "{Newline}" then call PB_LoginOK_Click
-        when keystr  = "{Esc}" then call PB_LoginAbort_Click
+        when keystr = "{Enter}" then call PB_LOGIN_OK_Click
+        when keystr = "{Newline}" then call PB_LOGIN_OK_Click
+        when keystr  = "{Esc}" then call PB_LOGIN_CANCEL_Click
         otherwise nop
     end
@@ -2713 +2668 @@
         when keystr = "{Enter}" then ok = VRMethod( "EF_LoginPassword", "SetFocus" ) 
         when keystr = "{Newline}" then ok = VRMethod( "EF_LoginPassword", "SetFocus" ) 
-        when keystr  = "{Esc}" then call PB_LoginAbort_Click
+        when keystr  = "{Esc}" then call PB_LOGIN_CANCEL_Click
         otherwise nop
     end
@@ -3437 +3392 @@
     end
 
-    if length(VRGet("EF_password","Value")) < MinPWLength then do
+    if length(VRGet("EF_password","Value")) < MinPWLength & \(VRGet("CB_NoPassword","Set") | VRGet("CB_MachineAccount","Set")) then do
         Msg.type  = "E"
         Msg.Text  = NLVGetMessage( 117 )
@@ -3658 +3613 @@
 return
 
-/*:VRX         PB_LoginAbort_Click
-*/
-PB_LoginAbort_Click: 
+/*:VRX         PB_LOGIN_CANCEL_Click
+*/
+PB_LOGIN_CANCEL_Click: 
     say "  Login Abort"
-    call Credentials_Close
+    call SW_LOGIN_Close
     exit 0
 return
 
-/*:VRX         PB_LoginOK_Click
-*/
-PB_LoginOK_Click: 
-    IF options.!debug == 1 THEN say "  Credentials OK started"
+/*:VRX         PB_LOGIN_OK_Click
+*/
+PB_LOGIN_OK_Click: 
+    IF options.!debug == 1 THEN say "  SW_LOGIN OK started"
     Credentials.!Username = VRGet("EF_LoginUser","Value")
     Credentials.!Password = VRGet("EF_LoginPassword","Value")
@@ -3677 +3632 @@
         else UserCred = '--user='Credentials.!username'%%'Credentials.!password
 
-    Call Credentials_Close
-    IF options.!debug == 1 THEN say "  Credentials OK done"
+    Call SW_LOGIN_Close
+    IF options.!debug == 1 THEN say "  SW_LOGIN OK done"
 return
 
@@ -3905 +3860 @@
 return
 
+/*:VRX         SW_LOGIN_Close
+*/
+SW_LOGIN_Close: 
+    call SW_LOGIN_Fini
+return
+
+/*:VRX         SW_LOGIN_Create
+*/
+SW_LOGIN_Create: 
+    call SW_LOGIN_Init
+    CALL NLVSetText 'SW_LOGIN',     'Caption', 31
+    CALL NLVSetText 'DT_LoginUser',    'Caption', 32
+    CALL NLVSetText 'DT_LoginPassword','Caption', 33
+    CALL NLVSetText 'PB_LOGIN_OK',      'Caption', 2
+    CALL NLVSetText 'PB_LOGIN_CANCEL',   'Caption', 3
+
+    if Credentials.!Username = "" 
+        then ok = VRSet("EF_LoginUser","Value", value("USER",,"OS2ENVIRONMENT"))
+        else ok = VRSet("EF_LoginUser","Value", Credentials.!Username)
+
+    if \_UserIsValid(VRGet("EF_LoginUser","Value")) & value("USER",,"OS2ENVIRONMENT") <> "" then do
+        Msg.Title =VRGet("Main", "caption")
+        Msg.Type = "E"
+        Msg.Text = NLVGetMessage(111, VRGet("EF_LoginUser","Value"))
+        call _ShowMsg
+        ok = VRSet("EF_LoginUser","Value","root")
+    end
+
+    if VRGet("EF_LoginUser","Value") <> "" then ok = VRMethod("EF_LoginPassword","Setfocus")
+return
+
+/*:VRX         SW_LOGIN_Fini
+*/
+SW_LOGIN_Fini: 
+    window = VRInfo( "Window" )
+    call VRDestroy window
+    drop window
+return
+/*:VRX         SW_LOGIN_Init
+*/
+SW_LOGIN_Init: 
+    window = VRInfo( "Object" )
+    if( \VRIsChildOf( window, "Notebook" ) ) then do
+        call VRMethod window, "CenterWindow"
+        call VRSet window, "Visible", 1
+        call VRMethod window, "Activate"
+    end
+    drop window
+return
+
 /*:VRX         TAB_1_Click
 */