<!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>[12087] sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory: Photo Directory, Uploads: Improve photo upload mime type restrictions.</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/12087">12087</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/12087","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-09-26 22:03:49 +0000 (Mon, 26 Sep 2022)</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'>Photo Directory, Uploads: Improve photo upload mime type restrictions.
- Define file input field with HTML rather than shortcode to allow defining 'accept' attribute
- Define accepted file extension via 'accept' attribute of file input
- Explicitly only accept "image/jpeg" in `restrict_upload_mimes()` despite what may be configured in FU plugin's settings.
- Fix how mimetype is specified in `restrict_upload_mimes()`
- Add fallback server-side check for image type during upload</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryassetsjssubmitjs">sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/assets/js/submit.js</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincuploadsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/uploads.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryassetsjssubmitjs"></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/photo-directory/assets/js/submit.js</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/photo-directory/assets/js/submit.js 2022-09-26 21:59:32 UTC (rev 12086)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/assets/js/submit.js 2022-09-26 22:03:49 UTC (rev 12087)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,6 +32,12 @@
</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">+ // Customize jQuery Validator, if still in use.
+ if ( window.jQuery && window.jQuery.validator ) {
+ // Customize error message for invalid file mimetype.
+ jQuery.validator.messages.accept = PhotoDir.err_invalid_mimetype;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Check validity of form fields on submission.
</span><span class="cx" style="display: block; padding: 0 10px"> photo_upload_form.addEventListener( 'submit', e => {
</span><span class="cx" style="display: block; padding: 0 10px"> photoShowFileSizeError( photo_upload_field );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincuploadsphp"></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/photo-directory/inc/uploads.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/photo-directory/inc/uploads.php 2022-09-26 21:59:32 UTC (rev 12086)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/uploads.php 2022-09-26 22:03:49 UTC (rev 12087)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,6 +250,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wporg-photos-submit',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PhotoDir',
</span><span class="cx" style="display: block; padding: 0 10px"> [
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // File extension.
+ 'err_invalid_mimetype' => __( 'Please select a JPEG image.', 'wporg-photos' ),
+
+ // File size.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'err_file_too_large' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The selected file cannot be larger than %s MB.', 'wporg-photos' ),
</span><span class="cx" style="display: block; padding: 0 10px"> self::get_maximum_photo_file_size( false )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,15 +334,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Restricts upload mimetypes to only allow image mimetypes.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $mimes Array of mimetypes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $mimes Array of mimetypes. Ignored.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function restrict_upload_mimes( $mimes ) {
- $acceptable_mimes = [
- 'jpg|jpeg|jpe' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function restrict_upload_mimes( $mimes = [] ) {
+ return [
+ 'jpg|jpeg|jpe' => 'image/jpeg',
</ins><span class="cx" style="display: block; padding: 0 10px"> ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- return array_intersect_key( $mimes, $acceptable_mimes );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,6 +370,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'duplicate-file':
</span><span class="cx" style="display: block; padding: 0 10px"> $rejection = __( 'Your submission appears to be a duplicate of something uploaded before.', 'wporg-photos' );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'file-not-jpg':
+ $rejection = __( 'Your submission must be an image in the JPEG format.', 'wporg-photos' );
+ break;
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'file-too-large':
</span><span class="cx" style="display: block; padding: 0 10px"> $rejection = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The file size for your submission is too large. Please submit a photo smaller than %d MB in size.', 'wporg-photos' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -544,6 +549,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ list( $width, $length, $image_type ) = getimagesize( $_FILES['files']['tmp_name'][0] );
+
+ // Check image type.
+ if ( ! in_array( $image_type, [ IMG_JPG, IMG_JPEG ] ) ) {
+ return 'file-not-jpg';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_POST['photo_copyright'] ) || ! $_POST['photo_copyright'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 'checkbox_unchecked_copyright';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -839,16 +851,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( self::user_reached_concurrent_submission_limit() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= '<p>' . __( 'Thanks for your submissions! Please wait until a photo is approved by moderators before submitting again.', 'wporg-photos' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $valid_upload_mimetypes = implode( ',', array_values( self::restrict_upload_mimes() ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content .= '[input type="hidden" name="post_title" value=""]' . "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '[input type="hidden" name="MAX_FILE_SIZE" value="%s"]' . "\n",
</span><span class="cx" style="display: block; padding: 0 10px"> self::get_maximum_photo_file_size()
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content .= sprintf(
- '[input type="file" name="ug_photo" id="ug_photo" description="%s" required="true" aria-required="true"]' . "\n",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content .= '<div class="ugc-input-wrapper">' . "\n"
+ . sprintf(
+ '<label for="ug_photo">%s</label>' . "\n",
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_attr( __( 'Photo', 'wporg-photos' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> . sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<input type="file" name="files[]" id="ug_photo" value="" required="true" aria-required="true" accept="%s">' . "\n",
+ esc_attr( $valid_upload_mimetypes )
+ )
+ . "</div>\n"
+ . sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> '[%s name="post_content" class="textarea" id="ug_content" description="%s" maxlength="%d" help="%s"]' . "\n",
</span><span class="cx" style="display: block; padding: 0 10px"> $description_shortcode,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( __( 'Description (optional)', 'wporg-photos' ) ),
</span></span></pre>
</div>
</div>
</body>
</html>