<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14055] sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc: Photo Directory, Rejection: Separately store and display notes to user for approval and rejection.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/14055">14055</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/14055","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-09-16 20:34:15 +0000 (Mon, 16 Sep 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Photo Directory, Rejection: Separately store and display notes to user for approval and rejection.
- Allow moderator to leave a note to user when rejecting a published photo
- For pending photos, only show the note to user field corresponding to approval/rejection based on the rejection dropdown choice
- Blank and hide rejection note to user if photo is not being rejected
Fixes <a href="http://meta.trac.wordpress.org/ticket/7772">#7772</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincmoderationphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/moderation.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincrejectionphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/rejection.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincmoderationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/moderation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/moderation.php 2024-09-16 04:43:58 UTC (rev 14054)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/moderation.php 2024-09-16 20:34:15 UTC (rev 14055)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,7 +390,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for moderator's note to user.
</span><span class="cx" style="display: block; padding: 0 10px"> $mod_note = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mod_note_to_user = Rejection::get_moderator_note_to_user( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mod_note_to_user = Rejection::get_moderator_note_to_user( $post, 'publish' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $mod_note_to_user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $mod_note = "\n" . __( 'Message from the moderator:', 'wporg-photos' ) . "\n{$mod_note_to_user}\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,7 +474,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for moderator's note to user.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mod_note = Rejection::get_moderator_note_to_user( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mod_note = Rejection::get_moderator_note_to_user( $post, 'reject' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $mod_note ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $rejection_message .= "\n" . __( 'Message from the moderator:', 'wporg-photos' ) . "\n" . $mod_note . "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -547,7 +547,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for moderator's note to user.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mod_note = Rejection::get_moderator_note_to_user( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mod_note = Rejection::get_moderator_note_to_user( $post, 'reject' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $mod_note ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $rejection_message .= "\n" . __( 'Message from the moderator:', 'wporg-photos' ) . "\n" . $mod_note . "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincrejectionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/rejection.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/rejection.php 2024-09-16 04:43:58 UTC (rev 14054)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/rejection.php 2024-09-16 20:34:15 UTC (rev 14055)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,9 +207,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'moderator_note_to_user' => [
</span><span class="cx" style="display: block; padding: 0 10px"> 'input_in_metabox' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_config' => [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'A message sent to the user by the moderator within the approval/rejection email.', 'wporg-photos' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'A message sent to the user by the moderator within the rejection email.', 'wporg-photos' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'moderator_note_to_user_on_publish' => [
+ 'input_in_metabox' => true,
+ 'meta_config' => [
+ 'description' => __( 'A message sent to the user by the moderator within the approval email.', 'wporg-photos' ),
+ ],
+ ],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'moderator_private_note' => [
</span><span class="cx" style="display: block; padding: 0 10px"> 'input_in_metabox' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_config' => [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,10 +371,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns the note the moderator has for the user.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int|WP_Post The post or post ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * There are two types of notes to user:
+ * - 'publish': A note sent to the user when a photo is published.
+ * - 'reject': A note sent to the user when a photo is rejected.
+ *
+ * It is possible for both types of notes to apply to a photo. However, it currently does not make sense
+ * for two separate notes of a given type to be possible, nor does the implementation support it.
+ *
+ * @param int|WP_Post $post The post or post ID.
+ * @param string $type The note type. Either 'reject' or 'publish'. Default 'reject'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function get_moderator_note_to_user( $post ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function get_moderator_note_to_user( $post, $type = 'reject' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $post ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,13 +389,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return get_post_meta( $post->ID, 'moderator_note_to_user', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_key = ( 'publish' === $type ) ? 'moderator_note_to_user_on_publish' : 'moderator_note_to_user';
+
+ return get_post_meta( $post->ID, $meta_key, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns the private note left by the moderator.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int|WP_Post The post or post ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|WP_Post $post The post or post ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_moderator_private_note( $post ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -846,6 +862,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> document.querySelector('#publish').disabled = hasRejectReason;
</span><span class="cx" style="display: block; padding: 0 10px"> // Reject button should be disabled if no rejection reason is selected.
</span><span class="cx" style="display: block; padding: 0 10px"> document.querySelector('#reject-post').disabled = !hasRejectReason;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Rejection note to user should be disabled if no rejection reason is selected.
+ const inputRejectNoteToUser = document.querySelector('#moderator_note_to_user');
+ if ( inputRejectNoteToUser ) {
+ inputRejectNoteToUser.disabled = !hasRejectReason || rejectSelect.disabled;
+ const rejectNoteToUser = document.querySelector('.moderator_note_to_user');
+ // Potentially hide the note input based on whether the dropdown has a value.
+ rejectNoteToUser.style.display = !hasRejectReason ? 'none' : 'block';
+ // If choosing to not reject photo, then delete the rejection note content to avoid it being saved.
+ if ( !hasRejectReason ) {
+ inputRejectNoteToUser.value = '';
+ }
+ }
+
+ // Handling for the note-to-user fields for a pending photo (to facilitate only showing one at a time).
+ const pendingPublishNoteToUser = document.querySelector('.pending_moderator_note_to_user.moderator_note_to_user_on_publish');
+ const pendingRejectNoteToUser = document.querySelector('.pending_moderator_note_to_user.moderator_note_to_user');
+ if ( pendingPublishNoteToUser && pendingRejectNoteToUser ) {
+ // Hide one of the note-to-user fields if awaiting initial moderation.
+ pendingPublishNoteToUser.style.display = ( hasRejectReason ? 'none' : 'block' );
+ pendingRejectNoteToUser.style.display = ( hasRejectReason ? 'block' : 'none' );
+
+ // When a note field gets hidden, transfer note field value to other note then clear it out.
+ if ( 'none' === pendingPublishNoteToUser.style.display ) {
+ const pendingPublishNote = pendingPublishNoteToUser.querySelector('textarea').value;
+ // Transfer value from approval note to rejection note if it had a value.
+ if ( pendingPublishNote ) {
+ pendingRejectNoteToUser.querySelector('textarea').value = pendingPublishNote;
+ }
+ pendingPublishNoteToUser.querySelector('textarea').value = '';
+ } else {
+ const pendingRejectNote = pendingRejectNoteToUser.querySelector('textarea').value;
+ // Transfer value from rejection note to approval note if it had a value.
+ if ( pendingRejectNote ) {
+ pendingPublishNoteToUser.querySelector('textarea').value = pendingRejectNote;
+ }
+ pendingRejectNoteToUser.querySelector('textarea').value = '';
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Notice of rejection of published post should be shown if post is published.
</span><span class="cx" style="display: block; padding: 0 10px"> const rejectPublishWarn = document.querySelector('.reject-warn-if-about-to-reject-published');
</span><span class="cx" style="display: block; padding: 0 10px"> if ( rejectPublishWarn ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -903,14 +958,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="reject-additional-fields">';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Assign a class only if the post is currently in a pending state.
+ $note_to_user_label_class = ( $is_disabled ? '' : ' pending_moderator_note_to_user' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Markup for optional note to send to user in rejection email.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<label for="moderator_note_to_user">' . __( '(Optional) Note to user:', 'wporg-photos' );
- echo '<p class="description"><em>' . __( 'Included in approval/rejection email.', 'wporg-photos' ) . '</em></p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<label for="moderator_note_to_user" class="moderator_note_to_user' . esc_attr( $note_to_user_label_class ) . '">' . __( '(Optional) Note to user on rejection:', 'wporg-photos' );
+ echo '<p class="description"><em>' . __( 'Included in rejection email.', 'wporg-photos' ) . '</em></p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<textarea id="moderator_note_to_user" name="moderator_note_to_user" rows="4"' . disabled( true, $is_disabled, false ) . '>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo esc_textarea( self::get_moderator_note_to_user( $post ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo esc_textarea( self::get_moderator_note_to_user( $post, 'reject' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '</textarea>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</label>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Markup for optional note sent to user in approval email.
+ echo '<label for="moderator_note_to_user_on_publish" class="moderator_note_to_user_on_publish' . esc_attr( $note_to_user_label_class ) . '">' . __( '(Optional) Note to user on approval:', 'wporg-photos' );
+ echo '<p class="description"><em>' . __( 'Included in approval email.', 'wporg-photos' ) . '</em></p>';
+ echo '<textarea id="moderator_note_to_user_on_publish" name="moderator_note_to_user_on_publish" rows="4"' . disabled( true, $is_disabled, false ) . '>';
+ echo esc_textarea( self::get_moderator_note_to_user( $post, 'publish' ) );
+ echo '</textarea>';
+ echo '</label>';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Markup for optional private note for moderator-eyes only.
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<label for="moderator_private_note">' . __( '(Optional) Private moderators-only note:', 'wporg-photos' );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<textarea id="moderator_private_note" name="moderator_private_note" rows="4">';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1074,7 +1140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'rejected_reason':
</span><span class="cx" style="display: block; padding: 0 10px"> echo self::get_rejection_reason( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> // Add asterisk to denote there was a moderator note to user.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( self::get_moderator_note_to_user( $post_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( self::get_moderator_note_to_user( $post_id, 'reject' ) || self::get_moderator_note_to_user( $post_id, 'publish' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '*';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span></span></pre>
</div>
</div>
</body>
</html>