Project

General

Profile

« Previous | Next » 

Revision ad60dd49

Added by Scott Ullrich over 17 years ago

Remove bigpond support. It has been phased out according to:
http://cvstrac.pfsense.com/chngview?cn=14038

View differences:

usr/local/www/interfaces.php
131 131

  
132 132
$pconfig['disableftpproxy'] = isset($wancfg['disableftpproxy']);
133 133

  
134
$pconfig['bigpond_username'] = $config['bigpond']['username'];
135
$pconfig['bigpond_password'] = $config['bigpond']['password'];
136
$pconfig['bigpond_authserver'] = $config['bigpond']['authserver'];
137
$pconfig['bigpond_authdomain'] = $config['bigpond']['authdomain'];
138
$pconfig['bigpond_minheartbeatinterval'] = $config['bigpond']['minheartbeatinterval'];
139

  
140 134
$pconfig['dhcphostname'] = $wancfg['dhcphostname'];
141 135
$pconfig['alias-address'] = $wancfg['alias-address'];
142 136
$pconfig['alias-subnet'] = $wancfg['alias-subnet'];
......
147 141
	$pconfig['type'] = "PPPoE";
148 142
} else if ($wancfg['ipaddr'] == "pptp") {
149 143
	$pconfig['type'] = "PPTP";
150
} else if ($wancfg['ipaddr'] == "bigpond") {
151
	$pconfig['type'] = "BigPond";
152 144
} else {
153 145
	$pconfig['type'] = "Static";
154 146
	$pconfig['ipaddr'] = $wancfg['ipaddr'];
......
234 226
			$reqdfieldsn = explode(",", "PPTP username,PPTP password,PPTP local IP address,PPTP subnet,PPTP remote IP address");
235 227
		}
236 228
		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
237
	} else if ($_POST['type'] == "BigPond") {
238
		$reqdfields = explode(" ", "bigpond_username bigpond_password");
239
		$reqdfieldsn = explode(",", "BigPond username,BigPond password");
240
		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
241 229
	}
242 230

  
243
        /* normalize MAC addresses - lowercase and convert Windows-ized hyphenated MACs to colon delimited */
244
        $_POST['spoofmac'] = strtolower(str_replace("-", ":", $_POST['spoofmac']));
231
	/* normalize MAC addresses - lowercase and convert Windows-ized hyphenated MACs to colon delimited */
232
	$_POST['spoofmac'] = strtolower(str_replace("-", ":", $_POST['spoofmac']));
245 233

  
246 234
	if (($_POST['ipaddr'] && !is_ipaddr($_POST['ipaddr']))) {
247 235
		$input_errors[] = "A valid IP address must be specified.";
......
297 285
	if (($_POST['pptp_idletimeout'] != "") && !is_numericint($_POST['pptp_idletimeout'])) {
298 286
		$input_errors[] = "The idle timeout value must be an integer.";
299 287
	}
300
	if (($_POST['bigpond_authserver'] && !is_domain($_POST['bigpond_authserver']))) {
301
		$input_errors[] = "The authentication server name contains invalid characters.";
302
	}
303
	if (($_POST['bigpond_authdomain'] && !is_domain($_POST['bigpond_authdomain']))) {
304
		$input_errors[] = "The authentication domain name contains invalid characters.";
305
	}
306
	if ($_POST['bigpond_minheartbeatinterval'] && !is_numericint($_POST['bigpond_minheartbeatinterval'])) {
307
		$input_errors[] = "The minimum heartbeat interval must be an integer.";
308
	}
309 288
	if (($_POST['spoofmac'] && !is_macaddr($_POST['spoofmac']))) {
310 289
		$input_errors[] = "A valid MAC address must be specified.";
311 290
	}
......
350 329
			unset($config['pptp']['ondemand']);
351 330
			unset($config['pptp']['timeout']);
352 331
		}
353
		unset($config['bigpond']['username']);
354
		unset($config['bigpond']['password']);
355
		unset($config['bigpond']['authserver']);
356
		unset($config['bigpond']['authdomain']);
357
		unset($config['bigpond']['minheartbeatinterval']);
358 332
		unset($wancfg['disableftpproxy']);
359 333

  
360 334
		/* per interface pftpx helper */
......
473 447
			$config['pptp']['remote'] = $_POST['pptp_remote'];
474 448
			$config['pptp']['ondemand'] = $_POST['pptp_dialondemand'] ? true : false;
475 449
			$config['pptp']['timeout'] = $_POST['pptp_idletimeout'];
