View a policy version's content, and make policy text readable
CI / Tests (PHP 8.1) (pull_request) Successful in 50s
CI / Tests (PHP 8.2) (pull_request) Successful in 1m12s
CI / No Debug Code (pull_request) Successful in 3s
CI / Coding Standards (pull_request) Successful in 2m50s
CI / PHPStan (pull_request) Successful in 3m4s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m42s
CI / Build Plugin Zip (pull_request) Skipped
CI / Tests (PHP 8.1) (pull_request) Successful in 50s
CI / Tests (PHP 8.2) (pull_request) Successful in 1m12s
CI / No Debug Code (pull_request) Successful in 3s
CI / Coding Standards (pull_request) Successful in 2m50s
CI / PHPStan (pull_request) Successful in 3m4s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m42s
CI / Build Plugin Zip (pull_request) Skipped
The Policies admin page listed versions but never showed what any of them said, so revising a policy meant retyping it blind into an empty draft box. Each version row now has a View action that renders that version's text on the page, editable in place. A draft is saved back to itself; editing a published or archived version branches a new draft and leaves the original alone, because acceptances are recorded against policy_version_id and text a student agreed to must stay exactly as they saw it. That viewer also exposed why a studio reported the acceptance box as unreadable — one squashed line, overlapping words, a horizontal scrollbar. Bodies are typed into a bare textarea, so most carry no markup, and the raw text was emitted with its blank lines intact but nothing to turn them into paragraphs. PolicyVersion::bodyHtml() now renders every body the way WordPress renders post content (kses, then wpautop) and feeds all three consumers: the booking/enrolment JSON, the signup form, and the new viewer. Bodies written with markup are unaffected. The other half was that .us-policy-body had no CSS whatsoever and inherited whatever the theme did with an unstyled block in a form. It is now a bounded reading box that scrolls vertically and breaks long tokens, so a pasted URL cannot force the page sideways and a long policy cannot push the accept checkbox out of view. RegistrationPage was also never enqueueing the plugin stylesheet, which is why the signup gate looked worst of all. Closes #126 Closes #127 Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
@@ -116,6 +116,10 @@ class RegistrationPage {
|
||||
$canRegister = $open || $inviteValid;
|
||||
$inviteOnlyMessage = $this->inviteOnlyMessage( $atts );
|
||||
|
||||
// The signup form carries the same policy-acceptance markup as the booking
|
||||
// gate, so it needs the plugin stylesheet that formats it.
|
||||
wp_enqueue_style( 'us-scheduler' );
|
||||
|
||||
// The two-step script only matters when there is a second step to reveal.
|
||||
if ( $canRegister && '' === $successType && [] !== $accountQuestions ) {
|
||||
wp_enqueue_script( 'us-scheduler-register' );
|
||||
|
||||
@@ -19,20 +19,35 @@ class PolicyController {
|
||||
wp_die( esc_html__( 'You do not have permission to manage policies.', 'unsupervised-schedular' ) );
|
||||
}
|
||||
|
||||
$notice = '';
|
||||
$viewVersionId = 0;
|
||||
|
||||
if ( isset( $_POST['usc_action'] ) && check_admin_referer( 'usc_policy_action' ) ) {
|
||||
$this->handleFormAction();
|
||||
[ $notice, $viewVersionId ] = $this->handleFormAction();
|
||||
}
|
||||
|
||||
// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- read-only policy selector.
|
||||
$policyId = absint( Val::int( $_GET['policy_id'] ?? 0 ) );
|
||||
// phpcs:disable WordPress.Security.NonceVerification.Recommended -- read-only policy/version selectors.
|
||||
$policyId = absint( Val::int( $_GET['policy_id'] ?? 0 ) );
|
||||
if ( 0 === $viewVersionId ) {
|
||||
$viewVersionId = absint( Val::int( $_GET['version_id'] ?? 0 ) );
|
||||
}
|
||||
// phpcs:enable WordPress.Security.NonceVerification.Recommended
|
||||
|
||||
$policyList = $this->policies->findAll();
|
||||
$selectedPolicy = $policyId > 0 ? $this->policies->findById( $policyId ) : null;
|
||||
$policyVersions = null !== $selectedPolicy ? $this->versions->findByPolicy( (int) $selectedPolicy->id ) : null;
|
||||
$viewedVersion = null !== $selectedPolicy ? $this->loadVersionForPolicy( (int) $selectedPolicy->id, $viewVersionId ) : null;
|
||||
|
||||
include USC_PLUGIN_DIR . 'templates/admin/policies.php';
|
||||
}
|
||||
|
||||
private function handleFormAction(): void {
|
||||
/**
|
||||
* Process the posted action.
|
||||
*
|
||||
* @return array{string, int} Status notice, and the version to open in the
|
||||
* viewer (0 to leave the current selection alone).
|
||||
*/
|
||||
private function handleFormAction(): array {
|
||||
// Nonce is verified by the caller (renderPage) before this method runs.
|
||||
// phpcs:disable WordPress.Security.NonceVerification.Missing
|
||||
$action = sanitize_key( Val::string( wp_unslash( $_POST['usc_action'] ?? '' ) ) );
|
||||
@@ -53,12 +68,12 @@ class PolicyController {
|
||||
$this->service->createPolicy( $title, $slug, $scope );
|
||||
}
|
||||
|
||||
return;
|
||||
return [ '', 0 ];
|
||||
}
|
||||
|
||||
$policyId = absint( Val::int( $_POST['policy_id'] ?? 0 ) );
|
||||
if ( $policyId <= 0 || null === $this->policies->findById( $policyId ) ) {
|
||||
return;
|
||||
return [ '', 0 ];
|
||||
}
|
||||
|
||||
if ( 'add_version' === $action ) {
|
||||
@@ -66,6 +81,40 @@ class PolicyController {
|
||||
$this->service->addDraftVersion( $policyId, $body );
|
||||
}
|
||||
|
||||
if ( 'edit_version' === $action ) {
|
||||
$source = $this->loadVersionForPolicy( $policyId, absint( Val::int( $_POST['version_id'] ?? 0 ) ) );
|
||||
if ( null === $source ) {
|
||||
return [ '', 0 ];
|
||||
}
|
||||
|
||||
$body = wp_kses_post( Val::string( wp_unslash( $_POST['body'] ?? '' ) ) );
|
||||
|
||||
// A draft has never been shown to a student, so it is edited in place.
|
||||
// A published (or archived) version is what students accepted, so an
|
||||
// edit branches a new draft and leaves the original untouched.
|
||||
if ( PolicyVersion::STATUS_DRAFT === $source->status ) {
|
||||
$this->versions->updateBody( (int) $source->id, $body );
|
||||
|
||||
return [
|
||||
sprintf(
|
||||
/* translators: %d: the edited version number. */
|
||||
__( 'Draft version %d was updated.', 'unsupervised-schedular' ),
|
||||
$source->versionNumber
|
||||
),
|
||||
(int) $source->id,
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
sprintf(
|
||||
/* translators: %d: the version number the edit was based on. */
|
||||
__( 'Your changes to version %d were saved as a new draft version.', 'unsupervised-schedular' ),
|
||||
$source->versionNumber
|
||||
),
|
||||
$this->service->addDraftVersion( $policyId, $body ),
|
||||
];
|
||||
}
|
||||
|
||||
if ( 'publish_version' === $action ) {
|
||||
$versionId = absint( Val::int( $_POST['version_id'] ?? 0 ) );
|
||||
if ( $versionId > 0 ) {
|
||||
@@ -73,5 +122,20 @@ class PolicyController {
|
||||
}
|
||||
}
|
||||
// phpcs:enable WordPress.Security.NonceVerification.Missing
|
||||
|
||||
return [ '', 0 ];
|
||||
}
|
||||
|
||||
/**
|
||||
* Load a version by id, confirming it belongs to the given policy.
|
||||
*/
|
||||
private function loadVersionForPolicy( int $policyId, int $versionId ): ?PolicyVersion {
|
||||
if ( $versionId <= 0 ) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$version = $this->versions->findById( $versionId );
|
||||
|
||||
return null !== $version && $version->policyId === $policyId ? $version : null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -104,9 +104,9 @@ class PolicyEndpoint {
|
||||
'policy_version_id' => $version->id,
|
||||
'version_number' => $version->versionNumber,
|
||||
// Bodies are kses'd on every write path, but the booking JS renders
|
||||
// this HTML raw — sanitise at output too so a missed write path can
|
||||
// never become stored XSS.
|
||||
'body' => wp_kses_post( (string) $version->body ),
|
||||
// this HTML raw — bodyHtml() sanitises at output too, so a missed
|
||||
// write path can never become stored XSS.
|
||||
'body' => $version->bodyHtml(),
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
@@ -42,6 +42,19 @@ class PolicyVersion {
|
||||
return self::STATUS_PUBLISHED === $this->status;
|
||||
}
|
||||
|
||||
/**
|
||||
* The body as display-ready HTML.
|
||||
*
|
||||
* Policy bodies are typed into a plain textarea, so most are written as
|
||||
* blank-line-separated prose with no markup at all — dropped into a page
|
||||
* as-is that collapses into one unreadable run of text. Running the same
|
||||
* `wpautop()` WordPress applies to post content turns those breaks into
|
||||
* paragraphs, and leaves bodies that do carry markup alone.
|
||||
*/
|
||||
public function bodyHtml(): string {
|
||||
return wpautop( wp_kses_post( (string) $this->body ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a plain array representation of the version.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user