frodovdr
/
raspap-webgui
mirror of https://github.com/billz/raspap-webgui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #11 from jrmhaig/master 

A few minor fixes
This commit is contained in:
Bill Zimmerman 2016-06-20 20:44:00 +02:00 committed by GitHub
parent 0ba25b9857 d431c3f767
commit f98af5c60b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
includes/functions.php
View File

@ -21,9 +21,10 @@ function GetDistString( $input,$string,$offset,$separator ) {
function ParseConfig( $arrConfig ) { function ParseConfig( $arrConfig ) {
$config = array(); $config = array();
foreach( $arrConfig as $line ) { foreach( $arrConfig as $line ) {
if( $line[0] != "#" ) { $line = trim($line);
if( $line != "" && $line[0] != "#" ) {
$arrLine = explode( "=",$line ); $arrLine = explode( "=",$line );
$config[$arrLine[0]] = $arrLine[1]; $config[$arrLine[0]] = ( count($arrLine) > 1 ? $arrLine[1] : true );
} }
} }
return $config; return $config;
@ -110,7 +111,7 @@ function DisplayDashboard(){
$strRxPackets = $result[1]; $strRxPackets = $result[1];
preg_match( '/TX packets:(\d+)/',$strWlan0,$result ); preg_match( '/TX packets:(\d+)/',$strWlan0,$result );
$strTxPackets = $result[1]; $strTxPackets = $result[1];
preg_match( '//RX bytes:(\d+)/i',$strWlan0,$result ); preg_match( '/RX bytes:(\d+ \(\d+.\d+ [K|M|G]iB\))/i',$strWlan0,$result );
$strRxBytes = $result[1]; $strRxBytes = $result[1];
preg_match( '/TX Bytes:(\d+ \(\d+.\d+ [K|M|G]iB\))/i',$strWlan0,$result ); preg_match( '/TX Bytes:(\d+ \(\d+.\d+ [K|M|G]iB\))/i',$strWlan0,$result );
$strTxBytes = $result[1]; $strTxBytes = $result[1];
@ -236,7 +237,7 @@ function DisplayDashboard(){
* *
*/ */
function DisplayWPAConfig(){ function DisplayWPAConfig(){
$status = '';
?> ?>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
@ -677,7 +678,7 @@ function DisplayDHCPConfig() {
</div><!-- /.table-responsive --> </div><!-- /.table-responsive -->
</div><!-- /.panel-body --> </div><!-- /.panel-body -->
</div><!-- /.panel --> </div><!-- /.panel -->
</div><!-- /.col-lg-6 -->' </div><!-- /.col-lg-6 -->
<?php <?php
if( isset( $_POST['savedhcpdsettings'] ) ) { if( isset( $_POST['savedhcpdsettings'] ) ) {
$config = 'interface='.$_POST['interface'].' $config = 'interface='.$_POST['interface'].'