SliTaz Repositories

     1.1 --- a/ppp/stuff/ppp.cgi	Sat May 02 21:48:46 2015 +0200
     1.2 +++ b/ppp/stuff/ppp.cgi	Sat May 02 22:46:46 2015 +0200
     1.3 @@ -16,7 +16,7 @@
     1.4  		export TEXTDOMAIN='ppp'
     1.5  
     1.6  		cat <<EOT
     1.7 -<li><a data-icon="removable" href="ppp.cgi" data-root>$(_ 'PPP Modem')</a></li>
     1.8 +<li><a data-icon="removable" href="ppp.cgi#ppprtc" data-root>$(_ 'PPP Modem')</a></li>
     1.9  <li><a data-icon="upgrade" href="ppp.cgi#pppnc" data-root>$(_ 'Route shortcut')</a></li>
    1.10  EOT
    1.11  		[ "$(which pptp 2>/dev/null)$(which pptpd 2>/dev/null)" ] && cat <<EOT
    1.12 @@ -117,6 +117,8 @@
    1.13  ACCOUNT="$(sed '/^ACCOUNT=/!d;s/^.*=\([^ \t]*\).*/\1/' /etc/ppp/scripts/ppp-on)"
    1.14  PASSRTC="$(sed '/^PASSWORD=/!d;s/^.*=\([^ \t]*\).*/\1/' /etc/ppp/scripts/ppp-on)"
    1.15  PHONE="$(sed '/^TELEPHONE=/!d;s/^.*=\([^ \t]*\).*/\1/' /etc/ppp/scripts/ppp-on)"
    1.16 +busybox ps x | grep -v grep | grep -q pppnc_server || stops_disabled='disabled'
    1.17 +busybox ps x | grep -v grep | grep -q pppnc_client || stopc_disabled='disabled'
    1.18  TITLE="$(_ 'TazPanel - Network') - $(_ 'PPP Connections')"
    1.19  header
    1.20  xhtml_header | sed 's/id="content"/id="content-sidebar"/'
    1.21 @@ -169,12 +171,18 @@
    1.22  else
    1.23  	stop_disabled='disabled'
    1.24  fi
    1.25 +if [ "$(busybox ps x | grep "pppd" | awk '/eth/{print $1}')" ]; then
    1.26 +	startoe_disabled='disabled'
    1.27 +else
    1.28 +	stopoe_disabled='disabled'
    1.29 +fi
    1.30  cat << EOT
    1.31  	<footer>
    1.32  	</footer>
    1.33  </section>
    1.34  </div>
    1.35  
    1.36 +<a name="ppprtc"></a>
    1.37  <section>
    1.38  	<header>
    1.39  		<span data-icon="removable">$(_ 'RTC modem') -
    1.40 @@ -202,10 +210,7 @@
    1.41  		--><button form="conf" type="submit" name="stop_rtc"  data-icon="stop"  $stop_disabled >$(_ 'Stop'   )</button><!--
    1.42  	--></footer>
    1.43  </section>
    1.44 -EOT
    1.45  
    1.46 -if [ "$(which pppoe 2>/dev/null)" ]; then
    1.47 -	cat <<EOT
    1.48  <a name="pppoe"></a>
    1.49  <section>
    1.50  	<header>
    1.51 @@ -225,16 +230,11 @@
    1.52  	</table>
    1.53  </form>
    1.54  	<footer><!--
    1.55 -		--><button form="conf" type="submit" name="start_pppoe" data-icon="start" >$(_ 'Start'  )</button><!--
    1.56 -		--><button form="conf" type="submit" name="stop_pppoe"  data-icon="stop"  >$(_ 'Stop'   )</button><!--
    1.57 +		--><button form="conf" type="submit" name="start_pppoe" data-icon="start" $startoe_disabled>$(_ 'Start'  )</button><!--
    1.58 +		--><button form="conf" type="submit" name="stop_pppoe"  data-icon="stop"  $stopoe_disabled >$(_ 'Stop'   )</button><!--
    1.59  	--></footer>
    1.60  </section>
    1.61 -EOT
    1.62 -fi
    1.63  
    1.64 -busybox ps x | grep -v grep | grep -q pppnc_server || stops_disabled='disabled'
    1.65 -busybox ps x | grep -v grep | grep -q pppnc_client || stopc_disabled='disabled'
    1.66 -cat <<EOT
    1.67  <a name="pppnc"></a>
    1.68  <section>
    1.69  	<header>

     2.1 --- a/rp-pppoe/receipt	Sat May 02 21:48:46 2015 +0200
     2.2 +++ b/rp-pppoe/receipt	Sat May 02 22:46:46 2015 +0200
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="rp-pppoe"
     2.7 -VERSION="3.10"
     2.8 +VERSION="3.11"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="Roaring Penguin PPPoE client"
    2.11  MAINTAINER="pankso@slitaz.org"