Merge pull request #63 from dmcoles/v5.6.1

V5.6.1
dmcoles · Mar 1, 2024 · 2ec4f91 · 2ec4f91
2 parents acda2d9 + 897a1ce
commit 2ec4f91
Show file tree

Hide file tree

Showing 9 changed files with 271 additions and 69 deletions.
diff --git a/README.md b/README.md
@@ -28,6 +28,12 @@ I have also updated the documentation for AmiExpress as many existing features w
 *  New US command (upload sysop) allows files to be uploaded to any directory anyhere on the system
 *  Query callers ip/hostname from telnetd.device and record to callers log, provide via door interface
 
+### Documentation
+
+The latest documentation for setting up and troubleshooting Ami-Express 5 is always located here:
+
+https://github.com/dmcoles/AmiExpress/wiki
+
 ### Want to help out?
 
 I am currently the sole developer on this project. If you are experienced with running /X on the Amiga platform and wish to help out, please feel free to contact me. I am always looking for ideas on how to improve this product.

diff --git a/axSetupTool/frmConfEdit.e b/axSetupTool/frmConfEdit.e
@@ -6,6 +6,8 @@ MODULE 'tools/boopsi','workbench/workbench','icon','intuition/classusr'
 MODULE 'utility/tagitem','utility/hooks','tools/installhook','exec/lists','libraries/asl','dos/dos'
 MODULE '*axedit','*frmBase','*tooltypes','*controls','*miscfuncs','*frmAddComplexItem','*configObject','*/stringlist','*helpText'
 
+CONST CONFDBSIZE=74000
+
 EXPORT OBJECT frmConfEdit OF frmBase
   confConfig         : PTR TO CHAR
   controlList        : LONG
@@ -38,6 +40,7 @@ EXPORT OBJECT frmConfEdit OF frmBase
   boolNoNewFiles     : PTR TO control
   boolNoFtpUploads   : PTR TO control
   boolFtpNoDirlist   : PTR TO control
+  intNDirs           : PTR TO control
   lvDownloadPaths    : PTR TO LONG
   strDownloadPath    : PTR TO LONG
   lvUploadPaths      : PTR TO LONG
@@ -614,7 +617,7 @@ PROC addControls() OF frmConfEdit
   NEW control.createDirSelect('Local Upload Path',CONF_LOCAL_UPLOAD_PATH,self.app.app,self.setChangedHook,self)
   self.paLocalULPath:=control
 
-  NEW control.createStringInt('FTP Dir Days',FTP_DIR_DAYS,self.app.app,self.setChangedHook,self)
+  NEW control.createStringInt('FTP Dir Days',1,self.app.app,self.setChangedHook,self)
   self.intFtpDirDays:=control
 
   NEW control.createString('FTP Dir Name',CONF_FTP_DIR_NAME,self.app.app,self.setChangedHook,self)
@@ -647,7 +650,10 @@ PROC addControls() OF frmConfEdit
   NEW control.createCheckBox('FTP No Dirlist',CONF_FTP_NO_DIRLIST,self.app.app,self.setChangedHook,self)
   self.boolFtpNoDirlist:=control 
 