476
		} else if ($_POST['type'] == "BigPond") {
477
			$wancfg['ipaddr'] = "bigpond";
478
			$config['bigpond']['username'] = $_POST['bigpond_username'];
479
			$config['bigpond']['password'] = $_POST['bigpond_password'];
480
			$config['bigpond']['authserver'] = $_POST['bigpond_authserver'];
481
			$config['bigpond']['authdomain'] = $_POST['bigpond_authdomain'];
482
			$config['bigpond']['minheartbeatinterval'] = $_POST['bigpond_minheartbeatinterval'];
483 450
		}
484 451
    
485 452
		/* reset cron items if necessary */
......
584 551
			document.iform.pptp_remote.disabled = 1;
585 552
			document.iform.pptp_dialondemand.disabled = 1;
586 553
			document.iform.pptp_idletimeout.disabled = 1;
587
			document.iform.bigpond_username.disabled = 1;
588
			document.iform.bigpond_password.disabled = 1;
589
			document.iform.bigpond_authserver.disabled = 1;
590
			document.iform.bigpond_authdomain.disabled = 1;
591
			document.iform.bigpond_minheartbeatinterval.disabled = 1;
592 554
			document.iform.dhcphostname.disabled = 1;
593 555
			break;
594 556
		case 1:
......
610 572
			document.iform.pptp_remote.disabled = 1;
611 573
			document.iform.pptp_dialondemand.disabled = 1;
612 574
			document.iform.pptp_idletimeout.disabled = 1;
613
			document.iform.bigpond_username.disabled = 1;
614
			document.iform.bigpond_password.disabled = 1;
615
			document.iform.bigpond_authserver.disabled = 1;
616
			document.iform.bigpond_authdomain.disabled = 1;
617
			document.iform.bigpond_minheartbeatinterval.disabled = 1;
618 575
			document.iform.dhcphostname.disabled = 0;
619 576
			break;
620 577
		case 2:
......
638 595
			document.iform.pptp_remote.disabled = 1;
639 596
			document.iform.pptp_dialondemand.disabled = 1;
640 597
			document.iform.pptp_idletimeout.disabled = 1;
641
			document.iform.bigpond_username.disabled = 1;
642
			document.iform.bigpond_password.disabled = 1;
643
			document.iform.bigpond_authserver.disabled = 1;
644
			document.iform.bigpond_authdomain.disabled = 1;
645
			document.iform.bigpond_minheartbeatinterval.disabled = 1;
646 598
			document.iform.dhcphostname.disabled = 1;
647 599
			break;
648 600
		case 3:
......
668 620
			} else {
669 621
				document.iform.pptp_idletimeout.disabled = 1;
670 622
			}
671
			document.iform.bigpond_username.disabled = 1;
672
			document.iform.bigpond_password.disabled = 1;
673
			document.iform.bigpond_authserver.disabled = 1;
674
			document.iform.bigpond_authdomain.disabled = 1;
675
			document.iform.bigpond_minheartbeatinterval.disabled = 1;
676 623
			document.iform.dhcphostname.disabled = 1;
677 624
			break;
678 625
		case 4:
......
694 641
			document.iform.pptp_remote.disabled = 1;
695 642
			document.iform.pptp_dialondemand.disabled = 1;
696 643
			document.iform.pptp_idletimeout.disabled = 1;
697
			document.iform.bigpond_username.disabled = 0;
698
			document.iform.bigpond_password.disabled = 0;
699
			document.iform.bigpond_authserver.disabled = 0;
700
			document.iform.bigpond_authdomain.disabled = 0;
701
			document.iform.bigpond_minheartbeatinterval.disabled = 0;
702 644
			document.iform.dhcphostname.disabled = 1;
703 645
			break;
704 646
	}
......
725 667
                <tr>
726 668
                  <td valign="middle" class="vncell"><strong>Type</strong></td>
727 669
                  <td class="vtable"> <select name="type" class="formselect" id="type" onchange="type_change()">
728
                      <?php $opts = split(" ", "Static DHCP PPPoE PPTP BigPond");
670
                      <?php $opts = split(" ", "Static DHCP PPPoE PPTP");
729 671
				foreach ($opts as $opt): ?>
730 672
                      <option <?php if ($opt == $pconfig['type']) echo "selected";?>>
731 673
                      <?=htmlspecialchars($opt);?>
......
978 920
                <tr>
979 921
                  <td colspan="2" valign="top" height="16"></td>
980 922
                </tr>
981
                <tr>
982
                  <td colspan="2" valign="top" class="listtopic">BigPond Cable configuration</td>
983
                </tr>
984
                <tr>
985
                  <td valign="top" class="vncellreq">Username</td>
