Changeset 1012

Timestamp:

Mar 5, 2017, 12:39:32 PM (8 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: EVFSGUI start work on WebDAV support

Location:

trunk/guitools/evfsgui

Files:

• evfsgui.vrp (modified) (1 diff)
• evfsgui.vrx (modified) (7 diffs)
• rc/lang/evfsi_de.mkm (modified) (1 diff)
• rc/lang/evfsi_en.mkm (modified) (1 diff)
• rc/lang/evfsi_es.mkm (modified) (1 diff)
• rc/lang/evfsi_fr.mkm (modified) (1 diff)
• rc/lang/evfsi_it.mkm (modified) (1 diff)
• rc/lang/evfsi_nl.mkm (modified) (1 diff)
• rc/lang/evfsi_sv.mkm (modified) (1 diff)

trunk/guitools/evfsgui/evfsgui.vrp ¶

@@ -7 +7 @@
 MacroPath: VRM:G:\netlabs\svn\samba\trunk\guitools\evfsgui
 EXEPath: 
-RunParameters: 
+RunParameters: -NDFS
 RunDirectory: G:\netlabs\svn\samba\trunk\guitools\evfsgui
 VRXWindow: __VREMainWindow,1,1831,2457,1012,7841
 VRXWindow: __VREFileListWindow,1,711,14020,2665,3358
 VRXWindow: __VRESectionListWindow,1,1072,11708,12238,6914
-VRXWindow: __VREToolsWindow,1,2951,12479,6992,1661
+VRXWindow: __VREToolsWindow,1,2951,12479,6986,1665
 VRXWindow: __VREWindListWindow,1,566,10262,4963,3150
 UserFile: 1
 UserWindow: Main,1
 UserWindow: SW_PROGRESS,1
-UserWindow: SW_SETTINGS,1
-UserWindow: SW_SMBCONF,1
+UserWindow: SW_DIALOG,1

trunk/guitools/evfsgui/evfsgui.vrx ¶

@@ -1646 +1646 @@
 
     if options.!debug == 1 then say '  initializing mtype. '
-    mtype.0 = 4
+    mtype.0 = 5
     mtype.1 = NLVGetMessage( 15 )
     mtype.2 = NLVGetMessage( 16 )
     mtype.3 = NLVGetMessage( 17 )
     mtype.4 = NLVGetMessage( 18 )
+    mtype.5 = NLVGetMessage(110 )
 
     if options.!debug == 1 then say '  initializing icons. '
@@ -1862 +1863 @@
             CALL VRSet "DT_SERVER",  "Visible", 1
             CALL VRSet "EF_SERVER",  "Visible", 1
+            CALL VRSet "DT_NETWORK", "Visible", 1
+            CALL VRSet "EF_NETWORK", "Visible", 1
             CALL VRSet "CHK_MTYPE",  "Visible", 0
             CALL NLVSetText "DT_NETWORK", "Caption", 21
@@ -1870 +1873 @@
             CALL VRSet "DT_SERVER",  "Visible", 1
             CALL VRSet "EF_SERVER",  "Visible", 1
+            CALL VRSet "DT_NETWORK", "Visible", 1
+            CALL VRSet "EF_NETWORK", "Visible", 1
             CALL VRSet "CHK_MTYPE",  "Visible", 0
             CALL NLVSetText "DT_NETWORK", "Caption", 21
@@ -1878 +1883 @@
             CALL VRSet "DT_SERVER",  "Visible", 0
             CALL VRSet "EF_SERVER",  "Visible", 0
+            CALL VRSet "DT_NETWORK", "Visible", 1
+            CALL VRSet "EF_NETWORK", "Visible", 1
             CALL VRSet "CHK_MTYPE",  "Visible", 0
             CALL NLVSetText "DT_NETWORK", "Caption", 21
@@ -1886 +1893 @@
             CALL VRSet "DT_SERVER",  "Visible", 0
             CALL VRSet "EF_SERVER",  "Visible", 0
+            CALL VRSet "DT_NETWORK", "Visible", 1
+            CALL VRSet "EF_NETWORK", "Visible", 1
             CALL VRSet "CHK_MTYPE",  "Visible", 1
             CALL NLVSetText "DT_NETWORK", "Caption", 22
+        END
+        WHEN mount == mtype.5 THEN DO
+            CALL VRSet "DT_SHARE",   "Visible", 0
+            CALL VRSet "EF_SHARE",   "Visible", 0
+            CALL VRSet "DT_SERVER",  "Visible", 1
+            CALL VRSet "EF_SERVER",  "Visible", 1
+            CALL VRSet "DT_NETWORK", "Visible", 0
+            CALL VRSet "EF_NETWORK", "Visible", 0
+            CALL VRSet "CHK_MTYPE",  "Visible", 0
+            CALL NLVSetText "DT_Server", "Caption", 111
         END
         OTHERWISE DO
@@ -3911 +3930 @@
 /*  PARSE VAR resource . ';WORKGROUP='p_workgroup';SERVER='p_server';SHARE='p_share';' . */
 
+    select /* Support for other filesystems comes here! */
+        when left(word(resource,1),5) = "SMBFS" then do
+            cd.lastrh = VRMethod("CN_CONDET","AddRecord")
+            PARSE VAR userdata p_mpoint ';' p_mpidx ';' .
+    
+            p_mpoint = strip(p_mpoint,'T','\')||'\'
+            p_rw     = word(resource, words(resource))
+    
+            /* Workaround for truncated resource string */
+            if length(p_rw) > 1 then do
+                /* The resource string must have been truncated
+                   p_rw is already wrong and
+                   p_easupport will most likely be also wrong (look below for workaround!) */
+                p_rw ="W" /* this is guessed only!!! */
+                if options.!debug == 1 then say '  WARNING! Detected truncated resource string - shorten workgroup name, server name, share name until this message goes away!'
+            end
+            /* this should be done unconditionally if the resource string is never truncated */
+            else resource  = left(resource,length(resource)-length(p_rw))
+    
+            call ParseResParmString
+    
+            if p_master   = "" then p_master   = "WORKGROUP"
+            if p_mtype    = "" then p_mtype    = "1"
+            if p_loglevel = "" then p_loglevel = "0"
+            if p_memlen   = "" then p_memlen   = "2"
+    
+            /* Also works around for a truncated resource string! */
+            if p_easupport= "" | p_easupport= " " then p_easupport = strip(options.!easupport)
+    
+            if p_password <> "" & p_spassword = "" then do
+                p_spassword = c2x(p_password)
+                p_password = ""
+            end
+    
+            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.mpointFH, p_mpoint, cd.mpidxfh, p_mpidx, cd.workgrpFH  , p_workgroup, cd.serverfh, p_server, cd.sharefh, p_share, cd.userfh, p_user)
+            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, p_password, cd.spasswordfh, p_spassword, cd.masterfh, p_master, cd.mtypefh, p_mtype)
+            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.ctoFH, p_cachetimeout, cd.cldFH, p_cachelistings)
+            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.memlenfh, p_memlen, cd.easupportfh, p_easupport, cd.logfilefh, p_logfile, cd.loglevelfh, p_loglevel, cd.rwfh, p_rw)
+            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, icons.!active) /* Active */
+            ok = VRMethod("CN_CONDET", "SetRecordAttr", cd.lastrh, "Icon", icons.!active) /* Active */
+    
+            hashstr = p_mpoint' 'translate(p_workgroup)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw
+    
+            md5 = rexx_md5(hashstr)
+    
+            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.hashfh,md5)
+    
+            SELECT
+                WHEN p_share  == '' & p_server \= '' THEN DO   /* all shares on server */
+                    IF p_workgroup == '' THEN
+                        userdata = userdata';\\'p_server'\*'
+                    ELSE
+                        userdata = userdata';'p_workgroup':\\'p_server'\*'
+                END
+                WHEN p_server == '' & p_workgroup \= '' THEN    /* all servers in workgroup */
+                    userdata = userdata';'p_workgroup':\\*'
+                WHEN p_server == '' & p_workgroup == '' THEN    /* all workgroups */
+                    userdata = userdata';*:\\*'
+                OTHERWISE DO
+                    IF p_workgroup == '' THEN
+                        userdata = userdata';\\'p_server'\'p_share
+                    ELSE
+                        userdata = userdata';'p_workgroup':\\'p_server'\'p_share
+                END
+            END
+
+        end
+        when left(word(resource,1),3) = "DAV" then do
+            userdata = "webDAV"
+        end
+        otherwise do /* All unsupported filesystems end here! */
+            userData = "UNKNOWN"
+        end
+    end 
     if left(word(resource,1),5) <> "SMBFS" then do
