Skip to content

Commit

Permalink
ACP
Browse files Browse the repository at this point in the history
1) Remove unused variables
2) increase number chat node structures to 32
Express
1) Remove unused variables
2) Split out some code into separate modules
3) Correct date format of DT_STAMP_LASTON
4) Track last dl cps to be used to estimate next dl time
5) midstr incorrectly used in many places
6) Support for HTTP uploads
7) More accurate tracking of transfer cps
8) Chat flag changed from YES/NO to ON/OFF (fix pager doors)
9) Add extra checks for server messages
10) Remove pause checks prior to logon
11) More accurate pause checks
12) Show todays calls as 0 if no calls made today
13) Fixed pointer bug when detecting callers IP
14) Only update status window title when using pubscreen
15) Change conf rejoin to handle multiple messagebases
16) Search all ndoes for user answers and display in account editor
17) Active/inactive flag sometimes not displayed in account editor
18) Setting messagebase rjoin from bulk editor
19) Fix incorrect checking of chat available flag when paging
20) Open zmodem stats window if screen is opened mid transfer
Update from 5.3alpha to 5.3beta
  • Loading branch information
dmcoles committed May 11, 2020
1 parent 97002ac commit f36183e
Show file tree
Hide file tree
Showing 13 changed files with 1,678 additions and 1,339 deletions.
47 changes: 7 additions & 40 deletions ACP.e
Original file line number Diff line number Diff line change
Expand Up @@ -44,35 +44,6 @@
'*stringlist',
'*acpversion'

/*
'Setup'
BBS:Config%d
execute %s
Icon Setup Complete.
Cannot Locate Icon Config.

aErrorCreatingD:dc.b 'Error Creating Directory %s',$A,0
aCreatingIconS: dc.b 'Creating Icon %s',$A,0
a3_3s: dc.b '>%-3.3s',0
aS_txt: dc.b '%s.txt',0
aErrorCreatingI:dc.b 'Error creating Icon %s',$A,0
aErrorCreatin_0:dc.b 'Error Creating Directory %s',$A,0
aCreatingIcon_0:dc.b 'Creating Icon %s',$A,0
aDrw: dc.b '>DRW',0
aS_txt_0: dc.b '%s.txt',0
aErrorCreatin_1:dc.b 'Error creating Icon %s',$A,0
aDir: dc.b '(DIR)',0
aAddingTooltype:dc.b 9,'Adding ToolType %s',$A,0
aErrorOpeningCo:dc.b 'Error opening config file',$A,0
aDef: dc.b '>DEF',0
aUsingDefaultIc:dc.b 'Using Default Icon',$A,0
aSelectIconconf:dc.b 'Select IconConfig',0
a?: dc.b '#?',0
aS_1: dc.b 's:',0
aAeicon_config: dc.b 'aeicon.config',0

*/

ENUM ERR_NONE,ERR_ALREADY_RUNNING,ERR_STARTUP, ERR_VALIDATE,ERR_NO_DISKFONT,ERR_FDS_RANGE

CONST LISTENQ=100
Expand Down Expand Up @@ -618,7 +589,7 @@ ENDPROC
PROC openListenSocket(port)
DEF server_s
DEF servaddr=0:PTR TO sockaddr_in
DEF tempStr[255]:STRING
->DEF tempStr[255]:STRING

