From 97a9332cfbf4ecb45d3d2ae50d650838505e5fb3 Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 26 Feb 2020 10:02:26 +0100 Subject: [PATCH 01/21] =?UTF-8?q?=E2=80=9Ethreadr/profile/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/profile/index.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/threadr/profile/index.php b/threadr/profile/index.php index 4e4d144..9915cac 100644 --- a/threadr/profile/index.php +++ b/threadr/profile/index.php @@ -45,6 +45,8 @@ $username = $dbentry['name'];

    • - + + + From 52f37b65e090e14bb682c42b5d69ef1343e458e9 Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 26 Feb 2020 10:03:18 +0100 Subject: [PATCH 02/21] =?UTF-8?q?=E2=80=9Ethreadr/profile/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/profile/index.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/threadr/profile/index.php b/threadr/profile/index.php index 9915cac..94020ec 100644 --- a/threadr/profile/index.php +++ b/threadr/profile/index.php @@ -45,8 +45,5 @@ $username = $dbentry['name'];

    • - - - From f2509481c89e51b2e5ff676871326e66b54b10aa Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 26 Feb 2020 10:03:36 +0100 Subject: [PATCH 03/21] =?UTF-8?q?=E2=80=9Ethreadr/userhome/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/userhome/index.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/threadr/userhome/index.php b/threadr/userhome/index.php index 2041719..f6ff5d6 100644 --- a/threadr/userhome/index.php +++ b/threadr/userhome/index.php @@ -43,5 +43,8 @@ $username = $dbentry['name'];

    + + + From 1194d31a584e117c093b3da2ddd4de8d1c094a43 Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 26 Feb 2020 10:04:18 +0100 Subject: [PATCH 04/21] =?UTF-8?q?=E2=80=9Ethreadr/userhome/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/userhome/index.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/threadr/userhome/index.php b/threadr/userhome/index.php index f6ff5d6..2041719 100644 --- a/threadr/userhome/index.php +++ b/threadr/userhome/index.php @@ -43,8 +43,5 @@ $username = $dbentry['name'];

    - - - From 0bf6c75abd690e473257426ec9da459cb0956849 Mon Sep 17 00:00:00 2001 From: flambus Date: Wed, 26 Feb 2020 10:04:45 +0100 Subject: [PATCH 05/21] =?UTF-8?q?=E2=80=9Ethreadr/userhome/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/userhome/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/threadr/userhome/index.php b/threadr/userhome/index.php index 2041719..0ea89e2 100644 --- a/threadr/userhome/index.php +++ b/threadr/userhome/index.php @@ -33,6 +33,7 @@ $username = $dbentry['name'];
  • About
    • +
  • Profile
  • %LOGIN_LINK%

    • From a156c1518b6fac76a07122deb08a8ec4030533e0 Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 26 Feb 2020 10:06:36 +0100 Subject: [PATCH 06/21] =?UTF-8?q?=E2=80=9Ethreadr/profile/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/profile/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/threadr/profile/index.php b/threadr/profile/index.php index 94020ec..37a343b 100644 --- a/threadr/profile/index.php +++ b/threadr/profile/index.php @@ -42,7 +42,7 @@ $username = $dbentry['name'];
      -

      • +

    From 38a2019bdd9e0b8303bba45de843cdbd7604f624 Mon Sep 17 00:00:00 2001 From: flambus Date: Wed, 26 Feb 2020 10:09:41 +0100 Subject: [PATCH 07/21] =?UTF-8?q?=E2=80=9Ethreadr/profile/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/profile/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/threadr/profile/index.php b/threadr/profile/index.php index 37a343b..6ae0863 100644 --- a/threadr/profile/index.php +++ b/threadr/profile/index.php @@ -33,6 +33,7 @@ $username = $dbentry['name'];
  • About
    • +
  • Profile
  • %LOGIN_LINK%

    • From 140edeedaa86eb1aa0fdb5bba7dc1916bc6dd20a Mon Sep 17 00:00:00 2001 From: flambus Date: Wed, 26 Feb 2020 10:11:19 +0100 Subject: [PATCH 08/21] =?UTF-8?q?=E2=80=9Ethreadr/profile/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/profile/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/threadr/profile/index.php b/threadr/profile/index.php index 6ae0863..8eed9fc 100644 --- a/threadr/profile/index.php +++ b/threadr/profile/index.php @@ -33,7 +33,7 @@ $username = $dbentry['name'];
  • About
    • -
  • Profile
    • +
  • Profile
  • %LOGIN_LINK%

    • From 6177a8dff1d2cce9ce5fb47f10207575fabda853 Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 26 Feb 2020 10:22:48 +0100 Subject: [PATCH 09/21] =?UTF-8?q?=E2=80=9Ethreadr/profile/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/profile/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/threadr/profile/index.php b/threadr/profile/index.php index 8eed9fc..b65cf2d 100644 --- a/threadr/profile/index.php +++ b/threadr/profile/index.php @@ -44,6 +44,7 @@ $username = $dbentry['name'];

      • +
    From 5752094e3186ab6f79fdac52f0a6ed74bdbf8c93 Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 26 Feb 2020 10:23:46 +0100 Subject: [PATCH 10/21] =?UTF-8?q?=E2=80=9Ethreadr/profile/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/profile/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/threadr/profile/index.php b/threadr/profile/index.php index b65cf2d..39d0936 100644 --- a/threadr/profile/index.php +++ b/threadr/profile/index.php @@ -44,7 +44,7 @@ $username = $dbentry['name'];

      • -
    • +
    From dfe2b5d460bcd8a5c36b3955e36d8d13155c703a Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 26 Feb 2020 10:25:38 +0100 Subject: [PATCH 11/21] =?UTF-8?q?=E2=80=9Ethreadr/profile/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/profile/index.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/threadr/profile/index.php b/threadr/profile/index.php index 39d0936..d658afa 100644 --- a/threadr/profile/index.php +++ b/threadr/profile/index.php @@ -44,7 +44,9 @@ $username = $dbentry['name'];

      • +
      +
    From d058b6f1d8f961d11b323c789deeed6ac0d5cf51 Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 26 Feb 2020 10:27:41 +0100 Subject: [PATCH 12/21] =?UTF-8?q?=E2=80=9Ethreadr/profile/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/profile/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/threadr/profile/index.php b/threadr/profile/index.php index d658afa..3eda0c0 100644 --- a/threadr/profile/index.php +++ b/threadr/profile/index.php @@ -41,7 +41,7 @@ $username = $dbentry['name'];

    ThreadR

    -
    +

      • From f4ce887309cdf851df591465fd8c25fd57020c92 Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 26 Feb 2020 10:28:34 +0100 Subject: [PATCH 13/21] =?UTF-8?q?=E2=80=9Ethreadr/profile/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/profile/index.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/threadr/profile/index.php b/threadr/profile/index.php index 3eda0c0..4d86e1a 100644 --- a/threadr/profile/index.php +++ b/threadr/profile/index.php @@ -42,12 +42,10 @@ $username = $dbentry['name'];

      ThreadR

    -
      -

      • +

      -
    From cc021fb2b47ccfbb786b89335ac716c565355381 Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 26 Feb 2020 10:28:59 +0100 Subject: [PATCH 14/21] =?UTF-8?q?=E2=80=9Ethreadr/profile/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/profile/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/threadr/profile/index.php b/threadr/profile/index.php index 4d86e1a..38b2fac 100644 --- a/threadr/profile/index.php +++ b/threadr/profile/index.php @@ -42,7 +42,7 @@ $username = $dbentry['name'];

    ThreadR

    -

    +

    From 6b6491e11ac7d594583205741d07b61f365c2dbb Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 26 Feb 2020 10:34:14 +0100 Subject: [PATCH 15/21] =?UTF-8?q?=E2=80=9Ethreadr/profile/index.php?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadr/profile/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/threadr/profile/index.php b/threadr/profile/index.php index 38b2fac..78e63d6 100644 --- a/threadr/profile/index.php +++ b/threadr/profile/index.php @@ -44,7 +44,7 @@ $username = $dbentry['name'];

    - +
    From 03d49c82faa2c724c03e805043d446e736e231c1 Mon Sep 17 00:00:00 2001 From: Jakob Date: Wed, 26 Feb 2020 10:44:52 +0100 Subject: [PATCH 16/21] added %NAVBAR% --- variable_grabbler.pass1.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/variable_grabbler.pass1.json b/variable_grabbler.pass1.json index ca0f653..cce782a 100644 --- a/variable_grabbler.pass1.json +++ b/variable_grabbler.pass1.json @@ -1,4 +1,3 @@ { -"LOGIN_LINK":"Log out\";} else { echo \"Log in\";} ?>", -"HOME_LINK":"\\\"My\";} else { echo \"\\\"Home\\\"/\";} ?>" +"NAVBAR":"
    • \\\"My \"; } else { echo \" \\\"My \"; } } else { if ($navbar == \"home\"){ echo \" \\\"Home\\\"/ \"; } else { echo \" \\\"Home\\\"/ \"; } } ?>
    • News \"; } else { echo \" News \"; } } ?>
      • Board 1 Board 2 Board 3
    • About \"; } else { echo \" About \"; } } ?>
    • Profile \"; } else { echo \" Profile \"; } } ?>
    • Log out \"; } else { if ($navbar == \"login\") { echo \" Log in \"; } else { echo \" Log in \"; } } ?>

    ", } From fc2df2fae5a8948e1dc0e930df4efc193f4ac887 Mon Sep 17 00:00:00 2001 From: Jakob Date: Wed, 26 Feb 2020 10:47:10 +0100 Subject: [PATCH 17/21] added %NAVBAR% --- threadr/about/index.php | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/threadr/about/index.php b/threadr/about/index.php index 4eb6c0e..d570b0d 100644 --- a/threadr/about/index.php +++ b/threadr/about/index.php @@ -1,7 +1,7 @@ @@ -14,23 +14,7 @@ session_start(); - + %NAVBAR%

    About us and our website...

    From 607f2742355772c888a41ec5b03f4ca5464c3243 Mon Sep 17 00:00:00 2001 From: Jakob Date: Wed, 26 Feb 2020 10:48:32 +0100 Subject: [PATCH 18/21] =?UTF-8?q?=E2=80=9Evariable=5Fgrabbler.pass1.json?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- variable_grabbler.pass1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variable_grabbler.pass1.json b/variable_grabbler.pass1.json index cce782a..3608b93 100644 --- a/variable_grabbler.pass1.json +++ b/variable_grabbler.pass1.json @@ -1,3 +1,3 @@ { -"NAVBAR":"
    • \\\"My \"; } else { echo \" \\\"My \"; } } else { if ($navbar == \"home\"){ echo \" \\\"Home\\\"/ \"; } else { echo \" \\\"Home\\\"/ \"; } } ?>
    • News \"; } else { echo \" News \"; } } ?>
      • Board 1 Board 2 Board 3
    • About \"; } else { echo \" About \"; } } ?>
    • Profile \"; } else { echo \" Profile \"; } } ?>
    • Log out \"; } else { if ($navbar == \"login\") { echo \" Log in \"; } else { echo \" Log in \"; } } ?>

    ", +"NAVBAR":"
    • \\\"My \"; } else { echo \" \\\"My \"; } } else { if ($navbar == \"home\"){ echo \" \\\"Home\\\"/ \"; } else { echo \" \\\"Home\\\"/ \"; } } ?>
    • News \"; } else { echo \" News \"; } } ?>
      • Board 1 Board 2 Board 3
    • About \"; } else { echo \" About \"; } } ?>
    • Profile \"; } else { echo \" Profile \"; } } ?>
    • Log out \"; } else { if ($navbar == \"login\") { echo \" Log in \"; } else { echo \" Log in \"; } } ?>

    " } From 2f87827159e2ebc6a81336153961a86f6d6535be Mon Sep 17 00:00:00 2001 From: Jakob Date: Wed, 26 Feb 2020 10:55:10 +0100 Subject: [PATCH 19/21] fix: json escaping --- variable_grabbler.pass1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variable_grabbler.pass1.json b/variable_grabbler.pass1.json index 3608b93..0d9f3af 100644 --- a/variable_grabbler.pass1.json +++ b/variable_grabbler.pass1.json @@ -1,3 +1,3 @@ { -"NAVBAR":"
    • \\\"My \"; } else { echo \" \\\"My \"; } } else { if ($navbar == \"home\"){ echo \" \\\"Home\\\"/ \"; } else { echo \" \\\"Home\\\"/ \"; } } ?>
    • News \"; } else { echo \" News \"; } } ?>
      • Board 1 Board 2 Board 3
    • About \"; } else { echo \" About \"; } } ?>
    • Profile \"; } else { echo \" Profile \"; } } ?>
    • Log out \"; } else { if ($navbar == \"login\") { echo \" Log in \"; } else { echo \" Log in \"; } } ?>

    " +"NAVBAR":"\r\n\r\n
    \ No newline at end of file