# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1430599606 -7200
# Node ID 67380acb9c1457bf23217d0b4a53cd11ec95fffb
# Parent  c6508bb9fd8ac0de908425e3b307ade934e7d749
Up rp-pppoe (3.11)

diff -r c6508bb9fd8a -r 67380acb9c14 ppp/stuff/ppp.cgi
--- a/ppp/stuff/ppp.cgi	Sat May 02 21:48:46 2015 +0200
+++ b/ppp/stuff/ppp.cgi	Sat May 02 22:46:46 2015 +0200
@@ -16,7 +16,7 @@
 		export TEXTDOMAIN='ppp'
 
 		cat <<EOT
-<li><a data-icon="removable" href="ppp.cgi" data-root>$(_ 'PPP Modem')</a></li>
+<li><a data-icon="removable" href="ppp.cgi#ppprtc" data-root>$(_ 'PPP Modem')</a></li>
 <li><a data-icon="upgrade" href="ppp.cgi#pppnc" data-root>$(_ 'Route shortcut')</a></li>
 EOT
 		[ "$(which pptp 2>/dev/null)$(which pptpd 2>/dev/null)" ] && cat <<EOT
@@ -117,6 +117,8 @@
 ACCOUNT="$(sed '/^ACCOUNT=/!d;s/^.*=\([^ \t]*\).*/\1/' /etc/ppp/scripts/ppp-on)"
 PASSRTC="$(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'
 TITLE="$(_ 'TazPanel - Network') - $(_ 'PPP Connections')"
 header
 xhtml_header | sed 's/id="content"/id="content-sidebar"/'
@@ -169,12 +171,18 @@
 else
 	stop_disabled='disabled'
 fi
+if [ "$(busybox ps x | grep "pppd" | awk '/eth/{print $1}')" ]; then
+	startoe_disabled='disabled'
+else
+	stopoe_disabled='disabled'
+fi
 cat << EOT
 	<footer>
 	</footer>
 </section>
 </div>
 
+<a name="ppprtc"></a>
 <section>
 	<header>
 		<span data-icon="removable">$(_ 'RTC modem') -
@@ -202,10 +210,7 @@
 		--><button form="conf" type="submit" name="stop_rtc"  data-icon="stop"  $stop_disabled >$(_ 'Stop'   )</button><!--
 	--></footer>
 </section>
-EOT
 
-if [ "$(which pppoe 2>/dev/null)" ]; then
-	cat <<EOT
 <a name="pppoe"></a>
 <section>
 	<header>
@@ -225,16 +230,11 @@
 	</table>
 </form>
 	<footer><!--
-		--><button form="conf" type="submit" name="start_pppoe" data-icon="start" >$(_ 'Start'  )</button><!--
-		--><button form="conf" type="submit" name="stop_pppoe"  data-icon="stop"  >$(_ 'Stop'   )</button><!--
+		--><button form="conf" type="submit" name="start_pppoe" data-icon="start" $startoe_disabled>$(_ 'Start'  )</button><!--
+		--><button form="conf" type="submit" name="stop_pppoe"  data-icon="stop"  $stopoe_disabled >$(_ 'Stop'   )</button><!--
 	--></footer>
 </section>
-EOT
-fi
 
-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'
-cat <<EOT
 <a name="pppnc"></a>
 <section>
 	<header>
diff -r c6508bb9fd8a -r 67380acb9c14 rp-pppoe/receipt
--- a/rp-pppoe/receipt	Sat May 02 21:48:46 2015 +0200
+++ b/rp-pppoe/receipt	Sat May 02 22:46:46 2015 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="rp-pppoe"
-VERSION="3.10"
+VERSION="3.11"
 CATEGORY="network"
 SHORT_DESC="Roaring Penguin PPPoE client"
 MAINTAINER="pankso@slitaz.org"