mirror of
https://github.com/opnsense/src.git
synced 2026-05-28 04:12:45 -04:00
Remove the registration stuff; we're redoing this and the emailed
registrations have a high failure rate for various reasons.
This commit is contained in:
Jordan K. Hubbard
parent
8ee64ab680
commit
c8f07a79f8
22 changed files with 21 additions and 485 deletions
|
|
@ -13,7 +13,7 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c kget.c \
|
|||
disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
|
||||
ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
|
||||
label.c lndir.c main.c makedevs.c media.c menus.c misc.c mouse.c \
|
||||
msg.c network.c nfs.c options.c package.c register.c system.c \
|
||||
msg.c network.c nfs.c options.c package.c system.c \
|
||||
tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
|
||||
keymap.h
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: config.c,v 1.123 1999/02/14 07:35:27 jkh Exp $
|
||||
* $Id: config.c,v 1.124 1999/02/14 21:35:01 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -420,12 +420,6 @@ configSaverTimeout(dialogMenuItem *self)
|
|||
DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE;
|
||||
}
|
||||
|
||||
int
|
||||
configRegister(dialogMenuItem *self)
|
||||
{
|
||||
return DITEM_STATUS(registerOpenDialog()) | DITEM_RESTORE;
|
||||
}
|
||||
|
||||
int
|
||||
configNTP(dialogMenuItem *self)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: dispatch.c,v 1.26 1998/11/15 09:06:19 jkh Exp $
|
||||
* $Id: dispatch.c,v 1.27 1999/02/05 22:15:48 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -56,7 +56,6 @@ static struct _word {
|
|||
{ "configNTP", configNTP },
|
||||
{ "configPCNFSD", configPCNFSD },
|
||||
{ "configPackages", configPackages },
|
||||
{ "configRegister", configRegister },
|
||||
{ "configUsers", configUsers },
|
||||
{ "configXEnvironment", configXEnvironment },
|
||||
{ "diskPartitionEditor", diskPartitionEditor },
|
||||
|
|
@ -105,7 +104,6 @@ static struct _word {
|
|||
{ "mediaGetType", mediaGetType },
|
||||
{ "msgConfirm", dispatch_msgConfirm },
|
||||
{ "optionsEditor", optionsEditor },
|
||||
{ "register", configRegister }, /* Alias */
|
||||
{ "packageAdd", packageAdd },
|
||||
{ "addGroup", userAddGroup },
|
||||
{ "addUser", userAddUser },
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: install.c,v 1.229 1999/02/15 00:49:33 jkh Exp $
|
||||
* $Id: install.c,v 1.230 1999/03/11 09:38:06 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -628,21 +628,6 @@ nodisks:
|
|||
restorescr(w);
|
||||
}
|
||||
|
||||
dialog_clear_norefresh();
|
||||
if (!msgYesNo("Would you like to register your FreeBSD system at this time?\n\n"
|
||||
"PLEASE, take just 5 minutes to do this. If we're ever to get any\n"
|
||||
"significant base of commercial software for FreeBSD, we need to\n"
|
||||
"be able to provide more information about the size of our user community.\n"
|
||||
"This is where your registration can really help us, and you can also\n"
|
||||
"sign up for the new FreeBSD newsletter (its free!) at the same time.\n"))
|
||||
configRegister(NULL);
|
||||
else {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("OK, but if you should change your mind then you always can register\n"
|
||||
"later by typing ``/stand/sysinstall register'' or by simply visiting our\n"
|
||||
"web site at http://www.freebsd.org/register.html");
|
||||
|
||||
}
|
||||
/* XXX Put whatever other nice configuration questions you'd like to ask the user here XXX */
|
||||
|
||||
/* Give user the option of one last configuration spree */
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: menus.c,v 1.193 1999/03/19 10:54:37 jkh Exp $
|
||||
* $Id: menus.c,v 1.194 1999/04/21 07:22:37 obrien Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -281,7 +281,6 @@ DMenu MenuIndex = {
|
|||
{ "Packages", "The packages collection", NULL, configPackages },
|
||||
{ "Partition", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor },
|
||||
{ "PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
|
||||
{ "Register", "Register yourself or company as a FreeBSD user.", dmenuVarCheck, configRegister, NULL, "registered" },
|
||||
{ "Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" },
|
||||
{ "Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" },
|
||||
{ "Syscons", "The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
|
||||
|
|
@ -1167,7 +1166,6 @@ DMenu MenuConfigure = {
|
|||
NULL, docBrowser },
|
||||
{ "X XFree86", "Configure XFree86",
|
||||
NULL, configXEnvironment },
|
||||
{ "U Register", "Register yourself or company as a FreeBSD user.", NULL, configRegister },
|
||||
{ "E Exit", "Exit this menu (returning to previous)",
|
||||
NULL, dmenuExit },
|
||||
{ NULL } },
|
||||
|
|
|
|||
|
|
@ -1,353 +0,0 @@
|
|||
/*
|
||||
* The new sysinstall program.
|
||||
*
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: register.c,v 1.8 1997/08/18 21:47:34 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1997
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer,
|
||||
* verbatim and that no modifications are made prior to this
|
||||
* point in the file.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY JORDAN HUBBARD ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL JORDAN HUBBARD OR HIS PETS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, LIFE OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "sysinstall.h"
|
||||
#include <ctype.h>
|
||||
|
||||
#define REGISTER_HELPFILE "register"
|
||||
#define REGISTRATION_FNAME "/new-registration"
|
||||
#define REGISTRATION_ADDRESS "register@freebsd.org"
|
||||
#define MAJORDOMO_ADDRESS "majordomo@freebsd.org"
|
||||
|
||||
#define FIRSTNAME_FIELD_LEN 25
|
||||
#define LASTNAME_FIELD_LEN 30
|
||||
#define EMAIL_FIELD_LEN 61
|
||||
#define ADDRESS_FIELD_LEN 160
|
||||
#define CITY_FIELD_LEN 20
|
||||
#define STATE_FIELD_LEN 15
|
||||
#define ZIP_FIELD_LEN 15
|
||||
|
||||
static char firstname[FIRSTNAME_FIELD_LEN], lastname[LASTNAME_FIELD_LEN],
|
||||
email[EMAIL_FIELD_LEN], address[ADDRESS_FIELD_LEN],
|
||||
city[CITY_FIELD_LEN], state[STATE_FIELD_LEN], zip[ZIP_FIELD_LEN];
|
||||
|
||||
static int okbutton, cancelbutton;
|
||||
|
||||
/* What the screen size is meant to be */
|
||||
#define REGISTER_DIALOG_Y 0
|
||||
#define REGISTER_DIALOG_X 2
|
||||
#define REGISTER_DIALOG_WIDTH COLS - 4
|
||||
#define REGISTER_DIALOG_HEIGHT LINES - 2
|
||||
|
||||
static Layout layout[] = {
|
||||
#define LAYOUT_LASTNAME 0
|
||||
{ 1, 2, LASTNAME_FIELD_LEN - 1, LASTNAME_FIELD_LEN - 1,
|
||||
"Last Name:", "Your surname (family name) or company name should go here.",
|
||||
lastname, STRINGOBJ, NULL },
|
||||
#define LAYOUT_FIRSTNAME 1
|
||||
{ 1, 36, FIRSTNAME_FIELD_LEN - 1, FIRSTNAME_FIELD_LEN - 1,
|
||||
"First Name:", "Your given name or a contact name if registering for a company.",
|
||||
firstname, STRINGOBJ, NULL },
|
||||
#define LAYOUT_EMAIL 2
|
||||
{ 6, 2, EMAIL_FIELD_LEN - 1, EMAIL_FIELD_LEN - 1,
|
||||
"EMail Address:",
|
||||
"Where you'd like any announcement email sent, e.g. bsdmail@someplace.com",
|
||||
email, STRINGOBJ, NULL },
|
||||
#define LAYOUT_ADDRESS 3
|
||||
{ 10, 2, 60, ADDRESS_FIELD_LEN - 1,
|
||||
"Street address:", "Your street address, all in one line (optional).",
|
||||
address, STRINGOBJ, NULL },
|
||||
#define LAYOUT_CITY 4
|
||||
{ 14, 2, CITY_FIELD_LEN - 1, CITY_FIELD_LEN - 1,
|
||||
"City:", "Your city name (optional)",
|
||||
city, STRINGOBJ, NULL },
|
||||
#define LAYOUT_STATE 5
|
||||
{ 14, 26, STATE_FIELD_LEN - 1, STATE_FIELD_LEN - 1,
|
||||
"State / Province:",
|
||||
"Your local state or province.",
|
||||
state, STRINGOBJ, NULL },
|
||||
#define LAYOUT_ZIP 5
|
||||
{ 14, 50, ZIP_FIELD_LEN - 1, ZIP_FIELD_LEN - 1,
|
||||
"Zip / Country Code:",
|
||||
"Your U.S. Zip code or International country code (optional).",
|
||||
zip, STRINGOBJ, NULL },
|
||||
#define LAYOUT_OKBUTTON 7
|
||||
{ 18, 20, 0, 0,
|
||||
"OK", "Select this if you are happy with these settings",
|
||||
&okbutton, BUTTONOBJ, NULL },
|
||||
#define LAYOUT_CANCELBUTTON 8
|
||||
{ 18, 40, 0, 0,
|
||||
"CANCEL", "Select this if you wish to cancel this registration",
|
||||
&cancelbutton, BUTTONOBJ, NULL },
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
/* Submenu selections */
|
||||
#define COMMERCE_MAIL 0
|
||||
#define COMMERCE_EMAIL 1
|
||||
#define ANNOUNCE_LIST 2
|
||||
#define NEWSLETTER 3
|
||||
|
||||
static struct { int y, x, sel; char *desc, *allowed; } hotspots[] = {
|
||||
{ 5, 35, 0, "Do you wish to receive FreeBSD [ONLY!] related commercial mail?", "Y" },
|
||||
{ 5, 57, 0, "Do you wish to receive FreeBSD [ONLY!] related commercial email?", "Y" },
|
||||
{ 6, 35, 0, "Sign up (with majordomo@FreeBSD.org) for important announcements?", "Y" },
|
||||
{ 10, 35, 0, "Sign up for the FreeBSD Newsletter? P = Postal (paper) copy, E = Email", "PE" },
|
||||
};
|
||||
|
||||
/* Check the accuracy of user's choices before letting them move on */
|
||||
static int
|
||||
verifySettings(void)
|
||||
{
|
||||
if (!lastname[0]) {
|
||||
msgConfirm("Missing last name / company name field.");
|
||||
return 0;
|
||||
}
|
||||
else if (email[0] && !index(email, '@'))
|
||||
return !msgYesNo("Hmmmm, this email address has no `@' in it. Are you\n"
|
||||
"sure that %s is a valid address?");
|
||||
else if (address[0] && !city[0]) {
|
||||
msgConfirm("Missing City name.");
|
||||
return 0;
|
||||
}
|
||||
else if (!email[0] && (hotspots[COMMERCE_EMAIL].sel || hotspots[NEWSLETTER].sel == 2)) {
|
||||
msgConfirm("You've signed up to receive commercial email or the newsletter by\n"
|
||||
"email but have no email address specified!");
|
||||
return 0;
|
||||
}
|
||||
else if (!address[0] && (hotspots[COMMERCE_MAIL].sel || hotspots[NEWSLETTER].sel == 1)) {
|
||||
msgConfirm("You've signed up to receive commercial mail or the newsletter by\n"
|
||||
"post but have no postal address specified!");
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Do the actual work of mailing out the registration once all is filled in */
|
||||
static void
|
||||
handle_registration(void)
|
||||
{
|
||||
FILE *fp;
|
||||
WINDOW *save = savescr();
|
||||
|
||||
dialog_clear_norefresh();
|
||||
(void)unlink(REGISTRATION_FNAME);
|
||||
fp = fopen(REGISTRATION_FNAME, "w");
|
||||
if (!fp) {
|
||||
msgConfirm("Unable to open %s for the new registration.\n"
|
||||
"That's pretty bad! Please fix whatever's wrong\n"
|
||||
"and try this registration again.");
|
||||
restorescr(save);
|
||||
return;
|
||||
}
|
||||
fprintf(fp, "<entry>\n");
|
||||
fprintf(fp, "<first>%s</first>\n", firstname);
|
||||
fprintf(fp, "<last>%s</last>\n", lastname);
|
||||
fprintf(fp, "<email>%s</email>\n", email);
|
||||
fprintf(fp, "<address>%s</address>\n", address);
|
||||
fprintf(fp, "<city>%s</city>\n", city);
|
||||
fprintf(fp, "<state>%s</state>\n", state);
|
||||
fprintf(fp, "<zip>%s</zip>\n", zip);
|
||||
fprintf(fp, "<options commerce_email=\"%s\" commerce_mail=\"%s\" announce=\"%s\" newsletter=\"%s\"></options>\n",
|
||||
hotspots[COMMERCE_EMAIL].sel ? "yes" : "no", hotspots[COMMERCE_MAIL].sel ? "yes" : "no",
|
||||
hotspots[ANNOUNCE_LIST].sel ? "yes" : "no",
|
||||
hotspots[NEWSLETTER].sel == 0 ? "no" : hotspots[NEWSLETTER].sel == 1 ? "postal" : "email");
|
||||
fprintf(fp, "<version>%s</version>\n", variable_get(VAR_RELNAME));
|
||||
fprintf(fp, "</entry>\n");
|
||||
fclose(fp);
|
||||
dialog_clear_norefresh();
|
||||
if (!msgYesNo("Do you have a working network connection and outgoing email\n"
|
||||
"enabled at this time? I need to be able to reach freebsd.org\n"
|
||||
"in order to submit your registration.")) {
|
||||
dialog_clear_norefresh();
|
||||
if (!vsystem("mail %s < %s", REGISTRATION_ADDRESS, REGISTRATION_FNAME)) {
|
||||
msgConfirm("Thank you! Your registration has been sent in successfully.\n");
|
||||
(void)unlink(REGISTRATION_FNAME);
|
||||
}
|
||||
else {
|
||||
msgConfirm("Argh! The mail program returned a bad status - there\n"
|
||||
"must be something still not quite configured correctly.\n"
|
||||
"leaving the registration in: %s\n"
|
||||
"When you're connected to the net and ready to send it,\n"
|
||||
"simply type: mail %s < %s\n", REGISTRATION_ADDRESS, REGISTRATION_FNAME,
|
||||
REGISTRATION_FNAME);
|
||||
}
|
||||
if (hotspots[ANNOUNCE_LIST].sel) {
|
||||
char *cp;
|
||||
|
||||
dialog_clear_norefresh();
|
||||
cp = msgGetInput(email, "What email address would you like to subscribe under?\n"
|
||||
"This is a fairly low-traffic mailing list and only generates\n"
|
||||
"around 5 messages a month, so it's also safe to receive at your\n"
|
||||
"standard email address.");
|
||||
if (!cp)
|
||||
msgConfirm("OK, I won't subscribe to announce at this time. To do it manually\n"
|
||||
"yourself, simply send mail to %s.", MAJORDOMO_ADDRESS);
|
||||
else {
|
||||
dialog_clear_norefresh();
|
||||
if (!vsystem("echo subscribe freebsd-announce %s | mail %s", email, MAJORDOMO_ADDRESS))
|
||||
msgConfirm("Your request to join the announce mailing list has been sent.\n"
|
||||
"you should receive notification back in 24 hours or less, otherwise\n"
|
||||
"something has gone wrong and you should try this again by sending\n"
|
||||
"a message to %s which contains the line:\n\n"
|
||||
"subscribe freebsd-announce %s\n", MAJORDOMO_ADDRESS, email);
|
||||
else
|
||||
msgConfirm("Argh! The mail program returned a bad status - there\n"
|
||||
"must be something still not quite configured correctly.\n"
|
||||
"Please fix this then try again by sending a message to\n"
|
||||
"to %s which contains the line:\n\n"
|
||||
"subscribe freebsd-announce %s\n", MAJORDOMO_ADDRESS, email);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("OK, your registration has been left in the file %s\n"
|
||||
"When you're connected to the net and ready to send it,\n"
|
||||
"simply type: mail %s < %s\n", REGISTRATION_FNAME,
|
||||
REGISTRATION_ADDRESS, REGISTRATION_FNAME);
|
||||
}
|
||||
restorescr(save);
|
||||
}
|
||||
|
||||
/* Put up a subdialog for the registration options */
|
||||
static void
|
||||
subdialog(WINDOW *win)
|
||||
{
|
||||
int i, j, attrs;
|
||||
char help_line[80];
|
||||
|
||||
attrs = getattrs(win);
|
||||
mvwaddstr(win, hotspots[COMMERCE_MAIL].y, hotspots[COMMERCE_MAIL].x - 1, "[ ] Postal Adverts");
|
||||
mvwaddstr(win, hotspots[COMMERCE_EMAIL].y, hotspots[COMMERCE_EMAIL].x - 1, "[ ] Email Adverts");
|
||||
mvwaddstr(win, hotspots[ANNOUNCE_LIST].y, hotspots[ANNOUNCE_LIST].x - 1,
|
||||
"[ ] The announce@FreeBSD.ORG mailing list.");
|
||||
mvwaddstr(win, hotspots[NEWSLETTER].y, hotspots[NEWSLETTER].x - 1, "[ ] The FreeBSD Newsletter.");
|
||||
/* Tack up the initial values */
|
||||
for (i = 0; i < sizeof(hotspots) / sizeof(hotspots[0]); i++) {
|
||||
wattrset(win, attrs | A_BOLD);
|
||||
mvwaddch(win, hotspots[i].y, hotspots[i].x, hotspots[i].sel ? hotspots[i].allowed[hotspots[i].sel - 1] : 'N');
|
||||
}
|
||||
wattrset(win, attrs);
|
||||
wrefresh(win);
|
||||
|
||||
for (i = 0; i < sizeof(hotspots) / sizeof(hotspots[0]);) {
|
||||
int ch, len = strlen(hotspots[i].desc);
|
||||
char *cp;
|
||||
|
||||
/* Display the help line at the bottom of the screen */
|
||||
for (j = 0; j < 79; j++)
|
||||
help_line[j] = (j < len) ? hotspots[i].desc[j] : ' ';
|
||||
help_line[j] = '\0';
|
||||
use_helpline(help_line);
|
||||
display_helpline(win, LINES - 1, COLS - 1);
|
||||
wmove(win, hotspots[i].y, hotspots[i].x);
|
||||
wrefresh(win);
|
||||
switch(ch = toupper(getch())) {
|
||||
case KEY_UP:
|
||||
if (i)
|
||||
i--;
|
||||
continue;
|
||||
|
||||
case KEY_DOWN:
|
||||
case '\011': /* TAB */
|
||||
case '\012': /* ^J */
|
||||
case '\014': /* ^M */
|
||||
/* Treat as a no-change op */
|
||||
++i;
|
||||
break;
|
||||
|
||||
case 'N': /* No is generic to all */
|
||||
hotspots[i].sel = 0;
|
||||
wattrset(win, attrs | A_BOLD);
|
||||
mvwaddch(win, hotspots[i].y, hotspots[i].x, 'N');
|
||||
wattrset(win, attrs);
|
||||
wrefresh(win);
|
||||
++i;
|
||||
break;
|
||||
|
||||
default:
|
||||
cp = index(hotspots[i].allowed, ch);
|
||||
if (cp) {
|
||||
hotspots[i].sel = (cp - hotspots[i].allowed) + 1;
|
||||
wattrset(win, attrs | A_BOLD);
|
||||
mvwaddch(win, hotspots[i].y, hotspots[i].x, *cp);
|
||||
wattrset(win, attrs);
|
||||
wrefresh(win);
|
||||
++i;
|
||||
}
|
||||
else
|
||||
beep();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Register a user */
|
||||
int
|
||||
registerOpenDialog(void)
|
||||
{
|
||||
WINDOW *ds_win, *save = savescr();
|
||||
ComposeObj *obj = NULL;
|
||||
int n = 0, cancel = FALSE;
|
||||
int max, ret = DITEM_SUCCESS;
|
||||
|
||||
dialog_clear_norefresh();
|
||||
/* We need a curses window */
|
||||
if (!(ds_win = openLayoutDialog(REGISTER_HELPFILE, " FreeBSD Registration Form: Press F1 for Help / General Info ",
|
||||
REGISTER_DIALOG_X, REGISTER_DIALOG_Y,
|
||||
REGISTER_DIALOG_WIDTH, REGISTER_DIALOG_HEIGHT))) {
|
||||
beep();
|
||||
msgConfirm("Cannot open registration dialog window!!");
|
||||
restorescr(save);
|
||||
return DITEM_FAILURE;
|
||||
}
|
||||
|
||||
/* Some more initialisation before we go into the main input loop */
|
||||
obj = initLayoutDialog(ds_win, layout, REGISTER_DIALOG_X, REGISTER_DIALOG_Y, &max);
|
||||
|
||||
reenter:
|
||||
cancelbutton = okbutton = 0;
|
||||
while (layoutDialogLoop(ds_win, layout, &obj, &n, max, &cancelbutton, &cancel)) {
|
||||
if (n == LAYOUT_ADDRESS)
|
||||
subdialog(ds_win);
|
||||
}
|
||||
|
||||
if (!cancel && !verifySettings())
|
||||
goto reenter;
|
||||
|
||||
/* OK, we've got a valid registration, now push it out */
|
||||
if (!cancel)
|
||||
handle_registration();
|
||||
|
||||
/* Clear this crap off the screen */
|
||||
delwin(ds_win);
|
||||
dialog_clear_norefresh();
|
||||
use_helpfile(NULL);
|
||||
|
||||
restorescr(save);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" $Id: sysinstall.8,v 1.15 1999/02/05 09:28:16 jkh Exp $
|
||||
.\" $Id: sysinstall.8,v 1.16 1999/02/18 23:59:58 jkh Exp $
|
||||
.\"
|
||||
.Dd August 9, 1997
|
||||
.Dt SYSINSTALL 8
|
||||
|
|
@ -208,10 +208,6 @@ version).
|
|||
Bring up the interactive package management menu.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It configRegister
|
||||
Register the user with the FreeBSD counter.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It configUsers
|
||||
Add users and/or groups to the system.
|
||||
.Pp
|
||||
|
|
@ -740,10 +736,6 @@ Interactively get the user to specify some type of media.
|
|||
Invoke the interactive options editor.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It register
|
||||
Bring up the FreeBSD registration form.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It packageAdd
|
||||
Try to fetch and add a package to the system (requires
|
||||
that a media type be set),
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last attempt in the `sysinstall' line, the next
|
||||
* generation being slated to essentially a complete rewrite.
|
||||
*
|
||||
* $Id: sysinstall.h,v 1.159 1999/03/19 10:54:38 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.160 1999/04/06 08:25:53 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -409,7 +409,6 @@ extern void configEnvironmentResolv(char *config);
|
|||
extern void configRC_conf(void);
|
||||
extern int configFstab(dialogMenuItem *self);
|
||||
extern int configRC(dialogMenuItem *self);
|
||||
extern int configRegister(dialogMenuItem *self);
|
||||
extern int configResolv(dialogMenuItem *self);
|
||||
extern int configPackages(dialogMenuItem *self);
|
||||
extern int configSaver(dialogMenuItem *self);
|
||||
|
|
@ -665,9 +664,6 @@ extern int package_add(char *name);
|
|||
extern int package_extract(Device *dev, char *name, Boolean depended);
|
||||
extern Boolean package_exists(char *name);
|
||||
|
||||
/* register.c */
|
||||
extern int registerOpenDialog(void);
|
||||
|
||||
/* system.c */
|
||||
extern void systemInitialize(int argc, char **argv);
|
||||
extern void systemShutdown(int status);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c kget.c \
|
|||
disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
|
||||
ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
|
||||
label.c lndir.c main.c makedevs.c media.c menus.c misc.c mouse.c \
|
||||
msg.c network.c nfs.c options.c package.c register.c system.c \
|
||||
msg.c network.c nfs.c options.c package.c system.c \
|
||||
tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
|
||||
keymap.h
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: config.c,v 1.123 1999/02/14 07:35:27 jkh Exp $
|
||||
* $Id: config.c,v 1.124 1999/02/14 21:35:01 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -420,12 +420,6 @@ configSaverTimeout(dialogMenuItem *self)
|
|||
DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE;
|
||||
}
|
||||
|
||||
int
|
||||
configRegister(dialogMenuItem *self)
|
||||
{
|
||||
return DITEM_STATUS(registerOpenDialog()) | DITEM_RESTORE;
|
||||
}
|
||||
|
||||
int
|
||||
configNTP(dialogMenuItem *self)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: dispatch.c,v 1.26 1998/11/15 09:06:19 jkh Exp $
|
||||
* $Id: dispatch.c,v 1.27 1999/02/05 22:15:48 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -56,7 +56,6 @@ static struct _word {
|
|||
{ "configNTP", configNTP },
|
||||
{ "configPCNFSD", configPCNFSD },
|
||||
{ "configPackages", configPackages },
|
||||
{ "configRegister", configRegister },
|
||||
{ "configUsers", configUsers },
|
||||
{ "configXEnvironment", configXEnvironment },
|
||||
{ "diskPartitionEditor", diskPartitionEditor },
|
||||
|
|
@ -105,7 +104,6 @@ static struct _word {
|
|||
{ "mediaGetType", mediaGetType },
|
||||
{ "msgConfirm", dispatch_msgConfirm },
|
||||
{ "optionsEditor", optionsEditor },
|
||||
{ "register", configRegister }, /* Alias */
|
||||
{ "packageAdd", packageAdd },
|
||||
{ "addGroup", userAddGroup },
|
||||
{ "addUser", userAddUser },
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: install.c,v 1.229 1999/02/15 00:49:33 jkh Exp $
|
||||
* $Id: install.c,v 1.230 1999/03/11 09:38:06 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -628,21 +628,6 @@ nodisks:
|
|||
restorescr(w);
|
||||
}
|
||||
|
||||
dialog_clear_norefresh();
|
||||
if (!msgYesNo("Would you like to register your FreeBSD system at this time?\n\n"
|
||||
"PLEASE, take just 5 minutes to do this. If we're ever to get any\n"
|
||||
"significant base of commercial software for FreeBSD, we need to\n"
|
||||
"be able to provide more information about the size of our user community.\n"
|
||||
"This is where your registration can really help us, and you can also\n"
|
||||
"sign up for the new FreeBSD newsletter (its free!) at the same time.\n"))
|
||||
configRegister(NULL);
|
||||
else {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("OK, but if you should change your mind then you always can register\n"
|
||||
"later by typing ``/stand/sysinstall register'' or by simply visiting our\n"
|
||||
"web site at http://www.freebsd.org/register.html");
|
||||
|
||||
}
|
||||
/* XXX Put whatever other nice configuration questions you'd like to ask the user here XXX */
|
||||
|
||||
/* Give user the option of one last configuration spree */
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: menus.c,v 1.193 1999/03/19 10:54:37 jkh Exp $
|
||||
* $Id: menus.c,v 1.194 1999/04/21 07:22:37 obrien Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -281,7 +281,6 @@ DMenu MenuIndex = {
|
|||
{ "Packages", "The packages collection", NULL, configPackages },
|
||||
{ "Partition", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor },
|
||||
{ "PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
|
||||
{ "Register", "Register yourself or company as a FreeBSD user.", dmenuVarCheck, configRegister, NULL, "registered" },
|
||||
{ "Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" },
|
||||
{ "Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" },
|
||||
{ "Syscons", "The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
|
||||
|
|
@ -1167,7 +1166,6 @@ DMenu MenuConfigure = {
|
|||
NULL, docBrowser },
|
||||
{ "X XFree86", "Configure XFree86",
|
||||
NULL, configXEnvironment },
|
||||
{ "U Register", "Register yourself or company as a FreeBSD user.", NULL, configRegister },
|
||||
{ "E Exit", "Exit this menu (returning to previous)",
|
||||
NULL, dmenuExit },
|
||||
{ NULL } },
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" $Id: sysinstall.8,v 1.15 1999/02/05 09:28:16 jkh Exp $
|
||||
.\" $Id: sysinstall.8,v 1.16 1999/02/18 23:59:58 jkh Exp $
|
||||
.\"
|
||||
.Dd August 9, 1997
|
||||
.Dt SYSINSTALL 8
|
||||
|
|
@ -208,10 +208,6 @@ version).
|
|||
Bring up the interactive package management menu.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It configRegister
|
||||
Register the user with the FreeBSD counter.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It configUsers
|
||||
Add users and/or groups to the system.
|
||||
.Pp
|
||||
|
|
@ -740,10 +736,6 @@ Interactively get the user to specify some type of media.
|
|||
Invoke the interactive options editor.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It register
|
||||
Bring up the FreeBSD registration form.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It packageAdd
|
||||
Try to fetch and add a package to the system (requires
|
||||
that a media type be set),
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last attempt in the `sysinstall' line, the next
|
||||
* generation being slated to essentially a complete rewrite.
|
||||
*
|
||||
* $Id: sysinstall.h,v 1.159 1999/03/19 10:54:38 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.160 1999/04/06 08:25:53 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -409,7 +409,6 @@ extern void configEnvironmentResolv(char *config);
|
|||
extern void configRC_conf(void);
|
||||
extern int configFstab(dialogMenuItem *self);
|
||||
extern int configRC(dialogMenuItem *self);
|
||||
extern int configRegister(dialogMenuItem *self);
|
||||
extern int configResolv(dialogMenuItem *self);
|
||||
extern int configPackages(dialogMenuItem *self);
|
||||
extern int configSaver(dialogMenuItem *self);
|
||||
|
|
@ -665,9 +664,6 @@ extern int package_add(char *name);
|
|||
extern int package_extract(Device *dev, char *name, Boolean depended);
|
||||
extern Boolean package_exists(char *name);
|
||||
|
||||
/* register.c */
|
||||
extern int registerOpenDialog(void);
|
||||
|
||||
/* system.c */
|
||||
extern void systemInitialize(int argc, char **argv);
|
||||
extern void systemShutdown(int status);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c kget.c \
|
|||
disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
|
||||
ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
|
||||
label.c lndir.c main.c makedevs.c media.c menus.c misc.c mouse.c \
|
||||
msg.c network.c nfs.c options.c package.c register.c system.c \
|
||||
msg.c network.c nfs.c options.c package.c system.c \
|
||||
tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
|
||||
keymap.h
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: config.c,v 1.123 1999/02/14 07:35:27 jkh Exp $
|
||||
* $Id: config.c,v 1.124 1999/02/14 21:35:01 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -420,12 +420,6 @@ configSaverTimeout(dialogMenuItem *self)
|
|||
DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE;
|
||||
}
|
||||
|
||||
int
|
||||
configRegister(dialogMenuItem *self)
|
||||
{
|
||||
return DITEM_STATUS(registerOpenDialog()) | DITEM_RESTORE;
|
||||
}
|
||||
|
||||
int
|
||||
configNTP(dialogMenuItem *self)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: dispatch.c,v 1.26 1998/11/15 09:06:19 jkh Exp $
|
||||
* $Id: dispatch.c,v 1.27 1999/02/05 22:15:48 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -56,7 +56,6 @@ static struct _word {
|
|||
{ "configNTP", configNTP },
|
||||
{ "configPCNFSD", configPCNFSD },
|
||||
{ "configPackages", configPackages },
|
||||
{ "configRegister", configRegister },
|
||||
{ "configUsers", configUsers },
|
||||
{ "configXEnvironment", configXEnvironment },
|
||||
{ "diskPartitionEditor", diskPartitionEditor },
|
||||
|
|
@ -105,7 +104,6 @@ static struct _word {
|
|||
{ "mediaGetType", mediaGetType },
|
||||
{ "msgConfirm", dispatch_msgConfirm },
|
||||
{ "optionsEditor", optionsEditor },
|
||||
{ "register", configRegister }, /* Alias */
|
||||
{ "packageAdd", packageAdd },
|
||||
{ "addGroup", userAddGroup },
|
||||
{ "addUser", userAddUser },
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: install.c,v 1.229 1999/02/15 00:49:33 jkh Exp $
|
||||
* $Id: install.c,v 1.230 1999/03/11 09:38:06 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -628,21 +628,6 @@ nodisks:
|
|||
restorescr(w);
|
||||
}
|
||||
|
||||
dialog_clear_norefresh();
|
||||
if (!msgYesNo("Would you like to register your FreeBSD system at this time?\n\n"
|
||||
"PLEASE, take just 5 minutes to do this. If we're ever to get any\n"
|
||||
"significant base of commercial software for FreeBSD, we need to\n"
|
||||
"be able to provide more information about the size of our user community.\n"
|
||||
"This is where your registration can really help us, and you can also\n"
|
||||
"sign up for the new FreeBSD newsletter (its free!) at the same time.\n"))
|
||||
configRegister(NULL);
|
||||
else {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("OK, but if you should change your mind then you always can register\n"
|
||||
"later by typing ``/stand/sysinstall register'' or by simply visiting our\n"
|
||||
"web site at http://www.freebsd.org/register.html");
|
||||
|
||||
}
|
||||
/* XXX Put whatever other nice configuration questions you'd like to ask the user here XXX */
|
||||
|
||||
/* Give user the option of one last configuration spree */
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: menus.c,v 1.193 1999/03/19 10:54:37 jkh Exp $
|
||||
* $Id: menus.c,v 1.194 1999/04/21 07:22:37 obrien Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -281,7 +281,6 @@ DMenu MenuIndex = {
|
|||
{ "Packages", "The packages collection", NULL, configPackages },
|
||||
{ "Partition", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor },
|
||||
{ "PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
|
||||
{ "Register", "Register yourself or company as a FreeBSD user.", dmenuVarCheck, configRegister, NULL, "registered" },
|
||||
{ "Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" },
|
||||
{ "Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" },
|
||||
{ "Syscons", "The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
|
||||
|
|
@ -1167,7 +1166,6 @@ DMenu MenuConfigure = {
|
|||
NULL, docBrowser },
|
||||
{ "X XFree86", "Configure XFree86",
|
||||
NULL, configXEnvironment },
|
||||
{ "U Register", "Register yourself or company as a FreeBSD user.", NULL, configRegister },
|
||||
{ "E Exit", "Exit this menu (returning to previous)",
|
||||
NULL, dmenuExit },
|
||||
{ NULL } },
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" $Id: sysinstall.8,v 1.15 1999/02/05 09:28:16 jkh Exp $
|
||||
.\" $Id: sysinstall.8,v 1.16 1999/02/18 23:59:58 jkh Exp $
|
||||
.\"
|
||||
.Dd August 9, 1997
|
||||
.Dt SYSINSTALL 8
|
||||
|
|
@ -208,10 +208,6 @@ version).
|
|||
Bring up the interactive package management menu.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It configRegister
|
||||
Register the user with the FreeBSD counter.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It configUsers
|
||||
Add users and/or groups to the system.
|
||||
.Pp
|
||||
|
|
@ -740,10 +736,6 @@ Interactively get the user to specify some type of media.
|
|||
Invoke the interactive options editor.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It register
|
||||
Bring up the FreeBSD registration form.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It packageAdd
|
||||
Try to fetch and add a package to the system (requires
|
||||
that a media type be set),
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last attempt in the `sysinstall' line, the next
|
||||
* generation being slated to essentially a complete rewrite.
|
||||
*
|
||||
* $Id: sysinstall.h,v 1.159 1999/03/19 10:54:38 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.160 1999/04/06 08:25:53 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -409,7 +409,6 @@ extern void configEnvironmentResolv(char *config);
|
|||
extern void configRC_conf(void);
|
||||
extern int configFstab(dialogMenuItem *self);
|
||||
extern int configRC(dialogMenuItem *self);
|
||||
extern int configRegister(dialogMenuItem *self);
|
||||
extern int configResolv(dialogMenuItem *self);
|
||||
extern int configPackages(dialogMenuItem *self);
|
||||
extern int configSaver(dialogMenuItem *self);
|
||||
|
|
@ -665,9 +664,6 @@ extern int package_add(char *name);
|
|||
extern int package_extract(Device *dev, char *name, Boolean depended);
|
||||
extern Boolean package_exists(char *name);
|
||||
|
||||
/* register.c */
|
||||
extern int registerOpenDialog(void);
|
||||
|
||||
/* system.c */
|
||||
extern void systemInitialize(int argc, char **argv);
|
||||
extern void systemShutdown(int status);
|
||||
|
|
|
|||
Loading…
Reference in a new issue