Changeset 408 for branches

Timestamp:

Feb 19, 2010, 9:14:00 AM (15 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: SSCC 0.9.5, SMBUsers 0.9.6 several fixes

Location:

branches/guitools-1.0

Files:

• install/sscc.vrp (modified) (1 diff)
• install/sscc.vrx (modified) (3 diffs)
• install/sscc.vry (modified) ( previous)
• shared/nlv.vrs (modified) (2 diffs)
• shared/sambainit.vrs (modified) (6 diffs)
• smbusers/smbusers.VRP (modified) (1 diff)
• smbusers/smbusers.VRX (modified) (6 diffs)
• smbusers/smbusers.VRY (modified) ( previous)

branches/guitools-1.0/install/sscc.vrp

@@ -7 +7 @@
 VRXWindow: __VREMainWindow,1,2180,4481,891,7263
 VRXWindow: __VRESectionListWindow,1,3011,12286,8974,3144
-VRXWindow: __VREToolsWindow,1,3211,10648,6989,1659
+VRXWindow: __VREToolsWindow,1,3211,10648,6995,1663
 VRXWindow: __VREWindListWindow,1,385,12286,2650,3150
 UserFile: 1

branches/guitools-1.0/install/sscc.vrx

@@ -1083 +1083 @@
     call lineout smbconf, Indent||'lm announce = Yes'
     call lineout smbconf, Indent||'wins support = Yes'
+    call lineout smbconf, Indent||'wide links = No'
     ok = SysFileTree(samba.!printcap,exist.,'FO')
     if exist.0 = 1 then do
@@ -2095 +2096 @@
         call _MasterPasswdCreate
         call _PasswordDBRewrite
+        ok = VRSet("CB_NoRoot","Enabled", 0)
     end
     if stream(samba.!pwddb,'c','query exists') = "" | stream(samba.!spwddb,'c','query exists') = "" then do
         call _PasswordDBRewrite
+        ok = VRSet("CB_NoRoot","Enabled", 0)
     end
     UseTDBsam = 1
@@ -2789 +2792 @@
     call _INIWrite
     call _SambaFinish
+    ok = SysFileDelete(TempDir'sscc.testparm')
     ok = SysFileDelete(smboutput)
 

branches/guitools-1.0/shared/nlv.vrs

@@ -1 @@
-/*:VRX         NLVGetMessage
-*/
-NLVGetMessage: PROCEDURE EXPOSE settings. options. fs.
+/*:VRX         NLVSetup
+ */
+NLVSetup: PROCEDURE EXPOSE settings. options.
+    /* This subroutine is (c) by Alex Taylor, portions (c) Herwig Bauernfeind
+     * Sets all UI text from the message file.  Any string that can't be loaded
+     * will default to the built-in English. 
+     */
 
-    msgfile = settings.!messages
-    msgnum  = ARG( 1 )
-
-    IF msgnum == '' THEN RETURN ''
-
-    SELECT
-        WHEN ARG() == 2 THEN 
-            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2) )
-        WHEN ARG() == 3 THEN 
-            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3) )
-        WHEN ARG() == 4 THEN 
-            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3), ARG(4) )
-        WHEN ARG() == 5 THEN 
-            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3), ARG(4), ARG(5) )
-        WHEN ARG() == 6 THEN 
-            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3), ARG(4), ARG(5), ARG(6) )
-        WHEN ARG() == 7 THEN 
-            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7) )
-        WHEN ARG() == 8 THEN 
-            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(2), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8) )
-        WHEN ARG() == 9 THEN 
-            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(2), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8), ARG(9) )
-        WHEN ARG() == 10 THEN 
-            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(2), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8), ARG(9), ARG(10) )
-        OTHERWISE
-            msgtxt = SysGetMessage( msgnum, msgfile )
-    END
-
-    PARSE VAR msgtxt message '0D'x .
-
-    IF translate(SUBSTR( message, 1, 4 )) == 'SYS0' THEN message = ''
-
-RETURN message
-
-/*:VRX         NLVSetText
-*/
-/* 
- * Sets the specified property of the specified control to the specified 
- * message text.
- */
-NLVSetText: PROCEDURE EXPOSE settings. options. fs.
-    PARSE ARG control, property, message, substitution
-
-    success = 1
-    IF substitution == '' THEN     
-        text = NLVGetMessage( message )
-    ELSE
-        text = NLVGetMessage( message, substitution )
-
-    IF text == '' THEN success = 0 
-    ELSE               CALL VRSet control, property, text
-
-RETURN success
-
-/*:VRX */
-NLVSetup: PROCEDURE EXPOSE settings. options.
-    /* This subroutine is (c) by Alex Taylor, portions (c) Herwig Bauernfeind */
     IF options.!debug == 1 THEN SAY 'NLVSetup() started'
     IF options.!debug == 1 THEN SAY '  NLVSetup() is (c) Alex Taylor, portions (c) Herwig Bauernfeind'
 