-        /* Support for other filesystems would come here! */
-        userData = "UNKNOWN"
     end
     else do
-        cd.lastrh = VRMethod("CN_CONDET","AddRecord")
-        PARSE VAR userdata p_mpoint ';' p_mpidx ';' .
-
-        p_mpoint = strip(p_mpoint,'T','\')||'\'
-        p_rw     = word(resource, words(resource))
-
-        /* Workaround for truncated resource string */
-        if length(p_rw) > 1 then do
-            /* The resource string must have been truncated
-               p_rw is already wrong and
-               p_easupport will most likely be also wrong (look below for workaround!) */
-            p_rw ="W" /* this is guessed only!!! */
-            if options.!debug == 1 then say '  WARNING! Detected truncated resource string - shorten workgroup name, server name, share name until this message goes away!'
-        end
-        /* this should be done unconditionally if the resource string is never truncated */
-        else resource  = left(resource,length(resource)-length(p_rw))
-
-        call ParseResParmString
-
-        if p_master   = "" then p_master   = "WORKGROUP"
-        if p_mtype    = "" then p_mtype    = "1"
-        if p_loglevel = "" then p_loglevel = "0"
-        if p_memlen   = "" then p_memlen   = "2"
-
-        /* Also works around for a truncated resource string! */
-        if p_easupport= "" | p_easupport= " " then p_easupport = strip(options.!easupport)
-
-        if p_password <> "" & p_spassword = "" then do
-            p_spassword = c2x(p_password)
-            p_password = ""
-        end
-
-        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.mpointFH, p_mpoint, cd.mpidxfh, p_mpidx, cd.workgrpFH  , p_workgroup, cd.serverfh, p_server, cd.sharefh, p_share, cd.userfh, p_user)
-        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, p_password, cd.spasswordfh, p_spassword, cd.masterfh, p_master, cd.mtypefh, p_mtype)
-        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.ctoFH, p_cachetimeout, cd.cldFH, p_cachelistings)
-        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.memlenfh, p_memlen, cd.easupportfh, p_easupport, cd.logfilefh, p_logfile, cd.loglevelfh, p_loglevel, cd.rwfh, p_rw)
-        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, icons.!active) /* Active */
-        ok = VRMethod("CN_CONDET", "SetRecordAttr", cd.lastrh, "Icon", icons.!active) /* Active */
-
-        hashstr = p_mpoint' 'translate(p_workgroup)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw
-
-        md5 = rexx_md5(hashstr)
-
-        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.hashfh,md5)
-
-        SELECT
-            WHEN p_share  == '' & p_server \= '' THEN DO   /* all shares on server */
-                IF p_workgroup == '' THEN
-                    userdata = userdata';\\'p_server'\*'
-                ELSE
-                    userdata = userdata';'p_workgroup':\\'p_server'\*'
-            END
-            WHEN p_server == '' & p_workgroup \= '' THEN    /* all servers in workgroup */
-                userdata = userdata';'p_workgroup':\\*'
-            WHEN p_server == '' & p_workgroup == '' THEN    /* all workgroups */
-                userdata = userdata';*:\\*'
-            OTHERWISE DO
-                IF p_workgroup == '' THEN
-                    userdata = userdata';\\'p_server'\'p_share
-                ELSE
-                    userdata = userdata';'p_workgroup':\\'p_server'\'p_share
-            END
-        END
     end
 
