diff --git a/express.e b/express.e index 56671f8..f9ef371 100644 --- a/express.e +++ b/express.e @@ -3604,17 +3604,11 @@ PROC runDoor(cmd,type,command,params,resident,doorTrap,privcmd,pri=0,stacksize=2 loggedOnUser.lineLength:=Val(msg.string) ENDIF CASE ACTIVE_NODES - strCpy(msg.string,' ',ALL) - IF(FindPort('AmiExpress_Node.0')) THEN msg.string[0]:="X" - IF(FindPort('AmiExpress_Node.1')) THEN msg.string[1]:="X" - IF(FindPort('AmiExpress_Node.2')) THEN msg.string[2]:="X" - IF(FindPort('AmiExpress_Node.3')) THEN msg.string[3]:="X" - IF(FindPort('AmiExpress_Node.4')) THEN msg.string[4]:="X" - IF(FindPort('AmiExpress_Node.5')) THEN msg.string[5]:="X" - IF(FindPort('AmiExpress_Node.6')) THEN msg.string[6]:="X" - IF(FindPort('AmiExpress_Node.7')) THEN msg.string[7]:="X" - IF(FindPort('AmiExpress_Node.8')) THEN msg.string[8]:="X" - IF(FindPort('AmiExpress_Node.9')) THEN msg.string[9]:="X" + strCpy(msg.string,' ',ALL) + FOR i:=0 TO MAXNODES-1 + StringF(tempstring,'AmiExpress_Node.\d',i) + IF FindPort(tempstring) THEN msg.string[i]:="X" + ENDFOR CASE DT_DUMP dumpActiveUser(msg.string) CASE DT_MSGCODE @@ -6655,6 +6649,10 @@ PROC processWindowMessage(signals) DEF msgclass DEF win:PTR TO window + IF screen AND (scropen=FALSE) + IF CloseScreen(screen) THEN screen:=NIL + ENDIF + IF windowClose<>NIL windowsig:=Shl(1, windowClose.userport.sigbit) win:=windowClose @@ -20231,6 +20229,7 @@ PROC conferenceMaintenance() DEF tempstr[255]:STRING DEF tempstr2[255]:STRING DEF confLoc[255]:STRING + DEF confStr[10]:STRING DEF path[255]:STRING DEF path2[255]:STRING DEF dirCacheEnabled @@ -20255,11 +20254,13 @@ PROC conferenceMaintenance() IF getConfMsgBaseCount(conf)>1 getMsgBaseName(conf,msgBase,tempstr2) StringF(tempstr,'\s - \s',getConfName(conf),tempstr2) + StringF(confStr,'\d.\d',conf,msgBase) ELSE getConfName(conf,tempstr) + StringF(confStr,'\d',conf) ENDIF - StringF(tempstr,' Conference [\d[3]]: \s[29]\b\n',conf,tempstr) + StringF(tempstr,' Conference [\s[5]]: \s[29]\b\n',confStr,tempstr) aePuts(tempstr) aePuts(' THE FOLLOWING OPTIONS EFFECT ALL USERS FOR THIS CONFERENCE!\b\n') aePuts('1.> Ratio') @@ -21996,25 +21997,23 @@ PROC internalCommandCF() DEF confNums[255]:STRING DEF tempstr[255]:STRING DEF tempstr2[255]:STRING + DEF confStr[10]:STRING DEF c1,c2,c3,c4 DEF cb: PTR TO confBase DEF ch DEF stat DEF p:PTR TO CHAR DEF v + DEF n,cnt IF checkSecurity(ACS_CONFFLAGS)=FALSE THEN RETURN RESULT_NOT_ALLOWED REPEAT sendCLS() aePuts('\b\n') - IF (0) - aePuts(' M A F Z Conference M F Z Conference\b\n') - aePuts(' ~ ~ ~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~ ~ ~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~\b\n\b\n') - ELSE - aePuts(' M A F Z Conference\b\n') - aePuts(' ~ ~ ~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~\b\n\b\n') - ENDIF + aePuts(' M A F Z Conference M A F Z Conference\b\n') + aePuts(' ~ ~ ~ ~ ~~~~~~~~~~~~~~~~~~~~~~~ ~ ~ ~ ~ ~~~~~~~~~~~~~~~~~~~~~~~\b\n\b\n') + n:=0 FOR i:=1 TO cmds.numConf IF checkConfAccess(i) @@ -22052,17 +22051,20 @@ PROC internalCommandCF() IF getConfMsgBaseCount(i)>1 getMsgBaseName(i,m,tempstr) StringF(tempstr2,'\s - \s',getConfName(i),tempstr) + StringF(confStr,'\d.\d',relConf(i),m) + StringF(tempstr,'[\r\s[5]] \c \c \c \c \l\s[23]',confStr,c1,c4, c2,c3,tempstr2) ELSE getConfName(i,tempstr2) + StringF(tempstr,'[\r\d[5]] \c \c \c \c \l\s[23]',relConf(i),c1,c4, c2,c3,tempstr2) ENDIF - - - IF(0) - StringF(tempstr,' [\z\r\d[3]] \c \c \c \c \l\s[25] ',relConf(i),c1,c4, c2,c3,tempstr2) + + aePuts(tempstr) + IF n AND 1 + aePuts('\b\n') ELSE - StringF(tempstr,' [\z\r\d[3]] \c \c \c \c \l\s[25]\b\n',relConf(i),c1,c4, c2,c3,tempstr2) + aePuts(' ') ENDIF - aePuts(tempstr) + n++ ENDFOR ENDIF ENDFOR @@ -22114,31 +22116,48 @@ PROC internalCommandCF() ELSEIF StrLen(confNums)>0 p:=confNums WHILE((i:=InStr(p,','))<>-1) AND ((p-confNums)0) - v:=getInverse(v) - IF v<=cmds.numConf - IF checkConfAccess(v) - FOR m:=1 TO getConfMsgBaseCount(v) - cb:=confBases.item(getConfIndex(v,m)-1) + StrCopy(tempstr,p,i) + fullTrim(tempstr,tempstr2) + p:=p+i+1 + + FOR i:=1 TO cmds.numConf + IF checkConfAccess(i) + v:=getInverse(i) + cnt:=getConfMsgBaseCount(i) + FOR m:=1 TO cnt + IF cnt=1 + StringF(tempstr,'\d',v) + ELSE + StringF(tempstr,'\d.\d',v,m) + ENDIF + IF StrCmp(tempstr,tempstr2) + cb:=confBases.item(getConfIndex(i,m)-1) cb.handle[0]:=Eor(cb.handle[0],editmask) - ENDFOR - ENDIF + ENDIF + ENDFOR ENDIF - ENDIF - p:=p+i+1 + ENDFOR ENDWHILE - IF ((p-confNums)0) - v:=getInverse(v) - IF v<=cmds.numConf - IF checkConfAccess(v) - FOR m:=1 TO getConfMsgBaseCount(v) - cb:=confBases.item(getConfIndex(v,m)-1) - cb.handle[0]:=Eor(cb.handle[0],editmask) + IF ((p-confNums)