Project

General

Profile

« Previous | Next » 

Revision 435b4eec

Added by Jim Pingle about 13 years ago

This should have been 2.1 only, and it's just causing some odd package behavior on 2.0.2 (blank lines in squid's interface selection, for one). 2.1 has different code here anyhow. Revert "Added "interface_selection" type to enable interface selection in tinydns server"

This reverts commit 05d908db3ad62e46eb22bb73e397ba8bf61cb36c.

View differences:

usr/local/www/javascript/row_helper_dynamic.js
24 24

  
25 25
var addRowTo = (function() {
26 26
    return (function (tableId, objectSize) {
27
	var d, tbody, tr, td, bgc, i, ii, j, size;
27
	var d, tbody, tr, td, bgc, i, ii, j;
28 28
	d = document;
29 29
	tbody = d.getElementById(tableId).getElementsByTagName("tbody").item(0);
30 30
	tr = d.createElement("tr");
31 31
	totalrows++;
32
	size = objectSize;
32
	if (!objectSize)
33
		objectSize = rowsize[i];
33 34
	for (i = 0; i < field_counter_js; i++) {
34
		if (!objectSize)
35
			size = rowsize[i];
36 35
		td = d.createElement("td");
37 36
		if(typeof(rowtype[i]) == 'function') {
38
			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input>" + rowtype[i](rowname[i], size, totalrows) + " ";
37
			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input>" + rowtype[i](rowname[i], objectSize, totalrows) + " ";
39 38
		} else if(rowtype[i] == 'textbox') {
40 39
			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input " + rowhelper_onChange + " size='" + rowsize[i] + "' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> ";
41 40
		} else if(rowtype[i] == 'select') {
42 41
			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select " + rowhelper_onChange + " name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'>" + newrow[i] + "</select> ";
43
		} else if(rowtype[i] == 'interfaces_selection') {
44
			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select " + rowhelper_onChange + " name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'>" + newrow[i] + "</select> ";
45 42
		} else if(rowtype[i] == 'select_source') {
46 43
			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select " + rowhelper_onChange + " name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'>" + newrow[i] + "</select> ";
47 44
		} else if(rowtype[i] == 'checkbox') {
48 45
			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input " + rowhelper_onChange + " type='checkbox'name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> ";
49 46
		} else if(rowtype[i] == 'input') {
50
			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input " + rowhelper_onChange + " class='formfld unknown' size='" + size + "' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> ";
47
			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input " + rowhelper_onChange + " class='formfld unknown' size='" + objectSize + "' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> ";
51 48
		} else if(rowtype[i] == 'password') {
52 49
			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input " + rowhelper_onChange + " class='formfld pwd' type='password' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> ";
53 50
		}
usr/local/www/pkg_edit.php
503 503
		} else if($pkga['type'] == "select") {
504 504
			$fieldname = $pkga['fieldname'];
505 505
			if (isset($pkga['multiple'])) {
506
				$multiple = 'multiple="multiple"';
506
      	$multiple = 'multiple="multiple"';
507 507
				$items = explode(',', $value);
508 508
				$fieldname .= "[]";
509 509
			} else {
......
653 653
			else
654 654
				$values  =  explode(',',  $value);
655 655
			$ifaces["lo0"] = "loopback";
656
			if(isset($pkga['advancedfield']) && $adv_enabled)
657
				$advanced .="<option><name></name><value></value></option>/n";
658
			else
659
				echo "<option><name></name><value></value></option>/n";
660 656
			foreach($ifaces as $ifname => $iface) {
661 657
				$selected = (in_array($ifname, $values) ? 'selected' : '');
662 658
				if(isset($pkga['advancedfield']) && $adv_enabled)
......
685 681
				foreach($pkga['rowhelper']['rowhelperfield'] as $rowhelper) {
686 682
					echo "rowname[" . $fieldcounter . "] = \"" . $rowhelper['fieldname'] . "\";\n";
687 683
					echo "rowtype[" . $fieldcounter . "] = \"" . $rowhelper['type'] . "\";\n";
688
					echo "rowsize[" . $fieldcounter . "] = \"" . $rowhelper['size'] . "\";\n";
689 684
					$fieldcounter++;
690 685
				}
691 686
			?>
......
752 747
				if($trc == 0) {
753 748
					/*
754 749
					 *  no records loaded.
755
					 *  just show a generic line non-populated with saved data
756
					 */
757
					foreach($pkga['rowhelper']['rowhelperfield'] as $rowhelper) {
750
                                         *  just show a generic line non-populated with saved data
751
                                         */
752
                                        foreach($pkga['rowhelper']['rowhelperfield'] as $rowhelper) {
758 753
						if($rowhelper['value'] <> "") $value = $rowhelper['value'];
759 754
						$fieldname = $rowhelper['fieldname'];
760 755
						$options = "";
......
898 893
		foreach($rowhelper['options']['option'] as $rowopt) {
899 894
			$selected = "";
900 895
			if($rowopt['value'] == $value) $selected = " SELECTED";
901
			$text .= "<option value='" . $rowopt['value'] . ">" . $rowopt['name'] . "</option>";
896
			$text .= "<option value='" . $rowopt['value'] . "'" . $selected . ">" . $rowopt['name'] . "</option>";
902 897
			echo "<option value='" . $rowopt['value'] . "'" . $selected . ">" . $rowopt['name'] . "</option>\n";
903 898
		}
904 899
		echo "</select>\n";
905
	} else if($type == "interfaces_selection") {
906
			$size = ($size ? "size=\"{$size}\"" : '');
907
			$multiple = '';
908
			if (isset($rowhelper['multiple'])) {
909
				$fieldname .= '[]';
910
				$multiple = 'multiple';
911
			}
912
			echo "<select id='" . $fieldname . $trc . "' name='" . $fieldname . $trc . "' $size $multiple>\n";
913
			$ifaces = get_configured_interface_with_descr();
914
			$additional_ifaces = $rowhelper['add_to_interfaces_selection'];
915
			if (!empty($additional_ifaces))
916
				$ifaces = array_merge($ifaces, explode(',', $additional_ifaces));
917
			if(is_array($value))
918
				$values = $value;
919
			else
920
				$values  =  explode(',',  $value);
921
			$ifaces["lo0"] = "loopback";
922
			echo "<option><name></name><value></value></option>/n";
923
			foreach($ifaces as $ifname => $iface) {
924
				$selected = (in_array($ifname, $values) ? 'selected' : '');
925
				$text .="<option value=\\\"$ifname\\\">$iface</option>";
926
				echo "<option value=\"$ifname\" $selected>$iface</option>\n";
927
			}
928
			echo "</select>\n";
929 900
	} else if($type == "select_source") {
930 901
		echo "<select id='" . $fieldname . $trc . "' name='" . $fieldname . $trc . "'>\n";
931 902
		$source_url = $rowhelper['source'];
......
944 915
		  	}
945 916
			if($source_value == $value) 
946 917
				$selected = " SELECTED";
947
			$text .= "<option value='" . $source_value . "'" . ">" . $source_name . "</option>";
918
			$text .= "<option value='" . $source_value . "'" . $selected . ">" . $source_name . "</option>";
948 919
			echo "<option value='" . $source_value . "'" . $selected . ">" . $source_name . "</option>\n";
949 920
		}
950 921
		echo "</select>\n";		

Also available in: Unified diff