<!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>[10024] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php: Plugin Directory: Update the list of trademark terms.</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/10024">10024</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/10024","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>2020-07-07 04:06:13 +0000 (Tue, 07 Jul 2020)</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'>Plugin Directory: Update the list of trademark terms. Allow for some `-for-$trademark` exceptions.
Props Ipstenu.
Fixes <a href="http://meta.trac.wordpress.org/ticket/5300">#5300</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp"></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/plugin-directory/shortcodes/class-upload-handler.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/plugin-directory/shortcodes/class-upload-handler.php 2020-07-07 03:39:52 UTC (rev 10023)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php 2020-07-07 04:06:13 UTC (rev 10024)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,6 +181,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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Plugins need descriptions.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->plugin['Description'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = __( 'Error: The plugin has no description.', 'wporg-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,6 +193,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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Plugins need versions.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->plugin['Version'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = __( 'Error: The plugin has no version.', 'wporg-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,6 +205,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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Versions should be NUMBERS.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '|[^\d\.]|', $this->plugin['Version'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = __( 'Error: Plugin versions are expected to be numbers.', 'wporg-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,6 +217,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"> // Prevent duplicate URLs.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // This is part of how the API looks for updates, so having them different helps prevent conflicts.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->plugin['PluginURI'] ) && ! empty( $this->plugin['AuthorURI'] ) && $this->plugin['PluginURI'] == $this->plugin['AuthorURI'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = __( 'Error: Your plugin and author URIs are the same.', 'wporg-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,8 +245,8 @@
</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">+ // Check for a valid readme.
</ins><span class="cx" style="display: block; padding: 0 10px"> $readme = $this->find_readme_file();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check for a valid readme.
</del><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $readme ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = __( 'Error: The plugin has no readme.', 'wporg-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,8 +408,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin',
</span><span class="cx" style="display: block; padding: 0 10px"> // Reserved names.
</span><span class="cx" style="display: block; padding: 0 10px"> 'jquery',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wordpress',
+ // common submissions by people trying to upload locally.
+ 'akismet-anti-spam',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'site-kit-by-google',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wordpress',
</del><span class="cx" style="display: block; padding: 0 10px"> 'yoast-seo',
</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">@@ -423,10 +429,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'adsense-',
</span><span class="cx" style="display: block; padding: 0 10px"> 'advanced-custom-fields-',
</span><span class="cx" style="display: block; padding: 0 10px"> 'adwords-',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'akismet-',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'amazon-',
</span><span class="cx" style="display: block; padding: 0 10px"> 'android-',
</span><span class="cx" style="display: block; padding: 0 10px"> 'apple-',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'aws-',
+ 'bbpress-',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'bing-',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'buddypress-',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'contact-form-7-',
</span><span class="cx" style="display: block; padding: 0 10px"> 'divi-',
</span><span class="cx" style="display: block; padding: 0 10px"> 'easy-digital-downloads-',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,9 +463,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wa-',
</span><span class="cx" style="display: block; padding: 0 10px"> 'whatsapp',
</span><span class="cx" style="display: block; padding: 0 10px"> 'whats-app',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'woocommerce',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'watson',
+ 'windows-',
+ 'woocommerce', // technically ending with '-for-woocommerce' is allowed.
+ 'woo-commerce',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'woo-',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordpress',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'yahoo-',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'yoast',
</span><span class="cx" style="display: block; padding: 0 10px"> 'youtube-',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,10 +476,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Domains from which exceptions would be accepted.
</span><span class="cx" style="display: block; padding: 0 10px"> $trademark_exceptions = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'yoast.com' => array( 'yoast' ),
- 'automattic.com' => array( 'wordpress', 'woo', 'woocommerce' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'yoast.com' => array( 'yoast' ),
+ 'automattic.com' => array( 'akismet', 'jetpack', 'wordpress', 'woo', 'woo-', 'woocommerce' ),
+ 'facebook.com' => array( 'facebook', 'whatsapp', 'instagram' ),
+ 'support.microsoft.com' => array( 'bing-', 'microsoft-' ),
+ 'microsoft.com' => array( 'bing-', 'microsoft-' ),
</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">+ // Trademarks that are allowed as 'for-whatever' ONLY.
+ $for_use_exceptions = array(
+ 'woocommerce',
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $has_trademarked_slug = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $trademarked_slugs as $trademark ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,13 +504,23 @@
</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">+ // check for 'for-TRADEMARK' exceptions.
+ if ( $has_trademarked_slug && in_array( $has_trademarked_slug, $for_use_exceptions ) ) {
+ $for_trademark = '-for-' . $has_trademarked_slug;
+ // At this point we might be okay, but there's one more check.
+ if ( $for_trademark === substr( $this->plugin_slug, -1 * strlen( $for_trademark ) ) ) {
+ // Yes the slug ENDS with 'for-TRADEMARK'.
+ $has_trademarked_slug = false;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get the user email domain.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_email_domain = explode( '@', wp_get_current_user()->user_email, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ list( ,$user_email_domain ) = explode( '@', wp_get_current_user()->user_email, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If email domain is on our list of possible exceptions, we have an extra check.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( array_key_exists( $user_email_domain[1], $trademark_exceptions ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $has_trademarked_slug && array_key_exists( $user_email_domain, $trademark_exceptions ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If $has_trademarked_slug is in the array for that domain, they can use the term.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $has_trademarked_slug, $trademark_exceptions[ $user_email_domain[1] ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $has_trademarked_slug, $trademark_exceptions[ $user_email_domain ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $has_trademarked_slug = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>