diff --git a/src/sbbs3/scfg/scfgnet.c b/src/sbbs3/scfg/scfgnet.c
index 11a26b09ace6a0e47e1d2afaf159dc03e4e12234..5711d4f591f58a1a5dc6a577ebe6d87e22bc8168 100644
--- a/src/sbbs3/scfg/scfgnet.c
+++ b/src/sbbs3/scfg/scfgnet.c
@@ -169,7 +169,6 @@ void net_cfg()
strcpy(opt[i++],"Internet E-mail");
strcpy(opt[i++],"QWK Packet Networks");
strcpy(opt[i++],"FidoNet EchoMail and NetMail");
- strcpy(opt[i++],"PostLink Networks");
opt[i][0]=0;
uifc.helpbuf=
"`Configure Networks:`\n"
@@ -611,130 +610,6 @@ void net_cfg()
}
}
}
- else if(i==3) {
- done=0;
- while(!done) {
- i=0;
- strcpy(opt[i++],"Network Hubs...");
- sprintf(opt[i++],"%-20.20s%-12s","Site Name",cfg.sys_psname);
- sprintf(opt[i++],"%-20.20s%-"PRIu32,"Site Number",cfg.sys_psnum);
- opt[i][0]=0;
- uifc.helpbuf=
- "`PostLink Networks:`\n"
- "\n"
- "From this menu you can configure PostLink or PCRelay Networks.\n"
- ;
- i=uifc.list(WIN_ACT|WIN_RHT|WIN_BOT|WIN_CHE,0,0,0,&pnet_dflt,0
- ,"PostLink Networks",opt);
- switch(i) {
- case -1: /* ESC */
- done=1;
- break;
- case 1:
- uifc.helpbuf=
- "`PostLink Site Name:`\n"
- "\n"
- "If your system is networked via PostLink or PCRelay, this should be the\n"
- "Site Name for your BBS.\n"
- ;
- uifc.input(WIN_MID|WIN_SAV,0,0,"Site Name"
- ,cfg.sys_psname,sizeof(cfg.sys_psname)-1,K_UPPER|K_EDIT);
- break;
- case 2:
- uifc.helpbuf=
- "`PostLink Site Number:`\n"
- "\n"
- "If your system is networked via PostLink or PCRelay, this should be the\n"
- "Site Number for your BBS.\n"
- ;
- ultoa(cfg.sys_psnum,str,10);
- uifc.input(WIN_MID|WIN_SAV,0,0,"Site Number"
- ,str,10,K_NUMBER|K_EDIT);
- cfg.sys_psnum=atol(str);
- break;
- case 0:
- while(1) {
- for(i=0;i<cfg.total_phubs && i<MAX_OPTS;i++)
- sprintf(opt[i],"%-10.10s",cfg.phub[i]->name);
- opt[i][0]=0;
- i=WIN_ACT|WIN_RHT|WIN_SAV;
- if(cfg.total_phubs<MAX_OPTS)
- i|=WIN_INS|WIN_INSACT|WIN_XTR;
- if(cfg.total_phubs)
- i|=WIN_DEL;
- uifc.helpbuf=
- "`PostLink Network Hubs:`\n"
- "\n"
- "This is a list of PostLink and/or PCRelay network hubs that your system\n"
- "calls to exchange packets with.\n"
- "\n"
- "To add a hub, select the desired location with the arrow keys and hit\n"
- "~ INS ~.\n"
- "\n"
- "To delete a hub, select it and hit ~ DEL ~.\n"
- "\n"
- "To configure a hub, select it and hit ~ ENTER ~.\n"
- ;
- i=uifc.list(i,0,0,0,&phub_dflt,0
- ,"PostLink Hubs",opt);
- if(i==-1)
- break;
- int msk = i & MSK_ON;
- i &= MSK_OFF;
- if (msk == MSK_INS) {
- if((cfg.phub=(phub_t **)realloc(cfg.phub
- ,sizeof(phub_t *)*(cfg.total_phubs+1)))==NULL) {
- errormsg(WHERE,ERR_ALLOC,nulstr
- ,sizeof(phub_t *)*(cfg.total_phubs+1));
- cfg.total_phubs=0;
- bail(1);
- continue;
- }
-
- uifc.helpbuf=
- "`Network Hub Site Name:`\n"
- "\n"
- "This is the Site Name of this hub. It is used for only for reference.\n"
- ;
- if(uifc.input(WIN_MID|WIN_SAV,0,0
- ,"Site Name",str,10,K_UPPER)<1)
- continue;
-
- for(j=cfg.total_phubs;j>i;j--)
- cfg.phub[j]=cfg.phub[j-1];
-
- if((cfg.phub[i]=(phub_t *)malloc(sizeof(phub_t)))
- ==NULL) {
- errormsg(WHERE,ERR_ALLOC,nulstr
- ,sizeof(phub_t));
- continue;
- }
- memset(cfg.phub[i],0,sizeof(phub_t));
- strcpy(cfg.phub[i]->name,str);
- strcpy(cfg.phub[i]->call,"%!pnet");
- cfg.phub[i]->node=1;
- cfg.phub[i]->days=(uchar)0xff; /* all days */
- cfg.total_phubs++;
- uifc.changes=1;
- continue;
- }
- if (msk == MSK_DEL) {
- free(cfg.phub[i]);
- cfg.total_phubs--;
- while(i<cfg.total_phubs) {
- cfg.phub[i]=cfg.phub[i+1];
- i++;
- }
- uifc.changes=1;
- continue;
- }
- phub_edit(i);
- }
- break;
- }
- }
- }
-
else if(i==0) { /* Internet E-mail */
done=0;
while(!done) {
@@ -1356,150 +1231,6 @@ BOOL import_qwk_conferences(uint qhubnum)
return TRUE;
}
-void phub_edit(int num)
-{
- static int phub_dflt;
- char *p,done=0,str[256];
- int i,j;
-
- while(!done) {
- i=0;
- sprintf(opt[i++],"%-27.27s%s","Hub Site Name",cfg.phub[num]->name);
- sprintf(opt[i++],"%-27.27s%.40s","Call-out Command Line",cfg.phub[num]->call);
- sprintf(opt[i++],"%-27.27s%u","Call-out Node",cfg.phub[num]->node);
- sprintf(opt[i++],"%-27.27s%s","Call-out Days",daystr(cfg.phub[num]->days));
- if(cfg.phub[num]->freq) {
- sprintf(str,"%u times a day",1440/cfg.phub[num]->freq);
- sprintf(opt[i++],"%-27.27s%s","Call-out Frequency",str);
- }
- else {
- sprintf(str,"%2.2u:%2.2u",cfg.phub[num]->time/60
- ,cfg.phub[num]->time%60);
- sprintf(opt[i++],"%-27.27s%s","Call-out Time",str);
- }
- opt[i][0]=0;
- sprintf(str,"%s Network Hub",cfg.phub[num]->name);
- uifc.helpbuf=
- "`PostLink Network Hub Configuration:`\n"
- "\n"
- "This menu allows you to configure options specific to this network hub.\n"
- ;
- switch(uifc.list(WIN_ACT|WIN_MID|WIN_SAV,0,0,0,&phub_dflt,0
- ,str,opt)) {
- case -1:
- done=1;
- break;
- case 0:
- uifc.helpbuf=
- "`Network Hub Site Name:`\n"
- "\n"
- "This is the Site Name of this hub. It is used for only for reference.\n"
- ;
- strcpy(str,cfg.phub[num]->name); /* save */
- if(!uifc.input(WIN_MID|WIN_SAV,0,0,"Hub Site Name"
- ,cfg.phub[num]->name,sizeof(cfg.phub[num]->name)-1,K_UPPER|K_EDIT))
- strcpy(cfg.phub[num]->name,str); /* restore */
- break;
- case 1:
- uifc.helpbuf=
- "`Network Hub Call-out Command Line:`\n"
- "\n"
- "This is the command line to use to initiate a call-out to this network\n"
- "hub.\n"
- ;
- uifc.input(WIN_MID|WIN_SAV,0,0,"Call-out Command"
- ,cfg.phub[num]->call,sizeof(cfg.phub[num]->call)-1,K_EDIT);
- break;
- case 2:
- sprintf(str,"%u",cfg.phub[num]->node);
- uifc.helpbuf=
- "`Node to Perform Call-out:`\n"
- "\n"
- "This is the number of the node to perform the call-out for this network\n"
- "hub.\n"
- ;
- uifc.input(WIN_MID|WIN_SAV,0,0
- ,"Node to Perform Call-out",str,3,K_EDIT|K_NUMBER);
- cfg.phub[num]->node=atoi(str);
- break;
- case 3:
- j=0;
- while(1) {
- for(i=0;i<7;i++)
- sprintf(opt[i],"%s %s"
- ,wday[i],(cfg.phub[num]->days&(1<<i)) ? "Yes":"No");
- opt[i][0]=0;
- uifc.helpbuf=
- "`Days to Perform Call-out:`\n"
- "\n"
- "These are the days that a call-out will be performed for this network\n"
- "hub.\n"
- ;
- i=uifc.list(WIN_MID|WIN_SAV,0,0,0,&j,0
- ,"Days to Perform Call-out",opt);
- if(i==-1)
- break;
- cfg.phub[num]->days^=(1<<i);
- uifc.changes=1;
- }
- break;
- case 4:
- i=1;
- uifc.helpbuf=
- "`Perform Call-out at a Specific Time:`\n"
- "\n"
- "If you want the system call this network hub at a specific time, set\n"
- "this option to `Yes`. If you want the system to call this hub more than\n"
- "once a day at predetermined intervals, set this option to `No`.\n"
- ;
- i=uifc.list(WIN_MID|WIN_SAV,0,0,0,&i,0
- ,"Perform Call-out at a Specific Time",uifcYesNoOpts);
- if(i==0) {
- sprintf(str,"%2.2u:%2.2u",cfg.phub[num]->time/60
- ,cfg.phub[num]->time%60);
- uifc.helpbuf=
- "`Time to Perform Call-out:`\n"
- "\n"
- "This is the time (in 24 hour HH:MM format) to perform the call-out to\n"
- "this network hub.\n"
- ;
- if(uifc.input(WIN_MID|WIN_SAV,0,0
- ,"Time to Perform Call-out (HH:MM)"
- ,str,5,K_UPPER|K_EDIT)>0) {
- cfg.phub[num]->freq=0;
- cfg.phub[num]->time=atoi(str)*60;
- if((p=strchr(str,':'))!=NULL)
- cfg.phub[num]->time+=atoi(p+1);
- }
- }
- else if(i==1) {
- sprintf(str,"%u",cfg.phub[num]->freq
- && cfg.phub[num]->freq<=1440 ? 1440/cfg.phub[num]->freq : 0);
- uifc.helpbuf=
- "`Number of Call-outs Per Day:`\n"
- "\n"
- "This is the maximum number of times the system will perform a call-out\n"
- "per day to this network hub. This value is actually converted by\n"
- "Synchronet into minutes between call-outs and when the BBS is idle\n"
- "and this number of minutes since the last call-out is reached, it will\n"
- "perform a call-out.\n"
- ;
- if(uifc.input(WIN_MID|WIN_SAV,0,0
- ,"Number of Call-outs Per Day"
- ,str,4,K_NUMBER|K_EDIT)>0) {
- cfg.phub[num]->time=0;
- i=atoi(str);
- if(i && i<=1440)
- cfg.phub[num]->freq=1440/i;
- else
- cfg.phub[num]->freq=0;
- }
- }
- break;
- }
- }
-}
-
char *daystr(char days)
{
static char str[256];
diff --git a/src/sbbs3/scfg/scfgsub.c b/src/sbbs3/scfg/scfgsub.c
index c83416deafeb917e6606e01748d24168d3ea4a15..d7a5ab535a88c266e001b99beee17eb3d5300308 100644
--- a/src/sbbs3/scfg/scfgsub.c
+++ b/src/sbbs3/scfg/scfgsub.c
@@ -1041,8 +1041,6 @@ void sub_cfg(uint grpnum)
sprintf(opt[n++],"QWK Tagline");
sprintf(opt[n++],"%-27.27s%s","Internet (UUCP/NNTP)"
,cfg.sub[i]->misc&SUB_INET ? "Yes":"No");
- sprintf(opt[n++],"%-27.27s%s","PostLink or PCRelay"
- ,cfg.sub[i]->misc&SUB_PNET ? "Yes":"No");
sprintf(opt[n++],"%-27.27s%s","FidoNet EchoMail"
,cfg.sub[i]->misc&SUB_FIDO ? "Yes":"No");
sprintf(opt[n++],"%-27.27s%s","FidoNet Address"
@@ -1199,31 +1197,6 @@ void sub_cfg(uint grpnum)
}
break;
case 6:
- n=1;
- uifc.helpbuf=
- "`Sub-board Networked via PostLink or PCRelay:`\n"
- "\n"
- "If this sub-board is networked with other BBSs via PostLink or PCRelay,\n"
- "this option should be set to `Yes`. With this option set to `Yes`,\n"
- "titles of posts on this sub-board will be limited to the UTI\n"
- "specification limitation of 25 characters. It also allows the `N`etwork\n"
- "restriction to function properly.\n"
- ;
- n=uifc.list(WIN_SAV|WIN_MID,0,0,0,&n,0
- ,"Networked via PostLink or PCRelay",uifcYesNoOpts);
- if(n==-1)
- break;
- if(!n && !(cfg.sub[i]->misc&SUB_PNET)) {
- uifc.changes = TRUE;
- cfg.sub[i]->misc|=SUB_PNET;
- break;
- }
- if(n==1 && cfg.sub[i]->misc&SUB_PNET) {
- uifc.changes = TRUE;
- cfg.sub[i]->misc&=~SUB_PNET;
- }
- break;
- case 7:
n=1;
uifc.helpbuf=
"`Sub-board Networked via FidoNet EchoMail:`\n"
@@ -1245,7 +1218,7 @@ void sub_cfg(uint grpnum)
cfg.sub[i]->misc&=~SUB_FIDO;
}
break;
- case 8:
+ case 7:
smb_faddrtoa(&cfg.sub[i]->faddr,str);
uifc.helpbuf=
"`Sub-board FidoNet Address:`\n"
@@ -1257,7 +1230,7 @@ void sub_cfg(uint grpnum)
,str,25,K_EDIT);
cfg.sub[i]->faddr=atofaddr(str);
break;
- case 9:
+ case 8:
uifc.helpbuf=
"`Sub-board FidoNet Origin Line:`\n"
"\n"