-    /* Sets all UI text from the message file.  Any string that can't be loaded
-     * will default to the built-in English. 
-     */
     execPath = VRGet("Application", "Program")
     if execPath = "" then parse source . . execPath
@@ -132 +76 @@
     IF options.!debug == 1 THEN SAY 'NLVSetup() done'
 RETURN
+
+/*:VRX         NLVGetMessage
+*/
+NLVGetMessage: PROCEDURE EXPOSE settings. options. fs.
+
+    msgfile = settings.!messages
+    msgnum  = ARG( 1 )
+
+    IF msgnum == '' THEN RETURN ''
+
+    SELECT
+        WHEN ARG() == 2 THEN 
+            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2) )
+        WHEN ARG() == 3 THEN 
+            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3) )
+        WHEN ARG() == 4 THEN 
+            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3), ARG(4) )
+        WHEN ARG() == 5 THEN 
+            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3), ARG(4), ARG(5) )
+        WHEN ARG() == 6 THEN 
+            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3), ARG(4), ARG(5), ARG(6) )
+        WHEN ARG() == 7 THEN 
+            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7) )
+        WHEN ARG() == 8 THEN 
+            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(2), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8) )
+        WHEN ARG() == 9 THEN 
+            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(2), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8), ARG(9) )
+        WHEN ARG() == 10 THEN 
+            msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(2), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8), ARG(9), ARG(10) )
+        OTHERWISE
+            msgtxt = SysGetMessage( msgnum, msgfile )
+    END
+
+    PARSE VAR msgtxt message '0D'x .
+
+    IF translate(SUBSTR( message, 1, 4 )) == 'SYS0' THEN message = ''
+
+RETURN message
+
+/*:VRX         NLVSetText
+*/
+/* 
+ * Sets the specified property of the specified control to the specified 
+ * message text.
+ */
+NLVSetText: PROCEDURE EXPOSE settings. options. fs.
+    PARSE ARG control, property, message, substitution
+
+    success = 1
+    IF substitution == '' THEN     
+        text = NLVGetMessage( message )
+    ELSE
+        text = NLVGetMessage( message, substitution )
+
+    IF text == '' THEN success = 0 
+    ELSE               CALL VRSet control, property, text
+
+RETURN success

branches/guitools-1.0/shared/sambainit.vrs

@@ -71 +71 @@
     end
 
-    if samba.!smbd = "" then call _ErrorBinaryNotFound "Could not find smbd.exe!"
+    if samba.!smbd = "" then call _ErrorBinaryNotFound 'Could not find smbd.exe!'
 
     samba.!bin = VRParseFileName(samba.!smbd,'DP')
@@ -80 +80 @@
     if \VRFileExists(samba.!smbcmd) then do
         samba.!smbcmd = samba.!bin'\smb.cmd'
-        if \VRFileExists(samba.!smbcmd) then call _ErrorBinaryNotFound "Could not find smb.cmd!"
+        if \VRFileExists(samba.!smbcmd) then call _ErrorBinaryNotFound 'Could not find smb.cmd!'
     end
     IF options.!debug == 1 THEN say '  smb.cmd        = "'samba.!smbcmd'"'
@@ -86 +86 @@
     /* smbpasswd.exe */
     samba.!smbpasswdexe = samba.!bin'\smbpasswd.exe'
-    if \VRFileExists(samba.!smbpasswdexe) then call _ErrorBinaryNotFound "Could not find smbpasswd.exe!"
+    if \VRFileExists(samba.!smbpasswdexe) then call _ErrorBinaryNotFound 'Could not find "'samba.!smbpasswdexe'"!'
     IF options.!debug == 1 THEN say '  smbpasswd.exe  = "'samba.!smbpasswdexe'"'
 
     /* pdbedit.exe */
     samba.!pdbeditexe = samba.!bin'\pdbedit.exe'
