Bug #16962 ยป 16962.patch
| src/usr/local/www/services_dhcp.php | ||
|---|---|---|
|
'disable' => gettext('Disable')
|
||
|
];
|
||
|
$customitemtypes = array(
|
||
|
'text' => gettext('Text'), 'string' => gettext('String'), 'boolean' => gettext('Boolean'),
|
||
|
'unsigned integer 8' => gettext('Unsigned 8-bit integer'), 'unsigned integer 16' => gettext('Unsigned 16-bit integer'), 'unsigned integer 32' => gettext('Unsigned 32-bit integer'),
|
||
|
'signed integer 8' => gettext('Signed 8-bit integer'), 'signed integer 16' => gettext('Signed 16-bit integer'), 'signed integer 32' => gettext('Signed 32-bit integer'), 'ip-address' => gettext('IP address or host')
|
||
|
);
|
||
|
if (!g_get('services_dhcp_server_enable')) {
|
||
|
header("Location: /");
|
||
|
exit;
|
||
| ... | ... | |
|
if (is_array($pconfig['numberoptions']['item'])) {
|
||
|
foreach ($pconfig['numberoptions']['item'] as $numberoption) {
|
||
|
if (!array_key_exists($numberoption['type'], $customitemtypes)) {
|
||
|
$input_errors[] = gettext("Invalid custom option type.");
|
||
|
}
|
||
|
$numberoption_value = base64_decode($numberoption['value']);
|
||
|
if ($numberoption['type'] == 'text' && strstr($numberoption_value, '"')) {
|
||
|
$input_errors[] = gettext("Text type cannot include quotation marks.");
|
||
| ... | ... | |
|
$pconfig['numberoptions']['item'] = array(array('number' => '', 'type' => 'text', 'value' => ''));
|
||
|
}
|
||
|
$customitemtypes = array(
|
||
|
'text' => gettext('Text'), 'string' => gettext('String'), 'boolean' => gettext('Boolean'),
|
||
|
'unsigned integer 8' => gettext('Unsigned 8-bit integer'), 'unsigned integer 16' => gettext('Unsigned 16-bit integer'), 'unsigned integer 32' => gettext('Unsigned 32-bit integer'),
|
||
|
'signed integer 8' => gettext('Signed 8-bit integer'), 'signed integer 16' => gettext('Signed 16-bit integer'), 'signed integer 32' => gettext('Signed 32-bit integer'), 'ip-address' => gettext('IP address or host')
|
||
|
);
|
||
|
$numrows = count($item) -1;
|
||
|
$counter = 0;
|
||
| src/usr/local/www/services_dhcp_edit.php | ||
|---|---|---|
|
'disable' => gettext('Disable')
|
||
|
];
|
||
|
$customitemtypes = array(
|
||
|
'text' => gettext('Text'), 'string' => gettext('String'), 'boolean' => gettext('Boolean'),
|
||
|
'unsigned integer 8' => gettext('Unsigned 8-bit integer'), 'unsigned integer 16' => gettext('Unsigned 16-bit integer'), 'unsigned integer 32' => gettext('Unsigned 32-bit integer'),
|
||
|
'signed integer 8' => gettext('Signed 8-bit integer'), 'signed integer 16' => gettext('Signed 16-bit integer'), 'signed integer 32' => gettext('Signed 32-bit integer'), 'ip-address' => gettext('IP address or host')
|
||
|
);
|
||
|
function staticmapcmp($a, $b) {
|
||
|
return ipcmp($a['ipaddr'], $b['ipaddr']);
|
||
|
}
|
||
| ... | ... | |
|
/* Redmine #13584 */
|
||
|
if (is_array($pconfig['numberoptions']['item'])) {
|
||
|
foreach ($pconfig['numberoptions']['item'] as $numberoption) {
|
||
|
if (!array_key_exists($numberoption['type'], $customitemtypes)) {
|
||
|
$input_errors[] = gettext("Invalid custom option type.");
|
||
|
}
|
||
|
$numberoption_value = base64_decode($numberoption['value']);
|
||
|
if ($numberoption['type'] == 'text' && strstr($numberoption_value, '"')) {
|
||
|
$input_errors[] = gettext("Text type cannot include quotation marks.");
|
||
| ... | ... | |
|
$pconfig['numberoptions']['item'] = array(array('number' => '', 'type' => 'text', 'value' => ''));
|
||
|
}
|
||
|
$customitemtypes = array(
|
||
|
'text' => gettext('Text'), 'string' => gettext('String'), 'boolean' => gettext('Boolean'),
|
||
|
'unsigned integer 8' => gettext('Unsigned 8-bit integer'), 'unsigned integer 16' => gettext('Unsigned 16-bit integer'), 'unsigned integer 32' => gettext('Unsigned 32-bit integer'),
|
||
|
'signed integer 8' => gettext('Signed 8-bit integer'), 'signed integer 16' => gettext('Signed 16-bit integer'), 'signed integer 32' => gettext('Signed 32-bit integer'), 'ip-address' => gettext('IP address or host')
|
||
|
);
|
||
|
$numrows = count($item) -1;
|
||
|
$counter = 0;
|
||
| ... | ... | |
|
text = "<?=gettext('Display Advanced');?>";
|
||
|
}
|
||
|
var children = $('#btnadvnwkboot').children();
|
||
|
$('#btnadvnwkboot').text(text).prepend(children);
|
||
|
$('#btnadvnwkboot').text(text).prepend(children);
|
||
|
}
|
||
|
$('#btnadvnwkboot').click(function(event) {
|
||