@@ -4868 +4896 @@
     CALL VRSet 'CB_TRAC', 'Set', options.!tracmark
 
-    ok = VRSet("DT_About","Caption", Program' (c) 2007-2017 Alexander Taylor'||'0D0A'x||'and Herwig Bauernfeind for bww bitwise works GmbH.')
+    ok = VRSet("DT_About","Caption", Program' (c) 2007-2017 Alexander Taylor for Arca Noae '||'0D0A'x||'and Herwig Bauernfeind for bww bitwise works GmbH.')
 
     About.DscFH  = VRMethod( "CN_ABOUT", "AddField", "String", "Component" )

trunk/guitools/evfsgui/rc/lang/evfsi_de.mkm ¶

@@ -117 +117 @@
 EVG0108?:
 EVG0109?:
-EVG0110?:
-EVG0111?:
+EVG0110!: webDAV
+EVG0111!: URL:
 EVG0112?:
 EVG0113?:

trunk/guitools/evfsgui/rc/lang/evfsi_en.mkm ¶

@@ -117 +117 @@
 EVG0108?:
 EVG0109?:
-EVG0110?:
-EVG0111?:
+EVG0110!: webDAV
+EVG0111!: URL:
 EVG0112?:
 EVG0113?:

trunk/guitools/evfsgui/rc/lang/evfsi_es.mkm ¶

@@ -117 +117 @@
 EVG0108?:
 EVG0109?:
-EVG0110?:
-EVG0111?:
+EVG0110!: webDAV
+EVG0111!: URL:
 EVG0112?:
 EVG0113?:

trunk/guitools/evfsgui/rc/lang/evfsi_fr.mkm ¶

@@ -123 +123 @@
 EVG0108?:
 EVG0109?:
-EVG0110?:
-EVG0111?:
+EVG0110!: webDAV
+EVG0111!: URL
 EVG0112?:
 EVG0113?:

trunk/guitools/evfsgui/rc/lang/evfsi_it.mkm ¶

@@ -121 +121 @@
 EVG0108?:
 EVG0109?:
-EVG0110?:
-EVG0111?:
+EVG0110!: webDAV
+EVG0111!: URL:
 EVG0112?:
 EVG0113?:

trunk/guitools/evfsgui/rc/lang/evfsi_nl.mkm ¶

@@ -117 +117 @@
 EVG0108?:
 EVG0109?:
-EVG0110?:
-EVG0111?:
+EVG0110!: webDAV
+EVG0111!: URL:
 EVG0112?:
 EVG0113?:

trunk/guitools/evfsgui/rc/lang/evfsi_sv.mkm ¶

@@ -117 +117 @@
 EVG0108?:
 EVG0109?:
-EVG0110?:
-EVG0111?:
+EVG0110!: webDAV
+EVG0111!: URL:
 EVG0112?:
 EVG0113?: