<!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>[3366] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt: WordCamp Post Type: Enforce required fields during application processing.</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 { 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/3366">3366</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/3366","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-14 22:46:04 +0000 (Tue, 14 Jun 2016)</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'>WordCamp Post Type: Enforce required fields during application processing.
The client-side validation is best for UX, but this is still necessary to prevent bots.
See https://make.wordpress.org/community/2016/06/13/monday-daily-updates-47/#comment-22200</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptapplicationswordcampphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/applications/wordcamp.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptviewsapplicationscommonsubmissionresultsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/views/applications/common/submission-results.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptapplicationswordcampphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/applications/wordcamp.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/applications/wordcamp.php 2016-06-14 22:18:31 UTC (rev 3365)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/applications/wordcamp.php 2016-06-14 22:46:04 UTC (rev 3366)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,14 +47,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['submit-application'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $application_data = validate_data( $_POST );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- create_wordcamp_post( $application_data );
- notify_applicant_application_received( $application_data['q_1079059_email'], $application_data['q_1079103_wordcamp_location'] );
- $message = "Thank you for your application! We've received it, and we'll contact you once we've had a chance to review it.";
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $application_data ) ) {
+ $message = $application_data->get_error_message();
+ $notice_classes = 'notice-error';
+ } else {
+ create_wordcamp_post( $application_data );
+ notify_applicant_application_received( $application_data['q_1079059_email'], $application_data['q_1079103_wordcamp_location'] );
+ $message = "Thank you for your application! We've received it, and we'll contact you once we've had a chance to review it.";
+ $notice_classes = 'notice-success';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> require( dirname( __DIR__ ) . '/views/applications/common/submission-results.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $countries = wcorg_get_countries();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> require( dirname( __DIR__ ) . '/views/applications/wordcamp/shortcode-application.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,12 +73,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $unsafe_data
</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 array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array|\WP_Error
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function validate_data( $unsafe_data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $safe_data = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $unsafe_data = shortcode_atts( get_default_application_values(), $unsafe_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $required_fields = array(
+ 'q_1079074_first_name', 'q_1079074_last_name', 'q_1079059_email', 'q_4236565_wporg_username',
+ 'q_1079103_wordcamp_location',
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach( $unsafe_data as $key => $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $safe_data[ $key ] = array_map( 'sanitize_text_field', $value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,6 +92,12 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $required_fields as $field ) {
+ if ( empty ( $safe_data[ $field ] ) ) {
+ return new \WP_Error( 'required_fields', "Please click on your browser's Back button, and fill in all of the required fields." );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $safe_data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptviewsapplicationscommonsubmissionresultsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/views/applications/common/submission-results.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/views/applications/common/submission-results.php 2016-06-14 22:18:31 UTC (rev 3365)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/views/applications/common/submission-results.php 2016-06-14 22:46:04 UTC (rev 3366)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,6 +5,6 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div class="notice notice-large notice-success">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="notice notice-large <?php echo esc_attr( $notice_classes ); ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $message ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>