From 5a49768614658c266981f450c79e7fdab3dda6f0 Mon Sep 17 00:00:00 2001 From: glaszig Date: Sun, 18 Aug 2019 23:22:43 +0100 Subject: [PATCH 01/25] fix renderTemplate() function to allow data-less rendering --- includes/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/functions.php b/includes/functions.php index 055f750e..75a6c3cd 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -578,9 +578,9 @@ function SaveTORAndVPNConfig() /** * Renders a simple PHP template */ -function renderTemplate($name, $data) +function renderTemplate($name, $data = []) { - $file = "../../templates/$name.php"; + $file = realpath(dirname(__FILE__) . "/../templates/$name.php"); if (!file_exists($file)) { return "template $name ($file) not found"; } From 76f905fe9d3551353a8c802e9096cefa8d027a69 Mon Sep 17 00:00:00 2001 From: glaszig Date: Sun, 18 Aug 2019 23:20:47 +0100 Subject: [PATCH 02/25] use template for about page --- includes/about.php | 29 +++-------------------------- templates/about.php | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 26 deletions(-) create mode 100644 templates/about.php diff --git a/includes/about.php b/includes/about.php index 33e7ee7d..d675619a 100755 --- a/includes/about.php +++ b/includes/about.php @@ -1,34 +1,11 @@ -
-
-
-
-
- -

-
GNU General Public License v3.0
-

-

RaspAP is a co-creation of @billz and @SirLagz
- with the contributions of our community.

-

https://github.com/billz/raspap-webgui

- -
-
-
-
-
- +
+
+
+
+ +

+
GNU General Public License v3.0
+

+

RaspAP is a co-creation of @billz and @SirLagz
+ with the contributions of our community.

+

https://github.com/billz/raspap-webgui

+ +
+
+
+
+ From 10dd214b17d8577e3f7bbdebb2af65990bb30e77 Mon Sep 17 00:00:00 2001 From: glaszig Date: Sun, 18 Aug 2019 23:22:12 +0100 Subject: [PATCH 03/25] add class for system information --- includes/system.php | 56 ++++++++++++++------------------------------- lib/system.php | 48 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 39 deletions(-) create mode 100644 lib/system.php diff --git a/includes/system.php b/includes/system.php index ed849237..5615c1a9 100755 --- a/includes/system.php +++ b/includes/system.php @@ -88,33 +88,16 @@ function DisplaySystem() 'tr_TR.UTF-8' => 'Türkçe' ); - // hostname - exec("hostname -f", $hostarray); - $hostname = $hostarray[0]; + require_once "lib/system.php"; + $system = new System(); - // uptime - $uparray = explode(" ", exec("cat /proc/uptime")); - $seconds = round($uparray[0], 0); - $minutes = $seconds / 60; - $hours = $minutes / 60; - $days = floor($hours / 24); - $hours = floor($hours - ($days * 24)); - $minutes = floor($minutes - ($days * 24 * 60) - ($hours * 60)); - $uptime= ''; - if ($days != 0) { - $uptime .= $days . ' day' . (($days > 1)? 's ':' '); - } - if ($hours != 0) { - $uptime .= $hours . ' hour' . (($hours > 1)? 's ':' '); - } - if ($minutes != 0) { - $uptime .= $minutes . ' minute' . (($minutes > 1)? 's ':' '); - } + $hostname = $system->hostname(); + $uptime = $system->uptime(); + $cores = $system->processorCount(); // mem used + $memused = $system->usedMemory(); $memused_status = "primary"; - exec("free -m | awk '/Mem:/ { total=$2 ; used=$3 } END { print used/total*100}'", $memarray); - $memused = floor($memarray[0]); if ($memused > 90) { $memused_status = "danger"; } elseif ($memused > 75) { @@ -124,9 +107,7 @@ function DisplaySystem() } // cpu load - $cores = exec("grep -c ^processor /proc/cpuinfo"); - $loadavg = exec("awk '{print $1}' /proc/loadavg"); - $cpuload = floor(($loadavg * 100) / $cores); + $cpuload = $system->systemLoadPercentage(); if ($cpuload > 90) { $cpuload_status = "danger"; } elseif ($cpuload > 75) { @@ -135,25 +116,22 @@ function DisplaySystem() $cpuload_status = "success"; } + if (isset($_POST['system_reboot'])) { + $status->addMessage("System Rebooting Now!", "warning", false); + $result = shell_exec("sudo /sbin/reboot"); + } + if (isset($_POST['system_shutdown'])) { + $status->addMessage("System Shutting Down Now!", "warning", false); + $result = shell_exec("sudo /sbin/shutdown -h now"); + } + ?>
- - ' . _("System Rebooting Now!") . '
'; - $result = shell_exec("sudo /sbin/reboot"); - } - if (isset($_POST['system_shutdown'])) { - echo '
' . _("System Shutting Down Now!") . '
'; - $result = shell_exec("sudo /sbin/shutdown -h now"); - } - ?> - -