986
                  <td class="vtable"><input name="bigpond_username" type="text" class="formfld user" id="bigpond_username" size="20" value="<?=htmlspecialchars($pconfig['bigpond_username']);?>">
987
                  </td>
988
                </tr>
989
                <tr>
990
                  <td valign="top" class="vncellreq">Password</td>
991
                  <td class="vtable"><input name="bigpond_password" type="text" class="formfld pwd" id="bigpond_password" size="20" value="<?=htmlspecialchars($pconfig['bigpond_password']);?>">
992
                  </td>
993
                </tr>
994
                <tr>
995
                  <td valign="top" class="vncell">Authentication server</td>
996
                  <td class="vtable"><input name="bigpond_authserver" type="text" class="formfld unknown" id="bigpond_authserver" size="20" value="<?=htmlspecialchars($pconfig['bigpond_authserver']);?>">
997
                    <br>
998
                  <span class="vexpl">If this field is left empty, the default (&quot;dce-server&quot;) is used. </span></td>
999
                </tr>
1000
                <tr>
1001
                  <td valign="top" class="vncell">Authentication domain</td>
1002
                  <td class="vtable"><input name="bigpond_authdomain" type="text" class="formfld unknown" id="bigpond_authdomain" size="20" value="<?=htmlspecialchars($pconfig['bigpond_authdomain']);?>">
1003
                    <br>
1004
                  <span class="vexpl">If this field is left empty, the domain name assigned via DHCP will be used.<br>
1005
                  <br>
1006
                  Note: the BigPond client implicitly sets the &quot;Allow DNS server list to be overridden by DHCP/PPP on WAN&quot; on the System: General setup page.            </span></td>
1007
                </tr>
1008
                <tr>
1009
                  <td valign="top" class="vncell">Min. heartbeat interval</td>
1010
                  <td class="vtable">
1011
                    <input name="bigpond_minheartbeatinterval" type="text" class="formfld unknown" id="bigpond_minheartbeatinterval" size="8" value="<?=htmlspecialchars($pconfig['bigpond_minheartbeatinterval']);?>">seconds<br>Setting this to a sensible value (e.g. 60 seconds) can protect against DoS attacks. </td>
1012
                </tr>
1013
                <tr>
1014
                  <td colspan="2" valign="top" height="16"></td>
1015
                </tr>
1016 923
                <tr>
1017 924
                  <td colspan="2" valign="top" class="listtopic">Other</td>
1018 925
                </tr>
usr/local/www/interfaces_wan.php
131 131

  
132 132
$pconfig['disableftpproxy'] = isset($wancfg['disableftpproxy']);
133 133

  
134
$pconfig['bigpond_username'] = $config['bigpond']['username'];
135
$pconfig['bigpond_password'] = $config['bigpond']['password'];
136
$pconfig['bigpond_authserver'] = $config['bigpond']['authserver'];
137
$pconfig['bigpond_authdomain'] = $config['bigpond']['authdomain'];
138
$pconfig['bigpond_minheartbeatinterval'] = $config['bigpond']['minheartbeatinterval'];
139

  
140 134
$pconfig['dhcphostname'] = $wancfg['dhcphostname'];
141 135
$pconfig['alias-address'] = $wancfg['alias-address'];
142 136
$pconfig['alias-subnet'] = $wancfg['alias-subnet'];
......
147 141
	$pconfig['type'] = "PPPoE";
148 142
} else if ($wancfg['ipaddr'] == "pptp") {
149 143
	$pconfig['type'] = "PPTP";
150
} else if ($wancfg['ipaddr'] == "bigpond") {
151
	$pconfig['type'] = "BigPond";
152 144
} else {
153 145
	$pconfig['type'] = "Static";
154 146
	$pconfig['ipaddr'] = $wancfg['ipaddr'];
......
234 226
			$reqdfieldsn = explode(",", "PPTP username,PPTP password,PPTP local IP address,PPTP subnet,PPTP remote IP address");
235 227
		}
236 228
		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
237
	} else if ($_POST['type'] == "BigPond") {
238
		$reqdfields = explode(" ", "bigpond_username bigpond_password");
239
		$reqdfieldsn = explode(",", "BigPond username,BigPond password");
240
		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
241 229
	}
242 230

  
243
        /* normalize MAC addresses - lowercase and convert Windows-ized hyphenated MACs to colon delimited */
244
        $_POST['spoofmac'] = strtolower(str_replace("-", ":", $_POST['spoofmac']));
231
	/* normalize MAC addresses - lowercase and convert Windows-ized hyphenated MACs to colon delimited */
232
	$_POST['spoofmac'] = strtolower(str_replace("-", ":", $_POST['spoofmac']));
