From 197f8d4392d7f7dc45d7a6ec4f6cd9ef6a941213 Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 13 Oct 2007 20:25:24 +0000 Subject: [PATCH] Eine kleine Aenderung in der pppsetup.cgi von Arne. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@964 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- html/cgi-bin/pppsetup.cgi | 904 +++++++++++++++++++------------------- src/pakfire/pakfire.conf | 2 +- 2 files changed, 459 insertions(+), 447 deletions(-) diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 51e2f68cf1..803925f0f4 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -53,262 +53,262 @@ $pppsettings{'ACTION'} = ''; &Header::getcgihash(\%pppsettings); if ($pppsettings{'ACTION'} ne '' && - (-e '/var/run/ppp-ipcop.pid' || -e "${General::swroot}/red/active")) + (-e '/var/run/ppp-ipcop.pid' || -e "${General::swroot}/red/active")) { - $errormessage = $Lang::tr{'unable to alter profiles while red is active'}; - # read in the current vars - %pppsettings = (); - $pppsettings{'VALID'} = ''; - &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); + $errormessage = $Lang::tr{'unable to alter profiles while red is active'}; + # read in the current vars + %pppsettings = (); + $pppsettings{'VALID'} = ''; + &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); } elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) { - unless ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn|pppoe|pptp|pppoeatm)$/) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; } - my $type = $pppsettings{'TYPE'}; - &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); - $pppsettings{'TYPE'} = $type; + unless ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn|pppoe|pptp|pppoeatm)$/) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } + my $type = $pppsettings{'TYPE'}; + &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); + $pppsettings{'TYPE'} = $type; } elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) { - if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM0|ttyACM1|ttyACM2|ttyACM3|isdn1|isdn2)$/) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; } - if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; } - if ($pppsettings{'TYPE'} eq 'modem' && $pppsettings{'DIALMODE'} !~ /^(T|P)$/) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; } - if ($pppsettings{'AUTH'} !~ /^(pap-or-chap|pap|chap|standard-login-script|demon-login-script|other-login-script)$/) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; - } - - if ($pppsettings{'PROFILENAME'} eq '') { - $errormessage = $Lang::tr{'profile name not given'}; - $pppsettings{'PROFILENAME'} = ''; - goto ERROR; } - if ($pppsettings{'TYPE'} =~ /^(modem|isdn)$/) { - if ($pppsettings{'TELEPHONE'} eq '') { - $errormessage = $Lang::tr{'telephone not set'}; - goto ERROR; } - if (!($pppsettings{'TELEPHONE'} =~ /^[\d\*\#\,]+$/)) { - $errormessage = $Lang::tr{'bad characters in the telephone number field'}; - goto ERROR; } - } - unless (($pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} =~ /^(STATIC|DHCP)$/)) { - if ($pppsettings{'USERNAME'} eq '') { - $errormessage = $Lang::tr{'username not set'}; - goto ERROR; } - if ($pppsettings{'PASSWORD'} eq '') { - $errormessage = $Lang::tr{'password not set'}; - goto ERROR; } - } - - if ($pppsettings{'TIMEOUT'} eq '') { - $errormessage = $Lang::tr{'idle timeout not set'}; - goto ERROR; } - if (!($pppsettings{'TIMEOUT'} =~ /^\d+$/)) { - $errormessage = $Lang::tr{'only digits allowed in the idle timeout'}; - goto ERROR; } - - if ($pppsettings{'LOGINSCRIPT'} =~ /[.\/ ]/ ) { - $errormessage = $Lang::tr{'bad characters in script field'}; - goto ERROR; } - - if ($pppsettings{'DNS1'}) - { - if (!(&General::validip($pppsettings{'DNS1'}))) { - $errormessage = $Lang::tr{'invalid primary dns'}; - goto ERROR; } - } - if ($pppsettings{'DNS2'}) - { - if (!(&General::validip($pppsettings{'DNS2'}))) { - $errormessage = $Lang::tr{'invalid secondary dns'}; - goto ERROR; } - } - - if ($pppsettings{'MAXRETRIES'} eq '') { - $errormessage = $Lang::tr{'max retries not set'}; - goto ERROR; } - if (!($pppsettings{'MAXRETRIES'} =~ /^\d+$/)) { - $errormessage = $Lang::tr{'only digits allowed in max retries field'}; - goto ERROR; } - - if (!($pppsettings{'HOLDOFF'} =~ /^\d+$/)) { - $errormessage = $Lang::tr{'only digits allowed in holdoff field'}; - goto ERROR; } - - if ($pppsettings{'TYPE'} eq 'pptp') { - $errormessage = ''; - if ($pppsettings{'METHOD'} eq 'STATIC') { - if (! &General::validip($pppsettings{'ROUTERIP'})) { - $errormessage = $Lang::tr{'router ip'}.' '.$Lang::tr{'invalid ip'}; - } - } else { - if (($pppsettings{'DHCP_HOSTNAME'} ne '') && (! &General::validfqdn($pppsettings{'DHCP_HOSTNAME'})) ) { - $errormessage = $errormessage.' '.$Lang::tr{'hostname'}.' '.$Lang::tr{'invalid hostname'}; - } - } - if ($errormessage ne '') {goto ERROR; } - } - if ($pppsettings{'TYPE'} =~ /^(pppoeatm)$/) { - if ( ($pppsettings{'VPI'} eq '') || ($pppsettings{'VCI'} eq '') ) { - $errormessage = $Lang::tr{'invalid vpi vpci'}; - goto ERROR; } - if ( (!($pppsettings{'VPI'} =~ /^\d+$/)) || (!($pppsettings{'VCI'} =~ /^\d+$/)) ) { - $errormessage = $Lang::tr{'invalid vpi vpci'}; - goto ERROR; } - if (($pppsettings{'VPI'} eq '0') && ($pppsettings{'VCI'} eq '0')) { - $errormessage = $Lang::tr{'invalid vpi vpci'}; - goto ERROR; } - if ( $pppsettings{'PROTOCOL'} eq '' ) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; } - } - - if ( ($pppsettings{'PROTOCOL'} eq 'RFC1483') && ($pppsettings{'METHOD'} eq '') && \ - ($pppsettings{'TYPE'} !~ /^(alcatelusb|fritzdsl)$/)) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; } - - if (($pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} eq 'DHCP')) { - if ($pppsettings{'DHCP_HOSTNAME'} ne '') { - if (! &General::validfqdn($pppsettings{'DHCP_HOSTNAME'})) { - $errormessage = $errormessage.' '.$Lang::tr{'hostname'}.': '.$Lang::tr{'invalid hostname'}; } - } - } - - if (($pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} eq 'STATIC')) { - $errormessage = ''; - if (! &General::validip($pppsettings{'IP'})) { - $errormessage = $Lang::tr{'static ip'}.' '.$Lang::tr{'invalid ip'}; } - if (! &General::validip($pppsettings{'GATEWAY'})) { - $errormessage = $errormessage.' '.$Lang::tr{'gateway ip'}.' '.$Lang::tr{'invalid ip'}; } - if (! &General::validmask($pppsettings{'NETMASK'})) { - $errormessage = $errormessage.' '.$Lang::tr{'netmask'}.' '.$Lang::tr{'invalid netmask'}; } - if ($pppsettings{'BROADCAST'} ne '') { - if (! &General::validip($pppsettings{'BROADCAST'})) { - $errormessage = $errormessage.' '.$Lang::tr{'broadcast'}.' '.$Lang::tr{'invalid broadcast ip'}; } - } - if( $pppsettings{'DNS'} eq 'Automatic') { - $errormessage = $Lang::tr{'invalid input'}; } - if ($errormessage ne '') {goto ERROR; } - } - - if( $pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} ne 'PPPOE' && \ - $pppsettings{'RECONNECTION'} eq 'dialondemand' ) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; } - - if( $pppsettings{'RECONNECTION'} eq 'dialondemand' && `/bin/cat ${General::swroot}/ddns/config` =~ /,on$/m ) { - $errormessage = $Lang::tr{'dod not compatible with ddns'}; - goto ERROR; } - -# if( $pppsettings{'PROTOCOL'} eq 'RFC1483') { -# $pppsettings{'ENCAP'} = $pppsettings{'ENCAP_RFC1483'}; } -# if( $pppsettings{'PROTOCOL'} eq 'RFC2364') { -# $pppsettings{'ENCAP'} = $pppsettings{'ENCAP_RFC2364'}; } - delete $pppsettings{'ENCAP_RFC1483'}; - delete $pppsettings{'ENCAP_RFC2364'}; + if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM0|ttyACM1|ttyACM2|ttyACM3|isdn1|isdn2)$/) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } + if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } + if ($pppsettings{'TYPE'} eq 'modem' && $pppsettings{'DIALMODE'} !~ /^(T|P)$/) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } + if ($pppsettings{'AUTH'} !~ /^(pap-or-chap|pap|chap|standard-login-script|demon-login-script|other-login-script)$/) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; + } + + if ($pppsettings{'PROFILENAME'} eq '') { + $errormessage = $Lang::tr{'profile name not given'}; + $pppsettings{'PROFILENAME'} = ''; + goto ERROR; } + if ($pppsettings{'TYPE'} =~ /^(modem|isdn)$/) { + if ($pppsettings{'TELEPHONE'} eq '') { + $errormessage = $Lang::tr{'telephone not set'}; + goto ERROR; } + if (!($pppsettings{'TELEPHONE'} =~ /^[\d\*\#\,]+$/)) { + $errormessage = $Lang::tr{'bad characters in the telephone number field'}; + goto ERROR; } + } + unless (($pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} =~ /^(STATIC|DHCP)$/)) { + if ($pppsettings{'USERNAME'} eq '') { + $errormessage = $Lang::tr{'username not set'}; + goto ERROR; } + if ($pppsettings{'PASSWORD'} eq '') { + $errormessage = $Lang::tr{'password not set'}; + goto ERROR; } + } + + if ($pppsettings{'TIMEOUT'} eq '') { + $errormessage = $Lang::tr{'idle timeout not set'}; + goto ERROR; } + if (!($pppsettings{'TIMEOUT'} =~ /^\d+$/)) { + $errormessage = $Lang::tr{'only digits allowed in the idle timeout'}; + goto ERROR; } + + if ($pppsettings{'LOGINSCRIPT'} =~ /[.\/ ]/ ) { + $errormessage = $Lang::tr{'bad characters in script field'}; + goto ERROR; } + + if ($pppsettings{'DNS1'}) + { + if (!(&General::validip($pppsettings{'DNS1'}))) { + $errormessage = $Lang::tr{'invalid primary dns'}; + goto ERROR; } + } + if ($pppsettings{'DNS2'}) + { + if (!(&General::validip($pppsettings{'DNS2'}))) { + $errormessage = $Lang::tr{'invalid secondary dns'}; + goto ERROR; } + } + + if ($pppsettings{'MAXRETRIES'} eq '') { + $errormessage = $Lang::tr{'max retries not set'}; + goto ERROR; } + if (!($pppsettings{'MAXRETRIES'} =~ /^\d+$/)) { + $errormessage = $Lang::tr{'only digits allowed in max retries field'}; + goto ERROR; } + + if (!($pppsettings{'HOLDOFF'} =~ /^\d+$/)) { + $errormessage = $Lang::tr{'only digits allowed in holdoff field'}; + goto ERROR; } + + if ($pppsettings{'TYPE'} eq 'pptp') { + $errormessage = ''; + if ($pppsettings{'METHOD'} eq 'STATIC') { + if (! &General::validip($pppsettings{'ROUTERIP'})) { + $errormessage = $Lang::tr{'router ip'}.' '.$Lang::tr{'invalid ip'}; + } + } else { + if (($pppsettings{'DHCP_HOSTNAME'} ne '') && (! &General::validfqdn($pppsettings{'DHCP_HOSTNAME'})) ) { + $errormessage = $errormessage.' '.$Lang::tr{'hostname'}.' '.$Lang::tr{'invalid hostname'}; + } + } + if ($errormessage ne '') {goto ERROR; } + } + if ($pppsettings{'TYPE'} =~ /^(pppoeatm)$/) { + if ( ($pppsettings{'VPI'} eq '') || ($pppsettings{'VCI'} eq '') ) { + $errormessage = $Lang::tr{'invalid vpi vpci'}; + goto ERROR; } + if ( (!($pppsettings{'VPI'} =~ /^\d+$/)) || (!($pppsettings{'VCI'} =~ /^\d+$/)) ) { + $errormessage = $Lang::tr{'invalid vpi vpci'}; + goto ERROR; } + if (($pppsettings{'VPI'} eq '0') && ($pppsettings{'VCI'} eq '0')) { + $errormessage = $Lang::tr{'invalid vpi vpci'}; + goto ERROR; } + if ( $pppsettings{'PROTOCOL'} eq '' ) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } + } + + if ( ($pppsettings{'PROTOCOL'} eq 'RFC1483') && ($pppsettings{'METHOD'} eq '') && \ + ($pppsettings{'TYPE'} !~ /^(alcatelusb|fritzdsl)$/)) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } + + if (($pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} eq 'DHCP')) { + if ($pppsettings{'DHCP_HOSTNAME'} ne '') { + if (! &General::validfqdn($pppsettings{'DHCP_HOSTNAME'})) { + $errormessage = $errormessage.' '.$Lang::tr{'hostname'}.': '.$Lang::tr{'invalid hostname'}; } + } + } + + if (($pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} eq 'STATIC')) { + $errormessage = ''; + if (! &General::validip($pppsettings{'IP'})) { + $errormessage = $Lang::tr{'static ip'}.' '.$Lang::tr{'invalid ip'}; } + if (! &General::validip($pppsettings{'GATEWAY'})) { + $errormessage = $errormessage.' '.$Lang::tr{'gateway ip'}.' '.$Lang::tr{'invalid ip'}; } + if (! &General::validmask($pppsettings{'NETMASK'})) { + $errormessage = $errormessage.' '.$Lang::tr{'netmask'}.' '.$Lang::tr{'invalid netmask'}; } + if ($pppsettings{'BROADCAST'} ne '') { + if (! &General::validip($pppsettings{'BROADCAST'})) { + $errormessage = $errormessage.' '.$Lang::tr{'broadcast'}.' '.$Lang::tr{'invalid broadcast ip'}; } + } + if( $pppsettings{'DNS'} eq 'Automatic') { + $errormessage = $Lang::tr{'invalid input'}; } + if ($errormessage ne '') {goto ERROR; } + } + + if( $pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} ne 'PPPOE' && \ + $pppsettings{'RECONNECTION'} eq 'dialondemand' ) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } + + if( $pppsettings{'RECONNECTION'} eq 'dialondemand' && `/bin/cat ${General::swroot}/ddns/config` =~ /,on$/m ) { + $errormessage = $Lang::tr{'dod not compatible with ddns'}; + goto ERROR; } + +# if( $pppsettings{'PROTOCOL'} eq 'RFC1483') { +# $pppsettings{'ENCAP'} = $pppsettings{'ENCAP_RFC1483'}; } +# if( $pppsettings{'PROTOCOL'} eq 'RFC2364') { +# $pppsettings{'ENCAP'} = $pppsettings{'ENCAP_RFC2364'}; } + delete $pppsettings{'ENCAP_RFC1483'}; + delete $pppsettings{'ENCAP_RFC2364'}; ERROR: - if ($errormessage) { - $pppsettings{'VALID'} = 'no'; } - else { - $pppsettings{'VALID'} = 'yes'; } + if ($errormessage) { + $pppsettings{'VALID'} = 'no'; } + else { + $pppsettings{'VALID'} = 'yes'; } - # write cgi vars to the file. - &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", - \%pppsettings); + # write cgi vars to the file. + &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", + \%pppsettings); - # make link and write secret file. - &updatesettings(); - &writesecrets(); + # make link and write secret file. + &updatesettings(); + &writesecrets(); - &General::log("$Lang::tr{'profile saved'} $pppsettings{'PROFILENAME'}"); + &General::log("$Lang::tr{'profile saved'} $pppsettings{'PROFILENAME'}"); } if ($pppsettings{'ACTION'} eq $Lang::tr{'select'}) { - my $profile = $pppsettings{'PROFILE'}; - %temppppsettings = (); - $temppppsettings{'PROFILE'} = ''; - &General::readhash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", - \%temppppsettings); + my $profile = $pppsettings{'PROFILE'}; + %temppppsettings = (); + $temppppsettings{'PROFILE'} = ''; + &General::readhash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", + \%temppppsettings); - # make link. - &updatesettings(); + # make link. + &updatesettings(); - # read in the new params "early" so we can write secrets. - %pppsettings = (); - &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); - $pppsettings{'PROFILE'} = $profile; - &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", - \%pppsettings); + # read in the new params "early" so we can write secrets. + %pppsettings = (); + &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); + $pppsettings{'PROFILE'} = $profile; + &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", + \%pppsettings); - &writesecrets(); + &writesecrets(); - &General::log("$Lang::tr{'profile made current'} $pppsettings{'PROFILENAME'}"); + &General::log("$Lang::tr{'profile made current'} $pppsettings{'PROFILENAME'}"); } elsif ($pppsettings{'ACTION'} eq $Lang::tr{'delete'}) { - &General::log("$Lang::tr{'profile deleted'} $pppsettings{'PROFILENAME'}"); - - my $profile = $pppsettings{'PROFILE'}; - truncate ("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", 0); - - %temppppsettings = (); - $temppppsettings{'PROFILE'} = ''; - &General::readhash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", - \%temppppsettings); - - # make link. - &updatesettings(); - - # read in the new params "early" so we can write secrets. - %pppsettings = (); - &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); - $pppsettings{'PROFILE'} = $profile; - &initprofile; - &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", - \%pppsettings); + &General::log("$Lang::tr{'profile deleted'} $pppsettings{'PROFILENAME'}"); + + my $profile = $pppsettings{'PROFILE'}; + truncate ("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", 0); + + %temppppsettings = (); + $temppppsettings{'PROFILE'} = ''; + &General::readhash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", + \%temppppsettings); + + # make link. + &updatesettings(); + + # read in the new params "early" so we can write secrets. + %pppsettings = (); + &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); + $pppsettings{'PROFILE'} = $profile; + &initprofile; + &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", + \%pppsettings); } elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) { } else { - # read in the current vars - %pppsettings = (); - $pppsettings{'VALID'} = ''; - &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); + # read in the current vars + %pppsettings = (); + $pppsettings{'VALID'} = ''; + &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); } # read in the profile names into @profilenames. my $c=0; for ($c = 1; $c <= $maxprofiles; $c++) { - %temppppsettings = (); - $temppppsettings{'PROFILENAME'} = $Lang::tr{'empty profile'}; - &General::readhash("${General::swroot}/ppp/settings-$c", \%temppppsettings); - $profilenames[$c] = $temppppsettings{'PROFILENAME'}; + %temppppsettings = (); + $temppppsettings{'PROFILENAME'} = $Lang::tr{'empty profile'}; + &General::readhash("${General::swroot}/ppp/settings-$c", \%temppppsettings); + $profilenames[$c] = $temppppsettings{'PROFILENAME'}; } if ($pppsettings{'VALID'} eq '') { - if ($pppsettings{'PROFILE'} eq '') { - $pppsettings{'PROFILE'} = '1'; - &initprofile(); - } + if ($pppsettings{'PROFILE'} eq '') { + $pppsettings{'PROFILE'} = '1'; + &initprofile(); + } } for ($c = 1; $c <= $maxprofiles; $c++) { - $selected{'PROFILE'}{$c} = ''; } + $selected{'PROFILE'}{$c} = ''; } $selected{'PROFILE'}{$pppsettings{'PROFILE'}} = "selected='selected'"; for ($c = 1; $c <= $maxprofiles; $c++) { - $selected{'BACKUPPROFILE'}{$c} = ''; } + $selected{'BACKUPPROFILE'}{$c} = ''; } $selected{'BACKUPPROFILE'}{$pppsettings{'BACKUPPROFILE'}} = "selected='selected'"; $selected{'TYPE'}{'modem'} = ''; @@ -420,11 +420,22 @@ $checked{'DNS'}{$pppsettings{'DNS'}} = "checked='checked'"; &Header::openpage($Lang::tr{'ppp setup'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); -if ($errormessage) { +if ($netsettings{'RED_TYPE'} ne 'PPPOE') { &Header::openbox('100%', 'center', $Lang::tr{'error messages'}); - print "$errormessage\n"; - print " \n"; - &Header::closebox(); + print "Einwahl nur funktioniert nur mit RED=PPPOE im Netzwerksetup"; + print " \n"; + &Header::closebox(); + &Header::closebigbox(); + + &Header::closepage(); + exit(1); +} + +if ($errormessage) { + &Header::openbox('100%', 'center', $Lang::tr{'error messages'}); + print "$errormessage\n"; + print " \n"; + &Header::closebox(); } @@ -436,20 +447,20 @@ print "
\n"; print < - $Lang::tr{'profile'} - - END ; for ($c = 1; $c <= $maxprofiles; $c++) { - print "\t\n"; + print "\t\n"; } print < - - - + + + +

@@ -463,135 +474,139 @@ END print < - $Lang::tr{'interface'}: - - END ; if ($netsettings{'RED_TYPE'} eq 'PPPOE') { - print "\t\n"; -} -if ($netsettings{'RED_TYPE'} eq 'PPTP') { - print "\t\n"; -} +print <$Lang::tr{'modem'} + + +END +; + my $atmdev=`cat /proc/net/atm/devices | grep 0`; chomp ($atmdev); if ($atmdev ne '') { - print <PPPoE over ATM-BRIDGE + print <PPPoE over ATM-BRIDGE END ; } - +} +#if ($netsettings{'RED_TYPE'} eq 'PPTP') {# +# print "\t\n"; +#} +# #if (0) { -# print <ECI USB ADSL -# -# -# -# -# -# +# print <ECI USB ADSL +# +# +# +# +# +# #END #; #} -# print ""; +# print ""; - print < - + END ; - if ($pppsettings{'TYPE'} =~ /^(modem)$/) { - print <$Lang::tr{'modem configuration'} + if ($pppsettings{'TYPE'} =~ /^(modem)$/) { + print <$Lang::tr{'modem configuration'} END ; } - print ""; + print ""; #if (-f "/proc/bus/usb/devices") { -# USB: -# my $usb=`lsmod | cut -d ' ' -f1 | grep -E "hci"`; -# if ($usb eq '') { -# print "\t$Lang::tr{'not running'}\n"; -# } else { -# print "\t$usb\n"; -# } +# USB: +# my $usb=`lsmod | cut -d ' ' -f1 | grep -E "hci"`; +# if ($usb eq '') { +# print "\t$Lang::tr{'not running'}\n"; +# } else { +# print "\t$usb\n"; +# } #} if ($pppsettings{'TYPE'}) { - print "