showMessages(); ?>

+ showMessages(); ?>
    diff --git a/lib/system.php b/lib/system.php new file mode 100644 index 00000000..5e6399ac --- /dev/null +++ b/lib/system.php @@ -0,0 +1,48 @@ + 1)? 's ':' '); + } + if ($hours != 0) { + $uptime .= $hours . ' hour' . (($hours > 1)? 's ':' '); + } + if ($minutes != 0) { + $uptime .= $minutes . ' minute' . (($minutes > 1)? 's ':' '); + } + + return $uptime; + } + + public function usedMemory() { + $used = shell_exec("free -m | awk '/Mem:/ { total=$2 ; used=$3 } END { print used/total*100}'"); + return floor($used); + } + + public function processorCount() { + $procs = shell_exec("nproc --all"); + return intval($proc); + } + + public function loadAvg1Min() { + $load = exec("awk '{print $1}' /proc/loadavg"); + return floatval($load); + } + + public function systemLoadPercentage() { + return floor(($this->loadAvg1Min() * 100) / $this->processorCount()); + } +} \ No newline at end of file From 0608b6cb22c404a48989e96e844b5b40833f8574 Mon Sep 17 00:00:00 2001 From: glaszig Date: Sun, 18 Aug 2019 23:29:46 +0100 Subject: [PATCH 04/25] use template for system page --- includes/system.php | 120 ++----------------------------------------- templates/system.php | 114 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 116 deletions(-) create mode 100644 templates/system.php diff --git a/includes/system.php b/includes/system.php index 5615c1a9..a6de2a21 100755 --- a/includes/system.php +++ b/includes/system.php @@ -1,6 +1,7 @@ 'Türkçe' ); - require_once "lib/system.php"; - $system = new System(); - - $hostname = $system->hostname(); - $uptime = $system->uptime(); - $cores = $system->processorCount(); - - // mem used - $memused = $system->usedMemory(); - $memused_status = "primary"; - if ($memused > 90) { - $memused_status = "danger"; - } elseif ($memused > 75) { - $memused_status = "warning"; - } elseif ($memused > 0) { - $memused_status = "success"; - } - - // cpu load - $cpuload = $system->systemLoadPercentage(); - if ($cpuload > 90) { - $cpuload_status = "danger"; - } elseif ($cpuload > 75) { - $cpuload_status = "warning"; - } elseif ($cpuload > 0) { - $cpuload_status = "success"; - } - - if (isset($_POST['system_reboot'])) { - $status->addMessage("System Rebooting Now!", "warning", false); - $result = shell_exec("sudo /sbin/reboot"); - } - if (isset($_POST['system_shutdown'])) { - $status->addMessage("System Shutting Down Now!", "warning", false); - $result = shell_exec("sudo /sbin/shutdown -h now"); - } - - ?> -
    -
    -
    -
    -
    - showMessages(); ?> - - -
      - - - -
    - -
    -
    -
    -
    -

    -

    -

    -


    -
    -
    -
    % -
    -
    -
    -
    -
    % -
    -
    - - - - " /> - " /> - " onclick="document.location.reload(true)" /> - -
    -
    -
    - -
    -

    -
    -
    - - -
    -
    - " /> - " onclick="document.location.reload(true)" /> -
    - -
    -
    -
    - -
    -
    -
    - -
    - - -
    -
    -
    -
    -
    - hostname(); +$uptime = $system->uptime(); +$cores = $system->processorCount(); + +// mem used +$memused = $system->usedMemory(); +$memused_status = "primary"; +if ($memused > 90) { + $memused_status = "danger"; +} elseif ($memused > 75) { + $memused_status = "warning"; +} elseif ($memused > 0) { + $memused_status = "success"; +} + +// cpu load +$cpuload = $system->systemLoadPercentage(); +if ($cpuload > 90) { + $cpuload_status = "danger"; +} elseif ($cpuload > 75) { + $cpuload_status = "warning"; +} elseif ($cpuload > 0) { + $cpuload_status = "success"; +} + +if (isset($_POST['system_reboot'])) { + $status->addMessage("System Rebooting Now!", "warning", false); + $result = shell_exec("sudo /sbin/reboot"); +} +if (isset($_POST['system_shutdown'])) { + $status->addMessage("System Shutting Down Now!", "warning", false); + $result = shell_exec("sudo /sbin/shutdown -h now"); +} + +?> +
    +
    +
    +
    +
    +showMessages(); ?> +
    + +
      + + + +
    + +
    +
    +
    +
    +

    +

    +

    +


    +
    +
    +
    % +
    +
    +
    +
    +
    % +
    +
    + + + + " /> + " /> + " onclick="document.location.reload(true)" /> + +
    +
    +
    + +
    +

    +
    +
    + + +
    +
    + " /> + " onclick="document.location.reload(true)" /> +
    + +
    +
    +
    + +
    +
    +
    + +
    + + +
    +
    +
    +
    +
    From 2215b11c219b92a300967f21d8c49b244c8e18f5 Mon Sep 17 00:00:00 2001 From: glaszig Date: Sun, 18 Aug 2019 23:35:58 +0100 Subject: [PATCH 05/25] use template for themes page --- includes/themes.php | 32 +------------------------------- templates/themes.php | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 31 deletions(-) create mode 100644 templates/themes.php diff --git a/includes/themes.php b/includes/themes.php index 431e57d0..ffeb203f 100755 --- a/includes/themes.php +++ b/includes/themes.php @@ -22,35 +22,5 @@ function DisplayThemeConfig() break; } -?> -
    -
    -
    -
    -
    - -

    - -
    -
    - - -
    -
    - -
    - - " onclick="document.location.reload(true)" /> -
    - -
    -
    -
    -
    - +
    +
    +
    +
    + +

    + +
    +
    + + +
    +
    + +
    + + " onclick="document.location.reload(true)" /> +
    + +
    +
    +
    +
