<!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>[12393] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-report-topic.php: Support Forums: Always require a reason for topic reports.</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/12393">12393</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/12393","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>Clorith</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-02-13 17:40:44 +0000 (Mon, 13 Feb 2023)</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'>Support Forums: Always require a reason for topic reports.

When reporting a topic, users have had the option to choose from a set of pre-determined reasons, or if none of the reasons were applicable, choosing the "other" alternative would give them a freeform text-field.

Using a pre-determined reason may leave reports short on context, where it could be down to the reporters interpretation why a reason was chosen, and would not be clear to those looking over reports.
This change addresses that by always requiring a user to not just choose a reason, but also provide context via the field asking "Why are you reporting this topic" when using the report tool in the sidebar.

Fixes <a href="http://meta.trac.wordpress.org/ticket/5706">#5706</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassreporttopicphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-report-topic.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassreporttopicphp"></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/support-forums/inc/class-report-topic.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/support-forums/inc/class-report-topic.php        2023-02-09 21:36:57 UTC (rev 12392)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-report-topic.php  2023-02-13 17:40:44 UTC (rev 12393)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,12 +105,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        remove_action( 'set_object_terms', array( $this, 'detect_manual_modlook' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px">                        wp_add_object_terms( $_POST['wporg-support-report-topic'], 'modlook', 'topic-tag' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $reason = $_POST['topic-report-reason'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            $reason = sprintf(
+                '%s: %s',
+                $_POST['topic-report-reason'],
+                $_POST['topic-report-reason-details']
+            );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( 'other-input' === $reason ) {
-                               $reason = $_POST['topic-report-reason-other'];
-                       }
-
</del><span class="cx" style="display: block; padding: 0 10px">                         $this->add_modlook_history( $_POST['wporg-support-report-topic'], $reason );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        wp_safe_redirect( get_the_permalink( $_POST['wporg-support-report-topic'] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +172,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                <input type="hidden" name="wporg-support-report-topic" value="<?php echo esc_attr( bbp_get_topic_id() ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                <label for="topic-report-reason"><?php _e( 'Report this topic for:', 'wporg-forums' ); ?></label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <select name="topic-report-reason" id="topic-report-reason" required="required" onchange="wporg_report_topic_change()">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <select name="topic-report-reason" id="topic-report-reason" required="required">
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <option value=""><?php _ex( '&mdash; Choose one &mdash;', 'Report a topic reason', 'wporg-forums' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <option><?php _ex( 'Guideline violation', 'Report a topic reason', 'wporg-forums' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <option><?php _ex( 'Security related', 'Report a topic reason', 'wporg-forums' ); ?></option>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,22 +180,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <option><?php _ex( 'NSFW (Not Safe For Work) link', 'Report a topic reason', 'wporg-forums' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <option value="other-input"><?php _ex( 'Other', 'Report a topic reason', 'wporg-forums' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px">                                </select>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <aside id="report-topic-other" style="display: none;">
-                                       <label for="topic-report-reason-other"><?php _e( 'Your own reason:', 'wporg-forums' ); ?></label>
-                                       <input type="text" name="topic-report-reason-other" id="topic-report-reason-other">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <aside id="report-topic-other">
+                                       <label for="topic-report-reason-details"><?php _e( 'Why are you reporting this topic:', 'wporg-forums' ); ?></label>
+                                       <input type="text" name="topic-report-reason-details" id="topic-report-reason-details" required="required">
</ins><span class="cx" style="display: block; padding: 0 10px">                                 </aside>
</span><span class="cx" style="display: block; padding: 0 10px">                                <input type="submit" name="submit" value="<?php esc_attr_e( 'Report', 'wporg-forums' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px">                        </form>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-            <script type="text/javascript">
-                function wporg_report_topic_change() {
-                       if ( 'other-input' === document.getElementById('topic-report-reason').value ) {
-                               document.getElementById( 'report-topic-other' ).style.display = 'block';
-                    } else {
-                                               document.getElementById( 'report-topic-other' ).style.display = 'none';
-                    }
-                }
-            </script>
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">                        $report_text = ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span></span></pre>
</div>
</div>

</body>
</html>