From 6f63a4afb823c5ea5f4e87bf2e01b5649f028ea8 Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Fri, 14 Feb 2025 05:08:06 -0700 Subject: [PATCH] fixed bugs that prevented proper grading. --- 5min/day7/css/.gitkeep | 0 5min/day7/css/styles.css | 0 5min/day7/img/.gitkeep | 0 5min/day7/includes/.gitkeep | 0 5min/day7/index.php | 19 +++++++++ 5min/day7/js/.gitkeep | 0 5min/day7/js/index.js | 0 5min/day8/css/.gitkeep | 0 5min/day8/css/styles.css | 0 5min/day8/img/.gitkeep | 0 5min/day8/includes/.gitkeep | 0 5min/day8/index.php | 26 +++++++++++ 5min/day8/js/.gitkeep | 0 5min/day8/js/index.js | 0 exercises/5/interpreter.txt | 5 +++ exercises/6/css/.gitkeep | 0 exercises/6/css/styles.css | 0 exercises/6/human-interpreter.txt | 4 ++ exercises/6/img/.gitkeep | 0 exercises/6/includes/.gitkeep | 0 exercises/6/index.php | 29 +++++++++++++ exercises/6/js/.gitkeep | 0 exercises/6/js/index.js | 0 poll/index.php | 11 +---- session/hidden.php | 71 ------------------------------- session/includes/account.php | 2 +- session/includes/functions.php | 4 +- session/includes/nav.php | 4 +- session/includes/video.php | 2 +- session/index.php | 5 ++- 30 files changed, 95 insertions(+), 87 deletions(-) create mode 100644 5min/day7/css/.gitkeep create mode 100644 5min/day7/css/styles.css create mode 100644 5min/day7/img/.gitkeep create mode 100644 5min/day7/includes/.gitkeep create mode 100644 5min/day7/index.php create mode 100644 5min/day7/js/.gitkeep create mode 100644 5min/day7/js/index.js create mode 100644 5min/day8/css/.gitkeep create mode 100644 5min/day8/css/styles.css create mode 100644 5min/day8/img/.gitkeep create mode 100644 5min/day8/includes/.gitkeep create mode 100644 5min/day8/index.php create mode 100644 5min/day8/js/.gitkeep create mode 100644 5min/day8/js/index.js create mode 100644 exercises/5/interpreter.txt create mode 100644 exercises/6/css/.gitkeep create mode 100644 exercises/6/css/styles.css create mode 100644 exercises/6/human-interpreter.txt create mode 100644 exercises/6/img/.gitkeep create mode 100644 exercises/6/includes/.gitkeep create mode 100644 exercises/6/index.php create mode 100644 exercises/6/js/.gitkeep create mode 100644 exercises/6/js/index.js delete mode 100644 session/hidden.php diff --git a/5min/day7/css/.gitkeep b/5min/day7/css/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/5min/day7/css/styles.css b/5min/day7/css/styles.css new file mode 100644 index 0000000..e69de29 diff --git a/5min/day7/img/.gitkeep b/5min/day7/img/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/5min/day7/includes/.gitkeep b/5min/day7/includes/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/5min/day7/index.php b/5min/day7/index.php new file mode 100644 index 0000000..bb9e1b7 --- /dev/null +++ b/5min/day7/index.php @@ -0,0 +1,19 @@ + + + + + Dummy Title + + + + + +

Hello cruel world!

+
+ + + +
+ + + diff --git a/5min/day7/js/.gitkeep b/5min/day7/js/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/5min/day7/js/index.js b/5min/day7/js/index.js new file mode 100644 index 0000000..e69de29 diff --git a/5min/day8/css/.gitkeep b/5min/day8/css/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/5min/day8/css/styles.css b/5min/day8/css/styles.css new file mode 100644 index 0000000..e69de29 diff --git a/5min/day8/img/.gitkeep b/5min/day8/img/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/5min/day8/includes/.gitkeep b/5min/day8/includes/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/5min/day8/index.php b/5min/day8/index.php new file mode 100644 index 0000000..87b104b --- /dev/null +++ b/5min/day8/index.php @@ -0,0 +1,26 @@ + + + + + Dummy Title + + + + + +

Hello cruel world!

+
+ + + +
+ + ' . $_GET['fname'] . '

'; + echo '

' . $_GET['lname'] . '

'; +} +?> + + + diff --git a/5min/day8/js/.gitkeep b/5min/day8/js/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/5min/day8/js/index.js b/5min/day8/js/index.js new file mode 100644 index 0000000..e69de29 diff --git a/exercises/5/interpreter.txt b/exercises/5/interpreter.txt new file mode 100644 index 0000000..c59b2ef --- /dev/null +++ b/exercises/5/interpreter.txt @@ -0,0 +1,5 @@ +

beavisandbutthead

+

beavisandbutthead

+

beavisandbutthead

+

first:beavis

middle:and

first:butthead

+

first:beavis

:and

last:butthead