From e4e9b5c5c1a1dfb990fb56111513a980c0011295 Mon Sep 17 00:00:00 2001 From: glaszig Date: Sun, 18 Aug 2019 23:39:22 +0100 Subject: [PATCH 06/25] use template for admin page --- includes/admin.php | 43 ++----------------------------------------- templates/admin.php | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 41 deletions(-) create mode 100644 templates/admin.php diff --git a/includes/admin.php b/includes/admin.php index e58ac4d9..93537997 100755 --- a/includes/admin.php +++ b/includes/admin.php @@ -32,45 +32,6 @@ function DisplayAuthConfig($username, $password) $status->addMessage('Old password does not match', 'danger'); } } -?> -
-
-
-
-
-

showMessages(); ?>

-
- -
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
- " /> -
-
-
-
-
- +
+
+
+
+

showMessages(); ?>

+
+ +
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+ " /> +
+
+
+
+
From d7ee29aeee7595bb141739877ce961b852d5bf4d Mon Sep 17 00:00:00 2001 From: glaszig Date: Sun, 18 Aug 2019 23:48:37 +0100 Subject: [PATCH 07/25] use template for configure client page --- includes/configure_client.php | 39 +--------------------------------- templates/configure_client.php | 34 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 38 deletions(-) create mode 100644 templates/configure_client.php diff --git a/includes/configure_client.php b/includes/configure_client.php index 4ee406c0..dbb384e2 100755 --- a/includes/configure_client.php +++ b/includes/configure_client.php @@ -95,43 +95,6 @@ function DisplayWPAConfig() nearbyWifiStations($networks); connectedWifiStations($networks); -?> + echo renderTemplate("configure_client", compact("status")); -
-
-
-
- -
-

