<!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>[13980] sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/uploads.php: Photo Directory, Uploads: Output a grid of the 6 latest submissions by the user on the upload page.</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/13980">13980</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/13980","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>2024-08-19 22:26:56 +0000 (Mon, 19 Aug 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Photo Directory, Uploads: Output a grid of the 6 latest submissions by the user on the upload page.
Props topher1kenobe, coffee2code.
Fixes <a href="http://meta.trac.wordpress.org/ticket/7600">#7600</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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_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 2024-08-19 22:19:46 UTC (rev 13979)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/uploads.php 2024-08-19 22:26:56 UTC (rev 13980)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,6 +80,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Enqueue scripts.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', [ __CLASS__, 'wp_enqueue_scripts' ] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Adds user's recent submissions above upload form.
+ add_filter( 'wporg_photos_pre_upload_form', [ __CLASS__, 'output_user_recent_submissions' ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Disable upload form and show message if user not allowed to upload.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_content', [ __CLASS__, 'insert_upload_disallowed_notice' ], 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> // Insert upload form into submit page.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -888,14 +890,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_page( self::SUBMIT_PAGE_SLUG ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= apply_filters( 'wporg_photos_pre_upload_form', $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( User::count_published_photos( get_current_user_id() ) ) {
- $content .= sprintf(
- /* translators: %s: URL to current user's photo archive. */
- '<p>' . __( 'View <a href="%s">your archive of photos</a> to see what you’ve already had published.', 'wporg-photos' ) . '</p>',
- get_author_posts_url( get_current_user_id() )
- );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $content .= '<fieldset id="wporg-photo-upload">';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1014,6 +1008,40 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $transforms;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Adds current user's 6 most recent photo submissions above upload form.
+ *
+ * @param string $content Existing content before the upload form.
+ * @return string
+ */
+ public static function output_user_recent_submissions( $content ) {
+ // Bail if user does not have any published photos.
+ if ( ! User::count_published_photos( get_current_user_id() ) ) {
+ return $content;
+ }
+
+ $recent_photos = User::get_recent_photos( get_current_user_id(), 6, false );
+ if ( $recent_photos ) {
+ $content .= '<h2 class="latest-photos">' . esc_html__( 'Your latest published photos', 'wporg-photos' ) . '</h2>' . "\n";
+ $content .= '<div class="photos-grid">' . "\n";
+
+ foreach ( $recent_photos as $photo ) {
+ $content .= Template_Tags\get_photo_as_grid_item( $photo, 'medium', 'post' );
+ }
+
+ $content .= "</div>\n";
+ }
+
+ $content .= sprintf(
+ /* translators: %s: URL to current user's photo archive. */
+ '<p>' . __( 'View <a href="%s">your archive of photos</a> to see everything you’ve already had published.', 'wporg-photos' ) . '</p>',
+ esc_url( get_author_posts_url( get_current_user_id() ) )
+ );
+
+ return $content;
+ }
+
</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"> add_action( 'plugins_loaded', [ __NAMESPACE__ . '\Uploads', 'init' ] );
</span></span></pre>
</div>
</div>
</body>
</html>