+
+
+
v |
Created by the RaspAP Team
@@ -8,3 +10,19 @@
+
+
diff --git a/includes/functions.php b/includes/functions.php
index 02cce1c6..4316ed5d 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -1,3 +1,4 @@
+
login($username, $password)) {
+ $config = $auth->getAuthConfig();
+ header('Location: ' . $redirectUrl);
+ die();
+ } else {
+ $status = "Login failed";
+ }
+ }
+ }
+
+ echo renderTemplate(
+ "login", compact(
+ "status",
+ "redirectUrl"
+ )
+ );
+}
+
diff --git a/includes/page_actions.php b/includes/page_actions.php
index 2e406bf8..c9649792 100755
--- a/includes/page_actions.php
+++ b/includes/page_actions.php
@@ -70,6 +70,9 @@ function handleCorePageAction(string $page, array &$extraFooterScripts): void
case "/about":
DisplayAbout();
break;
+ case "/login":
+ DisplayLogin();
+ break;
default:
DisplayDashboard($extraFooterScripts);
}
diff --git a/includes/session.php b/includes/session.php
index fe447f3d..12e45fec 100755
--- a/includes/session.php
+++ b/includes/session.php
@@ -3,3 +3,8 @@
if (session_status() == PHP_SESSION_NONE) {
session_start();
}
+
+if (!isset($_SESSION['lastActivity'])) {
+ $_SESSION['lastActivity'] = time();
+}
+
diff --git a/includes/wireguard.php b/includes/wireguard.php
index ed47a6e1..2cca31db 100755
--- a/includes/wireguard.php
+++ b/includes/wireguard.php
@@ -207,7 +207,10 @@ function SaveWireGuardConfig($status)
}
if (isset($_POST['wg_pendpoint']) && strlen(trim($_POST['wg_pendpoint']) >0 )) {
$wg_pendpoint_seg = substr($_POST['wg_pendpoint'],0,strpos($_POST['wg_pendpoint'],':'));
- if (!filter_var($wg_pendpoint_seg,FILTER_VALIDATE_IP)) {
+ $host_port = explode(':', $wg_pendpoint_seg);
+ $hostname = $host_port[0];
+ if (!filter_var($hostname, FILTER_VALIDATE_IP) &&
+ !filter_var($hostname, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) {
$status->addMessage('Invalid value for endpoint address', 'danger');
$good_input = false;
}
diff --git a/index.php b/index.php
index c1d39e94..50eeec73 100755
--- a/index.php
+++ b/index.php
@@ -14,7 +14,7 @@
* @author Lawrence Yau
* @author Bill Zimmerman
* @license GNU General Public License, version 3 (GPL-3.0)
- * @version 3.2.4
+ * @version 3.2.5
* @link https://github.com/RaspAP/raspap-webgui/
* @link https://raspap.com/
* @see http://sirlagz.net/2013/02/08/raspap-webgui/
@@ -23,6 +23,7 @@
* as you leave these references intact in the header comments of your source files.
*/
+require 'includes/session.php';
require 'includes/csrf.php';
ensureCSRFSessionToken();
@@ -35,6 +36,7 @@ require_once 'includes/functions.php';
// Default page actions
require_once 'includes/dashboard.php';
+require_once 'includes/login.php';
require_once 'includes/authenticate.php';
require_once 'includes/admin.php';
require_once 'includes/dhcp.php';
@@ -63,7 +65,7 @@ initializeApp();
- <?php echo _("RaspAP WiFi Configuration Portal"); ?>
+ <?php echo RASPI_BRAND_TITLE; ?>
@@ -96,6 +98,7 @@ initializeApp();
+
@@ -123,6 +126,7 @@ initializeApp();
+
+
+
+