showMessages(); ?>

-

-
- -
- -
- - - - - - -
-
-
Note: WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"); ?>
-
-
-
- diff --git a/templates/configure_client.php b/templates/configure_client.php new file mode 100644 index 00000000..c812d6e9 --- /dev/null +++ b/templates/configure_client.php @@ -0,0 +1,34 @@ +
+
+
+
+ +
+

showMessages(); ?>

+

+ +
+ +
+ +
+ + + +
+
+
Note: WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"); ?>
+
+
+
+ + From 7fcdd5e89c1d2a35f15da7e30adcbee3de5eef54 Mon Sep 17 00:00:00 2001 From: glaszig Date: Mon, 19 Aug 2019 00:04:53 +0100 Subject: [PATCH 08/25] use template for dashboard --- includes/dashboard.php | 117 ++++------------------------------------ templates/dashboard.php | 102 +++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 107 deletions(-) create mode 100644 templates/dashboard.php diff --git a/includes/dashboard.php b/includes/dashboard.php index 33a87869..6a751c0d 100755 --- a/includes/dashboard.php +++ b/includes/dashboard.php @@ -170,114 +170,17 @@ function DisplayDashboard() } else { $status->addMessage(sprintf(_('Interface is %s.'), strtolower($interfaceState)), $classMsgDevicestatus); } - ?> -
-
-
-
-
-

showMessages(); ?>

-
-
-
-
-

-

-

-

-

-


-
-
-
-
-

-

-


-

-

-
-
-
-
-
-
-

-

-

-

-

-

-


-
-
-
% -
-
-
-
-
-
-

-
- - - - - - - - - -'.PHP_EOL; - echo ''.PHP_EOL; - echo ''.PHP_EOL; - echo ''.PHP_EOL; - echo ''.PHP_EOL; -}; -?> - -
'.htmlspecialchars($client_items[3], ENT_QUOTES).''.htmlspecialchars($client_items[2], ENT_QUOTES).''.htmlspecialchars($client_items[1], ENT_QUOTES).'
-
-
-
-
-
-
-
-
- - '; -} else { - echo ''; -} - ?> - " onclick="document.location.reload(true)" /> -
-
-
- -
-
-
-
-
- +
+
+
+
+
+ showMessages(); ?> +
+
+
+
+

+

+

+

+

+


+
+
+
+
+

+

+


+

+

+
+
+
+
+
+
+

+

+

+

+

+

+


+
+
+
%
+
+
+
+
+
+

+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+ +
+
+
+ + + + " name="ifup_wlan0" /> + + " name="ifdown_wlan0" /> + + " onclick="document.location.reload(true)" /> +
+
+
+ +
+
+
+
+
From c1f75a696ad45e60fa037f28922247b0fce731f7 Mon Sep 17 00:00:00 2001 From: glaszig Date: Mon, 19 Aug 2019 00:21:23 +0100 Subject: [PATCH 09/25] use template for data usage page --- includes/data_usage.php | 94 +--------------------------------------- templates/data_usage.php | 81 ++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 93 deletions(-) create mode 100644 templates/data_usage.php diff --git a/includes/data_usage.php b/includes/data_usage.php index 1eb40717..e3c1a583 100755 --- a/includes/data_usage.php +++ b/includes/data_usage.php @@ -6,98 +6,7 @@ function DisplayDataUsage(&$extraFooterScripts) { exec("ip -o link show | awk -F ': ' '{print $2}' | grep -v lo ", $interfacesWlo); -?> -
-
-
-
-
- - - -
-
-
-
-

- - - -
-
-
-
-
-
-
-
-

- - - -
-
-
-
-
-
-
-
-

- - - -
-
-
-
-
-
- -
-
-
-
-
-
- - $interfacesWlo ]); $extraFooterScripts[] = array('src'=>'vendor/raphael/raphael.min.js', 'defer'=>false); @@ -105,4 +14,3 @@ t['receive'] = ''; $extraFooterScripts[] = array('src'=>'vendor/datatables/js/jquery.dataTables.min.js', 'defer'=>false); $extraFooterScripts[] = array('src'=>'js/bandwidthcharts.js', 'defer'=>false); } - diff --git a/templates/data_usage.php b/templates/data_usage.php new file mode 100644 index 00000000..ff95a244 --- /dev/null +++ b/templates/data_usage.php @@ -0,0 +1,81 @@ +
+
+
+
+
+ + + +
+
+
+
+

