<!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>[11271] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/upload.php: Theme Directory: Add a set of checkboxes authors must agree to before uploads can be processed.</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/11271">11271</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/11271","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-10-11 04:35:48 +0000 (Mon, 11 Oct 2021)</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'>Theme Directory: Add a set of checkboxes authors must agree to before uploads can be processed.
This ensures that authors are aware of the requirements prior to the upload being processed (and we can now assume they are aware of it).
The result of these checkboxes are not stored anywhere, but the upload cannot proceed unless they're checked, so all uploads after now will have agreed with them.
Fixes <a href="http://meta.trac.wordpress.org/ticket/1514">#1514</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryuploadphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/upload.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryuploadphp"></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/theme-directory/upload.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/theme-directory/upload.php 2021-10-08 05:41:01 UTC (rev 11270)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/upload.php 2021-10-11 04:35:48 UTC (rev 11271)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,9 +29,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_themes_render_upload_shortcode() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_user_logged_in() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $log_in_text = sprintf(
- __( 'Before you can upload a new theme, <a href="%s">please log in</a>.', 'wporg-themes' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return sprintf(
+ '<p>' . __( 'Before you can upload a new theme, <a href="%s">please log in</a>.', 'wporg-themes' ) . '</p>',
</ins><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> 'redirect_to',
</span><span class="cx" style="display: block; padding: 0 10px"> urlencode( 'https://wordpress.org/themes/upload/' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,11 +37,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://login.wordpress.org/'
</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 '<p>' . $log_in_text . '</p>';
</del><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">- $notice = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notice = '';
+ $terms_notice = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> ! empty( $_POST['_wpnonce'] ) &&
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $messages = wporg_themes_process_upload();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $notice_content = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $code = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $messages ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $messages->get_error_codes() as $code ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,21 +61,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $notice_content = "<li>{$messages}</li>";
</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">- $notice = "<div class='notice notice-warning notice-large'><ul>{$notice_content}</ul></div>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'pre_upload_terms' === $code ) {
+ $terms_notice = "<div class='notice notice-error notice-large'><ul>{$notice_content}</ul></div>";
+ } else {
+ $notice = "<div class='notice notice-warning notice-large'><ul>{$notice_content}</ul></div>";
+ }
</ins><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">- $form = '<h2>' . __( 'Select your zipped theme file', 'wporg-themes' ) . '</h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $notice . '<h2>' . __( 'Select your zipped theme file', 'wporg-themes' ) . '</h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <form enctype="multipart/form-data" id="upload_form" method="POST" action="" onsubmit="jQuery(\'#upload_button\').attr(\'disabled\',\'disabled\'); return true;">
</span><span class="cx" style="display: block; padding: 0 10px"> ' . wp_nonce_field( 'wporg-themes-upload', '_wpnonce', true, false ) . '
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="upload"/>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="file" id="zip_file" name="zip_file" size="25"/>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <button id="upload_button" class="button" type="submit" value="' . esc_attr__( 'Upload', 'wporg-themes' ) . '">' . esc_html__( 'Upload', 'wporg-themes' ) . '</button>
</del><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <small>' . sprintf( __( 'Maximum allowed file size: %s', 'wporg-themes' ), esc_html( size_format( wp_max_upload_size() ) ) ) . '</small>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ ' . $terms_notice . '
+
+ <p>
+ <label><input type="checkbox" required="required" name="required_terms[permission]"> ' . __( 'I have permission to upload this theme to WordPress.org for others to use and share.', 'wporg-themes' ) . '</label><br>
+ <label><input type="checkbox" required="required" name="required_terms[guidelines]"> ' . sprintf( __( 'The theme complies with all <a href="%s">Theme Guidelines</a>.', 'wporg-themes' ), 'https://make.wordpress.org/themes/handbook/review/required/' ) . '</label><br>
+ <label><input type="checkbox" required="required" name="required_terms[gpl]"> ' . sprintf( __( 'The theme, and all included assets, <a href="%s">are licenced as GPL or are under a GPL compatible license</a>.', 'wporg-themes' ), 'https://make.wordpress.org/themes/handbook/review/required/#1-licensing-copyright' ) . '</label><br>
+ </p>
+
+ <button id="upload_button" class="button" type="submit" value="' . esc_attr__( 'Upload', 'wporg-themes' ) . '">' . esc_html__( 'Upload', 'wporg-themes' ) . '</button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- return $notice . $form;
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,6 +109,13 @@
</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">+ if ( empty( $_POST['required_terms'] ) || count( $_POST['required_terms'] ) !== 3 ) {
+ return new WP_Error(
+ 'pre_upload_terms',
+ __( 'Please agree to terms below.', 'wporg-themes' )
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! class_exists( 'WPORG_Themes_Upload' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> include_once __DIR__ . '/class-wporg-themes-upload.php';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>