Changeset 665 for trunk/guitools/evfsgui/evfsgui.vrx

Timestamp:

Nov 19, 2011, 5:05:03 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI 2.5.x: Continue implementing server based logon script support

File:

• trunk/guitools/evfsgui/evfsgui.vrx (modified) (5 diffs)

trunk/guitools/evfsgui/evfsgui.vrx

@@ -1096 +1096 @@
 */
 _LoadOtherFuncs: 
+    SIGNAL ON SYNTAX NAME DLLMissing
+
     call RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs'
     call SysLoadFuncs
@@ -1105 +1107 @@
     call PRLoadFuncs
 
-    call RxFuncAdd 'RxuInit','Rxu','RxuInit'
+    call RxFuncAdd 'RxuInit',      'RXU',     'RxuInit'
     call RxuInit
-return
+
+    SIGNAL OFF SYNTAX
+return
+
+DLLMissing:
+    Fatal = 1
+    call VRMessage 'Main', 'REXX function library 'strip(translate(word(sourceline(SIGL-1),4),'  ',"',"))'.DLL is missing!', "EVFSGUI fatal error", "E"
+signal Quit
 
 /*:VRX         _ParseCommandLine
@@ -2215 +2224 @@
     end
 
+    /* do nothing if a workgroup was mounted */
+    if VRGet("EF_SERVER","value") = "*" then return
+
     machine = VRGet("EF_SERVER","value")    
     rh = _GetMachineHandle(machine)
@@ -3727 +3739 @@
     credentials.!entered = 1
 
-    ok = _rpcqueryuser(p_server, VRGet("EF_USER1","Value"), VRGet("EF_PASSWORD1","Value"), VRGet("EF_USER1","Value"))
-
-    LogonRetVal = word(ok,1)
-
-    if LogonRetVal = "1" then do
-        Msg.Type ="I"
-        ok = VRSet("DT_STATUSBAR","Caption", "Welcome "rpc.queryuser.FULL_NAME"!")
-    end
-    else do
-        Msg.Type ="E"
-        CALL VRMessage 'Main', Credentials.!username" at "p_server": "rpc.queryuser.LOGONSTATUS, "Login failure", Msg.Type
+    if p_server <> "" then do
+        ok = _rpcqueryuser(p_server, VRGet("EF_USER1","Value"), VRGet("EF_PASSWORD1","Value"), VRGet("EF_USER1","Value"))
+
+        if word(ok,1) = "1" then do
+            ok = VRSet("DT_STATUSBAR","Caption", NLVGetMessage(107, rpc.queryuser.FULL_NAME))
+            say 'rpc.queryuser.DIR_DRIVE    = "'rpc.queryuser.DIR_DRIVE'"'
+            say 'rpc.queryuser.LOGON_SCRIPT = "'rpc.queryuser.LOGON_SCRIPT'"'
+        end
+        else do
+            CALL VRMessage 'Main', VRGet("EF_USER1","Value")" \\"p_server": "rpc.queryuser.LOGONSTATUS, NLVGetMessage(5), "E"
+        end
     end
 
@@ -4474 +4486 @@
     end
 
-    Info.!comment= VRMethod( "CN_INFO", "AddRecord")
-    Info.!domain = VRMethod( "CN_INFO", "AddRecord")
-    Info.!DMBLMB = VRMethod( "CN_INFO", "AddRecord")
-    Info.!os     = VRMethod( "CN_INFO", "AddRecord")
-    Info.!server = VRMethod( "CN_INFO", "AddRecord")
-    Info.!status = VRMethod( "CN_INFO", "AddRecord")
-    Info.!IP     = VRMethod( "CN_INFO", "AddRecord")
-    Info.!MAC    = VRMethod( "CN_INFO", "AddRecord")
-
-
-    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!domain, Info.TypeFH, strip(NLVGetMessage(21),'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, WorkGroupFH ))
-    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!os,     Info.TypeFH, strip(NLVGetMessage(93),'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, OSFH  ))
-    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!server, Info.TypeFH, strip(NLVGetMessage(19),'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, VersionFH  ))
+    ok = _rpcsrvinfo(SMBObj.resname,credentials.!username,credentials.!password)
+
+    Info.!nbname       = VRMethod( "CN_INFO", "AddRecord")
+    Info.!comment      = VRMethod( "CN_INFO", "AddRecord")
+    Info.!domain       = VRMethod( "CN_INFO", "AddRecord")
+    Info.!DMBLMB       = VRMethod( "CN_INFO", "AddRecord")
+    Info.!capabilities = VRMethod( "CN_INFO", "AddRecord")
+    Info.!os           = VRMethod( "CN_INFO", "AddRecord")
+    Info.!server       = VRMethod( "CN_INFO", "AddRecord")
+    Info.!version      = VRMethod( "CN_INFO", "AddRecord")
+    Info.!status       = VRMethod( "CN_INFO", "AddRecord")
+    Info.!IP           = VRMethod( "CN_INFO", "AddRecord")
+    Info.!MAC          = VRMethod( "CN_INFO", "AddRecord")
+
+    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!nbname, Info.TypeFH, strip(NLVGetMessage(137),'T',':'),Info.ValueFH, rpc.srvinfo.NETBIOSNAME)
+    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!comment,Info.TypeFH, strip(NLVGetMessage(125),'T',':'),Info.ValueFH, rpc.srvinfo.SERVERSTRING)
+    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!domain, Info.TypeFH, strip(NLVGetMessage(21), 'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, WorkGroupFH ))
+    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!os,     Info.TypeFH, strip(NLVGetMessage(93), 'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, OSFH  ))
+    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!server, Info.TypeFH, strip(NLVGetMessage(19), 'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, VersionFH  ))
+    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!version,Info.TypeFH, strip(NLVGetMessage(139),'T',':'),Info.ValueFH, rpc.srvinfo.OS_VERSION)
+    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!capabilities, Info.TypeFH, strip(NLVGetMessage(138),'T',':'),Info.ValueFH, rpc.srvinfo.CAPABILITIES)
     ok = VRMethod( "CN_INFO", "SetFieldData", Info.!DMBLMB, Info.TypeFH, strip(NLVGetMessage(124),'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, MBFH  ))
     ok = VRMethod( "CN_INFO", "SetFieldData", Info.!IP,     Info.TypeFH, "IP"  ,Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, IPFH  ))
     ok = VRMethod( "CN_INFO", "SetFieldData", Info.!MAC,    Info.TypeFH, "MAC" ,Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, MacFH ))
-    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!comment,Info.TypeFH, strip(NLVGetMessage(125),'T',':'),Info.ValueFH, SMBObj.comment)
-    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!status, Info.TypeFH, strip(NLVGetMessage(67),'T',':'),Info.ValueFH, SMBObj.udatamsg )
+
+    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!status, Info.TypeFH, strip(NLVGetMessage(67),'T',':'),Info.ValueFH, rpc.srvinfo.LOGONSTATUS ) /* SMBObj.udatamsg */
     IF options.!debug == 1 THEN SAY time()' SW_INFO_Create done'    
 return