-    if \VRFileExists(samba.!pdbeditexe) then call _ErrorBinaryNotFound "Could not find pdbedit.exe!"
+    if \VRFileExists(samba.!pdbeditexe) then call _ErrorBinaryNotFound 'Could not find "'samba.!pdbeditexe'"!'
     IF options.!debug == 1 THEN say '  pdbedit.exe    = "'samba.!pdbeditexe'"'
 
     /* net.exe */
     samba.!netexe = samba.!bin'\net.exe'
-    if \VRFileExists(samba.!netexe) then call _ErrorBinaryNotFound "Could not find net.exe!"
+    if \VRFileExists(samba.!netexe) then call _ErrorBinaryNotFound 'Could not find "'samba.!netexe'"!'
     IF options.!debug == 1 THEN say '  net.exe        = "'samba.!netexe'"'
 
     /* testparm.exe */
     samba.!testparmexe = samba.!bin'\testparm.exe'
-    if \VRFileExists(samba.!testparmexe) then call _ErrorBinaryNotFound "Could not find testparm.exe!"
+    if \VRFileExists(samba.!testparmexe) then call _ErrorBinaryNotFound 'Could not find "'samba.!testparmexe'"!'
     IF options.!debug == 1 THEN say '  testparm.exe   = "'samba.!testparmexe'"'
 
     /* smbtree.exe */
     samba.!smbtreeexe = samba.!bin'\smbtree.exe'
-    if \VRFileExists(samba.!smbtreeexe) then call _ErrorBinaryNotFound "Could not find smbtree.exe!"
+    if \VRFileExists(samba.!smbtreeexe) then call _ErrorBinaryNotFound 'Could not find "'samba.!smbtreeexe'"!'
     IF options.!debug == 1 THEN say '  smbtree.exe    = "'samba.!smbtreeexe'"'
 
     /* smbstatus.exe */
     samba.!smbstatusexe = samba.!bin'\smbstatus.exe'
-    if \VRFileExists(samba.!smbstatusexe) then call _ErrorBinaryNotFound "Could not find smbstatus.exe!"
+    if \VRFileExists(samba.!smbstatusexe) then call _ErrorBinaryNotFound 'Could not find "'samba.!smbstatusexe'"!'
     IF options.!debug == 1 THEN say '  smbstatus.exe  = "'samba.!smbstatusexe'"'
 
     /* smbcontrol.exe */
     samba.!smbcontrolexe = samba.!bin'\smbcontrol.exe'
-    if \VRFileExists(samba.!smbcontrolexe) then call _ErrorBinaryNotFound "Could not find smbcontrol.exe!"
+    if \VRFileExists(samba.!smbcontrolexe) then call _ErrorBinaryNotFound 'Could not find "'samba.!smbcontrolexe'"!'
     IF options.!debug == 1 THEN say '  smbcontrol.exe = "'samba.!smbcontrolexe'"'
 
     /* smbclient.exe */
     samba.!smbclientexe = samba.!bin'\smbclient.exe'
-    if \VRFileExists(samba.!smbclientexe) then call _ErrorBinaryNotFound "Could not find smbclient.exe!"
+    if \VRFileExists(samba.!smbclientexe) then call _ErrorBinaryNotFound 'Could not find "'samba.!smbclientexe'"!'
     IF options.!debug == 1 THEN say '  smbclient.exe  = "'samba.!smbclientexe'"'
 
     /* nmblookup.exe */
     samba.!nmblookupexe = samba.!bin'\nmblookup.exe'
-    if \VRFileExists(samba.!nmblookupexe) then call _ErrorBinaryNotFound "Could not find nmblookup.exe!"
+    if \VRFileExists(samba.!nmblookupexe) then call _ErrorBinaryNotFound 'Could not find "'samba.!nmblookupexe'"!'
     IF options.!debug == 1 THEN say '  nmblookup.exe  = "'samba.!nmblookupexe'"'
 
@@ -151 +151 @@
     end
 
-    if samba.!pwd_mkdb = "" then call _ErrorBinaryNotFound "Could not find pwd_mkdb.exe!"
+    if samba.!pwd_mkdb = "" then call _ErrorBinaryNotFound 'Could not find "'samba.!pwd_mkdb'"!'
     IF options.!debug == 1 THEN say '  pwd_mkdb.exe   = "'samba.!pwd_mkdb'"'
 
@@ -168 +168 @@
     end
 