245 233

  
246 234
	if (($_POST['ipaddr'] && !is_ipaddr($_POST['ipaddr']))) {
247 235
		$input_errors[] = "A valid IP address must be specified.";
......
297 285
	if (($_POST['pptp_idletimeout'] != "") && !is_numericint($_POST['pptp_idletimeout'])) {
298 286
		$input_errors[] = "The idle timeout value must be an integer.";
299 287
	}
300
	if (($_POST['bigpond_authserver'] && !is_domain($_POST['bigpond_authserver']))) {
301
		$input_errors[] = "The authentication server name contains invalid characters.";
302
	}
303
	if (($_POST['bigpond_authdomain'] && !is_domain($_POST['bigpond_authdomain']))) {
304
		$input_errors[] = "The authentication domain name contains invalid characters.";
305
	}
306
	if ($_POST['bigpond_minheartbeatinterval'] && !is_numericint($_POST['bigpond_minheartbeatinterval'])) {
307
		$input_errors[] = "The minimum heartbeat interval must be an integer.";
308
	}
309 288
	if (($_POST['spoofmac'] && !is_macaddr($_POST['spoofmac']))) {
310 289
		$input_errors[] = "A valid MAC address must be specified.";
311 290
	}
......
350 329
			unset($config['pptp']['ondemand']);
351 330
			unset($config['pptp']['timeout']);
352 331
		}
353
		unset($config['bigpond']['username']);
354
		unset($config['bigpond']['password']);
355
		unset($config['bigpond']['authserver']);
356
		unset($config['bigpond']['authdomain']);
357
		unset($config['bigpond']['minheartbeatinterval']);
358 332
		unset($wancfg['disableftpproxy']);
359 333

  
360 334
		/* per interface pftpx helper */
......
473 447
			$config['pptp']['remote'] = $_POST['pptp_remote'];
474 448
			$config['pptp']['ondemand'] = $_POST['pptp_dialondemand'] ? true : false;
475 449
			$config['pptp']['timeout'] = $_POST['pptp_idletimeout'];
476
		} else if ($_POST['type'] == "BigPond") {
477
			$wancfg['ipaddr'] = "bigpond";
478
			$config['bigpond']['username'] = $_POST['bigpond_username'];
479
			$config['bigpond']['password'] = $_POST['bigpond_password'];
480
			$config['bigpond']['authserver'] = $_POST['bigpond_authserver'];
481
			$config['bigpond']['authdomain'] = $_POST['bigpond_authdomain'];
482
			$config['bigpond']['minheartbeatinterval'] = $_POST['bigpond_minheartbeatinterval'];
483 450
		}
484 451
    
485 452
		/* reset cron items if necessary */
......
584 551
			document.iform.pptp_remote.disabled = 1;
585 552
			document.iform.pptp_dialondemand.disabled = 1;
586 553
			document.iform.pptp_idletimeout.disabled = 1;
587
			document.iform.bigpond_username.disabled = 1;
588
			document.iform.bigpond_password.disabled = 1;
589
			document.iform.bigpond_authserver.disabled = 1;
590
			document.iform.bigpond_authdomain.disabled = 1;
591
			document.iform.bigpond_minheartbeatinterval.disabled = 1;
592 554
			document.iform.dhcphostname.disabled = 1;
593 555
			break;
594 556
		case 1:
......
610 572
			document.iform.pptp_remote.disabled = 1;
611 573
			document.iform.pptp_dialondemand.disabled = 1;
612 574
			document.iform.pptp_idletimeout.disabled = 1;
613
			document.iform.bigpond_username.disabled = 1;
614
			document.iform.bigpond_password.disabled = 1;
615
			document.iform.bigpond_authserver.disabled = 1;
616
			document.iform.bigpond_authdomain.disabled = 1;
617
			document.iform.bigpond_minheartbeatinterval.disabled = 1;
618 575
			document.iform.dhcphostname.disabled = 0;
619 576
			break;
620 577
		case 2:
......
638 595
			document.iform.pptp_remote.disabled = 1;
639 596
			document.iform.pptp_dialondemand.disabled = 1;
640 597
			document.iform.pptp_idletimeout.disabled = 1;
641
			document.iform.bigpond_username.disabled = 1;
642
			document.iform.bigpond_password.disabled = 1;
643
			document.iform.bigpond_authserver.disabled = 1;
644
			document.iform.bigpond_authdomain.disabled = 1;
645
			document.iform.bigpond_minheartbeatinterval.disabled = 1;
646 598
			document.iform.dhcphostname.disabled = 1;
647 599
			break;
