/ - Diff - pfSense - pfSense bugtracker

     <script>
     //<![CDATA[
     events.push(function(){
     	function setMasks() {
     		// Find all ipaddress masks and make dynamic based on address family of input
     		$('span.pfIpMask + select').each(function (idx, select){
     			var input = $(select).prevAll('input[type=text]');
     			input.on('change', function(e){
     				var isV6 = (input.val().indexOf(':') != -1), min = 0, max = 128;
     				if (!isV6)
     					max = 32;
     				if (input.val() == "")
     					return;
     				while (select.options.length > max)
     					select.remove(0);
     				if (select.options.length < max)
+    				{
     					for (var i=select.options.length; i<=max; i++)
     						select.options.add(new Option(i, i), 0);
+    				}
     			});
     			// Fire immediately
     			input.change();
     		});
+    	}
     	// Complicated function to move all help text associated with this input id to the same id
     	// on the row above. That way if you delete the last row, you don't lose the help
     	function moveHelpText(id) {
     		$('#' + id).parent('div').parent('div').find('input').each(function() {	 // For each <span></span>
     			var fromId = this.id;
     			var toId = decrStringInt(fromId);
     			var helpSpan;
     			if(!$(this).hasClass('pfIpMask') && !$(this).hasClass('btn')) {
     				helpSpan = $('#' + fromId).parent('div').parent('div').find('span:last').clone();
     				if($(helpSpan).hasClass('help-block')) {
     					if($('#' + decrStringInt(fromId)).parent('div').hasClass('input-group'))
     						$('#' + decrStringInt(fromId)).parent('div').after(helpSpan);
     					else
     						$('#' + decrStringInt(fromId)).after(helpSpan);
+    				}
+    			}
     		});
+    	}
     	// Increment the number at the end of the string
     	function bumpStringInt( str )	{
     	  var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
     	  if( data )
     		newStr = data[ 1 ] + ( Number( data[ 2 ] ) + 1 ) + data[ 3 ];
     	  return newStr || str;
+    	}
     	// Decrement the number at the end of the string
     	function decrStringInt( str )	{
     	  var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
     	  if( data )
     		newStr = data[ 1 ] + ( Number( data[ 2 ] ) - 1 ) + data[ 3 ];
     	  return newStr || str;
+    	}
     	// Called after a delete so that there are no gaps in the numbering. Most of the time the config system doesn't care about
     	// gaps, but I do :)
     	function renumber() {
     		var idx = 0;
     		$('.repeatable').each(function() {
     			$(this).find('input').each(function() {
     				$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     				$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     			});
     			$(this).find('select').each(function() {
     				$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     				$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     			});
     			$(this).find('label').attr('for', $(this).find('label').attr('for').replace(/\d+$/, "") + idx);
     			idx++;
     		});
+    	}
     	function delete_row(row) {
     		$('#' + row).parent('div').parent('div').remove();
     		renumber();
+    	}
     	function add_row() {
     		// Find the lst repeatable group
     		var lastRepeatableGroup = $('.repeatable:last');
     		// Clone it
     		var newGroup = lastRepeatableGroup.clone(true);
     		// Increment the suffix number for each input elemnt in the new group
     		$(newGroup).find('input').each(function() {
     			$(this).prop("id", bumpStringInt(this.id));
     			$(this).prop("name", bumpStringInt(this.name));
     			if(!$(this).is('[id^=delete]'))
     				$(this).val('');
     		});
     		// Do the same for selectors
     		$(newGroup).find('select').each(function() {
     			$(this).prop("id", bumpStringInt(this.id));
     			$(this).prop("name", bumpStringInt(this.name));
     			// If this selector lists mask bits, we need it to be reset to all 128 options
     			// and no items selected, so that automatic v4/v6 selection still works
     			if($(this).is('[id^=address_subnet]')) {
     				$(this).empty();
     				for(idx=128; idx>0; idx--) {
     					$(this).append($('<option>', {
     						value: idx,
     						text: idx
     					}));
+    				}
+    			}
     		});
     		// And for "for" tags
     		$(newGroup).find('label').attr('for', bumpStringInt($(newGroup).find('label').attr('for')));
     		$(newGroup).find('label').text(""); // Clear the label. We only want it on the very first row
     		// Insert the updated/cloned row
     		$(lastRepeatableGroup).after(newGroup);
     		// Delete any help text from the group we have cloned
     		$(lastRepeatableGroup).find('.help-block').each(function() {
     			$(this).remove();
     		});
     		setMasks();
     		$('[id^=address]').autocomplete({
     			source: addressarray
     		});
+    	}
     	function typechange() {
     		var tab = $('#type').find('option:selected').val();
     		$("[id^='address_subnet']").prop("disabled", (tab == 'host') || (tab == 'port') || (tab == 'url') || (tab == 'url_ports'));
-...
     		$('.repeatable:first').find('label').text(labelstr[tab]);
+    	}
     	// These are action buttons, not submit buttons
     	$('[id^=addrow]').prop('type','button');
     	$('[id^=delete]').prop('type','button');
     	// On load . .
     	typechange();
-...
     	});
     	// on click . .
     	$('[id^=addrow]').click(function() {
     		add_row();
     	});
     	$('[id^=delete]').click(function(event) {
     		if($('.repeatable').length > 1) {
     			moveHelpText(event.target.id);
     			delete_row(event.target.id);
+    		}
     		else
     			alert('<?php echo gettext("You may not delete the last one!")?>');
     	});
     	$('#type').on('change', function() {
     		typechange();
     	});

     /* ====================================================================
      *	Copyright (c)  2004-2015  Electric Sheep Fencing, LLC. All rights reserved.
      *	Copyright (c)  2004, 2005 Scott Ullrich
+     *
      *	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.
+     *
      *	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.
+     *
      *	3. All advertising materials mentioning features or use of this software
      *		must display the following acknowledgment:
      *		"This product includes software developed by the pfSense Project
      *		 for use in the pfSense software distribution. (http://www.pfsense.org/).
+     *
      *	4. The names "pfSense" and "pfSense Project" must not be used to
      *		 endorse or promote products derived from this software without
      *		 prior written permission. For written permission, please contact
      *		 coreteam@pfsense.org.
+     *
      *	5. Products derived from this software may not be called "pfSense"
      *		nor may "pfSense" appear in their names without prior written
      *		permission of the Electric Sheep Fencing, LLC.
+     *
      *	6. Redistributions of any form whatsoever must retain the following
      *		acknowledgment:
+     *
      *	"This product includes software developed by the pfSense Project
      *	for use in the pfSense software distribution (http://www.pfsense.org/).
+     *
      *	THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
      *	EXPRESSED 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 THE pfSense PROJECT OR
      *	ITS CONTRIBUTORS 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, 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.
+     *
      *	====================================================================
+     *
      */
     // These helper functions are used on many/most UI pages to hide/show/disable/enable form elements where required
     // Hides the <div> in which the specified input element lives so that the input, its label and help text are hidden