+ + + +
+
+
+
+
+
+
+
+

+ + + +
+
+
+
+
+
+
+
+

+ + + +
+
+
+
+
+
+ +
+
+
+
+
+ + From 9defff1cf4153d389362883427ff4d0ae94ade1e Mon Sep 17 00:00:00 2001 From: glaszig Date: Mon, 19 Aug 2019 00:28:01 +0100 Subject: [PATCH 10/25] use template for dhcp page --- includes/dhcp.php | 199 ++------------------------------------------- templates/dhcp.php | 188 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+), 191 deletions(-) create mode 100644 templates/dhcp.php diff --git a/includes/dhcp.php b/includes/dhcp.php index 81bf14c8..a70cdb13 100755 --- a/includes/dhcp.php +++ b/includes/dhcp.php @@ -132,195 +132,12 @@ function DisplayDHCPConfig() } } -?> -
-
-
-
- - dnsmasq -
- -
-

showMessages(); ?>

-
- - -
    -
  • -
    • -
    • -
  • -
    • -
- -
-
-

DHCP server settings

-
-
- - -
-
-
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
- - -
-
- - " name="savedhcpdsettings" /> - '; - } else { - echo''; - } - ?> -
- -
-

Client list

-
-
-
-
- -
-
- - - - - - - - - - - -'.PHP_EOL; - $lease_items = explode(' ', $lease); - foreach ($lease_items as $lease_item) { - echo ' '.PHP_EOL; - } - echo ' '.PHP_EOL; -}; -?> - -
'.htmlspecialchars($lease_item, ENT_QUOTES).'
-
-
-
-
-
-
- -
-
- - -
-
- " class="form-control"> -
-
- " class="form-control"> -
-
- -
-
- -
- -
-
-
- " class="form-control" autofocus="autofocus"> -
-
- " class="form-control"> -
-
- -
-
- - - - " name="savedhcpdsettings" /> - '; - } else { - echo''; - } - ?> -
- -
-
-
-
-
-
-
- +
+
+
+ + dnsmasq +
+ +
+

showMessages(); ?>

+
+ + +
    +
  • +
    • +
    • +
  • +
    • +
+ +
+
+

DHCP server settings

+
+
+ + +
+
+
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ +" name="savedhcpdsettings" /> +'; +} else { + echo''; +} +?> +
+ +
+

Client list

+
+
+
+
+ +
+
+ + + + + + + + + + + +'.PHP_EOL; +$lease_items = explode(' ', $lease); +foreach ($lease_items as $lease_item) { + echo ' '.PHP_EOL; +} +echo ' '.PHP_EOL; +}; +?> + +
'.htmlspecialchars($lease_item, ENT_QUOTES).'
+
+
+
+
+
+
+ +
+
+ + +
+
+ " class="form-control"> +
+
+ " class="form-control"> +
+
+ +
+
+ +
+ +
+
+
+ " class="form-control" autofocus="autofocus"> +
+
+ " class="form-control"> +
+
+ +
+
+ + + + " name="savedhcpdsettings" /> + '; + } else { + echo''; + } + ?> +
+ +
+
+
+
+
+
+ \ No newline at end of file From 33b99c0ae705075fb7f7e467a7c2c85d04d29821 Mon Sep 17 00:00:00 2001 From: glaszig Date: Mon, 19 Aug 2019 00:35:39 +0100 Subject: [PATCH 11/25] use template for hostapd page --- includes/hostapd.php | 458 +----------------------------------------- templates/hostapd.php | 449 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 456 insertions(+), 451 deletions(-) create mode 100644 templates/hostapd.php diff --git a/includes/hostapd.php b/includes/hostapd.php index e7facc94..774081a1 100755 --- a/includes/hostapd.php +++ b/includes/hostapd.php @@ -57,457 +57,13 @@ function DisplayHostAPDConfig() } }; -?> -
-
-
-
- - hostapd -
- -
-