648 600
		case 3:
......
668 620
			} else {
669 621
				document.iform.pptp_idletimeout.disabled = 1;
670 622
			}
671
			document.iform.bigpond_username.disabled = 1;
672
			document.iform.bigpond_password.disabled = 1;
673
			document.iform.bigpond_authserver.disabled = 1;
674
			document.iform.bigpond_authdomain.disabled = 1;
675
			document.iform.bigpond_minheartbeatinterval.disabled = 1;
676 623
			document.iform.dhcphostname.disabled = 1;
677 624
			break;
678 625
		case 4:
......
694 641
			document.iform.pptp_remote.disabled = 1;
695 642
			document.iform.pptp_dialondemand.disabled = 1;
696 643
			document.iform.pptp_idletimeout.disabled = 1;
697
			document.iform.bigpond_username.disabled = 0;
698
			document.iform.bigpond_password.disabled = 0;
699
			document.iform.bigpond_authserver.disabled = 0;
700
			document.iform.bigpond_authdomain.disabled = 0;
701
			document.iform.bigpond_minheartbeatinterval.disabled = 0;
702 644
			document.iform.dhcphostname.disabled = 1;
703 645
			break;
704 646
	}
......
725 667
                <tr>
726 668
                  <td valign="middle" class="vncell"><strong>Type</strong></td>
727 669
                  <td class="vtable"> <select name="type" class="formselect" id="type" onchange="type_change()">
728
                      <?php $opts = split(" ", "Static DHCP PPPoE PPTP BigPond");
670
                      <?php $opts = split(" ", "Static DHCP PPPoE PPTP");
729 671
				foreach ($opts as $opt): ?>
730 672
                      <option <?php if ($opt == $pconfig['type']) echo "selected";?>>
731 673
                      <?=htmlspecialchars($opt);?>
......
978 920
                <tr>
979 921
                  <td colspan="2" valign="top" height="16"></td>
980 922
                </tr>
981
                <tr>
982
                  <td colspan="2" valign="top" class="listtopic">BigPond Cable configuration</td>
983
                </tr>
984
                <tr>
985
                  <td valign="top" class="vncellreq">Username</td>
986
                  <td class="vtable"><input name="bigpond_username" type="text" class="formfld user" id="bigpond_username" size="20" value="<?=htmlspecialchars($pconfig['bigpond_username']);?>">
987
                  </td>
988
                </tr>
989
                <tr>
990
                  <td valign="top" class="vncellreq">Password</td>
991
                  <td class="vtable"><input name="bigpond_password" type="text" class="formfld pwd" id="bigpond_password" size="20" value="<?=htmlspecialchars($pconfig['bigpond_password']);?>">
992
                  </td>
993
                </tr>
994
                <tr>
995
                  <td valign="top" class="vncell">Authentication server</td>
996
                  <td class="vtable"><input name="bigpond_authserver" type="text" class="formfld unknown" id="bigpond_authserver" size="20" value="<?=htmlspecialchars($pconfig['bigpond_authserver']);?>">
997
                    <br>
998
                  <span class="vexpl">If this field is left empty, the default (&quot;dce-server&quot;) is used. </span></td>
999
                </tr>
1000
                <tr>
1001
                  <td valign="top" class="vncell">Authentication domain</td>
1002
                  <td class="vtable"><input name="bigpond_authdomain" type="text" class="formfld unknown" id="bigpond_authdomain" size="20" value="<?=htmlspecialchars($pconfig['bigpond_authdomain']);?>">
1003
                    <br>
1004
                  <span class="vexpl">If this field is left empty, the domain name assigned via DHCP will be used.<br>
1005
                  <br>
1006
                  Note: the BigPond client implicitly sets the &quot;Allow DNS server list to be overridden by DHCP/PPP on WAN&quot; on the System: General setup page.            </span></td>
1007
                </tr>
1008
                <tr>
1009
                  <td valign="top" class="vncell">Min. heartbeat interval</td>
1010
                  <td class="vtable">
1011
                    <input name="bigpond_minheartbeatinterval" type="text" class="formfld unknown" id="bigpond_minheartbeatinterval" size="8" value="<?=htmlspecialchars($pconfig['bigpond_minheartbeatinterval']);?>">seconds<br>Setting this to a sensible value (e.g. 60 seconds) can protect against DoS attacks. </td>
1012
                </tr>
1013
                <tr>
1014
                  <td colspan="2" valign="top" height="16"></td>
1015
                </tr>
1016 923
                <tr>
1017 924
                  <td colspan="2" valign="top" class="listtopic">Other</td>
1018 925
                </tr>

Also available in: Unified diff