Displays friendly URLs correctly in error log #8443
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Jon Stovell <[email protected]>
jdarwood007
reviewed
Feb 5, 2025
| @@ -232,7 +233,7 @@ public function view(): void | |||
| 'time' => Time::create('@' . $row['log_time'])->format(), | |||
| 'timestamp' => $row['log_time'], | |||
| 'url' => [ | |||
| 'html' => Utils::htmlspecialchars(!str_contains($row['url'], 'cron.php') ? (str_starts_with($row['url'], '?') ? Config::$scripturl : '') . $row['url'] : $row['url']), | |||
| 'html' => Utils::htmlspecialchars((Url::create($row['url'])->isValid() ? '' : Config::$boardurl) . $row['url']), | |||
There was a problem hiding this comment.
So if the url is valid, we show nothing, otherwise we assume its a partial url and add in the boardurl? Why not show it if its a valid url?
There was a problem hiding this comment.
No. If the URL is valid then we show it as-is. If it isn't then we prepend Config::$boardurl.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #8440
Previously we had attempted to be clever about figuring out what parts of the URL to record in the log and then about how to reconstruct the complete URL when displaying the log.
Now we keep it simple:
When recording, if the URL starts with Config::$boardurl, we chop off Config::$boardurl and save the remainder. If the URL does not start with Config::$boardurl for whatever reason, we record the whole URL.
When displaying, if the recorded value is a complete URL, we display it as-is. Otherwise, we prepend Config::$boardurl to it.
This does mean that people who have not enabled the option to hide index.php in their URLs will have
/index.phpat the start of all the recorded values in theurlfield of the error log table. But that's really not a big deal.