showMessages(); ?>

-
- - -
    -
    • -
    • -
    • -
    • -
- - -
-
- -

-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
-

-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
-

-
-
- '; - } else { - echo "
Logfile output not enabled"; - } - ?> -
-
-
-
-

-
-
-
- - /> - -
-
-
-
-
-
- - /> - -
-
-
-
-
-
- - /> - -
-
-
-
-
- - " aria-describedby="max_num_sta_help"> - max_num_sta option of hostapd. The default and maximum is 2007. If empty or 0, the default applies.") ?> -
-
-
-
- - - - -
-
-
- " /> - ' , PHP_EOL; - } else { - echo '' , PHP_EOL; - }; -?> - -
-
-
-
- +
+
+
+ + hostapd +
+ +
+

showMessages(); ?>

+
+ + +
    +
    • +
    • +
    • +
    • +
+ + +
+
+ +

+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+

+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+

+
+
+ '; + } else { + echo "
Logfile output not enabled"; + } + ?> +
+
+
+
+

+
+
+
+ + /> + +
+
+
+
+
+
+ + /> + +
+
+
+
+
+
+ + /> + +
+
+
+
+
+ + " aria-describedby="max_num_sta_help"> + max_num_sta option of hostapd. The default and maximum is 2007. If empty or 0, the default applies.") ?> +
+
+
+
+ + + + +
+
+
+ " /> + ' , PHP_EOL; + } else { + echo '' , PHP_EOL; + }; +?> + +
+
+
+
From 89f3330606c8a7fcb9a2e11d2ac89e1ce99748da Mon Sep 17 00:00:00 2001 From: glaszig Date: Mon, 19 Aug 2019 00:38:41 +0100 Subject: [PATCH 12/25] use template for network page --- includes/networking.php | 107 +-------------------------------------- templates/networking.php | 102 +++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 106 deletions(-) create mode 100644 templates/networking.php diff --git a/includes/networking.php b/includes/networking.php index 24e9d35d..4094d3cc 100755 --- a/includes/networking.php +++ b/includes/networking.php @@ -16,111 +16,6 @@ function DisplayNetworkingConfig() foreach ($interfaces as $interface) { exec("ip a show $interface", $$interface); } -?> -
-
-
-
-
-
-
- -
-
-

-
- -
-
'.htmlspecialchars($interface, ENT_QUOTES).'
-
- 

-                                

-                            

-                            
';
-                        }
-                        ?>
-                      

-                    

-                      

-               
-                      

-                    

-                  

-
-                        

-                          

-                            

-                            ' . CSRFTokenFieldTag() . '
-                              

-                                
' . _("Adapter IP Address Settings") . '

-                                

-                                  
-                                  
-                                

-                                
' . _("Enable Fallback to Static Option") . '

-                                

-                                  
-                                  
-                                

-                              

-                              

-                              
' . _("Static IP Options") . '

-                              

-                                
-                                
-                              

-                              

-                                
-                                
-                              

-                              

-                                
-                                
-                              

-                              

-                                
-                                
-                              

-                              

-                                
-                                
-                              

-                              ' . _("Save settings") . '
-                              ' . _("Apply settings") . '
-                              

-                            

-                      

-                    
';
+    echo renderTemplate("networking", compact("status", "interfaces"));
 }
-?>
-              

-            

-        

-        

-      

-    
-    
-
diff --git a/templates/networking.php b/templates/networking.php
new file mode 100644
index 00000000..2a109005
--- /dev/null
+++ b/templates/networking.php
@@ -0,0 +1,102 @@
+

+

+   

+      

+   

+      

+        

+          
+            

+              

+        

+                  

+                    
+                        

+                            
'.htmlspecialchars($interface, ENT_QUOTES).'

+                            

+                              

+                            

+                        

+                        
';
+                    }
+                    ?>
+                  

+                

+                  

+           
+                  

+                

+              

+
+                    

+                      

+                        

+                        ' . CSRFTokenFieldTag() . '
+                          

+                            
' . _("Adapter IP Address Settings") . '

+                            