IF((server_s:=Socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
->StringF(tempStr,'/X Telnet: Error creating listening socket. (\d)\b\n',Errno())
Expand Down Expand Up @@ -752,7 +723,7 @@ PROC initCycles()
ENDPROC

PROC initNdCycles()
DEF i,x
DEF x
DEF list:PTR TO itemsList
FOR x:=0 TO MAX_NODES-1
ndUser[x]:=NEW list.init()
Expand Down Expand Up @@ -1752,7 +1723,7 @@ PROC maddNodes(nodes)
ENDFOR
ENDPROC

PROC maddItem(type,label:PTR TO CHAR,commKey:PTR TO CHAR,flags,mutual,user)
PROC maddItem(type,label:PTR TO CHAR,commKey:PTR TO CHAR,flags,mutual,userData)
->DEF i=0 was static
DEF t:PTR TO newmenu
DEF s:PTR TO CHAR
Expand All @@ -1767,10 +1738,10 @@ PROC maddItem(type,label:PTR TO CHAR,commKey:PTR TO CHAR,flags,mutual,user)
s:=AllocMem(80,MEMF_PUBLIC OR MEMF_CLEAR)
IF(label) THEN strcpy(s,label) ELSE strcpy(s,'')
t.label:=s
t.commkey:=0->//(STRPTR)CommKey
t.commkey:=commKey
t.flags:=flags
t.mutualexclude:=mutual
t.userdata:=0
t.userdata:=userData
maxMenus++
ENDIF
maddItemi++
Expand All @@ -1788,7 +1759,6 @@ PROC maddRem()
ENDPROC

PROC regLastDownloads(name:PTR TO CHAR,dateStr:PTR TO CHAR,node)
DEF i=0
->DEF num=0 was static

regNodeDownloads(name,dateStr,node)
Expand All @@ -1802,7 +1772,6 @@ PROC regNodeDownloads(name:PTR TO CHAR, dateStr:PTR TO CHAR,node)
ENDPROC

PROC regLastUploads(name:PTR TO CHAR,dateStr:PTR TO CHAR,node)
DEF i=0
->DEF num=0 was static

regNodeUploads(name,dateStr,node)
Expand Down Expand Up @@ -1838,7 +1807,6 @@ PROC showQuiet(i)
ENDPROC

PROC regLastUser(name:PTR TO CHAR,dateStr:PTR TO CHAR,node)
DEF i=0
DEF tempStr[44]:STRING
->DEF num=0; was static

Expand Down Expand Up @@ -2187,7 +2155,7 @@ PROC initSemaSemiNodes(s:PTR TO multiPort)
DEF j
WHILE(i<MAX_NODES)
strcpy(s.myNode[i].handle,'')
FOR j:=0 TO 8
FOR j:=0 TO MAX_NODES-1
s.myNode[i].stats[j].info:=0
s.myNode[i].stats[j].status:=CHAT_NONE
ENDFOR
Expand Down Expand Up @@ -2623,7 +2591,6 @@ PROC setTheGads()
->DEF j=0 ->static int j=0;
->DEF set=FALSE ->static BOOL Set=FALSE;
DEF ng:PTR TO newgadget
DEF s

IF(setTheGadsj=FALSE)
StrCopy(setOriText[0],'Sysop Login')
Expand Down Expand Up @@ -3467,7 +3434,7 @@ PROC main() HANDLE
DEF num
DEF version[200]:STRING
DEF windowSig,myappsig
DEF i,j,class
DEF i,class
DEF newlock=NIL
DEF telnetServerSocket=-1
DEF telnetSocket=-1
Expand Down
43 changes: 38 additions & 5 deletions MiscFuncs.e
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ EXPORT PROC strCmpi(test1: PTR TO CHAR, test2: PTR TO CHAR, len)
ENDFOR
ENDPROC TRUE

EXPORT PROC midStr2(dest,src,pos,len)
IF len>0 THEN MidStr(dest,src,pos,len) ELSE StrCopy(dest,'')
ENDPROC

EXPORT PROC charToLower(c)
/* convert a given char to lowercase */
DEF str[1]:STRING
Expand Down Expand Up @@ -209,7 +213,7 @@ EXPORT PROC formatLongDate(cDateVal,outDateStr)
DEF d : PTR TO datestamp
DEF dt : datetime
DEF datestr[10]:STRING
DEF r,dateVal
DEF dateVal

dateVal:=cDateVal-21600

Expand All @@ -236,7 +240,7 @@ EXPORT PROC formatLongTime(cDateVal,outDateStr)
DEF d : PTR TO datestamp
DEF dt : datetime
DEF time[10]:STRING
DEF r,dateVal
DEF dateVal

dateVal:=cDateVal-21600

Expand Down Expand Up @@ -265,7 +269,36 @@ EXPORT PROC formatLongDateTime(cDateVal,outDateStr)
DEF datestr[10]:STRING
DEF daystr[10]:STRING
DEF timestr[10]:STRING
DEF r,dateVal
DEF dateVal

dateVal:=cDateVal-21600

d:=dt.stamp
d.tick:=(dateVal-Mul(Div(dateVal,60),60))
d.tick:=Mul(d.tick,50)
dateVal:=Div(dateVal,60)
d.days:=Div((dateVal),1440)-2922 ->-2922 days between 1/1/70 and 1/1/78
d.minute:=dateVal-(Mul(d.days+2922,1440))

dt.format:=FORMAT_DOS
dt.flags:=0
dt.strday:=daystr
dt.strdate:=datestr
dt.strtime:=timestr

IF DateToStr(dt)
StringF(outDateStr,'\s[3] \s[7]\d\s \s',daystr,datestr,IF dt.stamp.days>=8035 THEN 20 ELSE 19,datestr+7,timestr)
RETURN TRUE
ENDIF
ENDPROC FALSE

EXPORT PROC formatCDateTime(cDateVal,outDateStr)
DEF d : PTR TO datestamp
DEF dt : datetime
DEF datestr[10]:STRING
DEF daystr[10]:STRING
DEF timestr[10]:STRING
DEF dateVal

dateVal:=cDateVal-21600

Expand All @@ -283,7 +316,7 @@ EXPORT PROC formatLongDateTime(cDateVal,outDateStr)
dt.strtime:=timestr

IF DateToStr(dt)
StringF(outDateStr,'\s[3] \s \s',daystr,datestr,timestr)
StringF(outDateStr,'\s[3] \s[3] \s[2] \s \d\s',daystr,datestr+3,datestr,timestr,IF dt.stamp.days>=8035 THEN 20 ELSE 19,datestr+7)
RETURN TRUE
ENDIF
ENDPROC FALSE
Expand All @@ -293,7 +326,7 @@ EXPORT PROC formatLongDateTime2(cDateVal,outDateStr,seperatorChar)
DEF dt : datetime
DEF datestr[10]:STRING
DEF timestr[10]:STRING
DEF r,dateVal
DEF dateVal

dateVal:=cDateVal-21600

Expand Down
2 changes: 1 addition & 1 deletion axcommon.e
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ undocumented host addresses:
637 - get or set internet name
638 - get or set translator
639 - get or set host language name (languages.info)
640 - set amixnet outbound path (not yet implemented)
640 - set amixnet outbound path
*/

/* New host commands for /X5 using range 700+ */
Expand Down
25 changes: 13 additions & 12 deletions axobjects.e
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ EXPORT OBJECT user
/* Note ConfYM = the last msg you actually read, ConfRead is the same ?? */
newSinceDate: LONG
pwdHash: LONG
confRead2: LONG
confRead3: LONG
confRead2: LONG ->not used
confRead3: LONG ->not used
zoomType: INT
unknown: INT
unknown2: INT
unknown3: INT
unknown: INT ->not used
unknown2: INT ->not used
unknown3: INT ->not used
xferProtocol: INT
filler2: INT
lcFiles: INT
badFiles: INT
filler2: INT ->not used
lcFiles: INT ->not used
badFiles: INT ->not used
accountDate: LONG
screenType: INT
editorType: INT
Expand Down Expand Up @@ -61,9 +61,9 @@ EXPORT OBJECT user
creditTracking: CHAR -> track uploads/downloads flags in credit account
translatorID: CHAR
msgBaseRJoin:INT
confYM9: LONG
beginLogCall : LONG
protocol: CHAR
confYM9: LONG ->not used
beginLogCall : LONG ->not used
protocol: CHAR ->not really used
uucpa: CHAR
lineLength: CHAR
newUser: CHAR
Expand All @@ -88,7 +88,8 @@ EXPORT OBJECT userMisc
downloadBytesBCD[8]:ARRAY OF CHAR
uploadBytesBCD[8]:ARRAY OF CHAR
eMail[50]:ARRAY OF CHAR
unused[146]:ARRAY OF CHAR
lastDlCPS:LONG
unused[142]:ARRAY OF CHAR
->unknown[28]:ARRAY OF CHAR
->nodeFlags[32]:ARRAY OF LONG
->confFlags2[10]:ARRAY OF LONG
Expand Down
1 change: 0 additions & 1 deletion bcd.e
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ ENDPROC
EXPORT PROC convertFromBCD(inArray:PTR TO CHAR)
DEF tempBCD[8]:ARRAY
DEF bcdStr[20]:STRING
DEF i

convertToBCD($ffffffff,tempBCD)
subBCD2(tempBCD,inArray)
Expand Down
Loading

0 comments on commit f36183e

Please sign in to comment.