Revision 1707b6c6
Added by Francisco Cavalcante almost 9 years ago
| src/usr/local/www/interfaces_ppps_edit.php | ||
|---|---|---|
| 115 | 115 |
$pconfig['connect-timeout'] = $a_ppps[$id]['connect-timeout']; |
| 116 | 116 |
$pconfig['localip'] = explode(",", $a_ppps[$id]['localip']);
|
| 117 | 117 |
$pconfig['gateway'] = explode(",", $a_ppps[$id]['gateway']);
|
| 118 |
$pconfig['country'] = $a_ppps[$id]['country']; |
|
| 119 |
$pconfig['provider'] = $a_ppps[$id]['provider']; |
|
| 120 |
$pconfig['providerplan'] = $a_ppps[$id]['providerplan']; |
|
| 118 | 121 |
break; |
| 119 | 122 |
case "l2tp": |
| 120 | 123 |
case "pptp": |
| ... | ... | |
| 322 | 325 |
$ppp['if'] = $ppp['type'].$ppp['ptpid']; |
| 323 | 326 |
$ppp['ports'] = implode(',', $_POST['interfaces']);
|
| 324 | 327 |
$ppp['username'] = $_POST['username']; |
| 328 |
|
|
| 325 | 329 |
if ($_POST['passwordfld'] != DMYPWD) {
|
| 326 | 330 |
$ppp['password'] = base64_encode($_POST['passwordfld']); |
| 327 | 331 |
} else {
|
| ... | ... | |
| 342 | 346 |
|
| 343 | 347 |
switch ($_POST['type']) {
|
| 344 | 348 |
case "ppp": |
| 349 |
$ppp['country'] = $_POST['country']; |
|
| 350 |
$ppp['provider'] = $_POST['provider']; |
|
| 351 |
$ppp['providerplan'] = $_POST['providerplan']; |
|
| 345 | 352 |
if (!empty($_POST['initstr'])) {
|
| 346 | 353 |
$ppp['initstr'] = base64_encode($_POST['initstr']); |
| 347 | 354 |
} else {
|
| ... | ... | |
| 369 | 376 |
} else {
|
| 370 | 377 |
unset($ppp['connect-timeout']); |
| 371 | 378 |
} |
| 379 |
|
|
| 372 | 380 |
break; |
| 373 | 381 |
case "pppoe": |
| 374 | 382 |
if (!empty($_POST['provider'])) {
|
| ... | ... | |
| 696 | 704 |
isset($pconfig['uptime']) |
| 697 | 705 |
))->setHelp(sprintf('Causes cumulative uptime to be recorded and displayed on the %sStatus->Interfaces%s page.', '<a href="status_interfaces.php">', '</a>'));
|
| 698 | 706 |
|
| 699 |
$group = new Form_Group('Service name');
|
|
| 700 |
$group->addClass('pppoe');
|
|
| 707 |
if ($pconfig['type'] == 'pppoe') {
|
|
| 708 |
$group = new Form_Group('Service name');
|
|
| 709 |
$group->addClass('pppoe');
|
|
| 701 | 710 |
|
| 702 |
$group->add(new Form_Input( |
|
| 703 |
'provider', |
|
| 704 |
null, |
|
| 705 |
'text', |
|
| 706 |
$pconfig['provider'] |
|
| 707 |
)); |
|
| 711 |
$group->add(new Form_Input(
|
|
| 712 |
'provider',
|
|
| 713 |
null,
|
|
| 714 |
'text',
|
|
| 715 |
$pconfig['provider']
|
|
| 716 |
));
|
|
| 708 | 717 |
|
| 709 |
$group->add(new Form_Checkbox( |
|
| 710 |
'null_service', |
|
| 711 |
null, |
|
| 712 |
'Configure NULL service name', |
|
| 713 |
$pconfig['null_service'] |
|
| 714 |
)); |
|
| 718 |
$group->add(new Form_Checkbox(
|
|
| 719 |
'null_service',
|
|
| 720 |
null,
|
|
| 721 |
'Configure NULL service name',
|
|
| 722 |
$pconfig['null_service']
|
|
| 723 |
));
|
|
| 715 | 724 |
|
| 716 |
$group->setHelp('This field can usually be left empty. Service name will not be configured if this field is empty. ' .
|
|
| 717 |
'Check the "Configure NULL" box to configure a blank Service name.'); |
|
| 725 |
$group->setHelp('This field can usually be left empty. Service name will not be configured if this field is empty. ' .
|
|
| 726 |
'Check the "Configure NULL" box to configure a blank Service name.');
|
|
| 718 | 727 |
|
| 719 |
$section->add($group); |
|
| 728 |
$section->add($group); |
|
| 729 |
} |
|
| 720 | 730 |
|
| 721 | 731 |
$section->addInput(new Form_Select( |
| 722 | 732 |
'pppoe-reset-type', |
| ... | ... | |
| 1043 | 1053 |
hideClass('linkparam', true);
|
| 1044 | 1054 |
hideInput('linkparamhelp', true);
|
| 1045 | 1055 |
|
| 1056 |
<?php if ($pconfig['type'] != 'ppp') : ?> |
|
| 1046 | 1057 |
var selected = $(".interfaces").val();
|
| 1047 | 1058 |
var length = $(".interfaces :selected").length;
|
| 1048 | 1059 |
for (var i=0; i<length; i++) {
|
| ... | ... | |
| 1053 | 1064 |
hideInput('linkparamhelp', false);
|
| 1054 | 1065 |
} |
| 1055 | 1066 |
} |
| 1067 |
<?php endif; ?> |
|
| 1056 | 1068 |
} |
| 1057 | 1069 |
|
| 1058 | 1070 |
function hideProviders(hide) {
|
| ... | ... | |
| 1078 | 1090 |
$('#provider').append(new Option(value, value));
|
| 1079 | 1091 |
} |
| 1080 | 1092 |
} |
| 1093 |
$("#provider").val("<?=$pconfig['provider'];?>");
|
|
| 1094 |
// select option simulates the provider to populate the Plan |
|
| 1095 |
$("#provider").trigger("change");
|
|
| 1081 | 1096 |
} |
| 1082 | 1097 |
}); |
| 1083 | 1098 |
} |
| ... | ... | |
| 1100 | 1115 |
providerplan[1])); |
| 1101 | 1116 |
} |
| 1102 | 1117 |
} |
| 1118 |
$("#providerplan").val("<?=$pconfig['providerplan'];?>");
|
|
| 1103 | 1119 |
} |
| 1104 | 1120 |
}); |
| 1105 | 1121 |
} |
| ... | ... | |
| 1170 | 1186 |
} |
| 1171 | 1187 |
|
| 1172 | 1188 |
$('#pppoe_resetdate').datepicker();
|
| 1189 |
|
|
| 1190 |
if ($("#type").val() == "ppp") {
|
|
| 1191 |
providers_list(); |
|
| 1192 |
hideInput('provider', false);
|
|
| 1193 |
} |
|
| 1173 | 1194 |
}); |
| 1174 | 1195 |
//]]> |
| 1175 | 1196 |
|
Also available in: Unified diff
Fixed to properly save configs in PPPs interfaces
(cherry picked from commit 545a7850ea37cd8c379cc75428353ad0089f2bd3)