-...
     		element.parent('div').addClass('hidden');
     	else
     		element.parent('div').removeClass('hidden');
+    }
+    }
     // The followinf functions are used by form froups assigned a class of "repeatable" and provide the ability
     // to add/delete new rows of sequentially numbered elements, their labels and their help text
     // See firewall_aliases_edit.php for an example
     function setMasks() {
     	// Find all ipaddress masks and make dynamic based on address family of input
     	$('span.pfIpMask + select').each(function (idx, select){
     		var input = $(select).prevAll('input[type=text]');
     		input.on('change', function(e){
     			var isV6 = (input.val().indexOf(':') != -1), min = 0, max = 128;
     			if (!isV6)
     				max = 32;
     			if (input.val() == "")
     				return;
     			while (select.options.length > max)
     				select.remove(0);
     			if (select.options.length < max)
+    			{
     				for (var i=select.options.length; i<=max; i++)
     					select.options.add(new Option(i, i), 0);
+    			}
     		});
     		// Fire immediately
     		input.change();
     	});
+    }
     // Complicated function to move all help text associated with this input id to the same id
     // on the row above. That way if you delete the last row, you don't lose the help
     function moveHelpText(id) {
     	$('#' + id).parent('div').parent('div').find('input').each(function() {	 // For each <span></span>
     		var fromId = this.id;
     		var toId = decrStringInt(fromId);
     		var helpSpan;
     		if(!$(this).hasClass('pfIpMask') && !$(this).hasClass('btn')) {
     			helpSpan = $('#' + fromId).parent('div').parent('div').find('span:last').clone();
     			if($(helpSpan).hasClass('help-block')) {
     				if($('#' + decrStringInt(fromId)).parent('div').hasClass('input-group'))
     					$('#' + decrStringInt(fromId)).parent('div').after(helpSpan);
     				else
     					$('#' + decrStringInt(fromId)).after(helpSpan);
+    			}
+    		}
     	});
+    }
     // Increment the number at the end of the string
     function bumpStringInt( str )	{
       var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
       if( data )
     	newStr = data[ 1 ] + ( Number( data[ 2 ] ) + 1 ) + data[ 3 ];
       return newStr || str;
+    }
     // Decrement the number at the end of the string
     function decrStringInt( str )	{
       var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
       if( data )
     	newStr = data[ 1 ] + ( Number( data[ 2 ] ) - 1 ) + data[ 3 ];
       return newStr || str;
+    }
     // Called after a delete so that there are no gaps in the numbering. Most of the time the config system doesn't care about
     // gaps, but I do :)
     function renumber() {
     	var idx = 0;
     	$('.repeatable').each(function() {
     		$(this).find('input').each(function() {
     			$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     			$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     		});
     		$(this).find('select').each(function() {
     			$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     			$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     		});
     		$(this).find('label').attr('for', $(this).find('label').attr('for').replace(/\d+$/, "") + idx);
     		idx++;
     	});
+    }
     function delete_row(row) {
     	$('#' + row).parent('div').parent('div').remove();
     	renumber();
+    }
     function add_row() {
     	// Find the lst repeatable group
     	var lastRepeatableGroup = $('.repeatable:last');
     	// Clone it
     	var newGroup = lastRepeatableGroup.clone(true);
     	// Increment the suffix number for each input elemnt in the new group
     	$(newGroup).find('input').each(function() {
     		$(this).prop("id", bumpStringInt(this.id));
     		$(this).prop("name", bumpStringInt(this.name));
     		if(!$(this).is('[id^=delete]'))
     			$(this).val('');
     	});
     	// Do the same for selectors
     	$(newGroup).find('select').each(function() {
     		$(this).prop("id", bumpStringInt(this.id));
     		$(this).prop("name", bumpStringInt(this.name));
     		// If this selector lists mask bits, we need it to be reset to all 128 options
     		// and no items selected, so that automatic v4/v6 selection still works
     		if($(this).is('[id^=address_subnet]')) {
     			$(this).empty();
     			for(idx=128; idx>0; idx--) {
     				$(this).append($('<option>', {
     					value: idx,
     					text: idx
     				}));
+    			}
+    		}
     	});
     	// And for "for" tags
     	$(newGroup).find('label').attr('for', bumpStringInt($(newGroup).find('label').attr('for')));
     	$(newGroup).find('label').text(""); // Clear the label. We only want it on the very first row
     	// Insert the updated/cloned row
     	$(lastRepeatableGroup).after(newGroup);
     	// Delete any help text from the group we have cloned
     	$(lastRepeatableGroup).find('.help-block').each(function() {
     		if((typeof retainhelp) == "undefined")
     			$(this).remove();
     	});
     	setMasks();
     	$('[id^=address]').autocomplete({
     		source: addressarray
     	});
+    }
     // These are action buttons, not submit buttons
     $('[id^=addrow]').prop('type','button');
     $('[id^=delete]').prop('type','button');
     // on click . .
     $('[id^=addrow]').click(function() {
     	add_row();
     });
     $('[id^=delete]').click(function(event) {
     	if($('.repeatable').length > 1) {
     		if((typeof retainhelp) == "undefined")
     			moveHelpText(event.target.id);
     		delete_row(event.target.id);
+    	}
     	else
     		alert('You may not delete the last row!');
     });

     //<![CDATA[
     	events.push(function(){
     	function setMasks() {
     		// Find all ipaddress masks and make dynamic based on address family of input
     		$('span.pfIpMask + select').each(function (idx, select){
     			var input = $(select).prevAll('input[type=text]');
     			input.on('change', function(e){
     				var isV6 = (input.val().indexOf(':') != -1), min = 0, max = 128;
     				if (!isV6)
     					max = 32;
     				if (input.val() == "")
     					return;
     				while (select.options.length > max)
     					select.remove(0);
     				if (select.options.length < max)
+    				{
     					for (var i=select.options.length; i<=max; i++)
     						select.options.add(new Option(i, i), 0);
+    				}
     			});
     			// Fire immediately
     			input.change();
     		});
+    	}
     	// Complicated function to move all help text associated with this input id to the same id
     	// on the row above. That way if you delete the last row, you don't lose the help
     	function moveHelpText(id) {
     		$('#' + id).parent('div').parent('div').find('input').each(function() {	 // For each <span></span>
     			var fromId = this.id;
     			var toId = decrStringInt(fromId);
     			var helpSpan;
     			if(!$(this).hasClass('pfIpMask') && !$(this).hasClass('btn')) {
     				helpSpan = $('#' + fromId).parent('div').parent('div').find('span:last').clone();
     				if($(helpSpan).hasClass('help-block')) {
     					if($('#' + decrStringInt(fromId)).parent('div').hasClass('input-group'))
     						$('#' + decrStringInt(fromId)).parent('div').after(helpSpan);
     					else
     						$('#' + decrStringInt(fromId)).after(helpSpan);
+    				}
+    			}
     		});
+    	}
     	// Increment the number at the end of the string
     	function bumpStringInt( str )	{
     	  var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
     	  if( data )
     		newStr = data[ 1 ] + ( Number( data[ 2 ] ) + 1 ) + data[ 3 ];
     	  return newStr || str;
+    	}
     	// Decrement the number at the end of the string
     	function decrStringInt( str )	{
     	  var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
     	  if( data )
     		newStr = data[ 1 ] + ( Number( data[ 2 ] ) - 1 ) + data[ 3 ];
     	  return newStr || str;
+    	}
     	// Called after a delete so that there are no gaps in the numbering. Most of the time the config system doesn't care about
     	// gaps, but I do :)
     	function renumber() {
     		var idx = 0;
     		$('.repeatable').each(function() {
     			$(this).find('input').each(function() {
     				$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     				$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     			});
     			$(this).find('select').each(function() {
     				$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     				$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     			});
     			$(this).find('label').attr('for', $(this).find('label').attr('for').replace(/\d+$/, "") + idx);
     			idx++;
     		});
+    	}
     	function delete_row(row) {
     		$('#' + row).parent('div').parent('div').remove();
     		renumber();
+    	}
     	function add_row() {
     		// Find the lst repeatable group
     		var lastRepeatableGroup = $('.repeatable:last');
     		// Clone it
     		var newGroup = lastRepeatableGroup.clone(true);
     		// Increment the suffix number for each input elemnt in the new group
     		$(newGroup).find('input').each(function() {
     			$(this).prop("id", bumpStringInt(this.id));
     			$(this).prop("name", bumpStringInt(this.name));
     			if(!$(this).is('[id^=delete]'))
     				$(this).val('');
     		});
     		// Do the same for selectors
     		$(newGroup).find('select').each(function() {
     			$(this).prop("id", bumpStringInt(this.id));
     			$(this).prop("name", bumpStringInt(this.name));
     			// If this selector lists mask bits, we need it to be reset to all 128 options
     			// and no items selected, so that automatic v4/v6 selection still works
     			if($(this).is('[id^=address_subnet]')) {
     				$(this).empty();
     				for(idx=128; idx>0; idx--) {
     					$(this).append($('<option>', {
     						value: idx,
     						text: idx
     					}));
+    				}
+    			}
     		});
     		// And for "for" tags
     		$(newGroup).find('label').attr('for', bumpStringInt($(newGroup).find('label').attr('for')));
     		$(newGroup).find('label').text(""); // Clear the label. We only want it on the very first row
     		// Insert the updated/cloned row
     		$(lastRepeatableGroup).after(newGroup);
     		// Delete any help text from the group we have cloned
     		$(lastRepeatableGroup).find('.help-block').each(function() {
     			$(this).remove();
     		});
     		setMasks();
     		$('[id^=address]').autocomplete({
     			source: addressarray
     		});
+    	}
     	// These are action buttons, not submit buttons
     	$('[id^=addrow]').prop('type','button');
     	$('[id^=delete]').prop('type','button');
     	// on click . .
     	$('[id^=addrow]').click(function() {
     		add_row();
     	});
     	$('[id^=delete]').click(function(event) {
     		if($('.repeatable').length > 1) {
     			moveHelpText(event.target.id);
     			delete_row(event.target.id);
+    		}
     		else
     			alert('<?php echo gettext("You may not delete the last one!")?>');
     	});
     	// Hide the advanced section
     	var advanced_visible = false;

     //<![CDATA[
     events.push(function(){
     	// Row add/delete function for class="repeatable" =================================================================
     	function setMasks() {
     		// Find all ipaddress masks and make dynamic based on address family of input
     		$('span.pfIpMask + select').each(function (idx, select){
     			var input = $(select).prevAll('input[type=text]');
     			input.on('change', function(e){
     				var isV6 = (input.val().indexOf(':') != -1), min = 0, max = 128;
     				if (!isV6)
     					max = 32;
     				if (input.val() == "")
     					return;
     				while (select.options.length > max)
     					select.remove(0);
     				if (select.options.length < max)
+    				{
     					for (var i=select.options.length; i<=max; i++)
     						select.options.add(new Option(i, i), 0);
+    				}
     			});
     			// Fire immediately
     			input.change();
     		});
+    	}
     	// Complicated function to move all help text associated with this input id to the same id
     	// on the row above. That way if you delete the last row, you don't lose the help
     	function moveHelpText(id) {
     		$('#' + id).parent('div').parent('div').find('input').each(function() {	 // For each <span></span>
     			var fromId = this.id;
     			var toId = decrStringInt(fromId);
     			var helpSpan;
     			if(!$(this).hasClass('pfIpMask') && !$(this).hasClass('btn')) {
     				helpSpan = $('#' + fromId).parent('div').parent('div').find('span:last').clone();
     				if($(helpSpan).hasClass('help-block')) {
     					if($('#' + decrStringInt(fromId)).parent('div').hasClass('input-group'))
     						$('#' + decrStringInt(fromId)).parent('div').after(helpSpan);
     					else
     						$('#' + decrStringInt(fromId)).after(helpSpan);
+    				}
+    			}
     		});
+    	}
     	// Increment the number at the end of the string
     	function bumpStringInt( str )	{
     	  var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
     	  if( data )
     		newStr = data[ 1 ] + ( Number( data[ 2 ] ) + 1 ) + data[ 3 ];
     	  return newStr || str;
+    	}
     	// Decrement the number at the end of the string
     	function decrStringInt( str )	{
     	  var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
     	  if( data )
     		newStr = data[ 1 ] + ( Number( data[ 2 ] ) - 1 ) + data[ 3 ];
     	  return newStr || str;
+    	}
     	// Called after a delete so that there are no gaps in the numbering. Most of the time the config system doesn't care about
     	// gaps, but I do :)
     	function renumber() {
     		var idx = 0;
     		$('.repeatable').each(function() {
     			$(this).find('input').each(function() {
     				$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     				$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     			});
     			$(this).find('select').each(function() {
     				$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     				$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     			});
     			$(this).find('label').attr('for', $(this).find('label').attr('for').replace(/\d+$/, "") + idx);
     			idx++;
     		});
+    	}
     	function delete_row(row) {
     		$('#' + row).parent('div').parent('div').remove();
     		renumber();
+    	}
     	function add_row() {
     		// Find the lst repeatable group
     		var lastRepeatableGroup = $('.repeatable:last');
     		// Clone it
     		var newGroup = lastRepeatableGroup.clone(true);
     		// Increment the suffix number for each input elemnt in the new group
     		$(newGroup).find('input').each(function() {
     			$(this).prop("id", bumpStringInt(this.id));
     			$(this).prop("name", bumpStringInt(this.name));
     			if(!$(this).is('[id^=delete]'))
     				$(this).val('');
     		});
     		// Do the same for selectors
     		$(newGroup).find('select').each(function() {
     			$(this).prop("id", bumpStringInt(this.id));
     			$(this).prop("name", bumpStringInt(this.name));
     			// If this selector lists mask bits, we need it to be reset to all 128 options
     			// and no items selected, so that automatic v4/v6 selection still works
     			if($(this).is('[id^=address_subnet]')) {
     				$(this).empty();
     				for(idx=128; idx>0; idx--) {
     					$(this).append($('<option>', {
     						value: idx,
     						text: idx
     					}));
+    				}
+    			}
     		});
     		// And for "for" tags
     		$(newGroup).find('label').attr('for', bumpStringInt($(newGroup).find('label').attr('for')));
     		$(newGroup).find('label').text(""); // Clear the label. We only want it on the very first row
     		// Insert the updated/cloned row
     		$(lastRepeatableGroup).after(newGroup);
     		// Delete any help text from the group we have cloned
     		$(lastRepeatableGroup).find('.help-block').each(function() {
     			$(this).remove();
     		});
     		setMasks();
+    	}
     	// These are action buttons, not submit buttons
     	$('[id^=addrow]').prop('type','button');
     	$('[id^=delete]').prop('type','button');
     	// on click . .
     	$('[id^=addrow]').click(function() {
     		add_row();
     	});
     	$('[id^=delete]').click(function(event) {
     		if($('.repeatable').length > 1) {
     			moveHelpText(event.target.id);
     			delete_row(event.target.id);
+    		}
     		else
     			alert('<?php echo gettext("You may not delete the last one!")?>');
     	});
     	// Show advanced DNS options ======================================================================================
     	var showadvdns = false;

     ?>
     <script>
     	// If this variable is declared, any help text will not be deleted when rows are added
     	// IOW the help text will appear on every row
     	retainhelp = true;
     </script>
     <script>
     //<![CDATA[
     events.push(function(){
     	function setMasks() {
     		// Find all ipaddress masks and make dynamic based on address family of input
     		$('span.pfIpMask + select').each(function (idx, select){
     			var input = $(select).prevAll('input[type=text]');
     			input.on('change', function(e){
     				var isV6 = (input.val().indexOf(':') != -1), min = 0, max = 128;
     				if (!isV6)
     					max = 32;
     				if (input.val() == "")
     					return;
     				while (select.options.length > max)
     					select.remove(0);
     				if (select.options.length < max)
+    				{
     					for (var i=select.options.length; i<=max; i++)
     						select.options.add(new Option(i, i), 0);
+    				}
     			});
     			// Fire immediately
     			input.change();
     		});
+    	}
     	// Complicated function to move all help text associated with this input id to the same id
     	// on the row above. That way if you delete the last row, you don't lose the help
     	function moveHelpText(id) {
     		$('#' + id).parent('div').parent('div').find('input').each(function() {	 // For each <span></span>
     			var fromId = this.id;
     			var toId = decrStringInt(fromId);
     			var helpSpan;
     			if(!$(this).hasClass('pfIpMask') && !$(this).hasClass('btn')) {
     				helpSpan = $('#' + fromId).parent('div').parent('div').find('span:last').clone();
     				if($(helpSpan).hasClass('help-block')) {
     					if($('#' + decrStringInt(fromId)).parent('div').hasClass('input-group'))
     						$('#' + decrStringInt(fromId)).parent('div').after(helpSpan);
     					else
     						$('#' + decrStringInt(fromId)).after(helpSpan);
+    				}
+    			}
     		});
+    	}
     	// Increment the number at the end of the string
     	function bumpStringInt( str )	{
     	  var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
     	  if( data )
     		newStr = data[ 1 ] + ( Number( data[ 2 ] ) + 1 ) + data[ 3 ];
     	  return newStr || str;
+    	}
     	// Decrement the number at the end of the string
     	function decrStringInt( str )	{
     	  var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
     	  if( data )
     		newStr = data[ 1 ] + ( Number( data[ 2 ] ) - 1 ) + data[ 3 ];
     	  return newStr || str;
+    	}
     	// Called after a delete so that there are no gaps in the numbering. Most of the time the config system doesn't care about
     	// gaps, but I do :)
     	function renumber() {
     		var idx = 0;
     		$('.repeatable').each(function() {
     			$(this).find('input').each(function() {
     				$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     				$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     			});
     			$(this).find('select').each(function() {
     				$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     				$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     			});
     			$(this).find('label').attr('for', $(this).find('label').attr('for').replace(/\d+$/, "") + idx);
     			idx++;
     		});
+    	}
     	function delete_row(row) {
     		$('#' + row).parent('div').parent('div').remove();
     		renumber();
+    	}
     	function add_row() {
     		// Find the lst repeatable group
     		var lastRepeatableGroup = $('.repeatable:last');
     		// Clone it
     		var newGroup = lastRepeatableGroup.clone(true);
     		// Increment the suffix number for each input elemnt in the new group
     		$(newGroup).find('input').each(function() {
     			$(this).prop("id", bumpStringInt(this.id));
     			$(this).prop("name", bumpStringInt(this.name));
     			if(!$(this).is('[id^=delete]'))
     				$(this).val('');
     		});
     		// Do the same for selectors
     		$(newGroup).find('select').each(function() {
     			$(this).prop("id", bumpStringInt(this.id));
     			$(this).prop("name", bumpStringInt(this.name));
     			// If this selector lists mask bits, we need it to be reset to all 128 options
     			// and no items selected, so that automatic v4/v6 selection still works
     			if($(this).is('[id^=address_subnet]')) {
     				$(this).empty();
     				for(idx=128; idx>0; idx--) {
     					$(this).append($('<option>', {
     						value: idx,
     						text: idx
     					}));
+    				}
+    			}
     		});
     		// And for "for" tags
     		$(newGroup).find('label').attr('for', bumpStringInt($(newGroup).find('label').attr('for')));
     		$(newGroup).find('label').text(""); // Clear the label. We only want it on the very first row
     		// Insert the updated/cloned row
     		$(lastRepeatableGroup).after(newGroup);
     /*
     		// Delete any help text from the group we have cloned
     		$(lastRepeatableGroup).find('.help-block').each(function() {
     			$(this).remove();
     		});
     */
     		setMasks();
     		$('[id^=address]').autocomplete({
     			source: addressarray
     		});
+    	}
     	// These are action buttons, not submit buttons
     	$('[id^=addrow]').prop('type','button');
     	$('[id^=delete]').prop('type','button');
     	// on click . .
     	$('[id^=addrow]').click(function() {
     		add_row();
     	});
     	$('[id^=delete]').click(function(event) {
     		if($('.repeatable').length > 1) {
     	//		moveHelpText(event.target.id);
     			delete_row(event.target.id);
+    		}
     		else
     			alert('<?php echo gettext("You may not delete the last one!")?>');
     	});
     	// Make the ‘clear’ button a plain button, not a submit button
     	$('#btnadvstats').prop('type','button');

     $section = new Form_Section('DNS Configuration');
     for($idx=1; $idx=<4; $idx++) {
     for($idx=1; $idx<=4; $idx++) {
     	$section->addInput(new Form_IpAddress(
     		'radns' . $idx,
     		'Server ' . $idx,
-...
     //<![CDATA[
     events.push(function(){
     	function setMasks() {
     		// Find all ipaddress masks and make dynamic based on address family of input
     		$('span.pfIpMask + select').each(function (idx, select){
     			var input = $(select).prevAll('input[type=text]');
     			input.on('change', function(e){
     				var isV6 = (input.val().indexOf(':') != -1), min = 0, max = 128;
     				if (!isV6)
     					max = 32;
     				if (input.val() == "")
     					return;
     				while (select.options.length > max)
     					select.remove(0);
     				if (select.options.length < max)
+    				{
     					for (var i=select.options.length; i<=max; i++)
     						select.options.add(new Option(i, i), 0);
+    				}
     			});
     			// Fire immediately
     			input.change();
     		});
+    	}
     	// Complicated function to move all help text associated with this input id to the same id
     	// on the row above. That way if you delete the last row, you don't lose the help
     	function moveHelpText(id) {
     		$('#' + id).parent('div').parent('div').find('input').each(function() {	 // For each <span></span>
     			var fromId = this.id;
     			var toId = decrStringInt(fromId);
     			var helpSpan;
     			if(!$(this).hasClass('pfIpMask') && !$(this).hasClass('btn')) {
     				helpSpan = $('#' + fromId).parent('div').parent('div').find('span:last').clone();
     				if($(helpSpan).hasClass('help-block')) {
     					if($('#' + decrStringInt(fromId)).parent('div').hasClass('input-group'))
     						$('#' + decrStringInt(fromId)).parent('div').after(helpSpan);
     					else
     						$('#' + decrStringInt(fromId)).after(helpSpan);
+    				}
+    			}
     		});
+    	}
     	// Increment the number at the end of the string
     	function bumpStringInt( str )	{
     	  var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
     	  if( data )
     		newStr = data[ 1 ] + ( Number( data[ 2 ] ) + 1 ) + data[ 3 ];
     	  return newStr || str;
+    	}
     	// Decrement the number at the end of the string
     	function decrStringInt( str )	{
     	  var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
     	  if( data )
     		newStr = data[ 1 ] + ( Number( data[ 2 ] ) - 1 ) + data[ 3 ];
     	  return newStr || str;
+    	}
     	// Called after a delete so that there are no gaps in the numbering. Most of the time the config system doesn't care about
     	// gaps, but I do :)
     	function renumber() {
     		var idx = 0;
     		$('.repeatable').each(function() {
     			$(this).find('input').each(function() {
     				$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     				$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     			});
     			$(this).find('select').each(function() {
     				$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     				$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     			});
     			$(this).find('label').attr('for', $(this).find('label').attr('for').replace(/\d+$/, "") + idx);
     			idx++;
     		});
+    	}
     	function delete_row(row) {
     		$('#' + row).parent('div').parent('div').remove();
     		renumber();
+    	}
     	function add_row() {
     		// Find the lst repeatable group
     		var lastRepeatableGroup = $('.repeatable:last');
     		// Clone it
     		var newGroup = lastRepeatableGroup.clone(true);
     		// Increment the suffix number for each input elemnt in the new group
     		$(newGroup).find('input').each(function() {
     			$(this).prop("id", bumpStringInt(this.id));
     			$(this).prop("name", bumpStringInt(this.name));
     			if(!$(this).is('[id^=delete]'))
     				$(this).val('');
     		});
     		// Do the same for selectors
     		$(newGroup).find('select').each(function() {
     			$(this).prop("id", bumpStringInt(this.id));
     			$(this).prop("name", bumpStringInt(this.name));
     			// If this selector lists mask bits, we need it to be reset to all 128 options
     			// and no items selected, so that automatic v4/v6 selection still works
     			if($(this).is('[id^=address_subnet]')) {
     				$(this).empty();
     				for(idx=128; idx>0; idx--) {
     					$(this).append($('<option>', {
     						value: idx,
     						text: idx
     					}));
+    				}
+    			}
     		});
     		// And for "for" tags
     		$(newGroup).find('label').attr('for', bumpStringInt($(newGroup).find('label').attr('for')));
     		$(newGroup).find('label').text(""); // Clear the label. We only want it on the very first row
     		// Insert the updated/cloned row
     		$(lastRepeatableGroup).after(newGroup);
     		// Delete any help text from the group we have cloned
     		$(lastRepeatableGroup).find('.help-block').each(function() {
     			$(this).remove();
     		});
     		setMasks();
+    	}
     	// These are action buttons, not submit buttons
     	$('[id^=addrow]').prop('type','button');
     	$('[id^=delete]').prop('type','button');
     	// on click . .
     	$('[id^=addrow]').click(function() {
     		add_row();
     	});
     	$('[id^=delete]').click(function(event) {
     		if($('.repeatable').length > 1) {
     			moveHelpText(event.target.id);
     			delete_row(event.target.id);
+    		}
     		else
     			alert('<?php echo gettext("You may not delete the last one!")?>');
     	});
     	// --------- Autocomplete -----------------------------------------------------------------------------------------
     	var addressarray = <?= json_encode(get_alias_list(array("host", "network", "openvpn", "urltable"))) ?>;

     		$counter++;
+    	}
     	$section->addInput(new Form_Button(
     	$form->addGlobal(new Form_Button(
     		'addrow',
     		'Add network'
     	))->removeClass('btn-primary')->addClass('btn-success');
-...
     <?php
+    }
     ?>
     <script>
     //<![CDATA[
     // Most of this needs to live in a common include file. It will be moved before production release.
     events.push(function(){
     	function setMasks() {
     		// Find all ipaddress masks and make dynamic based on address family of input
     		$('span.pfIpMask + select').each(function (idx, select){
     			var input = $(select).prevAll('input[type=text]');
     			input.on('change', function(e){
     				var isV6 = (input.val().indexOf(':') != -1), min = 0, max = 128;
     				if (!isV6)
     					max = 32;
     				if (input.val() == "")
     					return;
     				while (select.options.length > max)
     					select.remove(0);
     				if (select.options.length < max)
+    				{
     					for (var i=select.options.length; i<=max; i++)
     						select.options.add(new Option(i, i), 0);
+    				}
     			});
     			// Fire immediately
     			input.change();
     		});
+    	}
     	// Complicated function to move all help text associated with this input id to the same id
     	// on the row above. That way if you delete the last row, you don't lose the help
     	function moveHelpText(id) {
     		$('#' + id).parent('div').parent('div').find('input').each(function() {	 // For each <span></span>
     			var fromId = this.id;
     			var toId = decrStringInt(fromId);
     			var helpSpan;
     			if(!$(this).hasClass('pfIpMask') && !$(this).hasClass('btn')) {
     				helpSpan = $('#' + fromId).parent('div').parent('div').find('span:last').clone();
     				if($(helpSpan).hasClass('help-block')) {
     					if($('#' + decrStringInt(fromId)).parent('div').hasClass('input-group'))
     						$('#' + decrStringInt(fromId)).parent('div').after(helpSpan);
     					else
     						$('#' + decrStringInt(fromId)).after(helpSpan);
+    				}
+    			}
     		});
+    	}
     	// Increment the number at the end of the string
     	function bumpStringInt( str )	{
     	  var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
     	  if( data )
     		newStr = data[ 1 ] + ( Number( data[ 2 ] ) + 1 ) + data[ 3 ];
     	  return newStr || str;
+    	}
     	// Decrement the number at the end of the string
     	function decrStringInt( str )	{
     	  var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
     	  if( data )
     		newStr = data[ 1 ] + ( Number( data[ 2 ] ) - 1 ) + data[ 3 ];
     	  return newStr || str;
+    	}
     	// Called after a delete so that there are no gaps in the numbering. Most of the time the config system doesn't care about
     	// gaps, but I do :)
     	function renumber() {
     		var idx = 0;
     		$('.repeatable').each(function() {
     			$(this).find('input').each(function() {
     				$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     				$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     			});
     			$(this).find('select').each(function() {
     				$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     				$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     			});
     			$(this).find('label').attr('for', $(this).find('label').attr('for').replace(/\d+$/, "") + idx);
     			idx++;
     		});
+    	}
     	function delete_row(row) {
     		$('#' + row).parent('div').parent('div').remove();
     		renumber();
+    	}
     	function add_row() {
     		// Find the lst repeatable group
     		var lastRepeatableGroup = $('.repeatable:last');
     		// Clone it
     		var newGroup = lastRepeatableGroup.clone(true);
     		// Increment the suffix number for each input elemnt in the new group
     		$(newGroup).find('input').each(function() {
     			$(this).prop("id", bumpStringInt(this.id));
     			$(this).prop("name", bumpStringInt(this.name));
     			if(!$(this).is('[id^=delete]'))
     				$(this).val('');
     		});
     		// Do the same for selectors
     		$(newGroup).find('select').each(function() {
     			$(this).prop("id", bumpStringInt(this.id));
     			$(this).prop("name", bumpStringInt(this.name));
     			// If this selector lists mask bits, we need it to be reset to all 128 options
     			// and no items selected, so that automatic v4/v6 selection still works
     			if($(this).is('[id^=mask]')) {
     				$(this).empty();
     				for(idx=128; idx>0; idx--) {
     					$(this).append($('<option>', {
     						value: idx,
     						text: idx
     					}));
+    				}
+    			}
     		});
     		// And for "for" tags
     		$(newGroup).find('label').attr('for', bumpStringInt($(newGroup).find('label').attr('for')));
     		$(newGroup).find('label').text(""); // Clear the label. We only want it on the very first row
     		// Insert the updated/cloned row
     		$(lastRepeatableGroup).after(newGroup);
     		// Delete any help text from the group we have cloned
     		$(lastRepeatableGroup).find('.help-block').each(function() {
     			$(this).remove();
     		});
     		setMasks();
+    	}
     	// These are action buttons, not submit buttons
     	$('[id^=addrow]').prop('type','button');
     	$('[id^=delete]').prop('type','button');
     	// on click . .
     	$('[id^=addrow]').click(function() {
     		add_row();
     	});
     	$('[id^=delete]').click(function(event) {
     		if($('.repeatable').length > 1) {
     			moveHelpText(event.target.id);
     			delete_row(event.target.id);
+    		}
     		else
     			alert('<?php echo gettext("You may not delete the last one!")?>');
     	});
     });
     //]]>
     </script>
     <?php
     include("foot.inc");
     include("foot.inc");

     //<![CDATA[
     events.push(function(){
     	function setMasks() {
     		// Find all ipaddress masks and make dynamic based on address family of input
     		$('span.pfIpMask + select').each(function (idx, select){
     			var input = $(select).prevAll('input[type=text]');
     			input.on('change', function(e){
     				var isV6 = (input.val().indexOf(':') != -1), min = 0, max = 128;
     				if (!isV6)
     					max = 32;
     				if (input.val() == "")
     					return;
     				while (select.options.length > max)
     					select.remove(0);
     				if (select.options.length < max)
+    				{
     					for (var i=select.options.length; i<=max; i++)
     						select.options.add(new Option(i, i), 0);
+    				}
     			});
     			// Fire immediately
     			input.change();
     		});
+    	}
     	// Complicated function to move all help text associated with this input id to the same id
     	// on the row above. That way if you delete the last row, you don't lose the help
     	function moveHelpText(id) {
     		$('#' + id).parent('div').parent('div').find('input').each(function() {	 // For each <span></span>
     			var fromId = this.id;
     			var toId = decrStringInt(fromId);
     			var helpSpan;
     			if(!$(this).hasClass('pfIpMask') && !$(this).hasClass('btn')) {
     				helpSpan = $('#' + fromId).parent('div').parent('div').find('span:last').clone();
     				if($(helpSpan).hasClass('help-block')) {
     					if($('#' + decrStringInt(fromId)).parent('div').hasClass('input-group'))
     						$('#' + decrStringInt(fromId)).parent('div').after(helpSpan);
     					else
     						$('#' + decrStringInt(fromId)).after(helpSpan);
+    				}
+    			}
     		});
+    	}
     	// Increment the number at the end of the string
     	function bumpStringInt( str )	{
     	  var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
     	  if( data )
     		newStr = data[ 1 ] + ( Number( data[ 2 ] ) + 1 ) + data[ 3 ];
     	  return newStr || str;
+    	}
     	// Decrement the number at the end of the string
     	function decrStringInt( str )	{
     	  var data = str.match(/(\D*)(\d+)(\D*)/), newStr = "";
     	  if( data )
     		newStr = data[ 1 ] + ( Number( data[ 2 ] ) - 1 ) + data[ 3 ];
     	  return newStr || str;
+    	}
     	// Called after a delete so that there are no gaps in the numbering. Most of the time the config system doesn't care about
     	// gaps, but I do :)
     	function renumber() {
     		var idx = 0;
     		$('.repeatable').each(function() {
     			$(this).find('input').each(function() {
     				$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     				$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     			});
     			$(this).find('select').each(function() {
     				$(this).prop("id", this.id.replace(/\d+$/, "") + idx);
     				$(this).prop("name", this.name.replace(/\d+$/, "") + idx);
     			});
     			$(this).find('label').attr('for', $(this).find('label').attr('for').replace(/\d+$/, "") + idx);
     			idx++;
     		});
+    	}
     	function delete_row(row) {
     		$('#' + row).parent('div').parent('div').remove();
     		renumber();
+    	}
     	function add_row() {
     		// Find the lst repeatable group
     		var lastRepeatableGroup = $('.repeatable:last');
     		// Clone it
     		var newGroup = lastRepeatableGroup.clone(true);
     		// Increment the suffix number for each input elemnt in the new group
     		$(newGroup).find('input').each(function() {
     			$(this).prop("id", bumpStringInt(this.id));
     			$(this).prop("name", bumpStringInt(this.name));
     			if(!$(this).is('[id^=delete]'))
     				$(this).val('');
     		});
     		// Do the same for selectors
     		$(newGroup).find('select').each(function() {
     			$(this).prop("id", bumpStringInt(this.id));
     			$(this).prop("name", bumpStringInt(this.name));
     			// If this selector lists mask bits, we need it to be reset to all 128 options
     			// and no items selected, so that automatic v4/v6 selection still works
     			if($(this).is('[id^=address_subnet]')) {
     				$(this).empty();
     				for(idx=128; idx>0; idx--) {
     					$(this).append($('<option>', {
     						value: idx,
     						text: idx
     					}));
+    				}
+    			}
     		});
     		// And for "for" tags
     		$(newGroup).find('label').attr('for', bumpStringInt($(newGroup).find('label').attr('for')));
     		$(newGroup).find('label').text(""); // Clear the label. We only want it on the very first row
     		// Insert the updated/cloned row
     		$(lastRepeatableGroup).after(newGroup);
     		// Delete any help text from the group we have cloned
     		$(lastRepeatableGroup).find('.help-block').each(function() {

Project

General

Profile

pfSense

Revision 08ec2d99

Added by Stephen Beaver almost 10 years ago