-  self.controlList:=[self.strConfName2,self.paConfPath,self.strForwardMail,self.strMenuPrompt,self.strUploadPrompt,self.paLocalULPath,
+  NEW control.createStringInt('NDirs',CONF_NDIRS,self.app.app,self.setChangedHook,self)
+  self.intNDirs:=control
+
+  self.controlList:=[self.strConfName2,self.paConfPath,self.intNDirs,self.strForwardMail,self.strMenuPrompt,self.strUploadPrompt,self.paLocalULPath,
                      self.intFtpDirDays,self.strFtpDirName]
 
   self.controlList2:=[self.boolFreeDownloads,self.boolUseUsernames,self.boolUseRealname,self.boolUseInternetNames,
@@ -751,6 +757,7 @@ PROC saveChanges() OF frmConfEdit
   DEF window,count,i,entry
   DEF folderStr[255]:STRING
   DEF msgbase:PTR TO msgbase
+  DEF fh,tmp
 
   MOVE.L (A1),self
   GetA4()
@@ -826,7 +833,20 @@ PROC saveChanges() OF frmConfEdit
         makeDir(msgbase.location)
       ENDIF
     ENDFOR
+
+    StrCopy(folderStr,confPath)
+    AddPart(folderStr,'Conf.DB',255)
 
+    ->create conf.db
+    IF (FileLength(folderStr)<=0)
+      fh:=Open(folderStr,MODE_NEWFILE)
+      IF fh<>0
+        tmp:=New(CONFDBSIZE)
+        Write(fh,tmp,CONFDBSIZE)
+        Dispose(tmp)
+        Close(fh)
+      ENDIF
+    ENDIF
   ENDIF
 
   IF self.boolFreeDownloads.getValue() THEN writeToolType(confPath,'FREEDOWNLOADS') ELSE deleteToolType(confPath,'FREEDOWNLOADS')  
@@ -854,6 +874,16 @@ PROC saveChanges() OF frmConfEdit
   IF self.boolNoNewFiles.getValue() THEN writeToolType(confPath,'NO_NEW_FILES') ELSE deleteToolType(confPath,'NO_NEW_FILES')
   IF self.boolNoFtpUploads.getValue() THEN writeToolType(confPath,'NO_FTP_UPLOADS') ELSE deleteToolType(confPath,'NO_FTP_UPLOADS')
   IF self.boolFtpNoDirlist.getValue() THEN writeToolType(confPath,'FTP_NO_DIRLIST') ELSE deleteToolType(confPath,'FTP_NO_DIRLIST')
+  writeToolType(confPath,'NDIRS',self.intNDirs.getValue())
+
+  StrCopy(folderStr,confPath)
+  AddPart(folderStr,'NDirs',255)
+  fh:=Open(folderStr,MODE_NEWFILE)
+  IF fh<>0
+    StringF(tempStr,'\s',self.intNDirs.getValue())
+    Write(fh,tempStr,EstrLen(tempStr))
+    Close(fh)
+  ENDIF
 
   get(self.lvDownloadPaths,MUIA_List_Entries,{count})  
   FOR i:=1 TO count
@@ -999,6 +1029,10 @@ PROC loadConf(conf) OF frmConfEdit
   self.boolNoNewFiles.setValue(IF checkToolTypeExists(confPath,'NO_NEW_FILES') THEN MUI_TRUE ELSE FALSE)
   self.boolNoFtpUploads.setValue(IF checkToolTypeExists(confPath,'NO_FTP_UPLOADS') THEN MUI_TRUE ELSE FALSE)
   self.boolFtpNoDirlist.setValue(IF checkToolTypeExists(confPath,'FTP_NO_DIRLIST') THEN MUI_TRUE ELSE FALSE)
+
+  val:=readToolTypeInt(confPath,'NDIRS')
+  IF val<1 THEN val:=1
+  self.intNDirs.setValue(val)
 
   domethod( self.lvDownloadPaths , [ MUIM_List_Clear] )
   domethod( self.lvUploadPaths , [ MUIM_List_Clear] )

diff --git a/axSetupTool/helpText.e b/axSetupTool/helpText.e
@@ -20,7 +20,7 @@ EXPORT ENUM ACCESS_NAME_MAX_PAGES,ACCESS_NAME,ACCESS_AREA_NAME,CHECKER_FILE,CHEC
     COMMAND_SCRIPT_CHECK,MSGBASE_SEND_EXTERNAL,MSGBASE_USES_USERNAMES,MSGBASE_USES_REALNAMES,
     MSGBASE_USES_INETNAMES,CONF_FREE_DL,CONF_FORCE_MSCAN,CONF_USE_USERNAMES,CONF_USE_INETNAMES,
     CONF_CUSTOM_MAIL,CONF_NEVER_MSCAN,CONF_DEFAULT_NEW_MSCAN,CONF_DEFAULT_NEW_FSCAN,CONF_DEFAULT_ZOOM,
-    CONF_USE_REALNAMES,CONF_ALWAYS_NEW_FILES,CONF_NEVER_NEW_FILES,CONF_FTP_UL_DISABLE,CONF_FTP_NO_DIRLIST,
+    CONF_USE_REALNAMES,CONF_ALWAYS_NEW_FILES,CONF_NEVER_NEW_FILES,CONF_FTP_UL_DISABLE,CONF_FTP_NO_DIRLIST,CONF_NDIRS,
     NODE_CALLERSLOG,NODE_CAPS_FILENAMES,NODE_DEF_SCREENS,NODE_DEBUG_LOGS,NODE_DOOR_LOGS,NODE_STARTUP_LOGS,
     NODE_UD_LOGS,NO_CHAT_ON,NODE_NO_QUICK_LOGON,NODE_IDLE,NODE_MSCAN_PROMPT,NODE_NO_TIMEOUT,NODE_QUIET,
     NODE_STEALTH,NODE_SHOW_PWFAILS,NODE_SENTBY_FILES,NODE_TELNET,NODE_FTP,NODE_TELNETD,NODE_TELSERD,
@@ -195,6 +195,7 @@ EXPORT PROC helpTextInitialise()
   addHelp(CONF_NEVER_NEW_FILES,'New file scanning at logon is disabled for this conference.')
   addHelp(CONF_FTP_UL_DISABLE,'Uploading via FTP is not allowed in this conference.')
   addHelp(CONF_FTP_NO_DIRLIST,'When enabled the FTP directory listing will be generated by the contents of the download paths rather than using the normal Ami-Express file list.')
+  addHelp(CONF_NDIRS,'Number of Dirlist files in this conf. (eg Dir1, Dir2 etc)')
   addHelp(NODE_CALLERSLOG,'Enable the callers log for this node.')
   addHelp(NODE_CAPS_FILENAMES,'Enable all uploads to be converted to upper case file names for this node.')
   addHelp(NODE_DEF_SCREENS,'Enable default security screens for this node. (eg bull.txt becomes higher priority than bullN.txt)')

diff --git a/deployment/File_Id.Diz b/deployment/File_Id.Diz
@@ -3,8 +3,6 @@
 ::../        /::..'  ::..' ::..  ::... ::...
 ::./    |    \:     ::  `: ::... ...:: ...::
 .--\____|\____\<svg>-----------------------.
-|    /X v5.6.0 Released on 02-Jan-2024     |
-|         Written By Darren Coles          |
-| This update introduces a full MUI based  |
-|  setup editor and a standard installer   |
+|   /X v5.6.1 Minor update (01-Mar-2024)   |
+|           Written By Darren Coles        |
 `------------------------------------------'
diff --git a/deployment/binaries.lha b/deployment/binaries.lha
diff --git a/deployment/read_me.hdr b/deployment/read_me.hdr
@@ -2,8 +2,8 @@ Short:        AmiExpress BBS system redeveloped in E
 Author:       darren_m_coles@yahoo.co.uk (Darren Coles)
 Uploader:     darren_m_coles@yahoo.co.uk (Darren Coles)
 Type:         comm/amiex
-Version:      5.6.0
-Replaces:     comm/amiex/Amix550.lha
+Version:      5.6.1
+Replaces:     comm/amiex/Amix560.lha
 Architecture: m68k-amigaos >= 2.0.4
 Distribution: Aminet
 Kurz:         AmiExpress BBS entwickelt in E

diff --git a/deployment/read_me.txt b/deployment/read_me.txt
@@ -5,11 +5,11 @@
 |//     l__�   \\_��   \\!___  �\_.  \  � l__�  ��\__  �\    \\    \\     \\|
 /         �l____/�'l____/: �l___/ l___\ !   �l____/�l___/_____/_____/       \
 |                      �                 �                                  |
+| Version 5.6.1                                                             |
+|                                                                           |
 | Ami-Express was a BBS System that ran on the Commodore Amiga series of    |
 | computers and was developed by Lightspeed Technologies in the 1990s.      |
 |                                                                           |
-| Version 5.6.0                                                             |
-|                                                                           |
 | This is a rewrite of that system written in Amiga E. It is open source    |
 | and has new features and bug fixes in addition to aiming for near 100%    |
 | backwards compatibility with the version 4.x releases.                    |
@@ -19,14 +19,13 @@
 | this software and to continue using the Ami-Express name.                 |
 |                                                                           |
 | I have also updated the documentation for Ami-Express as many existing    |
-| features were not properly documented. Some new features included in this |
-| release are:                                                              |
-|   * Full MUI Based Configuration / Setup Editor                           |
-|   * Installer Script that allows upgrading and initial BBS setup          |
-|   * Improved password encryption.                                         |
+| features were not properly documented. This documenations (including      |
+| setup, tooltype information and troubleshooting help) is here:            |
+|                                                                           |
+|  https://github.com/dmcoles/AmiExpress/wiki                               |
 |                                                                           |
-| All source code is publicly available at:                                 |
-|  https://github.com/dmcoles/AmiExpress along with the documentation.      |
+| In addition all source code is publicly available at:                     |
+|  https://github.com/dmcoles/AmiExpress                                    |
 |                                                                           |
 | The sample bbs configurations included in previous versions of this tool  |
 | are no longer included. The new install process will create a default     |
@@ -79,6 +78,10 @@
 |                                                                           |
 | Version History                                                           |
 |                                                                           |
+| 5.6.1 01 Mar 2024                                                         |
+|       * Some fixes to resolve issues when running on 68000                |
+|       * Added support for conf NDIRS setting in the configuration editor  |
+|       * Added option to move mail messages to another conference          |
 | 5.6.0 02 Jan 2024                                                         |
 |       * Improved password encryption, Full Setup Editor, Installer        |
 | 5.5.0 05 Jun 2022 (Feature parity release)                                |