YunoHost-Apps/hotspot_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/hotspot_ynh.git synced 2024-09-03 19:25:53 +02:00
Code Issues Activity Actions

Add security on More details action

Browse source
This commit is contained in:
Julien VAUBOURG 2014-11-20 20:03:24 +01:00
parent 3433169876
commit 6a39d6fc8b
5 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TODO
View file

@ -1,3 +1 @@
* Translate PHP interface in French * Translate PHP interface in French
* Add "More details" security (just one click)
* Add more [INFO] in status with autodetected variables

5
conf/init_ynh-hotspot
View file

@ -383,9 +383,12 @@ case "$1" in
;; ;;
status) status)
exitcode=0 exitcode=0
echo "[INFO] Autodetected internet interface: ${new_internet_device} (last start: ${old_internet_device})"
if has_ip6delegatedprefix; then if has_ip6delegatedprefix; then
echo "[INFO] IPv6 delegated prefix found" echo "[INFO] IPv6 delegated prefix found"
echo "[INFO] IPv6 address computed from the delegated prefix: ${ynh_ip6_addr}"
if is_ndproxy_set; then if is_ndproxy_set; then
echo "[OK] NDP proxy set" echo "[OK] NDP proxy set"

2
scripts/install
View file

@ -127,7 +127,7 @@ sudo sed 's|^;\?\s*max_execution_time.\+|max_execution_time = 600|' -i /etc/php5
sudo sed "s|<TPL:NGINX_LOCATION>|${url_path}|g" -i /var/www/wifiadmin/config.php sudo sed "s|<TPL:NGINX_LOCATION>|${url_path}|g" -i /var/www/wifiadmin/config.php
# Copy init script # Copy init script
sudo install -b -o root -g root -m 0755 ../conf/init_ynh-hotspot /etc/init.d/ynh-hotspot sudo install -o root -g root -m 0755 ../conf/init_ynh-hotspot /etc/init.d/ynh-hotspot
# Set default inits # Set default inits
# The boot order of these services are important, so they are disabled by default # The boot order of these services are important, so they are disabled by default

10
sources/controller.php
View file

@ -147,7 +147,7 @@ dispatch_put('/settings', function() {
} }
} catch(Exception $e) { } catch(Exception $e) {
flash('error', $e->getMessage().T_(' (configuration not updated).')); flash('error', $e->getMessage().' ('.T_('configuration not updated').').');
goto redirect; goto redirect;
} }
@ -184,16 +184,16 @@ dispatch('/status', function() {
foreach($status_lines AS $status_line) { foreach($status_lines AS $status_line) {
if(preg_match('/^\[INFO\]/', $status_line)) { if(preg_match('/^\[INFO\]/', $status_line)) {
$status_list .= "<li class='status-info'>${status_line}</li>"; $status_list .= '<li class="status-info">'.htmlspecialchars($status_line).'</li>';
} }
elseif(preg_match('/^\[OK\]/', $status_line)) { elseif(preg_match('/^\[OK\]/', $status_line)) {
$status_list .= "<li class='status-success'>${status_line}</li>"; $status_list .= '<li class="status-success">'.htmlspecialchars($status_line).'</li>';
} }
elseif(preg_match('/^\[WARN\]/', $status_line)) { elseif(preg_match('/^\[WARN\]/', $status_line)) {
$status_list .= "<li class='status-warning'>${status_line}</li>"; $status_list .= '<li class="status-warning">'.htmlspecialchars($status_line).'</li>';
} }
elseif(preg_match('/^\[ERR\]/', $status_line)) { elseif(preg_match('/^\[ERR\]/', $status_line)) {
$status_list .= "<li class='status-danger'>${status_line}</li>"; $status_list .= '<li class="status-danger">'.htmlspecialchars($status_line).'</li>';
} }
} }

19
sources/public/js/custom.js
View file

@ -39,14 +39,17 @@ $(document).ready(function() {
}); });
$('#statusbtn').click(function() { $('#statusbtn').click(function() {
$('#status-loading').show(); if($('#status-loading').is(':hidden')) {
$('#status').hide();
$('#status-loading').show();
$.ajax({ $.ajax({
url: '?/status', url: '?/status',
}).done(function(data) { }).done(function(data) {
$('#status-loading').hide(); $('#status-loading').hide();
$('#status-text').html('<ul>' + data + '</ul>'); $('#status-text').html('<ul>' + data + '</ul>');
$('#status').show('slow'); $('#status').show('slow');
}); });
}
}); });
}); });