Project

General

Profile

« Previous | Next » 

Revision 401ccf37

Added by Stephen Beaver over 9 years ago

Completed #5358

View differences:

src/usr/local/www/wizards/setup_wizard.xml
214 214
		}
215 215
		document.forms[0].selectedtype.selectedIndex = selectedItem;
216 216
		enableitems(selectedItem);
217

  
218
		events.push(function(){
219
			$('#showpppoepassword').click(function(event) {
220
				if(this.checked) {
221
					$('#pppoepassword').attr('type', 'text');
222
				} else {
223
					$('#pppoepassword').attr('type', 'password');
224
				}
225
			});
226
		});
227

  
217 228
	</javascriptafterformdisplay>
218 229
	<fields>
219 230
		<field>
......
234 245
				<option>
235 246
					<name>PPPoE</name>
236 247
					<value>pppoe</value>
237
					<enablefields>pppoeusername,pppoepassword,pppoeservicename,pppoedialondemand,pppoeidletimeout</enablefields>
248
					<enablefields>pppoeusername,pppoepassword,pppoeservicename,pppoedialondemand,pppoeidletimeout,showpppoepassword</enablefields>
238 249
				</option>
239 250
				<option>
240 251
					<name>PPTP</name>
......
320 331
		</field>
321 332
		<field>
322 333
			<name>PPPoE Password</name>
323
			<type>input</type>
334
			<type>password</type>
324 335
			<bindstofield>wizardtemp->wan->password</bindstofield>
325 336
		</field>
337
		<field>
338
			<name>Show PPPoE password</name>
339
			<type>checkbox</type>
340
			<typehint>Reveal password characters</typehint>
341
			<bindstofield>wizardtemp->wan->ppoeshowpassword</bindstofield>
342
		</field>
326 343
		<field>
327 344
			<name>PPPoE Service name</name>
328 345
			<type>input</type>
......
384 401
			<name>PPTP Dial on demand</name>
385 402
			<typehint>Enable Dial-On-Demand mode</typehint>
386 403
			<type>checkbox</type>
387
			<bindstofield>wizardtemp->wan->pptpondemand</bindstofield>			
404
			<bindstofield>wizardtemp->wan->pptpondemand</bindstofield>
388 405
			<description>This option causes the interface to operate in dial-on-demand mode, allowing you to have a virtual full time connection. The interface is configured, but the actual connection of the link is delayed until qualifying outgoing traffic is detected.</description>
389 406
		</field>
390 407
		<field>
391 408
			<name>PPTP Idle timeout</name>
392
			<type>input</type>			
409
			<type>input</type>
393 410
			<bindstofield>wizardtemp->wan->pptpidletimeout</bindstofield>
394 411
			<description>If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature.</description>
395 412
		</field>
......
462 479
			if ($_POST['subnetmask'] < 31 &&
463 480
			    ($_POST['ipaddress'] == gen_subnet($_POST['ipaddress'], $_POST['subnetmask']) ||
464 481
			     $_POST['ipaddress'] == gen_subnet_max($_POST['ipaddress'], $_POST['subnetmask']))) {
465
			    include("head.inc"); 
482
			    include("head.inc");
466 483
				$input_errors[] = "Invalid WAN IP Address. Please press back in your browser window and correct.";
467 484
				print_input_errors($input_errors);
468 485
				include("foot.inc");
......
533 550
	</stepsubmitphpaction>
534 551
	<stepsubmitbeforesave>
535 552
		<![CDATA[
536
			if($_POST['selectedtype'] == "Static") { 
537
			
553
			if($_POST['selectedtype'] == "Static") {
554

  
538 555
			} else {
539 556
				$_POST['ipaddress'] = $_POST['selectedtype'];
540 557
				$config['interfaces']['wan']['ipaddr'] = $_POST['selectedtype'];
541 558
				write_config();
542
				if(!$config['interfaces']['lan']) 
559
				if(!$config['interfaces']['lan'])
543 560
					header("Location: /wizard.php?xml=setup_wizard.xml&stepid=6&next=Next");
544 561
			}
545 562
		]]>
......
680 697
	<id>9</id>
681 698
	<title>Reload in progress</title>
682 699
	<description>
683
		A reload is now in progress.  Please wait. &lt;p&gt; 
700
		A reload is now in progress.  Please wait. &lt;p&gt;
684 701
		&lt;meta http-equiv="refresh" content="5; url=wizard.php?xml=setup_wizard.xml&amp;stepid=9" &gt;
685 702
		&lt;p&gt;
686 703
		The wizard will redirect to the next step once the reload is completed.
......
732 749
		if($g['product_name'] <> 'pfSense') {
733 750
			header("Location: " . fixup_string("\$myurl"));
734 751
			exit;
735
		}	
752
		}
736 753
	]]>
737 754
	</stepbeforeformdisplay>
738 755
	<description>

Also available in: Unified diff