diff --git a/exercises/6/css/.gitkeep b/exercises/6/css/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/exercises/6/css/styles.css b/exercises/6/css/styles.css new file mode 100644 index 0000000..e69de29 diff --git a/exercises/6/human-interpreter.txt b/exercises/6/human-interpreter.txt new file mode 100644 index 0000000..cc94ea1 --- /dev/null +++ b/exercises/6/human-interpreter.txt @@ -0,0 +1,4 @@ +

Fail

+

Match

+

Match

+

Match

diff --git a/exercises/6/img/.gitkeep b/exercises/6/img/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/exercises/6/includes/.gitkeep b/exercises/6/includes/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/exercises/6/index.php b/exercises/6/index.php new file mode 100644 index 0000000..4057ac3 --- /dev/null +++ b/exercises/6/index.php @@ -0,0 +1,29 @@ + + + + + Dummy Title + + + + + +

Hello cruel world!

+ + ' . $_POST['fname'] . '

'; + echo '

' . $_POST['lname'] . '

'; +} else { + echo ' +
+ + + +
+'; +} +?> + + + diff --git a/exercises/6/js/.gitkeep b/exercises/6/js/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/exercises/6/js/index.js b/exercises/6/js/index.js new file mode 100644 index 0000000..e69de29 diff --git a/poll/index.php b/poll/index.php index 0c70a40..9a026b2 100644 --- a/poll/index.php +++ b/poll/index.php @@ -37,10 +37,6 @@ $poll_options = [ 'Visual Studio Code', 'XCode', ]; - -if (isset($_POST['option'])) { - setcookie('form_submitted', 'true', time() + 3600, '/'); // Expires in 1 hour (adjust as needed) -} ?> @@ -55,7 +51,7 @@ if (isset($_POST['option'])) {

Poll

What is the best text editor or IDE?
'; @@ -76,10 +72,7 @@ if (!isset($_POST['option']) && !isset($_COOKIE['form_submitted'])) {
'; } else { echo "

Thank you! Here's the results.

"; - if ($_COOKIE['form_submitted']) - displayChart(); - else - updateDb($_POST['option']); + updateDb($_POST['option']); } ?> diff --git a/session/hidden.php b/session/hidden.php deleted file mode 100644 index ac1eee6..0000000 --- a/session/hidden.php +++ /dev/null @@ -1,71 +0,0 @@ - 'roast', 'bob' => 'ross'); -$access = false; - -if (isset($_POST['username']) && isset($_POST['password'])) { - $username = $_POST['username']; - $password = $_POST['password']; - if (array_key_exists($username, $users) && $users[$username] === $password) - $access = true; -} - -$file = 'fbi.txt'; - -function fileRead($file) -{ - if (isset($_GET['fbi'])) - $file = 'fbi.txt'; - else - $file = 'spies.txt'; - if ($access) { - echo "reading $file"; - $fs = fopen($file, 'r'); - $string = fread($fs, filesize($file)); - $values = explode('||>><<||', $string); - - echo ''; - foreach ($values as $v) { - list($a, $b) = explode(',', $v); - - echo ' - - - - - '; - } - echo '
' . $a . '' . $b . '
'; - } else - header('Location: .?access=false'); -} -?> - - - - - Spies - - - - - -

View Confidential Information

- -Access Granted

'; - - echo ' - - - '; - - fileRead($file); -} -?> - - - - - diff --git a/session/includes/account.php b/session/includes/account.php index f450535..583af26 100644 --- a/session/includes/account.php +++ b/session/includes/account.php @@ -1,7 +1,7 @@ View Confidential Information'; - if ($_SESSION['access'] !== true) { + if ($_SESSION['new-access'] !== true) { if (isset($_GET['error']) && $_GET['error'] === true) { echo '
@@ -103,7 +103,7 @@ function authUser() $row = mysqli_fetch_assoc($results); if ($row['password'] == $password) { - $_SESSION['access'] = true; + $_SESSION['new-access'] = true; $_GET['file'] = 'includes/fbi.txt'; $_SESSION['username'] = $username; } else { diff --git a/session/includes/nav.php b/session/includes/nav.php index 4d87dcc..0ca4de9 100644 --- a/session/includes/nav.php +++ b/session/includes/nav.php @@ -12,12 +12,12 @@ echo ' function getLogoutButton() { - if ($_SESSION['access'] === true) + if ($_SESSION['new-access'] === true) return ''; } if (isset($_GET['logout'])) { - $_SESSION['access'] = false; + $_SESSION['new-access'] = false; session_destroy(); header('Location: .'); } diff --git a/session/includes/video.php b/session/includes/video.php index 6f6c15f..420a437 100644 --- a/session/includes/video.php +++ b/session/includes/video.php @@ -1,7 +1,7 @@ YouTube Video'; diff --git a/session/index.php b/session/index.php index fea5ca6..029ea5b 100644 --- a/session/index.php +++ b/session/index.php @@ -1,5 +1,8 @@ - +