From 6a8493c8637c059b60eaee02dc392532d8a85930 Mon Sep 17 00:00:00 2001 From: BodgeMaster <> Date: Wed, 26 Feb 2020 19:03:55 +0100 Subject: [PATCH] %NAVBAR%ized all the pages. I hope, there are no errors. --- threadr/boards/index.php | 20 ++------------------ threadr/index.php | 1 + threadr/login/index.php | 20 ++------------------ threadr/logout/index.php | 18 ++---------------- threadr/news/index.php | 19 ++----------------- threadr/profile/index.php | 21 +++------------------ threadr/signup/index.php | 10 ++-------- threadr/signup/verify-email/index.php | 20 ++------------------ threadr/test.php | 2 -- threadr/userhome/index.php | 22 ++++------------------ 10 files changed, 20 insertions(+), 133 deletions(-) delete mode 100644 threadr/test.php diff --git a/threadr/boards/index.php b/threadr/boards/index.php index de209c4..20cee0a 100644 --- a/threadr/boards/index.php +++ b/threadr/boards/index.php @@ -2,6 +2,7 @@ //todo: fix automatic log out when opening "Boards" session_start(); %NO_CHEAP_SESSION_STEALING% +$navbar="boards"; ?> @@ -12,24 +13,7 @@ session_start(); - -
+ %NAVBAR%

ThreadR Boards

diff --git a/threadr/index.php b/threadr/index.php index 3e31637..de96440 100644 --- a/threadr/index.php +++ b/threadr/index.php @@ -1,6 +1,7 @@ diff --git a/threadr/login/index.php b/threadr/login/index.php index 41f35b5..9524298 100644 --- a/threadr/login/index.php +++ b/threadr/login/index.php @@ -1,6 +1,7 @@ @@ -11,24 +12,7 @@ session_start(); - + %NAVBAR%
diff --git a/threadr/logout/index.php b/threadr/logout/index.php index 5f0e809..4db917e 100644 --- a/threadr/logout/index.php +++ b/threadr/logout/index.php @@ -5,6 +5,7 @@ if (ini_get("session.use_cookies")) { setcookie(session_name(), '', time() - 42000, $params["path"], $params["domain"], $params["secure"], $params["httponly"]); } session_destroy(); +$navbar = "logout"; ?> @@ -15,22 +16,7 @@ session_destroy(); - + %NAVBAR%
diff --git a/threadr/news/index.php b/threadr/news/index.php index 0baba9f..09a982c 100644 --- a/threadr/news/index.php +++ b/threadr/news/index.php @@ -2,6 +2,7 @@ //todo: fix automatic log out when opening "News" session_start(); %NO_CHEAP_SESSION_STEALING% +$navbar = "news"; ?> @@ -12,23 +13,7 @@ session_start(); - + %NAVBAR%
diff --git a/threadr/profile/index.php b/threadr/profile/index.php index 78e63d6..a23cc4e 100644 --- a/threadr/profile/index.php +++ b/threadr/profile/index.php @@ -7,6 +7,8 @@ $statement = $pdo->prepare('SELECT name FROM users WHERE id = :user_id;'); // to $result = $statement->execute(array('user_id' => $_SESSION['user_id'])); $dbentry = $statement->fetch(); $username = $dbentry['name']; + +$navbar = "profile"; ?> @@ -19,24 +21,7 @@ $username = $dbentry['name']; - -
+ %NAVBAR%

ThreadR

diff --git a/threadr/signup/index.php b/threadr/signup/index.php index 56c7ebc..0516765 100644 --- a/threadr/signup/index.php +++ b/threadr/signup/index.php @@ -1,6 +1,7 @@ @@ -12,14 +13,7 @@ session_start(); - -
+ %NAVBAR%

Create your ThreadR account

diff --git a/threadr/signup/verify-email/index.php b/threadr/signup/verify-email/index.php index e726a28..541d8df 100644 --- a/threadr/signup/verify-email/index.php +++ b/threadr/signup/verify-email/index.php @@ -26,6 +26,7 @@ $pdo = new PDO('mysql:host=localhost;dbname=web', 'webstuff', 'Schei// auf Pa$$w0rter!'); //$statement = $pdo->prepare(''); +$navbar = "verify-email"; ?> @@ -36,24 +37,7 @@ - -
+ %NAVBAR%

diff --git a/threadr/test.php b/threadr/test.php deleted file mode 100644 index c64b080..0000000 --- a/threadr/test.php +++ /dev/null @@ -1,2 +0,0 @@ - -%NAVBAR% \ No newline at end of file diff --git a/threadr/userhome/index.php b/threadr/userhome/index.php index 0ea89e2..d93ee6e 100644 --- a/threadr/userhome/index.php +++ b/threadr/userhome/index.php @@ -9,6 +9,9 @@ $statement = $pdo->prepare('SELECT name FROM users WHERE id = :user_id;'); // to $result = $statement->execute(array('user_id' => $_SESSION['user_id'])); $dbentry = $statement->fetch(); $username = $dbentry['name']; + +$navbar = "home"; +//ToDo: differentiate between home and userhome (or auto-redirect) ?> @@ -19,24 +22,7 @@ $username = $dbentry['name']; - -
+ %NAVBAR%

ThreadR