Ticket #2131: 2131-2.diff

wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php

@@ -263 +263 @@
          */
         private function get_plugin_root( $dir ) {
                 $plugin_root  = '';
-                $plugin_files = Filesystem::list_files( $dir, true /* Recursive */, '!\.php$!i', 1 /* Depth */ );
+                $plugin_files = Filesystem::list_files( $dir, true /* Recursive */, '!\.php$!i' );
 
                 foreach ( $plugin_files as $plugin_file ) {
 

wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-review-tools.php

@@ -1 +1 @@
 <?php
 namespace WordPressdotorg\Plugin_Directory\Admin\Metabox;
-use WordPressdotorg\Plugin_Directory\Tools;
 
 /**
  * The Plugin Review metabox.
@@ -46 +45 @@
                 add_filter( 'wp_comment_reply', function( $string ) use ( $post ) {
                         $author = get_user_by( 'id', $post->post_author );
 
-                        $committers = Tools::get_plugin_committers( $post->post_name );
-                        $committers = array_map( function ( $user_login ) {
-                                return get_user_by( 'login', $user_login );
-                        }, $committers );
-
-                        $cc_emails = wp_list_pluck( $committers, 'user_email' );
-                        $cc_emails = implode( ', ', array_diff( $cc_emails, array( $author->user_email ) ) );
-
                         if ( 'new' === $post->post_status || 'pending' === $post->post_status ) {
                                 /* translators: %s: plugin title */
                                 $subject = sprintf( __( '[WordPress Plugin Directory] Request: %s', 'wporg-plugins' ), $post->post_title );
@@ -69 +60 @@
                         <form id="contact-author" class="contact-author" method="POST" action="https://supportpress.wordpress.org/plugins/thread-new.php">
                                 <input type="hidden" name="to_email" value="<?php echo esc_attr( $author->user_email ); ?>" />
                                 <input type="hidden" name="to_name" value="<?php echo esc_attr( $author->display_name ); ?>" />
-                                <input type="hidden" name="cc" value="<?php echo esc_attr( $cc_emails ); ?>" />
                                 <input type="hidden" name="subject" value="<?php echo esc_attr( $subject ); ?>" />
                                 <button class="button button-primary" type="submit"><?php _e( 'Contact plugin author', 'wporg-plugins' ); ?></button>
                         </form>

wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/rebuild-zip.php

@@ -1 +1 @@
 <?php
 namespace WordPressdotorg\Plugin_Directory;
-use WordPressdotorg\Plugin_Directory\Plugin_Directory;
 use WordPressdotorg\Plugin_Directory\Tools\SVN;
 
 // This script should only be called in a CLI environment.
@@ -86 +85 @@
 try {
         $zip_builder = new ZIP\Builder();
 
-        $plugin_post = Plugin_Directory::get_plugin_post( $plugin_slug );
-        if ( ! $plugin_post ) {
-                throw new Exception( "Could not locate plugin post" );
-        }
-        $stable_tag = get_post_meta( $plugin_post->ID, 'stable_tag', true ) ?? 'trunk';
-
         // (re)Build & Commit 5 Zips at a time to avoid limitations.
         foreach ( array_chunk( $versions, 5 ) as $versions_to_build ) {
                 $zip_builder->build(
                         $plugin_slug,
                         $versions_to_build,
-                        "{$plugin_slug}: Rebuild triggered by " . php_uname('n' ),
-                        $stable_tag
+                        "{$plugin_slug}: Rebuild triggered by " . php_uname('n' )
                 );
         }
 

wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php

@@ -132 +132 @@
         }
 
         /**
-         * Returns a string representing the number of active installations for an item.
+         * Returns a string representing the number of active installs for an item.
          *
          * @static
          *
-         * @param bool              $full Optional. Whether to include "active installations" suffix. Default: true.
+         * @param bool              $full Optional. Whether to include "active installs" suffix. Default: true.
          * @param int|\WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
-         * @return string "1+ million" or "1+ million active installations" depending on $full.
+         * @return string "1+ million" or "1+ million active installs" depending on $full.
          */
         public static function active_installs( $full = true, $post = null ) {
                 $post  = get_post( $post );
@@ -154 +154 @@
                         $text = number_format_i18n( $count ) . '+';
                 }
 
-                return $full ? sprintf( __( '%s active installations', 'wporg-plugins' ), $text ) : $text;
+                return $full ? sprintf( __( '%s active installs', 'wporg-plugins' ), $text ) : $text;
         }
 
         /**

wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -195 +195 @@
                                 array_unique( $versions_to_build ),
                                 $svn_revision_triggered ?
                                         "{$plugin_slug}: ZIP build triggered by https://plugins.trac.wordpress.org/changeset/{$svn_revision_triggered}" :
-                                        "{$plugin_slug}: ZIP build triggered by " . php_uname('n'),
-                                $stable_tag
+                                        "{$plugin_slug}: ZIP build triggered by " . php_uname('n')
                         );
                 } catch( Exception $e ) {
                         return false;

wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php

@@ -60 +60 @@
                 $zip_file = $_FILES['zip_file']['tmp_name'];
                 $this->plugin_dir = Filesystem::unzip( $zip_file );
 
-                $plugin_files = Filesystem::list_files( $this->plugin_dir, true /* Recursive */, '!\.php$!i', 1 /* Depth */ );
+                $plugin_files = Filesystem::list_files( $this->plugin_dir, true /* Recursive */, '!\.php$!i' );
                 foreach ( $plugin_files as $plugin_file ) {
                         $plugin_data = get_plugin_data( $plugin_file, false, false ); // No markup/translation needed.
                         if ( ! empty( $plugin_data['Name'] ) ) {

wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php

@@ -30 +30 @@
                 if ( is_user_logged_in() ) :
                         include_once ABSPATH . 'wp-admin/includes/template.php';
 
-                        $submitted_plugins = self::get_submitted_plugins();
-                        $submitted_counts  = (object) array_fill_keys( array( 'new', 'pending' ), 0 );
-
-                        $submitted_counts->total = count( $submitted_plugins );
-
-                        foreach ( $submitted_plugins as $key => $plugin ) {
-                                if ( 'new' === $plugin->post_status ) {
-                                        $submitted_plugins[ $key ]->status = __( 'Awaiting Review', 'wporg-plugins' );
-                                        $submitted_counts->new++;
-                                } elseif ( 'pending' === $plugin->post_status ) {
-                                        $submitted_plugins[ $key ]->status = __( 'Being Reviewed', 'wporg-plugins' );
-                                        $submitted_counts->pending++;
-                                }
-                        }
-
                         if ( ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-plugins-upload' ) && 'upload' === $_POST['action'] ) :
                                 if ( UPLOAD_ERR_OK === $_FILES['zip_file']['error'] ) :
                                         $uploader = new Upload_Handler;
@@ -80 +65 @@
                                         ?></p>
                                 </div>
 
-                                <?php if ( $submitted_counts->total ) : ?>
+                                <?php
+                                $submitted_plugins = self::get_submitted_plugins();
+                                $submitted_counts  = (object) array_fill_keys( array( 'new', 'pending' ), 0 );
+
+                                foreach ( $submitted_plugins as $key => $plugin ) {
+                                        if ( 'new' === $plugin->post_status ) {
+                                                $submitted_plugins[ $key ]->status = __( 'Awaiting Review', 'wporg-plugins' );
+                                                $submitted_counts->new++;
+                                        } elseif ( 'pending' === $plugin->post_status ) {
+                                                $submitted_plugins[ $key ]->status = __( 'Being Reviewed', 'wporg-plugins' );
+                                                $submitted_counts->pending++;
+                                        }
+                                }
+                                ?>
+
+                                <?php if ( $submitted_counts->new + $submitted_counts->pending ) : ?>
 
                                         <div class="plugin-queue-message notice notice-warning notice-alt">
                                                 <p><?php
-                                                        if ( 1 === $submitted_counts->total ) {
-                                                                _e( 'You already have a plugin in the review queue. Please wait for it to be approved before submitting any more.', 'wporg-plugins' );
+                                                        if ( 1 === ( $submitted_counts->new + $submitted_counts->pending ) ) {
+                                                                _e( 'You have 1 plugin in the review queue.', 'wporg-plugins' );
                                                         } else {
                                                                 printf(
                                                                         _n(
-                                                                                'You have %1$s plugins in the review queue, %2$s is being actively reviewed. Please wait for them to be approved before submitting any more.',
-                                                                                'You have %1$s plugins in the review queue, %2$s are being actively reviewed. Please wait for them to be approved before submitting any more.',
+                                                                                'You have %1$s plugins in the review queue, %2$s is being actively reviewed.',
+                                                                                'You have %1$s plugins in the review queue, %2$s are being actively reviewed.',
                                                                                 $submitted_counts->pending,
                                                                                 'wporg-plugins'
                                                                         ),
-                                                                        '<strong>' . $submitted_counts->total . '</strong>',
+                                                                        '<strong>' . ( $submitted_counts->new + $submitted_counts->pending ) . '</strong>',
                                                                         '<strong>' . $submitted_counts->pending . '</strong>'
                                                                 );
                                                         }
@@ -114 +114 @@
                                                 ?></p>
                                         </div>
 
-                                <?php endif; // $submitted_counts->total ?>
-
-                        <?php endif; // wp_verify_nonce() && 'upload' === $_POST['action'] ?>
-
-                        <?php if ( ! $submitted_counts->total ) : ?>
-
-                                <form id="upload_form" class="plugin-upload-form" enctype="multipart/form-data" method="POST" action="">
-                                        <?php wp_nonce_field( 'wporg-plugins-upload' ); ?>
-                                        <input type="hidden" name="action" value="upload"/>
-                                        <?php /* <fieldset>
-                                                <legend><?php _e( 'Select categories (up to 3)', 'wporg-plugins' ); ?></legend>
-                                                <ul class="category-checklist">
-                                                        <?php wp_terms_checklist( 0, array( 'taxonomy' => 'plugin_category' ) ); ?>
-                                                </ul>
-                                        </fieldset> */ ?>
-
-                                        <input type="file" id="zip_file" class="plugin-file" name="zip_file" size="25" accept=".zip"/>
-                                        <label class="button button-secondary" for="zip_file"><?php _e( 'Select File', 'wporg-plugins' ); ?></label>
-
-                                        <input id="upload_button" class="button button-primary" type="submit" value="<?php esc_attr_e( 'Upload', 'wporg-plugins' ); ?>"/>
-
-                                        <p>
-                                                <small><?php printf( __( 'Maximum allowed file size: %s', 'wporg-plugins' ), esc_html( self::get_max_allowed_file_size() ) ); ?></small>
-                                        </p>
-                                </form>
-                                <script>
-                                        ( function ( $ ) {
-                                                var $label    = $( 'label.button' ),
-                                                        labelText = $label.text();
-
-                                                $( '#zip_file' )
-                                                        .on( 'change', function( event ) {
-                                                                var fileName = event.target.value.split( '\\' ).pop();
-
-                                                                fileName ? $label.text( fileName ) : $label.text( labelText );
-                                                        } )
-                                                        .on( 'focus', function() { $label.addClass( 'focus' ); } )
-                                                        .on( 'blur', function() { $label.removeClass( 'focus' ); } );
-                                        } ( window.jQuery ) );
-                                </script>
-
-                        <?php endif; // ! $submitted_counts->total ?>
+                                <?php endif; ?>
+
+                        <?php endif; ?>
+
+                        <form id="upload_form" class="plugin-upload-form" enctype="multipart/form-data" method="POST" action="">
+                                <?php wp_nonce_field( 'wporg-plugins-upload' ); ?>
+                                <input type="hidden" name="action" value="upload"/>
+                                <?php /* <fieldset>
+                                        <legend><?php _e( 'Select categories (up to 3)', 'wporg-plugins' ); ?></legend>
+                                        <ul class="category-checklist">
+                                                <?php wp_terms_checklist( 0, array( 'taxonomy' => 'plugin_category' ) ); ?>
+                                        </ul>
+                                </fieldset> */ ?>
+
+                                <input type="file" id="zip_file" class="plugin-file" name="zip_file" size="25" accept=".zip"/>
+                                <label class="button button-secondary" for="zip_file"><?php _e( 'Select File', 'wporg-plugins' ); ?></label>
+
+                                <input id="upload_button" class="button button-primary" type="submit" value="<?php esc_attr_e( 'Upload', 'wporg-plugins' ); ?>"/>
+
+                                <p>
+                                        <small><?php printf( __( 'Maximum allowed file size: %s', 'wporg-plugins' ), esc_html( self::get_max_allowed_file_size() ) ); ?></small>
+                                </p>
+                        </form>
+                        <script>
+                                ( function ( $ ) {
+                                        var $label    = $( 'label.button' ),
+                                                labelText = $label.text();
+
+                                        $( '#zip_file' )
+                                                .on( 'change', function( event ) {
+                                                        var fileName = event.target.value.split( '\\' ).pop();
+
+                                                        fileName ? $label.text( fileName ) : $label.text( labelText );
+                                                } )
+                                                .on( 'focus', function() { $label.addClass( 'focus' ); } )
+                                                .on( 'blur', function() { $label.removeClass( 'focus' ); } );
+                                } ( window.jQuery ) );
+                        </script>
 
                 <?php else : ?>
 
-                        <p><?php printf( __( 'Before you can upload a new plugin, <a href="%s">please log in</a>.', 'wporg-plugins' ), esc_url( wp_login_url() ) ); ?></p>
+                        <p><?php printf( __( 'Before you can upload a new plugin, <a href="%s">please log in</a>.', 'wporg-plugins' ), esc_url( 'https://login.wordpress.org/' ) ); ?></p>
 
-                <?php endif; // is_user_logged_in()
+                <?php endif;
 
                 return ob_get_clean();
         }

wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-filesystem.php

@@ -80 +80 @@
          * @param string $directory Path to directory to search.
          * @param bool   $recursive Optional. Whether to recurse into subdirectories. Default: false.
          * @param string $pattern   Optional. A regular expression to match files against. Default: null.
-         * @param int    $depth     Optional. Recursion depth. Default: -1 (infinite).
          * @return array All files within the passed directory.
          */
-        public static function list_files( $directory, $recursive = false, $pattern = null, $depth = -1 ) {
+        public static function list_files( $directory, $recursive = false, $pattern = null ) {
                 if ( $recursive ) {
                         $iterator = new \RecursiveIteratorIterator(
                                 new \RecursiveDirectoryIterator( $directory ),
                                 \RecursiveIteratorIterator::SELF_FIRST
                         );
-
-                        if ( $depth > -1 ) {
-                                $iterator->setMaxDepth( $depth );
-                        }
                 } else {
                         $iterator = new \DirectoryIterator( $directory );
                 }

wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-meta.php

@@ -48 +48 @@
                                 );
                                 ?>
                         </li>
-                        <li><?php printf( __( 'Active installations: %s', 'wporg-plugins' ), '<strong>' . Template::active_installs( false ) . '</strong>' ); ?></li>
+                        <li><?php printf( __( 'Active installs: %s', 'wporg-plugins' ), '<strong>' . Template::active_installs( false ) . '</strong>' ); ?></li>
 
                         <?php if ( $requires = (string) get_post_meta( $post->ID, 'requires', true ) ) : ?>
                                 <li><?php

wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-builder.php

@@ -14 +14 @@
         const SVN_URL = 'http://plugins.svn.wordpress.org';
         const ZIP_SVN_URL = PLUGIN_ZIP_SVN_URL;
 
-        protected $zip_file      = '';
-        protected $checksum_file = '';
-        protected $tmp_build_dir = '';
-        protected $tmp_dir       = '';
+        protected $zip_file = '';
+        protected $tmp_build_dir  = '';
+        protected $tmp_dir = '';
 
-        protected $slug       = '';
-        protected $version    = '';
-        protected $context    = '';
-        protected $stable_tag = '';
+        protected $slug    = '';
+        protected $version = '';
+        protected $context = '';
 
         /**
-         * Generate a ZIP for a provided Plugin tags.
+         * Generate a ZIP for a provided Plugin versions.
          *
          * @param string $slug     The plugin slug.
          * @param array  $versions The versions of the plugin to build ZIPs for.
          * @param string $context  The context of this Builder instance (commit #, etc)
          */
-        public function build( $slug, $versions, $context = '', $stable_tag = '' ) {
+        public function build( $slug, $versions, $context = '' ) {
                 // Bail when in an unconfigured environment.
                 if ( ! defined( 'PLUGIN_ZIP_SVN_URL' ) ) {
                         return false;
                 }
 
-                $this->slug       = $slug;
-                $this->versions   = $versions;
-                $this->context    = $context;
-                $this->stable_tag = $stable_tag;
+                $this->slug     = $slug;
+                $this->versions = $versions;
+                $this->context  = $context;
 
                 // General TMP directory
                 if ( ! is_dir( self::TMP_DIR ) ) {
@@ -99 +96 @@
 
                         // Pull the ZIP file down we're going to modify, which may not already exist.
                         SVN::up( $this->zip_file );
-                        // This is done within the checksum generation function due to us not knowing the checksum filename until export_plugin().
-                        // SVN::up( $this->checksum_file );
 
                         try {
 
@@ -108 +103 @@
                                 mkdir( $this->tmp_build_dir, 0777, true );
 
                                 $this->export_plugin();
-                                $this->fix_directory_dates();
-
+                                $this->fix_directory_dates();                   
                                 $this->generate_zip();
-
-                                $this->generate_checksums();
-
                                 $this->cleanup_plugin_tmp();
 
                         } catch( Exception $e ) {
@@ -122 +113 @@
 
                                 // Perform an SVN up to revert any changes made.
                                 SVN::up( $this->zip_file );
-                                if ( $this->checksum_file ) {
-                                        SVN::up( $this->checksum_file );
-                                }
                                 continue;
                         }
 
                         // Add the ZIP file to SVN - This is only really needed for new files which don't exist in SVN.
-                        SVN::add( $this->zip_file );
-                        if ( $this->checksum_file ) {
-                                SVN::add( $this->checksum_file );
-                        }
+                        SVN::add( $this->zip_file );                    
                 }
 
                 $res = SVN::commit(
@@ -160 +145 @@
         }
 
         /**
-         * Generates a JSON file containing the checksums of the files within the ZIP.
-         *
-         * In the event that a previous ZIP for this version exists, checksums for all versions of the file will be included.
-         */
-        function generate_checksums() {
-                // Only enable this for the `exploit-scanner` plugin for the time being.
-                if ( 'exploit-scanner' != $this->slug ) {
-                        return;
-                }
-
-                // Don't create checksums for trunk.
-                if ( ! $this->stable_tag || ( 'trunk' == $this->version && 'trunk' != $this->stable_tag && '' != $this->stable_tag ) ) {
-                        return;
-                }
-
-                // Fetch the plugin headers
-                $plugin_data = false;
-                foreach ( glob( $this->tmp_build_dir . '/' . $this->slug . '/*.php' ) as $filename ) {
-                        $plugin_data = get_plugin_data( $filename, false, false );
-
-                        if ( $plugin_data['Name'] && '' !== $plugin_data['Version'] ) {
-                                break;
-                        }
-                }
-
-                if ( ! $plugin_data || '' === $plugin_data['Version'] ) {
-                        return;
-                }
-
-                $plugin_version = $plugin_data['Version'];
-                // Catch malformed version strings.
-                if ( basename( $plugin_version ) != $plugin_version ) {
-                        return;
-                }
-
-                $this->checksum_file = "{$this->tmp_dir}/{$this->slug}/{$this->slug}.{$plugin_version}.checksums.json";
-
-                // Checkout the Checksum file for this plugin version
-                SVN::up( $this->checksum_file );
-
-                // Existing checksums?
-                $existing_json_checksum_file = file_exists( $this->checksum_file );
-
-                $this->exec( sprintf(
-                        'cd %s && find . -type f -print0 | sort -z | xargs -0 md5sum 2>&1',
-                        escapeshellarg( $this->tmp_build_dir . '/' . $this->slug )
-                ), $checksum_output, $return_value );
-
-                if ( $return_value ) {
-                //      throw new Exception( __METHOD__ . ': Checksum generation failed, return code: ' . $return_value, 503 );
-                // For now, just silently bail.
-                        return;
-                }
-
-                $checksums = array();
-                foreach ( $checksum_output as $line ) {
-                        list( $md5, $filename ) = preg_split( '!\s+!', $line );
-                        $filename = preg_replace( '!^./!', '', $filename );
-                        $checksums[ trim( $filename ) ] = trim( $md5 );
-                }
-
-                $json_checksum_file = (object) array(
-                        'plugin'     => $this->slug,
-                        'version'    => $plugin_version,
-                        'source_tag' => $this->version,
-                        'zip'        => basename( $this->zip_file ),
-                        'checksums'  => $checksums
-                );
-
-                // If the checksum file exists already, merge it into this one.
-                if ( $existing_json_checksum_file ) {
-                        $existing_json_checksum_file = json_decode( file_get_contents( $this->checksum_file ) );
-
-                        if ( $existing_json_checksum_file && ! empty( $existing_json_checksum_file->checksums ) ) {
-                                foreach ( $existing_json_checksum_file->checksums as $file => $checksum_details ) {
-
-                                        if ( ! isset( $json_checksum_file->checksums[ $file ] ) ) {
-                                                // Deleted file, include it in checksums.
-                                                $json_checksum_file->checksums[ $file ] = $checksum_details;
-
-                                        } elseif ( $json_checksum_file->checksums[ $file ] != $checksum_details ) {
-                                                // Checksum has changed, include both in the resulting json file.
-                                                if ( is_array( $checksum_details ) ) {
-                                                        $checksum_details[] = $json_checksum_file->checksums[ $file ];
-                                                        $json_checksum_file->checksums[ $file ] = $checksum_details;
-                                                } else {
-                                                        $json_checksum_file->checksums[ $file ] = array(
-                                                                $json_checksum_file->checksums[ $file ],
-                                                                $checksum_details
-                                                        );
-                                                }
-                                        }
-                                }
-                        }
-                }
-
-                file_put_contents( $this->checksum_file, wp_json_encode( $json_checksum_file ) );
-        }
-
-        /**
          * Generates a temporary unique directory in a given directory
          *
          * Performs a similar job to `tempnam()` with an added suffix and doesn't
@@ -393 +278 @@
          * @return bool
          */
         public function invalidate_zip_caches( $versions ) {
-                // TODO: Implement PURGE
+                // TODO: Implement PURGE 
                 return true;
                 if ( ! defined( 'PLUGIN_ZIP_X_ACCEL_REDIRECT_LOCATION' ) ) {
                         return true;

wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-serve.php

@@ -36 +36 @@
         protected function determine_request() {
                 $zip = basename( parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH ) );
 
-                if ( ! preg_match( "!^(?P<slug>[a-z0-9-_]+)(\.(?P<version>.+?))?\.(?P<request_type>zip|checksums\.json)$!i", $zip, $m ) ) {
+                $slug = false;
+                $version = 'trunk';
+
+                if ( ! preg_match( "!^(?P<slug>[a-z0-9-_]+)(.(?P<version>.+))?.zip$!i", $zip, $m ) ) {
                         throw new Exception( __METHOD__ . ": Invalid URL." );
                 }
 
                 $slug = strtolower( $m['slug'] );
-
-                $version = 'trunk';
-                if ( isset( $m['version'] ) && '' !== $m['version'] ) {
+                if ( isset( $m['version'] ) ) {
                         $version = $m['version'];
                 }
+
                 if ( 'latest-stable' == $version ) {
                         $version = $this->get_stable_tag( $slug );
                 }
 
-                if ( 'zip' == strtolower( $m['request_type'] ) ) {
-                        $checksum_request = false;
-                } else {
-                        $checksum_request = true;
-
-                        // Checksum requests for 'trunk' are not possible.
-                        if ( 'trunk' == $version ) {
-                                throw new Exception( __METHOD__ . ": Checksum requests must include a version." );
-                        }
-
-                }
-
                 $args = array(
                         'stats' => true,
                 );
-
-                if ( $checksum_request ) {
-                        $args['stats'] = false;
-
-                } elseif ( isset( $_GET['stats'] ) ) {
+                if ( isset( $_GET['stats'] ) ) {
                         $args['stats'] = (bool) $_GET['stats'];
-
                 } elseif ( isset( $_GET['nostats'] ) ) {
                         $args['stats'] = !empty( $_GET['nostats'] );
                 }
 
-                return compact( 'zip', 'slug', 'version', 'args', 'checksum_request' );
+                return compact( 'zip', 'slug', 'version', 'args' );
         }
 
         /**
@@ -132 +117 @@
         }
 
         /**
-         * Returns the file to be served for the request.
+         * Returns the files to use for the request.
          *
          * @param array $request The request object for the request.
-         * @return array The file to serve.
+         * @return array An array containing the files to use for the request, 'zip' and 'md5'.
          */
         protected function get_file( $request ) {
-                // Checksum requests must include a version
-                if ( $request['checksum_request'] ) {
-                        return "{$request['slug']}/{$request['slug']}.{$request['version']}.checksums.json";
-
-                } elseif ( empty( $request['version'] ) || 'trunk' == $request['version'] ) {
+                if ( empty( $request['version'] ) || 'trunk' == $request['version'] ) {
                         return "{$request['slug']}/{$request['slug']}.zip";
-
                 } else {
                         return "{$request['slug']}/{$request['slug']}.{$request['version']}.zip";
                 }
-
         }
 
         /**
@@ -157 +136 @@
          * @param array $request The request array for the request.
          */
         protected function serve_zip( $request ) {
-                $file = $this->get_file( $request );
+                $zip = $this->get_file( $request );
 
                 if ( defined( 'PLUGIN_ZIP_X_ACCEL_REDIRECT_LOCATION' ) ) {
-                        $file_url = PLUGIN_ZIP_X_ACCEL_REDIRECT_LOCATION . $file;
+                        $zip_url = PLUGIN_ZIP_X_ACCEL_REDIRECT_LOCATION . $zip;
 
-                        if ( $request['checksum_request'] ) {
-                                header( 'Content-Type: application/json' );
-                        } else {
-                                header( 'Content-Type: application/zip' );
-                                header( 'Content-Disposition: attachment; filename=' . basename( $file ) );
-                        }
-                        header( "X-Accel-Redirect: $file_url" );
+                        header( 'Content-Type: application/zip' );
+                        header( 'Content-Disposition: attachment; filename=' . basename( $zip ) );
+                        header( "X-Accel-Redirect: $zip_url" );
                 } else {
                         header( 'Content-Type: text/plain' );
-                        echo "This is a request for $file, this server isn't currently configured to serve files.\n";
+                        echo "This is a request for $zip, this server isn't currently configured to serve zip files.\n";
                 }
 
                 if ( function_exists( 'fastcgi_finish_request' ) ) {

wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/content-none.php

@@ -41 +41 @@
 
                 <?php else : ?>
                 
-                        <p><?php printf( __( '<a href="%s">Login to WordPress.org</a> to mark plugins as favorites.', 'wporg-plugins' ), esc_url( wp_login_url( 'https://wordpress.org/plugins/browse/favorites/' ) ) ); ?></p>
+                        <p><?php printf( __( '<a href="%s">Login to WordPress.org</a> to mark plugins as favorites.', 'wporg-plugins' ), esc_url( 'https://login.wordpress.org/?redirect_to=https%3A%2F%2Fwordpress.org%2Fplugins%2Fbrowse%2Ffavorites%2F' ) ); ?></p>
 
                 <?php
                   endif; // is_user_logged_in()

wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin.php

@@ -33 +33 @@
                         <i class="dashicons dashicons-admin-users"></i> <?php echo esc_html( strip_tags( get_post_meta( get_the_ID(), 'header_author', true ) ) ?: get_the_author() ); ?>
                 </span>
                 <span class="active-installs">
-                        <i class="dashicons dashicons-chart-area"></i> <?php printf( __( '%s active installations', 'wporg-plugins' ), Template::active_installs(false) ); ?>
+                        <i class="dashicons dashicons-chart-area"></i> <?php printf( __( '%s active installs', 'wporg-plugins' ), Template::active_installs(false) ); ?>
                 </span>
                 <span class="tested-with">
                         <?php if ( $tested_up_to = (string) get_post_meta( $post->ID, 'tested', true ) ) { ?>

wordpress.tv/public_html/wp-content/themes/wptv2/anon-upload-template.php

@@ -61 +61 @@
 
         .video-upload p {
                 margin: 16px 0;
-                overflow: auto;
+                overflow: hidden;
         }
 
         .video-upload h3 {