mirror of
https://github.com/pfsense/pfsense.git
synced 2025-10-26 11:38:35 +00:00
Bring to functionality the editing of aliases.
* Cleanup uneccesary eval() use in php code * Invrease on javascript the limits to 299 to really allow 299 entries * Remove limitiation of not being able to delete the first entry * Make all the rows dynamic. Now a new alias will not show any rows unless the plus sign is clicked. * Fix bug where OpenVPN aliases where being selected in case of Port aliases * Cleanup and style(9) here and there
This commit is contained in:
Ermal Luçi
parent
fb673a312f
commit
b6f3005c2b
@ -103,20 +103,6 @@ if ($_POST) {
|
||||
$pconfig = $_POST;
|
||||
|
||||
/* input validation */
|
||||
$reqdfields = explode(" ", "name address");
|
||||
$reqdfieldsn = explode(",", "Name,Address");
|
||||
|
||||
if ($_POST['type'] == "network") {
|
||||
$reqdfields[] = "address_subnet";
|
||||
$reqdfieldsn[] = "Subnet bit count";
|
||||
}
|
||||
|
||||
do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
|
||||
|
||||
if(strtolower($_POST['name']) == "lan")
|
||||
$input_errors[] = "Aliases may not be named LAN.";
|
||||
if(strtolower($_POST['name']) == "wan")
|
||||
$input_errors[] = "Aliases may not be named WAN.";
|
||||
if(strtolower($_POST['name']) == "pptp")
|
||||
$input_errors[] = gettext("Aliases may not be named PPTP.");
|
||||
|
||||
@ -127,24 +113,6 @@ if ($_POST) {
|
||||
if (is_validaliasname($_POST['name']) == false)
|
||||
$input_errors[] = "The alias name may only consist of the characters a-z, A-Z, 0-9, _.";
|
||||
}
|
||||
if ($_POST['type'] == "network") {
|
||||
if (!is_ipaddr($_POST['address'])) {
|
||||
$input_errors[] = "A valid address must be specified.";
|
||||
}
|
||||
if (!is_numeric($_POST['address_subnet'])) {
|
||||
$input_errors[] = "A valid subnet bit count must be specified.";
|
||||
}
|
||||
}
|
||||
|
||||
if ($_POST['type'] == "url") {
|
||||
if(stristr($_POST['address'], "http") == false)
|
||||
$input_errors[] = "You must provide a valid URL to the resource.";
|
||||
}
|
||||
|
||||
if ($_POST['type'] == "port")
|
||||
if (! is_port($_POST['address']) && ! is_portrange($_POST['address']))
|
||||
$input_errors[] = "Please specify a valid port or portrange.";
|
||||
|
||||
/* check for name conflicts */
|
||||
foreach ($a_aliases as $alias) {
|
||||
if (isset($id) && ($a_aliases[$id]) && ($a_aliases[$id] === $alias))
|
||||
@ -166,31 +134,12 @@ if ($_POST) {
|
||||
|
||||
$alias = array();
|
||||
$alias['name'] = $_POST['name'];
|
||||
if ($_POST['type'] == "network")
|
||||
$alias['address'] = $_POST['address'] . "/" . $_POST['address_subnet'];
|
||||
|
||||
else
|
||||
$alias['address'] = $_POST['address'];
|
||||
|
||||
$address = $alias['address'];
|
||||
$final_address_detail = mb_convert_encoding($_POST['detail'],"HTML-ENTITIES","auto");
|
||||
if($final_address_detail <> "") {
|
||||
$final_address_details .= $final_address_detail;
|
||||
} else {
|
||||
$final_address_details .= "Entry added" . " ";
|
||||
$final_address_details .= date('r');
|
||||
}
|
||||
$final_address_details .= "||";
|
||||
$isfirst = 0;
|
||||
|
||||
if($_POST['type'] == "url") {
|
||||
$address = "";
|
||||
$isfirst = 0;
|
||||
$address_count = 2;
|
||||
|
||||
/* item is a url type */
|
||||
if($_POST['address'])
|
||||
$_POST['address0'] = $_POST['address'];
|
||||
for($x=0; isset($_POST['address'. $x]); $x++) {
|
||||
if($_POST['address' . $x]) {
|
||||
/* fetch down and add in */
|
||||
@ -238,35 +187,31 @@ if ($_POST) {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$address = "";
|
||||
$isfirst = 0;
|
||||
/* item is a normal alias type */
|
||||
for($x=0; $x<299; $x++) {
|
||||
$comd = "\$subnet = \$_POST['address" . $x . "'];";
|
||||
eval($comd);
|
||||
$comd = "\$subnet_address = \$_POST['address_subnet" . $x . "'];";
|
||||
eval($comd);
|
||||
if($subnet <> "") {
|
||||
$address .= " ";
|
||||
$address .= $subnet;
|
||||
if($subnet_address <> "") $address .= "/" . $subnet_address;
|
||||
if($_POST["address{$x}"] <> "") {
|
||||
if ($isfirst > 0)
|
||||
$address .= " ";
|
||||
$address .= $_POST["address{$x}"];
|
||||
if($_POST["address_subnet{$x}"] <> "")
|
||||
$address .= "/" . $_POST["address_subnet{$x}"];
|
||||
|
||||
/* Compress in details to a single key, data separated by pipes.
|
||||
Pulling details here lets us only pull in details for valid
|
||||
address entries, saving us from having to track which ones to
|
||||
process later. */
|
||||
$comd = "\$final_address_detail = mb_convert_encoding(\$_POST['detail" . $x . "'],'HTML-ENTITIES','auto');";
|
||||
eval($comd);
|
||||
if($final_address_detail <> "") {
|
||||
$final_address_details .= $final_address_detail;
|
||||
} else {
|
||||
$final_address_details .= "Entry added" . " ";
|
||||
$final_address_details .= date('r');
|
||||
}
|
||||
$final_address_details .= "||";
|
||||
if($_POST["detail{$x}"] <> "") {
|
||||
$final_address_details .= $_POST["detail{$x}"];
|
||||
} else {
|
||||
$final_address_details .= "Entry added" . " ";
|
||||
$final_address_details .= date('r');
|
||||
}
|
||||
$final_address_details .= "||";
|
||||
$isfirst++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!$input_errors) {
|
||||
echo "{$address} --- ggggggggg <br/><br/>";
|
||||
$alias['address'] = $address;
|
||||
$alias['descr'] = mb_convert_encoding($_POST['descr'],"HTML-ENTITIES","auto");
|
||||
$alias['type'] = $_POST['type'];
|
||||
@ -305,11 +250,8 @@ function typesel_change() {
|
||||
case 0: /* host */
|
||||
var cmd;
|
||||
|
||||
document.iform.address_subnet.disabled = 1;
|
||||
document.iform.address_subnet.value = "";
|
||||
document.iform.address_subnet.selected = 0;
|
||||
newrows = totalrows+1;
|
||||
for(i=2; i<newrows; i++) {
|
||||
newrows = totalrows;
|
||||
for(i=0; i<newrows; i++) {
|
||||
comd = 'document.iform.address_subnet' + i + '.disabled = 1;';
|
||||
eval(comd);
|
||||
comd = 'document.iform.address_subnet' + i + '.value = "";';
|
||||
@ -319,9 +261,8 @@ function typesel_change() {
|
||||
case 1: /* network */
|
||||
var cmd;
|
||||
|
||||
document.iform.address_subnet.disabled = 0;
|
||||
newrows = totalrows+1;
|
||||
for(i=2; i<newrows; i++) {
|
||||
newrows = totalrows;
|
||||
for(i=0; i<newrows; i++) {
|
||||
comd = 'document.iform.address_subnet' + i + '.disabled = 0;';
|
||||
eval(comd);
|
||||
}
|
||||
@ -329,10 +270,8 @@ function typesel_change() {
|
||||
case 2: /* port */
|
||||
var cmd;
|
||||
|
||||
document.iform.address_subnet.disabled = 1;
|
||||
document.iform.address_subnet.value = "";
|
||||
newrows = totalrows+1;
|
||||
for(i=2; i<newrows; i++) {
|
||||
newrows = totalrows;
|
||||
for(i=0; i<newrows; i++) {
|
||||
comd = 'document.iform.address_subnet' + i + '.disabled = 1;';
|
||||
eval(comd);
|
||||
comd = 'document.iform.address_subnet' + i + '.value = "32";';
|
||||
@ -342,11 +281,8 @@ function typesel_change() {
|
||||
case 3: /* OpenVPN Users */
|
||||
var cmd;
|
||||
|
||||
document.iform.address_subnet.disabled = 1;
|
||||
document.iform.address_subnet.value = "";
|
||||
document.iform.address_subnet.selected = 0;
|
||||
newrows = totalrows+1;
|
||||
for(i=2; i<newrows; i++) {
|
||||
newrows = totalrows;
|
||||
for(i=0; i<newrows; i++) {
|
||||
comd = 'document.iform.address_subnet' + i + '.disabled = 1;';
|
||||
eval(comd);
|
||||
comd = 'document.iform.address_subnet' + i + '.value = "";';
|
||||
@ -356,9 +292,8 @@ function typesel_change() {
|
||||
|
||||
case 4: /* url */
|
||||
var cmd;
|
||||
document.iform.address_subnet.disabled = 0;
|
||||
newrows = totalrows+1;
|
||||
for(i=2; i<newrows; i++) {
|
||||
newrows = totalrows;
|
||||
for(i=0; i<newrows; i++) {
|
||||
comd = 'document.iform.address_subnet' + i + '.disabled = 0;';
|
||||
eval(comd);
|
||||
}
|
||||
@ -396,40 +331,30 @@ function update_box_type() {
|
||||
var selected = document.forms[0].type.options[indexNum].text;
|
||||
if(selected == '{$networks_str}') {
|
||||
document.getElementById ("addressnetworkport").firstChild.data = "{$networks_str}";
|
||||
document.getElementById ("address_subnet").visible = true;
|
||||
document.getElementById ("address_subnet").disabled = false;
|
||||
document.getElementById ("onecolumn").firstChild.data = "{$network_str}";
|
||||
document.getElementById ("twocolumn").firstChild.data = "{$cidr_str}";
|
||||
document.getElementById ("threecolumn").firstChild.data = "{$description_str}";
|
||||
document.getElementById ("itemhelp").firstChild.data = "{$networks_help}";
|
||||
} else if(selected == '{$hosts_str}') {
|
||||
document.getElementById ("addressnetworkport").firstChild.data = "{$hosts_str}";
|
||||
document.getElementById ("address_subnet").visible = false;
|
||||
document.getElementById ("address_subnet").disabled = true;
|
||||
document.getElementById ("onecolumn").firstChild.data = "{$ip_str}";
|
||||
document.getElementById ("twocolumn").firstChild.data = "";
|
||||
document.getElementById ("threecolumn").firstChild.data = "{$description_str}";
|
||||
document.getElementById ("itemhelp").firstChild.data = "{$hosts_help}";
|
||||
} else if(selected == '{$ports_str}') {
|
||||
document.getElementById ("addressnetworkport").firstChild.data = "{$ports_str}";
|
||||
document.getElementById ("address_subnet").visible = false;
|
||||
document.getElementById ("address_subnet").disabled = true;
|
||||
document.getElementById ("onecolumn").firstChild.data = "{$port_str}";
|
||||
document.getElementById ("twocolumn").firstChild.data = "";
|
||||
document.getElementById ("threecolumn").firstChild.data = "{$description_str}";
|
||||
document.getElementById ("itemhelp").firstChild.data = "{$ports_help}";
|
||||
} else if(selected == '{$url_str}') {
|
||||
document.getElementById ("addressnetworkport").firstChild.data = "{$url_str}";
|
||||
document.getElementById ("address_subnet").visible = true;
|
||||
document.getElementById ("address_subnet").disabled = false;
|
||||
document.getElementById ("onecolumn").firstChild.data = "{$url_str}";
|
||||
document.getElementById ("twocolumn").firstChild.data = "{$update_freq_str}";
|
||||
document.getElementById ("threecolumn").firstChild.data = "{$description_str}";
|
||||
document.getElementById ("itemhelp").firstChild.data = "{$url_help}";
|
||||
} else if(selected == '{$openvpn_user_str}') {
|
||||
document.getElementById ("addressnetworkport").firstChild.data = "{$openvpn_user_str}";
|
||||
document.getElementById ("address_subnet").visible = false;
|
||||
document.getElementById ("address_subnet").disabled = false;
|
||||
document.getElementById ("onecolumn").firstChild.data = "{$openvpn_str}";
|
||||
document.getElementById ("twocolumn").firstChild.data = "{$openvpn_freq}";
|
||||
document.getElementById ("threecolumn").firstChild.data = "{$description_str}";
|
||||
@ -465,7 +390,7 @@ EOD;
|
||||
|
||||
rowname[2] = "detail";
|
||||
rowtype[2] = "textbox";
|
||||
rowsize[2] = "61";
|
||||
rowsize[2] = "50";
|
||||
</script>
|
||||
|
||||
<?php if ($input_errors) print_input_errors($input_errors); ?>
|
||||
@ -512,7 +437,7 @@ EOD;
|
||||
<option value="host" <?php if ($pconfig['type'] == "host") echo "selected"; ?>>Host(s)</option>
|
||||
<option value="network" <?php if ($pconfig['type'] == "network") echo "selected"; ?>>Network(s)</option>
|
||||
<option value="port" <?php if ($pconfig['type'] == "port") echo "selected"; ?>>Port(s)</option>
|
||||
<option value="openvpn" <?php if ($pconfig['type'] == "port") echo "selected"; ?>>OpenVPN Users</option>
|
||||
<option value="openvpn" <?php if ($pconfig['type'] == "openvpn") echo "selected"; ?>>OpenVPN Users</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
@ -535,6 +460,7 @@ EOD;
|
||||
<?php
|
||||
$counter = 0;
|
||||
$address = $pconfig['address'];
|
||||
if ($address <> "") {
|
||||
$item = explode(" ", $address);
|
||||
$item3 = explode("||", $pconfig['detail']);
|
||||
foreach($item as $ww) {
|
||||
@ -548,7 +474,7 @@ EOD;
|
||||
}
|
||||
}
|
||||
$item4 = $item3[$counter];
|
||||
if($counter > 0) $tracker = $counter + 1;
|
||||
$tracker = $counter;
|
||||
?>
|
||||
<tr>
|
||||
<td>
|
||||
@ -566,16 +492,13 @@ EOD;
|
||||
<input name="detail<?php echo $tracker; ?>" type="text" class="formfld unknown" id="detail<?php echo $tracker; ?>" size="50" value="<?=$item4;?>" />
|
||||
</td>
|
||||
<td>
|
||||
<?php
|
||||
if($counter > 0)
|
||||
echo "<input type=\"image\" src=\"/themes/".$g['theme']."/images/icons/icon_x.gif\" onclick=\"removeRow(this); return false;\" value=\"Delete\" />";
|
||||
?>
|
||||
</td>
|
||||
<input type="image" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow(this); return false;" value="Delete" />
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
$counter++;
|
||||
|
||||
} // end foreach
|
||||
}} // end foreach
|
||||
?>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
@ -591,7 +514,7 @@ EOD;
|
||||
<td width="22%" valign="top"> </td>
|
||||
<td width="78%">
|
||||
<input id="submit" name="submit" type="submit" class="formbtn" value="Save" />
|
||||
<input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="Cancel" onclick="history.back()" />
|
||||
<a href="firewall_aliases.php"><input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="Cancel" /></a>
|
||||
<?php if (isset($id) && $a_aliases[$id]): ?>
|
||||
<input name="id" type="hidden" value="<?=$id;?>" />
|
||||
<?php endif; ?>
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
// Global Variables
|
||||
var rowname = new Array(99);
|
||||
var rowtype = new Array(99);
|
||||
var newrow = new Array(99);
|
||||
var rowsize = new Array(99);
|
||||
var rowname = new Array(299);
|
||||
var rowtype = new Array(299);
|
||||
var newrow = new Array(299);
|
||||
var rowsize = new Array(299);
|
||||
|
||||
for (i = 0; i < 99; i++) {
|
||||
for (i = 0; i < 299; i++) {
|
||||
rowname[i] = '';
|
||||
rowtype[i] = '';
|
||||
newrow[i] = '';
|
||||
rowsize[i] = '25';
|
||||
rowsize[i] = '30';
|
||||
}
|
||||
|
||||
var field_counter_js = 0;
|
||||
@ -22,13 +22,12 @@ var addRowTo = (function() {
|
||||
d = document;
|
||||
tbody = d.getElementById(tableId).getElementsByTagName("tbody").item(0);
|
||||
tr = d.createElement("tr");
|
||||
totalrows++;
|
||||
for (i = 0; i < field_counter_js; i++) {
|
||||
td = d.createElement("td");
|
||||
if(rowtype[i] == 'textbox') {
|
||||
td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input size='" + rowsize[i] + "' name='" + rowname[i] + totalrows + "'></input> ";
|
||||
} else if(rowtype[i] == 'select') {
|
||||
td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select size='" + rowsize[i] + "' name='" + rowname[i] + totalrows + "'><option value=\"32\" selected>32</option><option value=\"31\" >31</option><option value=\"30\" >30</option><option value=\"29\" >29</option><option value=\"28\" >28</option><option value=\"27\" >27</option><option value=\"26\" >26</option><option value=\"25\" >25</option><option value=\"24\" >24</option><option value=\"23\" >23</option><option value=\"22\" >22</option><option value=\"21\" >21</option><option value=\"20\" >20</option><option value=\"19\" >19</option><option value=\"18\" >18</option><option value=\"17\" >17</option><option value=\"16\" >16</option><option value=\"15\" >15</option><option value=\"14\" >14</option><option value=\"13\" >13</option><option value=\"12\" >12</option><option value=\"11\" >11</option><option value=\"10\" >10</option><option value=\"9\" >9</option><option value=\"8\" >8</option><option value=\"7\" >7</option><option value=\"6\" >6</option><option value=\"5\" >5</option><option value=\"4\" >4</option><option value=\"3\" >3</option><option value=\"2\" >2</option><option value=\"1\" >1</option></select> ";
|
||||
td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select size='1' name='" + rowname[i] + totalrows + "'><option value=\"32\" selected>32</option><option value=\"31\" >31</option><option value=\"30\" >30</option><option value=\"29\" >29</option><option value=\"28\" >28</option><option value=\"27\" >27</option><option value=\"26\" >26</option><option value=\"25\" >25</option><option value=\"24\" >24</option><option value=\"23\" >23</option><option value=\"22\" >22</option><option value=\"21\" >21</option><option value=\"20\" >20</option><option value=\"19\" >19</option><option value=\"18\" >18</option><option value=\"17\" >17</option><option value=\"16\" >16</option><option value=\"15\" >15</option><option value=\"14\" >14</option><option value=\"13\" >13</option><option value=\"12\" >12</option><option value=\"11\" >11</option><option value=\"10\" >10</option><option value=\"9\" >9</option><option value=\"8\" >8</option><option value=\"7\" >7</option><option value=\"6\" >6</option><option value=\"5\" >5</option><option value=\"4\" >4</option><option value=\"3\" >3</option><option value=\"2\" >2</option><option value=\"1\" >1</option></select> ";
|
||||
} else {
|
||||
td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input type='checkbox' name='" + rowname[i] + totalrows + "'></input> ";
|
||||
}
|
||||
@ -40,6 +39,7 @@ var addRowTo = (function() {
|
||||
td.innerHTML = '<input type="image" src="/themes/' + theme + '/images/icons/icon_x.gif" onclick="removeRow(this); return false;" value="Delete">';
|
||||
tr.appendChild(td);
|
||||
tbody.appendChild(tr);
|
||||
totalrows++;
|
||||
});
|
||||
})();
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user