Changeset 662 for trunk/guitools/evfsgui

Timestamp:

Nov 13, 2011, 4:25:35 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

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

Location:

trunk/guitools/evfsgui

Files:

• evfsgui.vrx (modified) (13 diffs)
• evfsgui.vry (modified) ( previous)

trunk/guitools/evfsgui/evfsgui.vrx

@@ -98 +98 @@
 #append U:\Develop\Samba\trunk\guitools\shared\textini.vrs
 #append U:\Develop\Samba\trunk\guitools\shared\usercredmem.vrs
+#append U:\Develop\Samba\trunk\guitools\shared\rxrpclib.vrs
 */
 return
@@ -1602 +1603 @@
 */
 CN_CONDET_Click:
-    ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText"))
+    /* ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText")) */
 return
 
@@ -1642 +1643 @@
 CN_CURRENT_Click:
     IF options.!debug == 1 THEN SAY time()' CN_CURRENT_Click started'
-    ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText"))
+    /* ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText")) */
 
     /* Herwig B. */
@@ -1653 +1654 @@
     options.currentdata = data
 
-    ok = VRset("DT_StatusBar","Caption", data' - 'VRGet("Main", "HintText"))
+    /* ok = VRset("DT_StatusBar","Caption", data' - 'VRGet("Main", "HintText")) */
 
     PARSE VAR data p_node ';' p_mounts ';' p_string
@@ -1773 +1774 @@
 
     CALL VRSet 'MENU_CONTEXT_OPEN', 'Visible', 1
-    CALL VRSet 'MENU_CONTEXT_SEP1', 'Visible', 1
+/*  CALL VRSet 'MENU_CONTEXT_SEP1', 'Visible', 1
     CALL VRSet 'MENU_CONTEXT_SEP2', 'Visible', 1
-    CALL VRSet 'MENU_CONTEXT_SEP3', 'Visible', 1
+    CALL VRSet 'MENU_CONTEXT_SEP3', 'Visible', 1 */
     CALL VRSet 'Menu_Context_Open_Default', "Visible", 1
 
@@ -1797 +1798 @@
         CALL VRSet 'MENU_CONTEXT_DETACH',     'Visible', 1
         CALL VRSet 'MENU_CONTEXT_OPEN',       'Visible', 1
-        CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 1
+/*      CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 1 */
         CALL VRSet 'MENU_CONTEXT_DETACH_ALL', 'Visible', 1
-        CALL VRSet 'MENU_CONTEXT_SEP2',       'Visible', 1
-        CALL VRSet 'MENU_CONTEXT_SEP3',       'Visible', 1
+/*      CALL VRSet 'MENU_CONTEXT_SEP2',       'Visible', 1 */
+/*      CALL VRSet 'MENU_CONTEXT_SEP3',       'Visible', 1 */
     END
     ELSE DO
@@ -1806 +1807 @@
         CALL VRSet 'MENU_CONTEXT_DETACH',     'Visible', 0
         CALL VRSet 'MENU_CONTEXT_OPEN',       'Visible', 0
-        CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 0
+/*      CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 0 */
         CALL VRSet 'MENU_CONTEXT_DETACH_ALL', 'Visible', 0
-        CALL VRSet 'MENU_CONTEXT_SEP2',       'Visible', 0
-        CALL VRSet 'MENU_CONTEXT_SEP3',       'Visible', 0
+/*      CALL VRSet 'MENU_CONTEXT_SEP2',       'Visible', 0 */
+/*      CALL VRSet 'MENU_CONTEXT_SEP3',       'Visible', 0 */
     END
 
@@ -1979 +1980 @@
 
         ok = VRSet("EF_DIRECTORY","Value", "")
-
-        window = VRLoadSecondary( "SW_MOUNTPOINT", "W" )
-
-        if VRGet("CB_DRIVES","Value") = "" then return
     end
     else do
-
         TargetString = VRMethod(trgCtn, "GetRecordAttr", trgRec, "Caption")
 
@@ -1998 +1994 @@
         ok = VRSet("CB_DRIVES","Value", left(TargetString,2))
         ok = VRSet("EF_DIRECTORY","Value", substr(TargetString,4))
-        window = VRLoadSecondary( "SW_MOUNTPOINT", "W" )
-        if VRGet("CB_DRIVES","Value") = "" then return
-    end
+    end
+
+    window = VRLoadSecondary( "SW_MOUNTPOINT", "W" )
+    if VRGet("CB_DRIVES","Value") = "" then return
+
     window = VRLoadSecondary( "SW_LOGIN", "W" )
     if credentials.!entered = 1 then call PB_MOUNT_CLICK
@@ -2013 +2011 @@
 CN_SMBTREE_Click:
     IF options.!debug == 1 THEN SAY time()' CN_SMBTREE_Click started'
-    ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText"))
+    /* ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText")) */
 
     call _dropdeprecated
@@ -3729 +3727 @@
     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
+    end
+
     call SW_LOGIN_Close
 RETURN
@@ -4523 +4534 @@
         when pos("PDC",VRMethod("CN_smbtree", "GetFieldData", SMBObj.rh, MBFH)) > 0 then LoginIcon = "#63:PMWP.DLL" /* icons.!pdc */
         when SMBObj.udatatype = "WORKGROUP" then LoginIcon = SMBObj.Icon
-        when SMBObj.udatatype = "SERVER" then LoginIcon = SMBObj.Icon
+        when SMBObj.udatatype = "SERVER"    then LoginIcon = SMBObj.Icon
+        when SMBObj.udatatype = "DISK"      then do
+            if pos("PDC",VRMethod("CN_smbtree", "GetFieldData", SMBObj.parentrh, MBFH)) > 0 
+                then LoginIcon = "#63:PMWP.DLL" /* icons.!pdc */
+                else LoginIcon = "#35:PMWP.DLL" /* icons.!pdc */
+        end
         otherwise LoginIcon = "#35:PMWP.DLL" /* icons.!machine_awake */
     end
@@ -4595 +4611 @@
     ok = VRMethod("EF_DIRECTORY1","AddString",p_share)
 
-    IF advanced.!easupport \= "" THEN ok = VRSet("CB_EAS1",     "Set",   advanced.!easupport)
-    IF advanced.!readonly  \= "" THEN ok = VRSet("CB_READONLY1","Set",   advanced.!readonly)
-    IF advanced.!alwaysmp  \= "" THEN ok = VRSet("CB_ALWAYSMP1","Set",   advanced.!alwaysmp)
+    IF advanced.!easupport     \= "" THEN ok = VRSet("CB_EAS1",            "Set",   advanced.!easupport)
+    IF advanced.!readonly      \= "" THEN ok = VRSet("CB_READONLY1",       "Set",   advanced.!readonly)
+    IF advanced.!alwaysmp      \= "" THEN ok = VRSet("CB_ALWAYSMP1",       "Set",   advanced.!alwaysmp)
     IF advanced.!cachetimeout  \= "" THEN ok = VRSet("SPIN_CACHETIMEOUT1", "Value", advanced.!cachetimeout)
     IF advanced.!cachelistings \= "" THEN ok = VRSet("SPIN_CACHELISTINGS1","Value", advanced.!cachelistings)