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

WIP: enable bind-addr control

Browse Source
This commit is contained in:
billz 2020-07-29 15:52:31 +01:00
parent 04f62b9f0d
commit eeccb19b35
4 changed files with 56 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
includes/system.php
View File

@ -77,7 +77,8 @@ function DisplaySystem()
} }
if (!RASPI_MONITOR_ENABLED) { if (!RASPI_MONITOR_ENABLED) {
if (isset($_POST['SaveServerPort'])) { if (isset($_POST['SaveServerSettings'])) {
// Save server port
if (isset($_POST['serverPort'])) { if (isset($_POST['serverPort'])) {
if (strlen($_POST['serverPort']) > 4 || !is_numeric($_POST['serverPort'])) { if (strlen($_POST['serverPort']) > 4 || !is_numeric($_POST['serverPort'])) {
$status->addMessage('Invalid value for port number', 'danger'); $status->addMessage('Invalid value for port number', 'danger');
@ -89,6 +90,19 @@ function DisplaySystem()
} }
} }
} }
// Save server bind address
if (isset($_POST['serverBind'])) {
if (!filter_var($_POST['serverBind'], FILTER_VALIDATE_IP)) {
$status->addMessage('Invalid value for bind address', 'danger');
} else {
$serverBind = escapeshellarg($_POST['serverBind']);
//exec("sudo /etc/raspap/lighttpd/configport.sh $serverPort " .RASPI_LIGHTTPD_CONFIG. " ".$_SERVER['SERVER_NAME'], $return);
//foreach ($return as $line) {
// $status->addMessage($line, 'info');
//}
}
}
} }
if (isset($_POST['system_reboot'])) { if (isset($_POST['system_reboot'])) {
$status->addMessage("System Rebooting Now!", "warning", false); $status->addMessage("System Rebooting Now!", "warning", false);
@ -106,7 +120,8 @@ function DisplaySystem()
} }
exec('cat '. RASPI_LIGHTTPD_CONFIG, $return); exec('cat '. RASPI_LIGHTTPD_CONFIG, $return);
$conf = ParseConfig($return); $conf = ParseConfig($return);
$ServerPort = $conf['server.port']; $serverPort = $conf['server.port'];
$serverBind = str_replace('"', '',$conf['server.bind']);
// define locales // define locales
$arrLocales = array( $arrLocales = array(
@ -132,5 +147,5 @@ function DisplaySystem()
'vi_VN.UTF-8' => 'Tiếng Việt (Vietnamese)' 'vi_VN.UTF-8' => 'Tiếng Việt (Vietnamese)'
); );
echo renderTemplate("system", compact("arrLocales", "status", "ServerPort")); echo renderTemplate("system", compact("arrLocales", "status", "serverPort", "serverBind"));
} }

14
installers/configport.sh
View File

@ -1,12 +1,20 @@
#!/bin/bash #!/bin/bash
# #
# Updates lighttpd server.port and restarts the service # Updates lighttpd config settings and restarts the service
# @author billz # @author billz
# license: GNU General Public License v3.0 # license: GNU General Public License v3.0
# Exit on error
set -o errexit
# Exit on error inside functions
set -o errtrace
# Turn on traces, disabled by default
#set -o xtrace
server_port=$1 server_port=$1
lighttpd_conf=$2 server_bind=$2
host=$3 lighttpd_conf=$3
host=$4
restart_service=0 restart_service=0
while :; do while :; do

6
locale/en_US/LC_MESSAGES/messages.po
View File

@ -533,6 +533,12 @@ msgstr "System Rebooting Now!"
msgid "System Shutting Down Now!" msgid "System Shutting Down Now!"
msgstr "System Shutting Down Now!" msgstr "System Shutting Down Now!"
msgid "Web server port"
msgstr "Web server port"
msgid "Web server bind address"
msgstr "Web server bind address"
#: includes/themes.php #: includes/themes.php
msgid "Theme settings" msgid "Theme settings"
msgstr "Theme settings" msgstr "Theme settings"

23
templates/system/advanced.php
View File

@ -1,18 +1,25 @@
<!-- advanced tab --> <!-- advanced tab -->
<div role="tabpanel" class="tab-pane" id="advanced"> <div role="tabpanel" class="tab-pane" id="advanced">
<h4 class="mt-3"><?php echo _("Advanced settings") ;?></h4> <h4 class="mt-3"><?php echo _("Advanced settings") ;?></h4>
<?php if (!RASPI_MONITOR_ENABLED) : ?>
<form action="?page=system_info" method="POST">
<?php echo CSRFTokenFieldTag() ?>
<div class="row"> <div class="row">
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="code"><?php echo _("Web server port") ;?></label> <label for="code"><?php echo _("Web server port") ;?></label>
<form action="?page=system_info" method="POST"> <input type="text" class="form-control" name="serverPort" value="<?php echo htmlspecialchars($serverPort, ENT_QUOTES); ?>" />
<?php echo CSRFTokenFieldTag() ?> </div>
<?php if (!RASPI_MONITOR_ENABLED) : ?> </div>
<input type="text" class="form-control" name="serverPort" value="<?php echo htmlspecialchars($ServerPort, ENT_QUOTES); ?>" /> <div class="row">
<div class="form-group col-md-6">
<label for="code"><?php echo _("Web server bind address") ;?></label>
<input type="text" class="form-control" name="serverBind" value="<?php echo htmlspecialchars($serverBind, ENT_QUOTES); ?>" />
</div>
</div>
<input type="submit" class="btn btn-outline btn-primary" name="SaveServerSettings" value="<?php echo _("Save settings"); ?>" />
<input type="submit" class="btn btn-warning" name="RestartLighttpd" value="<?php echo _("Restart lighttpd"); ?>" />
</form>
<?php endif ?> <?php endif ?>
</div> </div>
</div>
<input type="submit" class="btn btn-outline btn-primary" name="SaveServerPort" value="<?php echo _("Save settings"); ?>" />
<input type="submit" class="btn btn-warning" name="RestartLighttpd" value="<?php echo _("Restart lighttpd"); ?>" />
</div>