frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/SirLagz/raspap-webgui

Browse Source
This commit is contained in:
Lawrence 2017-10-14 12:56:23 +08:00
commit f18b5785c8
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/configure_client.php
View File

@ -151,7 +151,7 @@ function DisplayWPAConfig(){
<p><?php $status->showMessages(); ?></p> <p><?php $status->showMessages(); ?></p>
<h4>Client settings</h4> <h4>Client settings</h4>
<div class="btn-group btn-block"> <div class="btn-group btn-block">
<a href=".?<?php echo $_SERVER['QUERY_STRING']; ?>" style="padding:10px;float: right;display: block;position: relative;margin-top: -55px;" class="col-md-6-btn btn-info" id="update">Rescan</a> <a href=".?<?php echo $_SERVER['QUERY_STRING']; ?>" style="padding:10px;float: right;display: block;position: relative;margin-top: -55px;" class="col-md-2 btn btn-info" id="update">Rescan</a>
</div> </div>
<form method="POST" action="?page=wpa_conf" name="wpa_conf_form"> <form method="POST" action="?page=wpa_conf" name="wpa_conf_form">
<?php CSRFToken() ?> <?php CSRFToken() ?>

1
includes/dashboard.php
View File

@ -68,6 +68,7 @@ function DisplayDashboard(){
exec( 'ifconfig wlan0 | grep -i running | wc -l',$test ); exec( 'ifconfig wlan0 | grep -i running | wc -l',$test );
if($test[0] == 0) { if($test[0] == 0) {
exec( 'sudo ip link set wlan0 up',$return ); exec( 'sudo ip link set wlan0 up',$return );
exec( 'sudo ip -s a f label wlan0',$return);
} else { } else {
echo 'Interface already up'; echo 'Interface already up';
} }

6
index.php
View File

@ -13,7 +13,7 @@
* @author Lawrence Yau <sirlagz@gmail.com> * @author Lawrence Yau <sirlagz@gmail.com>
* @author Bill Zimmerman <billzimmerman@gmail.com> * @author Bill Zimmerman <billzimmerman@gmail.com>
* @license GNU General Public License, version 3 (GPL-3.0) * @license GNU General Public License, version 3 (GPL-3.0)
* @version 1.1 * @version 1.2.2
* @link https://github.com/billz/raspap-webgui * @link https://github.com/billz/raspap-webgui
* @see http://sirlagz.net/2013/02/08/raspap-webgui/ * @see http://sirlagz.net/2013/02/08/raspap-webgui/
*/ */
@ -117,7 +117,7 @@ $csrf_token = $_SESSION['csrf_token'];
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="index.php">RaspAP Wifi Portal v1.1</a> <a class="navbar-brand" href="index.php">RaspAP Wifi Portal v1.2.2</a>
</div> </div>
<!-- /.navbar-header --> <!-- /.navbar-header -->
@ -135,7 +135,7 @@ $csrf_token = $_SESSION['csrf_token'];
<a href="index.php?page=hostapd_conf"><i class="fa fa-dot-circle-o fa-fw"></i> Configure hotspot</a> <a href="index.php?page=hostapd_conf"><i class="fa fa-dot-circle-o fa-fw"></i> Configure hotspot</a>
</li> </li>
<li> <li>
<a href="index.php?page=dhcpd_conf"><i class="fa fa-exchange fa-fw"></i> Configure DHCP</a> <a href="index.php?page=dhcpd_conf"><i class="fa fa-exchange fa-fw"></i> Configure DHCP Server</a>
</li> </li>
<?php if ( RASPI_OPENVPN_ENABLED ) : ?> <?php if ( RASPI_OPENVPN_ENABLED ) : ?>
<li> <li>

3
installers/common.sh
View File

@ -183,6 +183,9 @@ function patch_system_files() {
'/bin/cp /tmp/dhcpddata /etc/dnsmasq.conf' '/bin/cp /tmp/dhcpddata /etc/dnsmasq.conf'
'/sbin/shutdown -h now' '/sbin/shutdown -h now'
'/sbin/reboot' '/sbin/reboot'
'/sbin/ip link set wlan0 down'
'/sbin/ip link set wlan0 up'
'/sbin/ip -s a f label wlan0'
) )
# Check if sudoers needs patchin # Check if sudoers needs patchin

2
installers/uninstall.sh
View File

@ -81,7 +81,7 @@ function remove_raspap_directories() {
install_error "RaspAP Installation directory not found. Exiting!" install_error "RaspAP Installation directory not found. Exiting!"
fi fi
sudo rm -rf "$webroot_dir/*" sudo rm -rf "$webroot_dir"/*
sudo rm -rf "$raspap_dir" sudo rm -rf "$raspap_dir"
} }