<!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>[12840] sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/rejection.php: Photo Directory, Rejection: Add prefix label to each rejection reason in dropdown and alphabetize the list.</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/12840">12840</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/12840","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>2023-08-14 21:58:12 +0000 (Mon, 14 Aug 2023)</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, Rejection: Add prefix label to each rejection reason in dropdown and alphabetize the list.
Props topher1kenobe, coffee2code.
Fixes <a href="http://meta.trac.wordpress.org/ticket/7182">#7182</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincrejectionphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/rejection.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincrejectionphp"></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/rejection.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/rejection.php 2023-08-14 21:11:54 UTC (rev 12839)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/rejection.php 2023-08-14 21:58:12 UTC (rev 12840)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,71 +29,67 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function init() {
</span><span class="cx" style="display: block; padding: 0 10px"> self::$rejection_reasons = [
</span><span class="cx" style="display: block; padding: 0 10px"> '' => [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Do not reject', 'wporg-photos' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Approve: Do not reject', 'wporg-photos' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'email' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'general' => [
- 'label' => __( 'General/nonspecific', 'wporg-photos' ),
- 'email' => '', // No specific reason will be conveyed to contributor.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'anothers_art' => [
+ 'label' => __( 'Other art: Predominantly another piece of art', 'wporg-photos' ),
+ 'email' => __( 'The photo appeared to largely consist of the art of another person. We respect the rights of other artists by not distributing reproductions of their work.', 'wporg-photos' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'branding' => [
+ 'label' => __( 'Branding: Prominent branding', 'wporg-photos' ),
+ 'email' => __ ( 'The photo prominently displayed branding in such a way that the branding and/or branded product was the focus of the image. We do not accept branded subject matter to avoid the directory being used for promotional purposes or to imply endorsement by the WordPress project.', 'wporg-photos' ),
+ ],
+ 'collage' => [
+ 'label' => __( 'Collage: Collage or composite image', 'wporg-photos' ),
+ 'email' => __( 'The image appeared to be a collage or composite of separate images.', 'wporg-photos' ),
+ ],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'copyright' => [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Potential copyright/ownership infringement', 'wporg-photos' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Copyright: Potential copyright/ownership infringement', 'wporg-photos' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'email' => __( 'The photo has been posted elsewhere but does not appear to be your original work. We require that you "have the copyright or other legal ownership for any photo you submit". This does not include posting photos created by others, even if their licensing is permissive in its use, since copyright is not conferred to you.', 'wporg-photos' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'branding' => [
- 'label' => __( 'Prominent branding', 'wporg-photos' ),
- 'email' => __ ( 'The photo prominently displayed branding in such a way that the branding and/or branded product was the focus of the image. We do not accept branded subject matter to avoid the directory being used for promotional purposes or to imply endorsement by the WordPress project.', 'wporg-photos' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'faces' => [
+ 'label' => __( 'Faces: Contains human face(s)', 'wporg-photos' ),
+ 'email' => __( 'The photo contained one or more human faces. We do not currently accept photos that show human faces, wholly or partially, even if facial features cannot clearly be identified.', 'wporg-photos' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'general' => [
+ 'label' => __( 'General: General/nonspecific', 'wporg-photos' ),
+ 'email' => '', // No specific reason will be conveyed to contributor.
+ ],
+ 'image_extreme' => [
+ 'label' => __( 'Extreme: Violence, gore, hate, or sexual content', 'wporg-photos' ),
+ 'email' => __( 'The photo depicted some element of violence, gore, hate, or sexual content.', 'wporg-photos' ),
+ ],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'image_quality' => [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Insufficient image quality (e.g. blurriness, composition, lighting, lens issues)', 'wporg-photos' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Quality: Insufficient image quality (e.g. blurriness, composition, lighting, lens issues)', 'wporg-photos' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'email' => __( 'The photo had an issue regarding image quality. Submissions should be of high quality composition, lighting, focus, and color. The image should be free of blur (for the primary subject), noise, lens flare, glare, and spots due to water or dirt on the lens.', 'wporg-photos' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image_subject' => [
+ 'label' => __( 'Subject matter: Image subject matter', 'wporg-photos' ),
+ 'email' => __( 'The photo included subject matter of insufficient quality.', 'wporg-photos' ),
+ ],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'not_a_photo' => [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Not a photo (e.g. screenshot, digital art)', 'wporg-photos' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Not a photo: Not a photo (e.g. screenshot, digital art)', 'wporg-photos' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'email' => __( 'The image did not appear to be a photograph. We do not accept screenshots, digital art, or other non-photographic images.', 'wporg-photos' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'collage' => [
- 'label' => __( 'Collage or composite image', 'wporg-photos' ),
- 'email' => __( 'The image appeared to be a collage or composite of separate images.', 'wporg-photos' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'other' => [
+ 'label' => __( 'See below: Reason specified below', 'wporg-photos' ),
+ 'email' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> 'overlays' => [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Overlays, watermark, borders, or other additions', 'wporg-photos' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Overlays: Overlays, watermark, borders, or other additions', 'wporg-photos' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'email' => __( 'The photo included an overlay of some form (e.g. graphic, text, watermark, border).', 'wporg-photos' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image_subject' => [
- 'label' => __( 'Image subject matter', 'wporg-photos' ),
- 'email' => __( 'The photo included subject matter of insufficient quality.', 'wporg-photos' ),
- ],
- 'image_extreme' => [
- 'label' => __( 'Violence, gore, hate, or sexual content', 'wporg-photos' ),
- 'email' => __( 'The photo depicted some element of violence, gore, hate, or sexual content.', 'wporg-photos' ),
- ],
- 'text' => [
- 'label' => __( 'Predominantly text', 'wporg-photos' ),
- 'email' => __( 'The photo was predominantly text. Please refrain from submitting photos where text is a significant element of the photo.', 'wporg-photos' ),
- ],
</del><span class="cx" style="display: block; padding: 0 10px"> 'overprocessed' => [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Overprocessed', 'wporg-photos' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Overprocessed: Overprocessed', 'wporg-photos' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'email' => __( 'The photo appeared to be overprocessed with filters or other photo adjustments. We prefer minimal processing.', 'wporg-photos' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'anothers_art' => [
- 'label' => __( 'Predominantly another piece of art', 'wporg-photos' ),
- 'email' => __( 'The photo appeared to largely consist of the art of another person. We respect the rights of other artists by not distributing reproductions of their work.', 'wporg-photos' ),
- ],
- 'faces' => [
- 'label' => __( 'Contains human face(s)', 'wporg-photos' ),
- 'email' => __( 'The photo contained one or more human faces. We do not currently accept photos that show human faces, wholly or partially, even if facial features cannot clearly be identified.', 'wporg-photos' ),
- ],
</del><span class="cx" style="display: block; padding: 0 10px"> 'privacy' => [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Potentially violates privacy', 'wporg-photos' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Privacy: Potentially violates privacy', 'wporg-photos' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'email' => __( 'The photo contained potentially privacy-violating material such as a home address, license plate, or other form of personal identification.', 'wporg-photos' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'variation' => [
- 'label' => __( 'Duplicate or minor variation of submitted photo', 'wporg-photos' ),
- 'email' => __( 'The photo is a duplicate or minor variation of something you have already had published to the site or recently submitted. This can be the same subject matter taken from a different angle, from slightly before or after in time, with a different composition or cropping or dimensions, or staged or edited differently.', 'wporg-photos' ),
- ],
</del><span class="cx" style="display: block; padding: 0 10px"> 'submission-error' => [ // This specific key is referenced in code, so make related updates if renaming.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Submission error', 'wporg-photos' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Error: Submission error', 'wporg-photos' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to meta.trac to report bugs. */
</span><span class="cx" style="display: block; padding: 0 10px"> 'email' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'There appears to have been an error with your submission and the photo never fully uploaded. This could be caused by a broken internet connection, network issues, or a glitch somewhere. Please retry your submission. If this is not your first notice regarding this image, try another. If you have anything to report in terms of errors encountered while uploading, please report them to us at %s.', 'wporg-photos' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,10 +96,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://meta.trac.wordpress.org/newticket?component=Photo%20Directory'
</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">- 'other' => [
- 'label' => __( 'Reason specified below', 'wporg-photos' ),
- 'email' => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'text' => [
+ 'label' => __( 'Text: Predominantly text', 'wporg-photos' ),
+ 'email' => __( 'The photo was predominantly text. Please refrain from submitting photos where text is a significant element of the photo.', 'wporg-photos' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'variation' => [
+ 'label' => __( 'Variation/Duplicate: Duplicate or minor variation of submitted photo', 'wporg-photos' ),
+ 'email' => __( 'The photo is a duplicate or minor variation of something you have already had published to the site or recently submitted. This can be the same subject matter taken from a different angle, from slightly before or after in time, with a different composition or cropping or dimensions, or staged or edited differently.', 'wporg-photos' ),
+ ],
</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"> $post_type = Registrations::get_post_type();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +306,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_rejection_reasons( $reason = '', $field = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Return all reasons if one wasn't specified.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $reason ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return self::$rejection_reasons;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $reasons = self::$rejection_reasons;
+ uasort( $reasons, function( $a, $b ) {
+ return strcmp( $a['label'], $b['label'] );
+ } );
+ return $reasons;
</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"> // Bail if reason requested is not valid.
</span></span></pre>
</div>
</div>
</body>
</html>