"; + print "

"; - if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/) { - print < - $Lang::tr{'interface'}: - END ; - if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) { - print <$Lang::tr{'modem on com1'} - - - - + if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) { + print <COM1 + + + + END ; - if ($pppsettings{'TYPE'} ne 'serial' ) { - print <$Lang::tr{'usb modem on acm0'} - - - + if ($pppsettings{'TYPE'} ne 'serial' ) { + print <$Lang::tr{'usb modem on acm0'} + + + END ; - } - print " "} - if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) { - print < "} + if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) { + print < $Lang::tr{'computer to modem rate'} - + END ; - } - if ($pppsettings{'TYPE'} =~ /^(modem)$/ ) { - print "$Lang::tr{'number'}\n"; - print "\n"; - if ($pppsettings{'TYPE'} eq 'modem' ) { - print "$Lang::tr{'modem speaker on'}\n"; - print "\n"; - } - } - } - if ($pppsettings{'TYPE'} eq 'modem') { - print <$Lang::tr{'number'}\n"; + print "\n"; + if ($pppsettings{'TYPE'} eq 'modem' ) { + print "$Lang::tr{'modem speaker on'}\n"; + print "\n"; + } + } + } + if ($pppsettings{'TYPE'} eq 'modem') { + print < - $Lang::tr{'dialing mode'} - + $Lang::tr{'dialing mode'} + $Lang::tr{'send cr'} - + END ; @@ -599,54 +614,54 @@ END print < - $Lang::tr{'idle timeout'} - + $Lang::tr{'idle timeout'} + $Lang::tr{'connection debugging'}: - +

- $Lang::tr{'reconnection'}: + $Lang::tr{'reconnection'}: - $Lang::tr{'dod'} + $Lang::tr{'dod'} END ; if ($pppsettings{'TYPE'} ne 'isdn') { print < - $Lang::tr{'persistent'} + $Lang::tr{'persistent'} $Lang::tr{'backupprofile'}: - END ; - for ($c = 1; $c <= $maxprofiles; $c++) { - print "\t\n"; - } - print < + for ($c = 1; $c <= $maxprofiles; $c++) { + print "\t\n"; + } + print < END ; } print < - $Lang::tr{'dod for dns'} + $Lang::tr{'dod for dns'} - $Lang::tr{'holdoff'}: - + $Lang::tr{'holdoff'}: + - $Lang::tr{'maximum retries'} - + $Lang::tr{'maximum retries'} + END ; @@ -656,22 +671,22 @@ if ($pppsettings{'TYPE'} eq 'pptp') print <

- $Lang::tr{'pptp settings'} + $Lang::tr{'pptp settings'} - $Lang::tr{'phonebook entry'} - - + $Lang::tr{'phonebook entry'} + + - $Lang::tr{'static ip'} - $Lang::tr{'router ip'} - + $Lang::tr{'static ip'} + $Lang::tr{'router ip'} + - $Lang::tr{'dhcp mode'} - $Lang::tr{'hostname'}: * - + $Lang::tr{'dhcp mode'} + $Lang::tr{'hostname'}: * + END ; @@ -680,27 +695,24 @@ if ($pppsettings{'TYPE'} =~ /^(pppoeatm)$/) { print < - - - + - - + + - - - - + + + + END ; @@ -712,22 +724,22 @@ if ($pppsettings{'TYPE'} eq 'pppoe' || $pppsettings{'TYPE'} eq 'pppoeatm') print < - + - - - + + + - - - + + + - - - + + + END ; @@ -736,63 +748,63 @@ END print < - + - - - - + + + + - - + - - + + + - + - + - + - - - - + + + + - - + + - - + +
$Lang::tr{'adsl settings'}:
$Lang::tr{'adsl settings'}:
$Lang::tr{'encapsulation'}: - - $Lang::tr{'encapsulation'}: + +
$Lang::tr{'vpi number'}$Lang::tr{'vci number'}$Lang::tr{'vpi number'}$Lang::tr{'vci number'}


$Lang::tr{'pppoe settings'}$Lang::tr{'pppoe settings'}
PPPoE plugin$Lang::tr{'service name'} *PPPoE plugin$Lang::tr{'service name'} *
$Lang::tr{'pppoe'}$Lang::tr{'concentrator name'} *$Lang::tr{'pppoe'}$Lang::tr{'concentrator name'} *
MTUMTU


$Lang::tr{'authentication'}$Lang::tr{'authentication'}
$Lang::tr{'username'}$Lang::tr{'password'}$Lang::tr{'username'}$Lang::tr{'password'}
$Lang::tr{'method'}$Lang::tr{'method'}$Lang::tr{'script name'} *$Lang::tr{'script name'} *


DNS:DNS:
$Lang::tr{'automatic'}$Lang::tr{'automatic'}
$Lang::tr{'manual'}$Lang::tr{'manual'}
$Lang::tr{'primary dns'}$Lang::tr{'secondary dns'}$Lang::tr{'primary dns'}$Lang::tr{'secondary dns'}




$Lang::tr{'profile name'} - $Lang::tr{'profile name'} +
$Lang::tr{'legend'}:* $Lang::tr{'this field may be blank'}$Lang::tr{'legend'}:* $Lang::tr{'this field may be blank'}
END @@ -808,70 +820,70 @@ print "\n"; sub updatesettings { - # make a link from the selected profile to the "default" one. - unlink("${General::swroot}/ppp/settings"); - link("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", - "${General::swroot}/ppp/settings"); - system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings"); + # make a link from the selected profile to the "default" one. + unlink("${General::swroot}/ppp/settings"); + link("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", + "${General::swroot}/ppp/settings"); + system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings"); } sub writesecrets { - # write secrets file. - open(FILE, ">/${General::swroot}/ppp/secrets") or die "Unable to write secrets file."; - flock(FILE, 2); - my $username = $pppsettings{'USERNAME'}; - my $password = $pppsettings{'PASSWORD'}; - print FILE "'$username' * '$password'\n"; - chmod 0600, "${General::swroot}/ppp/secrets"; - close FILE; + # write secrets file. + open(FILE, ">/${General::swroot}/ppp/secrets") or die "Unable to write secrets file."; + flock(FILE, 2); + my $username = $pppsettings{'USERNAME'}; + my $password = $pppsettings{'PASSWORD'}; + print FILE "'$username' * '$password'\n"; + chmod 0600, "${General::swroot}/ppp/secrets"; + close FILE; } sub initprofile { - $pppsettings{'PROFILENAME'} = $Lang::tr{'unnamed'}; - $pppsettings{'COMPORT'} = 'ttyS0'; - $pppsettings{'DTERATE'} = 115200; - $pppsettings{'SPEAKER'} = 'off'; - $pppsettings{'RECONNECTION'} = 'persistent'; - $pppsettings{'DIALONDEMANDDNS'} = 'off'; - $pppsettings{'AUTOCONNECT'} = 'on'; - $pppsettings{'SENDCR'} = 'off'; - $pppsettings{'USEIBOD'} = 'off'; - $pppsettings{'USEDOV'} = 'off'; - $pppsettings{'MODEM'} = 'PCIST'; - $pppsettings{'LINE'} = 'WO'; - $pppsettings{'ENCAP'} = '0'; - $pppsettings{'VPI'} = '1'; - $pppsettings{'VCI'} = '32'; - $pppsettings{'PHONEBOOK'} = 'RELAY_PPP1'; - $pppsettings{'PROTOCOL'} = 'RFC2364'; - $pppsettings{'METHOD'} = 'PPPOE_PLUGIN'; - if ( $pppsettings{'METHOD'} eq 'PPPOE_PLUGIN' ) { - $pppsettings{'MTU'} = '1492'; - $pppsettings{'MRU'} = '1492'; + $pppsettings{'PROFILENAME'} = $Lang::tr{'unnamed'}; + $pppsettings{'COMPORT'} = 'ttyS0'; + $pppsettings{'DTERATE'} = 115200; + $pppsettings{'SPEAKER'} = 'off'; + $pppsettings{'RECONNECTION'} = 'persistent'; + $pppsettings{'DIALONDEMANDDNS'} = 'off'; + $pppsettings{'AUTOCONNECT'} = 'on'; + $pppsettings{'SENDCR'} = 'off'; + $pppsettings{'USEIBOD'} = 'off'; + $pppsettings{'USEDOV'} = 'off'; + $pppsettings{'MODEM'} = 'PCIST'; + $pppsettings{'LINE'} = 'WO'; + $pppsettings{'ENCAP'} = '0'; + $pppsettings{'VPI'} = '1'; + $pppsettings{'VCI'} = '32'; + $pppsettings{'PHONEBOOK'} = 'RELAY_PPP1'; + $pppsettings{'PROTOCOL'} = 'RFC2364'; + $pppsettings{'METHOD'} = 'PPPOE_PLUGIN'; + if ( $pppsettings{'METHOD'} eq 'PPPOE_PLUGIN' ) { + $pppsettings{'MTU'} = '1492'; + $pppsettings{'MRU'} = '1492'; } else { - $pppsettings{'MTU'} = '1452'; - $pppsettings{'MRU'} = '1452'; + $pppsettings{'MTU'} = '1452'; + $pppsettings{'MRU'} = '1452'; } - $pppsettings{'DIALMODE'} = 'T'; - $pppsettings{'MAXRETRIES'} = 5; - $pppsettings{'HOLDOFF'} = 30; - $pppsettings{'TIMEOUT'} = 15; - $pppsettings{'MODULATION'} = 'AUTO'; - $pppsettings{'AUTH'} = 'pap-or-chap'; - $pppsettings{'DNS'} = 'Automatic'; - $pppsettings{'DEBUG'} = 'off'; - $pppsettings{'BACKUPPROFILE'} = $pppsettings{'PROFILE'}; - - # Get PPPoE settings so we can see if PPPoE is enabled or not. - &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); - - # empty profile partial pre-initialization - if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) { - $pppsettings{'TYPE'}=lc($netsettings{'RED_TYPE'}); - } else { - $pppsettings{'TYPE'}='modem'; - } + $pppsettings{'DIALMODE'} = 'T'; + $pppsettings{'MAXRETRIES'} = 5; + $pppsettings{'HOLDOFF'} = 30; + $pppsettings{'TIMEOUT'} = 15; + $pppsettings{'MODULATION'} = 'AUTO'; + $pppsettings{'AUTH'} = 'pap-or-chap'; + $pppsettings{'DNS'} = 'Automatic'; + $pppsettings{'DEBUG'} = 'off'; + $pppsettings{'BACKUPPROFILE'} = $pppsettings{'PROFILE'}; + + # Get PPPoE settings so we can see if PPPoE is enabled or not. + &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); + + # empty profile partial pre-initialization + if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) { + $pppsettings{'TYPE'}=lc($netsettings{'RED_TYPE'}); + } else { + $pppsettings{'TYPE'}='modem'; + } } diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf index 228aea99eb..f21748ba36 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -21,7 +21,7 @@ package Conf; -$version = "2.0rc1t"; +$version = "2.0rc1"; $mainserver = "pakfire.ipfire.org"; -- 2.39.2