+                              
+                              
+                            

+                            
' . _("Enable Fallback to Static Option") . '

+                            

+                              
+                              
+                            

+                          

+                          

+                          
' . _("Static IP Options") . '

+                          

+                            
+                            
+                          

+                          

+                            
+                            
+                          

+                          

+                            
+                            
+                          

+                          

+                            
+                            
+                          

+                          

+                            
+                            
+                          

+                          ' . _("Save settings") . '
+                          ' . _("Apply settings") . '
+                          

+                        

+                  

+                
';
+}
+?>
+          

+        

+    

+    

+  
+
\ No newline at end of file

From 2cd2082499451b9ae13b9c8f45de6ac0a4f028f9 Mon Sep 17 00:00:00 2001
From: glaszig 
Date: Mon, 19 Aug 2019 00:51:26 +0100
Subject: [PATCH 13/25] fixed up networking template

---
 templates/networking.php | 194 ++++++++++++++++++++-------------------
 1 file changed, 98 insertions(+), 96 deletions(-)

diff --git a/templates/networking.php b/templates/networking.php
index 2a109005..717f5851 100644
--- a/templates/networking.php
+++ b/templates/networking.php
@@ -1,102 +1,104 @@
 

-

+  

    

-      

-   

+    
 

       

         

-          
-            

-              

-        

-                  

-                    
-                        

-                            
'.htmlspecialchars($interface, ENT_QUOTES).'

-                            

-                              

-                            

-                        

-                        
';
-                    }
-                    ?>
-                  

-                

-                  

-           
-                  

-                

-              

-
-                    

-                      

-                        

-                        ' . CSRFTokenFieldTag() . '
-                          

-                            
' . _("Adapter IP Address Settings") . '

-                            

-                              
-                              
-                            

-                            
' . _("Enable Fallback to Static Option") . '

-                            

-                              
-                              
-                            

-                          

-                          

-                          
' . _("Static IP Options") . '

-                          

-                            
-                            
-                          

-                          

-                            
-                            
-                          

-                          

-                            
-                            
-                          

-                          

-                            
-                            
-                          

-                          

-                            
-                            
-                          

-                          ' . _("Save settings") . '
-                          ' . _("Apply settings") . '
-                          

-                        

-                  

-                
';
-}
-?>
-          

-        

-    

+        
    
+          
+          
+          
+          
    • 
+          
+        

+        

+
+          

+            

+            

+              
+              
+              

+                

+                  

+                  

+                    

+                  

+                

+              

+              
+            

+            

+              

+                 
+              

+            

+          

+
+          
+          
+          

+            

+              

+
+                

+                  
+                  

+                    

+                    

+                      
+                      
+                    

+                    

+                    

+                      
+                      
+                    

+                  

+
+                  

+
+                  

+                  

+                    
+                    
+                  

+                  

+                    
+                    
+                  

+                  

+                    
+                    
+                  

+                  

+                    
+                    
+                  

+                  

+                    
+                    
+                  

+                  
+                  
+                

+
+              

+            

+          

+          
+
+        

+      

+      

     

   
-
\ No newline at end of file
+

From 82274ed1c9a2440668de4540c6f3fc1543a0c578 Mon Sep 17 00:00:00 2001
From: glaszig 
Date: Mon, 19 Aug 2019 00:56:35 +0100
Subject: [PATCH 14/25] fixed up about template

---
 templates/about.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/templates/about.php b/templates/about.php
index 6d930977..50729834 100644
--- a/templates/about.php
+++ b/templates/about.php
@@ -1,18 +1,18 @@
 

-

-

-
 

-

+  

+    

+      
 

+      

 
-  

-  
GNU General Public License v3.0

-  

-  
RaspAP is a co-creation of @billz and @SirLagz

-  with the contributions of our community.

-  
 https://github.com/billz/raspap-webgui

+        

+        
GNU General Public License v3.0

+        

+        
RaspAP is a co-creation of @billz and @SirLagz

+          with the contributions of our community.

+          
 https://github.com/billz/raspap-webgui

 
-

-

-

-

+      

+      

+    

+  

 


