# HG changeset patch # User Pascal Bellard # Date 1430820260 -7200 # Node ID 5c05d949d42910239d8cf30a7d4d9e1572e71280 # Parent e73d029d98ae41c68e552144013bae5ce3481a4a ppp/ppp.cgi: s/rtc/pstn/ , VPN submenu diff -r e73d029d98ae -r 5c05d949d429 ppp/receipt --- a/ppp/receipt Sun May 03 19:46:03 2015 +0300 +++ b/ppp/receipt Tue May 05 12:04:20 2015 +0200 @@ -27,13 +27,14 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr $fs/var/www/tazpanel/menu.d/network + mkdir -p $fs/usr $fs/var/www/tazpanel/menu.d/network/VPN cp -a $install/usr/sbin $fs/usr [ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr cp -a $stuff/pppnc-server $fs/usr/sbin ln $fs/usr/sbin/pppnc-server $fs/usr/sbin/pppnc-client cp -a $stuff/ppp.cgi $fs/var/www/tazpanel ln -s ../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/ppp + ln -s ../../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/VPN/ppp # Config files. mkdir -p $fs/etc/ppp/scripts $fs/etc/ppp/ip-up.d $fs/etc/ppp/ip-down.d diff -r e73d029d98ae -r 5c05d949d429 ppp/stuff/ppp.cgi --- a/ppp/stuff/ppp.cgi Sun May 03 19:46:03 2015 +0300 +++ b/ppp/stuff/ppp.cgi Tue May 05 12:04:20 2015 +0200 @@ -15,16 +15,23 @@ TEXTDOMAIN_original=$TEXTDOMAIN export TEXTDOMAIN='ppp' + case "$2" in + *VPN*) + [ "$(which pptp 2>/dev/null)$(which pptpd 2>/dev/null)" ] && cat <$(_ 'PPTP') +EOT + [ "$(which pppssh 2>/dev/null)" ] && cat <$(_ 'PPP/SSH') +EOT cat <$(_ 'PPP Modem')

EOT - [ "$(which pptp 2>/dev/null)$(which pptpd 2>/dev/null)" ] && cat <$(_ 'VPN PPTP') + ;; + *) + cat <$(_ 'PPP Modem') EOT - [ "$(which pppssh 2>/dev/null)" ] && cat <$(_ 'VPN PPP/SSH') -EOT + esac export TEXTDOMAIN=$TEXTDOMAIN_original exit esac @@ -35,8 +42,8 @@ # case " $(GET) " in -*\ setppprtc\ *) - if [ "$(GET start_rtc)" -a "$(GET user)" ]; then +*\ setppppstn\ *) + if [ "$(GET start_pstn)" -a "$(GET user)" ]; then grep -s "$(GET user)" /etc/ppp/pap-secrets || echo "$(GET user) * $(GET pass)" >> /etc/ppp/pap-secrets grep -s "$(GET user)" /etc/ppp/chap-secrets || @@ -46,7 +53,7 @@ /etc/ppp/scripts/ppp-off /etc/ppp/scripts/ppp-on & fi - if [ "$(GET stop_rtc)" ]; then + if [ "$(GET stop_pstn)" ]; then /etc/ppp/scripts/ppp-off fi ;; @@ -115,7 +122,7 @@ USERNAME="$(sed '/^name/!d;s/^[^ ]* *//' /etc/ppp/options)" PASSWORD="$(awk -v key=$USERNAME "\$1==key{print \$3}" /etc/ppp/pap-secrets)" ACCOUNT="$(sed '/^ACCOUNT=/!d;s/^.*=$[^ \t]*$.*/\1/' /etc/ppp/scripts/ppp-on)" -PASSRTC="$(sed '/^PASSWORD=/!d;s/^.*=$[^ \t]*$.*/\1/' /etc/ppp/scripts/ppp-on)" +PASSPSTN="$(sed '/^PASSWORD=/!d;s/^.*=$[^ \t]*$.*/\1/' /etc/ppp/scripts/ppp-on)" PHONE="$(sed '/^TELEPHONE=/!d;s/^.*=$[^ \t]*$.*/\1/' /etc/ppp/scripts/ppp-on)" busybox ps x | grep -v grep | grep -q pppnc_server || stops_disabled='disabled' busybox ps x | grep -v grep | grep -q pppnc_client || stopc_disabled='disabled' @@ -152,7 +159,7 @@

$(_ 'Configuration')

- $(_ 'PPP RTC script')

+ $(_ 'PPP PSTN script')

$(_ 'PPP dailer chat')

$(_ 'PPP options')

$(_ 'chap users')

@@ -182,14 +189,14 @@ - +

- $(_ 'RTC modem') - - $(_ 'Manage RTC Internet connections') + $(_ 'PSTN modem') - + $(_ 'Manage PSTN Internet connections')

$(_ 'Username')
$(_ 'Password')
$(_ 'Phone number')