<!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>[2625] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugins Directory: Introduce plugin uploader.</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/2625">2625</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/2625","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-25 23:56:12 +0000 (Thu, 25 Feb 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'>Plugins Directory: Introduce plugin uploader.

Happy iterating!

Props dd32, obenland.
See <a href="http://meta.trac.wordpress.org/ticket/1569">#1569</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_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</a></li>
</ul>

<h3>Added 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>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.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  2016-02-25 23:38:36 UTC (rev 2624)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php    2016-02-25 23:56:12 UTC (rev 2625)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,6 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        private function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'add_meta_boxes', array( $this, 'register_admin_metaboxes' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                add_action( 'edit_form_after_title', array( $this, 'edit_form_after_title' ) );
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,4 +36,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        'plugin'
</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">+
+       /**
+        * Displays a link to the plugins zip file.
+        *
+        * @param \WP_Post $post
+        */
+       public function edit_form_after_title( $post ) {
+               $zip_files = get_attached_media( 'application/zip', $post );
+               $zip_file  = current( $zip_files );
+
+               if ( $zip_file ) :
+                       ?>
+
+                       <p style="padding: 0 10px;">
+                               <?php printf( __( '<strong>Zip file:</strong> %s' ), sprintf( '<a href="%s">%s</a>', esc_url( $zip_file->guid ), $zip_file->guid ) ); ?>
+                       </p>
+
+               <?php
+               endif;
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp"></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/class-plugin-directory.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/class-plugin-directory.php      2016-02-25 23:38:36 UTC (rev 2624)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php        2016-02-25 23:56:12 UTC (rev 2625)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,6 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * Register the Shortcodes used within the content.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function register_shortcodes() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                add_shortcode( 'wporg-plugin-upload',       array( __NAMESPACE__ . '\\Shortcodes\\Upload',      'display' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                 add_shortcode( 'wporg-plugins-screenshots', array( __NAMESPACE__ . '\\Shortcodes\\Screenshots', 'display' ) );
</span><span class="cx" style="display: block; padding: 0 10px">        //      add_shortcode( 'wporg-plugins-stats',       array( __NAMESPACE__ . '\\Shortcodes\\Stats',       'display' ) );
</span><span class="cx" style="display: block; padding: 0 10px">        //      add_shortcode( 'wporg-plugins-developer',   array( __NAMESPACE__ . '\\Shortcodes\\Developer',   'display' ) );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: 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                             (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php       2016-02-25 23:56:12 UTC (rev 2625)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,489 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+namespace WordPressdotorg\Plugin_Directory\Shortcodes;
+
+/**
+ * The [wporg-plugin-upload] shortcode handler to display a plugin uploader.
+ *
+ * @package WordPressdotorg\Plugin_Directory\Shortcodes
+ */
+class Upload_Handler {
+
+       /**
+        * Path to `rm` script.
+        *
+        * @var string
+        */
+       const RM = '/bin/rm';
+
+       /**
+        * Path to `unzip` script.
+        *
+        * @var string
+        */
+       const UNZIP = '/usr/bin/unzip';
+
+       /**
+        * Path to temporary directory.
+        *
+        * @var string
+        */
+       protected $tmp_dir;
+
+       /**
+        * Path to temporary plugin folder.
+        *
+        * @var string
+        */
+       protected $plugin_dir;
+
+       /**
+        * The uploaded plugin.
+        *
+        * @var array
+        */
+       protected $plugin;
+
+       /**
+        * The plugin slug.
+        *
+        * @var string
+        */
+       protected $plugin_slug;
+
+       /**
+        * The plugin post if it already exists in the repository.
+        *
+        * @var \WP_Post
+        */
+       protected $plugin_post;
+
+       /**
+        * The plugin author (current user).
+        *
+        * @var \WP_User
+        */
+       protected $author;
+
+       /**
+        * Get set up to run tests on the uploaded plugin.
+        */
+       public function __construct() {
+               require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+               require_once( ABSPATH . 'wp-admin/includes/image.php' );
+               require_once( ABSPATH . 'wp-admin/includes/file.php' );
+               require_once( ABSPATH . 'wp-admin/includes/media.php' );
+
+               $this->create_tmp_dirs();
+               $this->unwrap_package();
+
+               add_filter( 'extra_plugin_headers', array( $this, 'extra_plugin_headers' ) );
+       }
+
+       /**
+        * Processes the plugin upload.
+        *
+        * Runs various tests and creates plugin post.
+        *
+        * @return string Failure or success message.
+        */
+       public function process_upload() {
+               $plugin_files = $this->get_all_files( $this->plugin_dir );
+
+               // First things first. Do we have something to work with?
+               if ( empty( $plugin_files ) ) {
+                       return __( 'The zip file was empty.', 'wporg-plugins' );
+               }
+
+               foreach ( $plugin_files as $plugin_file ) {
+                       if ( ! is_readable( $plugin_file ) ) {
+                               continue;
+                       }
+
+                       $plugin_data = get_plugin_data( $plugin_file, false, false ); // No markup/translation needed.
+                       if ( ! empty( $plugin_data['Name'] ) ) {
+                               $this->plugin = $plugin_data;
+                               break;
+                       }
+               }
+
+               // Let's check some plugin headers, shall we?
+
+               if ( ! $this->plugin['Name'] ) {
+                       $error = __( 'The plugin has no name.', 'wporg-plugins' ) . ' ';
+
+                       /* translators: 1: comment header line, 2: Codex URL */
+                       $error .= sprintf( __( 'Add a %1$s line to your main plugin file and upload the plugin again. <a href="%2$s">Plugin Headers</a>', 'wporg-plugins' ),
+                               '<code>Plugin Name:</code>',
+                               __( 'https://codex.wordpress.org/File_Header', 'wporg-plugins' )
+                       );
+
+                       return $error;
+               }
+
+               // Determine the plugin slug based on the name of the plugin in the main plugin file.
+               $this->plugin_slug = sanitize_title_with_dashes( $this->plugin['Name'] );
+               $this->author      = wp_get_current_user();
+
+               // Make sure it doesn't use a slug deemed not to be used by the public.
+               if ( $this->has_reserved_slug() ) {
+                       /* translators: 1: plugin slug, 2: style.css */
+                       return sprintf( __( 'Sorry, the plugin name %1$s is reserved for use by WordPress Core. Please change the name of your plugin and upload it again.', 'wporg-plugins' ),
+                               '<code>' . $this->plugin_slug . '</code>'
+                       );
+               }
+
+               // Populate the plugin post and author.
+               $this->plugin_post = $this->get_plugin_post();
+
+               // Is there already a plugin with the name name?
+               if ( ! empty( $this->plugin_post ) ) {
+                       /* translators: 1: plugin slug, 2: style.css */
+                       return sprintf( __( 'There is already a plugin called %1$s by a different author. Please change the name of your plugin and upload it again.', 'wporg-plugins' ),
+                               '<code>' . $this->plugin_slug . '</code>'
+                       );
+               }
+
+               $plugin_description = $this->strip_non_utf8( (string) $this->plugin['Description'] );
+               if ( empty( $plugin_description ) ) {
+                       $error = __( 'The plugin has no description.', 'wporg-plugins' ) . ' ';
+
+                       /* translators: 1: comment header line, 2: style.css, 3: Codex URL */
+                       $error .= sprintf( __( 'Add a %1$s line to your main plugin file and upload the plugin again. <a href="%3$s">Plugin Headers</a>', 'wporg-plugins' ),
+                               '<code>Description:</code>',
+                               __( 'https://codex.wordpress.org/File_Header', 'wporg-plugins' )
+                       );
+
+                       return $error;
+               }
+
+               if ( ! $this->plugin['Version'] ) {
+                       $error = __( 'The plugin has no version.', 'wporg-plugins' ) . ' ';
+
+                       /* translators: 1: comment header line, 2: style.css, 3: Codex URL */
+                       $error .= sprintf( __( 'Add a %1$s line to your main plugin file and upload the plugin again. <a href="%3$s">Plugin Headers</a>', 'wporg-plugins' ),
+                               '<code>Version:</code>',
+                               __( 'https://codex.wordpress.org/File_Header', 'wporg-plugins' )
+                       );
+
+                       return $error;
+               }
+
+               if ( preg_match( '|[^\d\.]|', $this->plugin['Version'] ) ) {
+                       /* translators: %s: style.css */
+                       return sprintf( __( 'Version strings can only contain numeric and period characters (like 1.2). Please fix your %s line in your main plugin file and upload the plugin again.', 'wporg-plugins' ),
+                               '<code>Version:</code>'
+                       );
+               }
+
+               // Prevent duplicate URLs.
+               $plugin_uri = $this->plugin['PluginURI'];
+               $author_uri = $this->plugin['AuthorURI'];
+               if ( ! empty( $plugin_uri ) && ! empty( $author_uri ) && $plugin_uri == $author_uri ) {
+                       return __( 'Duplicate plugin and author URLs. A plugin URL is a page/site that provides details about this specific plugin. An author URL is a page/site that provides information about the author of the plugin. You aren&rsquo;t required to provide both, so pick the one that best applies to your URL.', 'wporg-plugins' );
+               }
+
+               // Don't send special plugins through Plugin Check.
+               if ( ! has_category( 'special-case-plugin', $this->plugin_post ) ) {
+                       // Pass it through Plugin Check and see how great this plugin really is.
+                       $result = $this->check_plugin( $plugin_files );
+
+                       if ( ! $result ) {
+                               /* translators: 1: Plugin Check Plugin URL, 2: make.wordpress.org/plugins */
+                               return sprintf( __( 'Your plugin has failed the plugin check. Please correct the problems with it and upload it again. You can also use the <a href="%1$s">Plugin Check Plugin</a> to test your plugin before uploading. If you have any questions about this please post them to %2$s.', 'wporg-plugins' ),
+                                       '//wordpress.org/plugins/plugin-check/',
+                                       '<a href="https://make.wordpress.org/plugins">https://make.wordpress.org/plugins</a>'
+                               );
+                       }
+               }
+
+               // Passed all tests!
+               // Let's save everything and get things wrapped up.
+
+               // Add a Plugin Directory entry for this plugin.
+               $post_id = $this->create_plugin_post();
+
+               $attachment = $this->save_zip_file( $post_id );
+               if ( is_wp_error( $attachment ) ) {
+                       return $attachment->get_error_message();
+               }
+
+               // Send plugin author an email for peace of mind.
+               $this->send_email_notification();
+
+               do_action( 'plugin_upload', $this->plugin, $this->plugin_post );
+
+               // Success!
+               /* translators: 1: plugin name */
+
+               return sprintf( __( 'Thank you for uploading %1$s to the WordPress Plugin Directory. We&rsquo;ve sent you an email verifying that we&rsquo;ve received it.', 'wporg-plugins' ),
+                       $this->plugin['Name']
+               );
+       }
+
+       /**
+        * Creates a temporary directory, and the plugin dir within it.
+        */
+       public function create_tmp_dirs() {
+               // Create a temporary directory if it doesn't exist yet.
+               $tmp = '/tmp/wporg-plugin-upload';
+               if ( ! is_dir( $tmp ) ) {
+                       mkdir( $tmp, 0777 );
+               }
+
+               // Create file with unique file name.
+               $this->tmp_dir = tempnam( $tmp, 'WPORG_PLUGIN_' );
+
+               // Remove that file.
+               unlink( $this->tmp_dir );
+
+               // Create a directory with that unique name.
+               mkdir( $this->tmp_dir, 0777 );
+
+               // Get a sanitized name for that plugin and create a directory for it.
+               $base_name        = $this->get_sanitized_zip_name();
+               $this->plugin_dir = "{$this->tmp_dir}/{$base_name}";
+               mkdir( $this->plugin_dir, 0777 );
+
+               // Make sure we clean up after ourselves.
+               add_action( 'shutdown', array( $this, 'remove_files' ) );
+       }
+
+       /**
+        * Unzips the uploaded plugin and saves it in the temporary plugin dir.
+        */
+       public function unwrap_package() {
+               $unzip      = escapeshellarg( self::UNZIP );
+               $zip_file   = escapeshellarg( $_FILES['zip_file']['tmp_name'] );
+               $plugin_dir = escapeshellarg( $this->plugin_dir );
+
+               // Unzip it into the plugin directory.
+               exec( escapeshellcmd( "{$unzip} -DD {$zip_file} -d {$plugin_dir}" ) );
+
+               // Fix any permissions issues with the files. Sets 755 on directories, 644 on files.
+               exec( escapeshellcmd( "chmod -R 755 {$plugin_dir}" ) );
+               exec( escapeshellcmd( "find {$plugin_dir} -type f -print0" ) . ' | xargs -I% -0 chmod 644 %' );
+       }
+
+       /**
+        * Adds plugin headers that are expected in the directory.
+        *
+        * @param array $headers Additional plugin headers. Default empty array.
+        * @return array
+        */
+       public function extra_plugin_headers( $headers ) {
+               $headers['Tags'] = 'Tags';
+
+               return $headers;
+       }
+
+       /**
+        * Returns the the plugin post if it already exists in the repository.
+        *
+        * @return \WP_Post|null
+        */
+       public function get_plugin_post() {
+               $plugins = get_posts( array(
+                       'name'             => $this->plugin_slug,
+                       'posts_per_page'   => 1,
+                       'post_type'        => 'plugin',
+                       'orderby'          => 'ID',
+                       /*
+                        * Specify post stati so this query returns a result for draft plugins, even
+                        * if the uploading user doesn't have have the permission to view drafts.
+                        */
+                       'post_status'      => array( 'publish', 'pending', 'draft', 'future', 'trash', 'suspend' ),
+                       'suppress_filters' => false,
+               ) );
+
+               return current( $plugins );
+       }
+
+       /**
+        * Whether the uploaded plugin uses a reserved slug.
+        *
+        * Passes if the author happens to be `wordpressdotorg`.
+        *
+        * @return bool
+        */
+       public function has_reserved_slug() {
+               $reserved_slugs = array(
+                       // Plugin Directory URL parameters.
+                       'browse',
+                       'tag',
+                       'search',
+                       'filter',
+                       'upload',
+                       'featured',
+                       'popular',
+                       'new',
+                       'updated',
+               );
+
+               return in_array( $this->plugin_slug, $reserved_slugs ) && 'wordpressdotorg' !== $this->author->user_login;
+       }
+
+       /**
+        * Sends a plugin through Plugin Check.
+        *
+        * @param array $files All plugin files to check.
+        * @return bool Whether the plugin passed the checks.
+        */
+       public function check_plugin( $files ) {
+
+               // Run the checks.
+               // @todo Include plugin checker.
+               $result = true;
+
+               // Display the errors.
+               $verdict = $result ? array( 'tc-pass', __( 'Pass', 'wporg-plugins' ) ) : array(
+                       'tc-fail',
+                       __( 'Fail', 'wporg-plugins' )
+               );
+               echo '<h4>' . sprintf( __( 'Results of Automated Plugin Scanning: %s', 'wporg-plugins' ), vsprintf( '<span class="%1$s">%2$s</span>', $verdict ) ) . '</h4>';
+               echo '<ul class="tc-result">' . 'Result' . '</ul>';
+               echo '<div class="notice notice-info"><p>' . __( 'Note: While the automated plugin scan is based on the Plugin Review Guidelines, it is not a complete review. A successful result from the scan does not guarantee that the plugin will pass review. All submitted plugins are reviewed manually before approval.', 'wporg-plugins' ) . '</p></div>';
+
+               return $result;
+       }
+
+       /**
+        * Creates a plugin post.
+        *
+        * @return int|\WP_Error The post ID on success. The value 0 or WP_Error on failure.
+        */
+       public function create_plugin_post() {
+               $upload_date = current_time( 'mysql' );
+
+               return wp_insert_post( array(
+                       'post_author'    => $this->author->ID,
+                       'post_title'     => $this->plugin['Name'],
+                       'post_name'      => $this->plugin_slug,
+                       'post_excerpt'   => $this->plugin['Description'],
+                       'post_date'      => $upload_date,
+                       'post_date_gmt'  => $upload_date,
+                       'comment_status' => 'closed',
+                       'ping_status'    => 'closed',
+                       'post_status'    => 'pending',
+                       'post_type'      => 'plugin',
+                       'tags_input'     => $this->plugin['Tags'],
+               ) );
+       }
+
+       /**
+        * Saves zip file and attaches it to the plugin post.
+        *
+        * @param int $post_id Post ID.
+        * @return int|\WP_Error Attachment ID or upload error.
+        */
+       public function save_zip_file( $post_id ) {
+               $_FILES['zip_file']['name'] = wp_generate_password( 12 ) . '-' . $_FILES['zip_file']['name'];
+
+               add_filter( 'site_option_upload_filetypes', array( $this, 'whitelist_zip_files' ) );
+               add_filter( 'default_site_option_upload_filetypes', array( $this, 'whitelist_zip_files' ) );
+
+               $attachment_id = media_handle_upload( 'zip_file', $post_id );
+
+               remove_filter( 'site_option_upload_filetypes', array( $this, 'whitelist_zip_files' ) );
+               remove_filter( 'default_site_option_upload_filetypes', array( $this, 'whitelist_zip_files' ) );
+
+               return $attachment_id;
+       }
+
+       /**
+        * Sends out an email confirmation to the plugin's author.
+        */
+       public function send_email_notification() {
+
+               /* translators: %s: plugin name */
+               $email_subject = sprintf( __( '[WordPress Plugins] New Plugin - %s', 'wporg-plugins' ),
+                       $this->plugin['Name']
+               );
+
+               /* translators: 1: plugin name, 2: Trac ticket URL */
+               $email_content = sprintf( __( 'Thank you for uploading %1$s to the WordPress Plugin Directory. If your plugin is selected to be part of the directory we\'ll send a follow up email.
+
+--
+The WordPress.org Plugins Team
+https://make.wordpress.org/plugins', 'wporg-plugins' ),
+                       $this->plugin['Name']
+               );
+
+               wp_mail( $this->author->user_email, $email_subject, $email_content, 'From: plugins@wordpress.org' );
+       }
+
+       // Helper
+
+       /**
+        * Returns a sanitized version of the uploaded zip file name.
+        *
+        * @return string
+        */
+       public function get_sanitized_zip_name() {
+               return preg_replace( '|\W|', '', strtolower( basename( $_FILES['zip_file']['name'], '.zip' ) ) );
+       }
+
+       /**
+        * Returns all (usable) files of a given directory.
+        *
+        * @param string $dir Path to directory to search.
+        *
+        * @return array All files within the passed directory.
+        */
+       public function get_all_files( $dir ) {
+               $files        = array();
+               $dir_iterator = new \RecursiveDirectoryIterator( $dir );
+               $iterator     = new \RecursiveIteratorIterator( $dir_iterator, \RecursiveIteratorIterator::SELF_FIRST );
+
+               foreach ( $iterator as $file ) {
+                       // Only return files that are no directory references or Mac resource forks.
+                       if ( $file->isFile() && ! in_array( $file->getBasename(), array(
+                                       '..',
+                                       '.'
+                               ) ) && ! stristr( $file->getPathname(), '__MACOSX' )
+                       ) {
+                               array_push( $files, $file->getPathname() );
+                       }
+               }
+
+               return $files;
+       }
+
+       /**
+        * Whitelist zip files to be allowed to be uploaded to the media library.
+        *
+        * @param string $site_exts Whitelisted file extentions.
+        *
+        * @return string Whitelisted file extentions.
+        */
+       public function whitelist_zip_files( $site_exts ) {
+               $file_extenstions   = explode( ' ', $site_exts );
+               $file_extenstions[] = 'zip';
+
+               return implode( ' ', array_unique( $file_extenstions ) );
+       }
+
+       /**
+        * Deletes the temporary directory.
+        */
+       public function remove_files() {
+               $rm    = escapeshellarg( self::RM );
+               $files = escapeshellarg( $this->tmp_dir );
+
+               exec( escapeshellcmd( "{$rm} -rf {$files}" ) );
+       }
+
+       /**
+        * Strips invalid UTF-8 characters.
+        *
+        * Non-UTF-8 characters in plugin descriptions will causes blank descriptions in plugins.trac.
+        *
+        * @param string $string The string to be converted.
+        *
+        * @return string The converted string.
+        */
+       protected function strip_non_utf8( $string ) {
+               ini_set( 'mbstring.substitute_character', 'none' );
+
+               return mb_convert_encoding( $string, 'UTF-8', 'UTF-8' );
+       }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-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/plugin-directory/shortcodes/class-upload.php                             (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php       2016-02-25 23:56:12 UTC (rev 2625)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,65 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+namespace WordPressdotorg\Plugin_Directory\Shortcodes;
+
+class Upload {
+
+       /**
+        * Renders the upload shortcode.
+        */
+       public static function display() {
+               if ( is_user_logged_in() ) :
+
+                       if ( ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-plugins-upload' ) && 'upload' === $_POST['action'] ) {
+                               if ( UPLOAD_ERR_OK === $_FILES['zip_file']['error'] ) {
+                                       switch_to_blog( WPORG_PLUGIN_DIRECTORY_BLOGID );
+                                       $uploader = new Upload_Handler;
+                                       $message  = $uploader->process_upload();
+                                       restore_current_blog();
+
+                               }  else {
+                                       $message = __( 'Error in file upload.', 'wporg-plugins' );
+                               }
+
+                               if ( ! empty( $message ) ) {
+                                       echo "<div class='notice notice-warning'><p>{$message}</p></div>\n";
+                               }
+                       }
+                       ?>
+                       <form enctype="multipart/form-data" id="upload_form" method="POST" action="">
+                               <?php wp_nonce_field( 'wporg-plugins-upload' ); ?>
+                               <input type="hidden" name="action" value="upload"/>
+                               <input type="file" id="zip_file" name="zip_file" size="25"/>
+                               <input id="upload_button" class="button" 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>
+               <?php else : ?>
+                       <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;
+       }
+
+       /**
+        * Returns a human readable version of the max allowed upload size.
+        *
+        * @return string The allowed file size.
+        */
+       public static function get_max_allowed_file_size() {
+               $upload_size_unit = wp_max_upload_size();
+               $byte_sizes       = array( 'KB', 'MB', 'GB' );
+
+               for ( $unit = - 1; $upload_size_unit > 1024 && $unit < count( $byte_sizes ) - 1; $unit ++ ) {
+                       $upload_size_unit /= 1024;
+               }
+
+               if ( $unit < 0 ) {
+                       $upload_size_unit = $unit = 0;
+               } else {
+                       $upload_size_unit = (int) $upload_size_unit;
+               }
+
+               return $upload_size_unit . $byte_sizes[ $unit ];
+       }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>

</body>
</html>