<!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>[13729] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Allow plugin slugs to be renamed during the approval stage.</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/13729">13729</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/13729","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>2024-05-17 06:14:37 +0000 (Fri, 17 May 2024)</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: Allow plugin slugs to be renamed during the approval stage.
This allows plugin reviewers to change the slug immediately after the plugin is approved, but before the author commits any code.
Fixes <a href="http://meta.trac.wordpress.org/ticket/6878">#6878</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclasscustomizationsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorytoolsclasssvnphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-svn.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclasscustomizationsphp"></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/admin/class-customizations.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/admin/class-customizations.php 2024-05-17 05:04:19 UTC (rev 13728)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php 2024-05-17 06:14:37 UTC (rev 13729)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,6 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> use \WordPressdotorg\Plugin_Directory;
</span><span class="cx" style="display: block; padding: 0 10px"> use \WordPressdotorg\Plugin_Directory\Tools;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use \WordPressdotorg\Plugin_Directory\Tools\SVN;
</ins><span class="cx" style="display: block; padding: 0 10px"> use \WordPressdotorg\Plugin_Directory\Template;
</span><span class="cx" style="display: block; padding: 0 10px"> use \WordPressdotorg\Plugin_Directory\Readme\Validator;
</span><span class="cx" style="display: block; padding: 0 10px"> use \WordPressdotorg\Plugin_Directory\Admin\List_Table\Plugin_Posts;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -561,33 +562,77 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array The data to insert into the database.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_existing_plugin_slug_on_post_update( $data, $postarr ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'plugin' !== $data['post_type'] || ! isset( $postarr['ID'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</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">- $existing_plugin = Plugin_Directory\Plugin_Directory::get_plugin_post( $data['post_name'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If we can't locate the existing plugin, we can't check for a conflict.
+ $plugin = get_post( $postarr['ID'] );
+ if ( ! $plugin ) {
+ return $data;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $old_slug = $plugin->post_name;
+ $new_slug = $data['post_name'];
+ $existing_plugin = Plugin_Directory\Plugin_Directory::get_plugin_post( $new_slug );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Is there already a plugin with the same slug?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $existing_plugin && $existing_plugin->ID != $postarr['ID'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $existing_plugin && $existing_plugin->ID != $plugin->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: plugin slug */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Error: The plugin %s already exists.', 'wporg-plugins' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data['post_name']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_slug
</ins><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 the plugin is approved, we'll need to perform a folder rename, and re-grant SVN access.
+ if ( 'approved' === $plugin->post_status ) {
+ // SVN Rename $old_slug to $new_slug
+ $result = SVN::rename(
+ "http://plugins.svn.wordpress.org/{$old_slug}/",
+ "http://plugins.svn.wordpress.org/{$new_slug}/",
+ array(
+ 'message' => sprintf( 'Renaming %1$s to %2$s.', $old_slug, $new_slug ),
+ )
+ );
+ if ( $result['errors'] ) {
+ $error = 'Error renaming SVN repository: ' . var_export( $result['errors'], true );
+ Tools::audit_log( $error, $plugin->ID );
+ wp_die( $error ); // Abort before the post is altered.
+ } else {
+ Tools::audit_log(
+ sprintf(
+ 'Renamed SVN repository in %s.',
+ 'https://plugins.svn.wordpress.org/changeset/' . $result['revision']
+ ),
+ $plugin->ID
+ );
+
+ /*
+ * Migrate Committers to new path.
+ * As no committers have changed as part of this operation, just update the database.
+ */
+ $wpdb->update(
+ PLUGINS_TABLE_PREFIX . 'svn_access',
+ [ 'path' => '/' . $new_slug ],
+ [ 'path' => '/' . $old_slug ]
+ );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Record the slug change.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin = get_post( $postarr['ID'] );
- if ( $plugin && $plugin->post_name !== $data['post_name'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $old_slug !== $new_slug ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Only log if the slugs don't appear to be rejection-related.
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! preg_match( '!^rejected-.+-rejected$!', $post->post_name ) &&
- ! preg_match( '!^rejected-.+-rejected$!', $data['post_name'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! preg_match( '!^rejected-.+-rejected$!', $old_slug ) &&
+ ! preg_match( '!^rejected-.+-rejected$!', $new_slug )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> Tools::audit_log( sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> "Slug changed from '%s' to '%s'.",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin->post_name,
- $data['post_name']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $old_slug,
+ $new_slug
</ins><span class="cx" style="display: block; padding: 0 10px"> ), $plugin->ID );
</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">@@ -735,8 +780,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_meta_box( 'commentsdiv', 'plugin', 'normal' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_meta_box( 'commentstatusdiv', 'plugin', 'normal' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Remove slug metabox unless the slug is editable for the current user.
- if ( ! in_array( $post->post_status, array( 'new', 'pending' ) ) || ! current_user_can( 'plugin_approve', $post ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove slug metabox unless the slug is editable by the current user.
+ if ( ! in_array( $post->post_status, array( 'new', 'pending', 'approved' ) ) || ! current_user_can( 'plugin_approve', $post ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_meta_box( 'slugdiv', 'plugin', 'normal' );
</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="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorytoolsclasssvnphp"></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/tools/class-svn.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/tools/class-svn.php 2024-05-17 05:04:19 UTC (rev 13728)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-svn.php 2024-05-17 06:14:37 UTC (rev 13729)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,6 +429,60 @@
</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">+ * Rename a SVN path (or url).
+ *
+ * @static
+ *
+ * @param string $from The path of the SVN folder to rename. May be a URL.
+ * @param string $to The new path of the SVN folder. May be a URL.
+ * @param array $options Optional. A list of options to pass to SVN. Default: empty array.
+ * @return array {
+ * @type bool $result The result of the operation.
+ * @type int $revision The revision.
+ * @type false|array $errors Whether any errors or warnings were encountered.
+ * }
+ */
+ public static function rename( $from, $to, $options = array() ) {
+ $options[] = 'non-interactive';
+ $is_url = ( preg_match( '#https?://#i', $from ) && preg_match( '#https?://#i', $to ) );
+
+ if ( $is_url ) {
+ // Set the message if not provided.
+ if ( ! isset( $options['message'] ) && ! isset( $options['m'] ) ) {
+ $options['message'] = sprintf( "Rename %s to %s.", basename( $from ), basename( $to ) );
+ }
+
+ if ( empty( $options['username'] ) ) {
+ $options['username'] = PLUGIN_SVN_MANAGEMENT_USER;
+ $options['password'] = PLUGIN_SVN_MANAGEMENT_PASS;
+ }
+ }
+
+ $esc_options = self::parse_esc_parameters( $options );
+
+ $esc_from = escapeshellarg( $from );
+ $esc_to = escapeshellarg( $to );
+
+ $output = self::shell_exec( "svn mv $esc_from $esc_to $esc_options 2>&1" );
+ if ( $is_url && preg_match( '/Committed revision (?P<revision>\d+)[.]/i', $output, $m ) ) {
+ $revision = (int) $m['revision'];
+ $result = true;
+ $errors = false;
+ } else {
+ $errors = self::parse_svn_errors( $output );
+ $revision = false;
+
+ if ( $is_url || $errors ) {
+ $result = false;
+ } else {
+ $result = true;
+ }
+ }
+
+ return compact( 'result', 'revision', 'errors' );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Parse and escape the provided SVN arguements for usage on the CLI.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Parameters can be passed as [ param ] or [ param = value ], if the argument is not
</span></span></pre>
</div>
</div>
</body>
</html>