Skip to content

Fix: Extract closure to allow using early returns#666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
localheinz wants to merge 1 commit into from
Closed

Fix: Extract closure to allow using early returns #666

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 34 additions & 31 deletions manual/add-note.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,48 +44,49 @@
$user = "Anonymous";
}

// We don't know of any error now
$error = false;

// No note specified
if (strlen($note) == 0) {
$error = "You have not specified the note text.";
}

// SPAM challenge failed
elseif (!test_answer($_POST['func'], $_POST['arga'], $_POST['argb'], $_POST['answer'])) {

@localheinzlocalheinzJul 16, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This expression here is a bit difficult to refactor in the light of #664:

As @kamil-tekiela pointed out, it makes sense to fail early, and in order to fail early, I would need to add at least one condition here and a try-catch block, to attempt creating a challenge from

  • $_POST['func']
  • $_POST['arga']
  • $_POST['argb']

and if creating a challenge succeeded, compare the expected with the actual answer.

$error = 'SPAM challenge failed.';
}
$error = (static function (string $note, string $user, array $post): ?string {
// No note specified
if (strlen($note) == 0) {
return "You have not specified the note text.";
}

// The user name contains a malicious character
elseif (stristr($user, "|")) {
$error = "You have included bad characters within your username. We appreciate you may want to obfuscate your email further, but we have a system in place to do this for you.";
}
// SPAM challenge failed
if (!test_answer($post['func'], $post['arga'], $post['argb'], $post['answer'])) {
return 'SPAM challenge failed.';
}

// Check if the note is too long
elseif (strlen($note) >= 4096) {
$error = "Your note is too long. You'll have to make it shorter before you can post it. Keep in mind that this is not the place for long code examples!";
}
// The user name contains a malicious character
if (stristr($user, "|")) {
return "You have included bad characters within your username. We appreciate you may want to obfuscate your email further, but we have a system in place to do this for you.";
}

// Check if the note is not too short
elseif (strlen($note) < 32) {
$error = "Your note is too short. Trying to test the notes system? Save us the trouble of deleting your test, and don't. It works.";
}
// Check if the note is too long
if (strlen($note) >= 4096) {
return "Your note is too long. You'll have to make it shorter before you can post it. Keep in mind that this is not the place for long code examples!";
}

// Check if any line is too long
else {
// Check if the note is not too short
if (strlen($note) < 32) {
return "Your note is too short. Trying to test the notes system? Save us the trouble of deleting your test, and don't. It works.";
}

// Check if any line is too long
// Split the note by whitespace, and check length
foreach (preg_split("/\\s+/", $note) as $chunk) {
if (strlen($chunk) > 120) {
$error = "Your note contains a bit of text that will result in a line that is too long, even after using wordwrap().";
break;
return "Your note contains a bit of text that will result in a line that is too long, even after using wordwrap().";
}
}
}

return null;
})(
$note,
$user,
$_POST
);

// No error was found, and the submit action is required
if (!$error && strtolower($_POST['action']) !== "preview") {
if (!is_string($error) && strtolower($_POST['action']) !== "preview") {

$redirip = $_SERVER['HTTP_X_FORWARDED_FOR'] ??
($_SERVER['HTTP_VIA'] ?? '');
Expand DownExpand Up@@ -135,7 +136,9 @@

// There was an error, or a preview is needed
// If there was an error, print out
if ($error) { echo "<p class=\"formerror\">$error</p>\n"; }
if (is_string($error)) {
echo "<p class=\"formerror\">$error</p>\n";
}

// Print out preview of note
echo '<p>This is what your entry will look like, roughly:</p>';
Expand Down