<!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>[2401] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php: WordCamp Post Type: Inform users which fields are required.</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/2401">2401</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/2401","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-01-28 18:53:46 +0000 (Thu, 28 Jan 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: Inform users which fields are required.
The `required` attribute wasn't added to the `input` fields, since the browser would have to know which status the post is moving towards, and there's already server-side validation for that.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampadminphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampadminphp"></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/wcpt-wordcamp/wordcamp-admin.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/wcpt-wordcamp/wordcamp-admin.php 2016-01-28 17:26:52 UTC (rev 2400)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php 2016-01-28 18:53:46 UTC (rev 2401)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,29 +626,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // The ID of the last site that was created before this rule went into effect, so that we don't apply the rule retroactively.
</span><span class="cx" style="display: block; padding: 0 10px"> $min_site_id = apply_filters( 'wcpt_require_complete_meta_min_site_id', '2416297' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $required_pending_fields = array( 'E-mail Address' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $required_pending_fields = $this->get_required_fields( 'pending' );
+ $required_publish_fields = $this->get_required_fields( 'publish' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $required_publish_fields = array(
- // WordCamp
- 'Start Date (YYYY-mm-dd)',
- 'Location',
- 'URL',
- 'E-mail Address',
- 'Number of Anticipated Attendees',
- 'Multi-Event Sponsor Region',
-
- // Organizing Team
- 'Organizer Name',
- 'WordPress.org Username',
- 'Email Address',
- 'Telephone',
- 'Mailing Address',
- 'Sponsor Wrangler Name',
- 'Sponsor Wrangler E-mail Address',
- 'Budget Wrangler Name',
- 'Budget Wrangler E-mail Address',
- );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Check pending posts
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'pending' == $post_data['post_status'] && absint( $_POST['post_ID'] ) > $min_site_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( $required_pending_fields as $field ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -679,6 +659,55 @@
</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">+ * Get a list of fields required to move to a certain post status
+ *
+ * @param string $status 'pending' | 'publish' | 'any'
+ *
+ * @return array
+ */
+ public static function get_required_fields( $status ) {
+ $pending = array( 'E-mail Address' );
+
+ $publish = array(
+ // WordCamp
+ 'Start Date (YYYY-mm-dd)',
+ 'Location',
+ 'URL',
+ 'E-mail Address',
+ 'Number of Anticipated Attendees',
+ 'Multi-Event Sponsor Region',
+
+ // Organizing Team
+ 'Organizer Name',
+ 'WordPress.org Username',
+ 'Email Address',
+ 'Telephone',
+ 'Mailing Address',
+ 'Sponsor Wrangler Name',
+ 'Sponsor Wrangler E-mail Address',
+ 'Budget Wrangler Name',
+ 'Budget Wrangler E-mail Address',
+ );
+
+ switch ( $status ) {
+ case 'pending':
+ $required_fields = $pending;
+ break;
+
+ case 'publish':
+ $required_fields = $publish;
+ break;
+
+ case 'any':
+ default:
+ $required_fields = array_merge( $pending, $publish );
+ break;
+ }
+
+ return $required_fields;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Add our custom admin notice keys to the redirect URL.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Any member can add a key to $this->active_admin_notices to signify that the corresponding message should
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -790,6 +819,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wcpt_metabox( $meta_keys ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $post_id;
</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 = WordCamp_Admin::get_required_fields( 'any' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // @todo When you refactor meta_keys() to support changing labels -- see note in meta_keys() -- also make it support these notes
</span><span class="cx" style="display: block; padding: 0 10px"> $messages = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Telephone' => 'Required for shipping.',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -798,7 +829,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $meta_keys as $key => $value ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $object_name = wcpt_key_to_str( $key, 'wcpt_' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><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"> <div class="inside">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -813,6 +843,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <strong><?php echo $key; ?></strong>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( in_array( $key, $required_fields, true ) ) : ?>
+ <span class="description"><?php _e( '(required)', 'wordcamporg' ); ?></span>
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span></span></pre>
</div>
</div>
</body>
</html>