-    if samba.!log = "" then call _ErrorDataFileNotFound "Could not find logfiles!"
+    if samba.!log = "" then call _ErrorDataFileNotFound 'Could not find logfiles!'
     IF options.!debug == 1 THEN say '  Samba logfiles = "'samba.!log'"'
 
@@ -180 +180 @@
     /* the password files - we'll create them if they don't exist */
     samba.!masterpasswd = unixetc'\master.passwd'
-    if \VRFileExists(samba.!masterpasswd) then call _ErrorDataFileNotFound "Could not find master.passwd!"
+    if \VRFileExists(samba.!masterpasswd) then call _ErrorDataFileNotFound 'Could not find "'samba.!masterpasswd'"!'
     IF options.!debug == 1 THEN say '  master.passwd  = "'samba.!masterpasswd'"'
 
     samba.!pwddb = unixetc'\pwd.db'
-    if \VRFileExists(samba.!pwddb) then call _ErrorDataFileNotFound "Could not find pwd.db!"
+    if \VRFileExists(samba.!pwddb) then call _ErrorDataFileNotFound 'Could not find "'samba.!pwddb'"!'
     IF options.!debug == 1 THEN say '  pwd.db         = "'samba.!pwddb'"'
 
     samba.!spwddb = unixetc'\spwd.db'
-    if \VRFileExists(samba.!spwddb) then call _ErrorDataFileNotFound "Could not find spwd.db!"
+    if \VRFileExists(samba.!spwddb) then call _ErrorDataFileNotFound 'Could not find "'samba.!spwddb'"!'
     IF options.!debug == 1 THEN say '  spwd.db        = "'samba.!spwddb'"'
 
     samba.!group = unixetc'\group'
-    if \VRFileExists(samba.!group) then call _ErrorDataFileNotFound "Could not find "samba.!group"!"
+    if \VRFileExists(samba.!group) then call _ErrorDataFileNotFound 'Could not find "'samba.!group'"!'
     IF options.!debug == 1 THEN say '  group          = "'samba.!group'"'
 
     samba.!printcap = unixetc'\printcap'
-    if \VRFileExists(samba.!spwddb) then call _ErrorDataFileNotFound "Could not find printcap!"
+    if \VRFileExists(samba.!printcap) then call _ErrorDataFileNotFound 'Could not find "'samba.!printcap'"!'
     IF options.!debug == 1 THEN say '  printcap       = "'samba.!printcap'"'
 

branches/guitools-1.0/smbusers/smbusers.VRP

@@ -7 +7 @@
 VRXWindow: __VREMainWindow,1,2180,3710,891,8000
 VRXWindow: __VRESectionListWindow,1,2951,11130,8949,3342
-VRXWindow: __VREToolsWindow,1,2457,1012,6995,1667
+VRXWindow: __VREToolsWindow,1,2457,1012,6986,1669
 VRXWindow: __VREWindListWindow,1,446,11130,2650,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_LOGIN,1

branches/guitools-1.0/smbusers/smbusers.VRX

@@ -421 +421 @@
     ok = VRCopyFile( samba.!group, samba.!group'.bak' )
     ok = VRCopyFile( newgroup, samba.!group )
+    ok = SysFileDelete(newgroup)
     IF options.!debug == 1 THEN say '_GroupWrite() done'
 return
@@ -755 +756 @@
     ok = VRCopyFile( samba.!masterpasswd, samba.!masterpasswd'.bak' )
     ok = VRCopyFile( newmasterpasswd, samba.!masterpasswd )
+    ok = SysFileDelete(newmasterpasswd)
     IF options.!debug == 1 THEN say "_MasterpasswdWrite() done"
 return
@@ -1138 +1140 @@
     end
     ok = stream(groupmap,'c','close')
+    ok = SysFileDelete(groupmap)
 
     /* Now read the group list */
@@ -1160 +1163 @@
     end
     ok = stream(grouplist,'c','close')
-    /* ok = SysFiledelete(grouplist) */
+    ok = SysFileDelete(grouplist)
+
     gline.0 = i
  
@@ -1523 +1527 @@
     end
     ok = stream(UserProperties,'c','close')
+    ok = SysFileDelete(UserProperties)
 
     upline.0 = i
@@ -3748 +3753 @@
             end
             else do
-                if length(VRGet("EF_password","Value")) < MinPWLength then do
+                if length(VRGet("EF_upPassword","Value")) < MinPWLength then do
                     Msg.type  = "E"
                     Msg.Text  = NLVGetMessage( 117 )