From b04661171a14ee2d5dd0dbf2dff272cb5849a94f Mon Sep 17 00:00:00 2001
From: glaszig 
Date: Mon, 19 Aug 2019 00:57:26 +0100
Subject: [PATCH 15/25] fixed up data usage template

---
 templates/data_usage.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/templates/data_usage.php b/templates/data_usage.php
index ff95a244..a4c67f2b 100644
--- a/templates/data_usage.php
+++ b/templates/data_usage.php
@@ -15,10 +15,11 @@
               

                 

                   

-                   
+                  
                   
                   
     " />
-    " onclick="document.location.reload(true)" />
+    
   

 
   

diff --git a/templates/themes.php b/templates/themes.php
index 1a4d41a8..8920ad00 100644
--- a/templates/themes.php
+++ b/templates/themes.php
@@ -15,7 +15,7 @@
 
         

           
-          " onclick="document.location.reload(true)" />
+          
         

 
       


From 26fbd78156860bc857c13b285f0bf90c704ed8ec Mon Sep 17 00:00:00 2001
From: glaszig 
Date: Mon, 19 Aug 2019 02:28:48 +0100
Subject: [PATCH 23/25] replaced CheckPSK dom level 1 events with level 2 event
 listener-driven implementation

---
 js/custom.js                | 13 +++++++++++++
 templates/wifi_stations.php |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/js/custom.js b/js/custom.js
index b938556d..6fd77882 100644
--- a/js/custom.js
+++ b/js/custom.js
@@ -213,6 +213,19 @@ $(document).on("click", ".js-toggle-password", function(e) {
     }
 });
 
+$(document).on("keyup", ".js-validate-psk", function(e) {
+    var field  = $(e.target);
+    var colors = field.data("colors").split(",");
+    var target = $(field.data("target"));
+    if (field.val().length < 8 || field.val().length > 63) {
+        field.css("backgroundColor", colors[0]);
+        target.attr("disabled", true);
+    } else {
+        field.css("backgroundColor", colors[1]);
+        target.attr("disabled", false);
+    }
+});
+
 $(document)
     .ajaxSend(setCSRFTokenHeader)
     .ready(contentLoaded)
diff --git a/templates/wifi_stations.php b/templates/wifi_stations.php
index 1c2b7542..7d4f48fa 100644
--- a/templates/wifi_stations.php
+++ b/templates/wifi_stations.php
@@ -67,7 +67,7 @@
             
               
             
-              
+              
               
                 
               

From 61f38ceda66c99da85d4f24bbf8443095e7c7fe1 Mon Sep 17 00:00:00 2001
From: glaszig 
Date: Mon, 19 Aug 2019 02:30:34 +0100
Subject: [PATCH 24/25] removed obosolete js file

---
 dist/js/functions.js | 9 ---------
 index.php            | 3 ---
 2 files changed, 12 deletions(-)
 delete mode 100644 dist/js/functions.js

diff --git a/dist/js/functions.js b/dist/js/functions.js
deleted file mode 100644
index e9164308..00000000
--- a/dist/js/functions.js
+++ /dev/null
@@ -1,9 +0,0 @@
-function CheckPSK(psk, id) {
-  if(psk.value.length < 8 || psk.value.length > 63) { 
-    psk.style.background='#FFD0D0';
-    document.getElementById(id).disabled = true;
-  } else {
-    psk.style.background='#D0FFD0';
-    document.getElementById(id).disabled = false;
-  }
-}
diff --git a/index.php b/index.php
index b0816c37..c2a0e004 100755
--- a/index.php
+++ b/index.php
@@ -242,9 +242,6 @@ $theme_url = 'dist/css/'.htmlspecialchars($theme, ENT_QUOTES);
       
 
     
 
-    
-    
-
     
     
 

From 48c9880a92d8dcf0c3363505636d8994a55ab718 Mon Sep 17 00:00:00 2001
From: billz 
Date: Tue, 27 Aug 2019 16:40:57 +0100
Subject: [PATCH 25/25] Update panel class fix

---
 templates/networking.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/networking.php b/templates/networking.php
index 717f5851..ea534842 100644
--- a/templates/networking.php
+++ b/templates/networking.php
@@ -1,7 +1,7 @@
 

   

    

-    
 

+