<!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>[13628] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-api-update-updater.php: Plugin Directory: API: Store the closed data in the update-check source table.</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/13628">13628</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/13628","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-04-30 07:15:29 +0000 (Tue, 30 Apr 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'>Plugin Directory: API: Store the closed data in the update-check source table.

Note: This only makes it available to the API, doesn't currently output it.

See <a href="http://meta.trac.wordpress.org/ticket/7057">#7057</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjobsclassapiupdateupdaterphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-api-update-updater.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjobsclassapiupdateupdaterphp"></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/jobs/class-api-update-updater.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/jobs/class-api-update-updater.php       2024-04-30 07:08:16 UTC (rev 13627)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-api-update-updater.php 2024-04-30 07:15:29 UTC (rev 13628)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,6 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                LEFT JOIN {$wpdb->prefix}update_source u ON p.ID = u.plugin_id
</span><span class="cx" style="display: block; padding: 0 10px">                                LEFT JOIN {$wpdb->postmeta} pm ON p.ID = pm.post_id AND pm.meta_key = 'version'
</span><span class="cx" style="display: block; padding: 0 10px">                                LEFT JOIN {$wpdb->postmeta} pm_stable ON p.ID = pm_stable.post_id AND pm_stable.meta_key = 'stable_tag'
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                LEFT JOIN {$wpdb->postmeta} pm_closed ON p.ID = pm_closed.post_id AND pm_closed.meta_key = 'plugin_closed_date'
</ins><span class="cx" style="display: block; padding: 0 10px">                         WHERE
</span><span class="cx" style="display: block; padding: 0 10px">                                p.post_type = 'plugin'
</span><span class="cx" style="display: block; padding: 0 10px">                                AND (
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,8 +37,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        u.last_updated != p.post_modified OR
</span><span class="cx" style="display: block; padding: 0 10px">                                        ( u.version != pm.meta_value AND u.version != left( pm.meta_value, 128 ) ) OR
</span><span class="cx" style="display: block; padding: 0 10px">                                        ( u.stable_tag != pm_stable.meta_value AND u.stable_tag != left( pm_stable.meta_value, 128 ) ) OR
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ( u.available = 1 AND (p.post_status != 'publish' AND p.post_status != 'disabled' ) ) OR
-                                       ( u.available = 0 AND (p.post_status = 'publish' OR p.post_status = 'disabled' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ( u.available = 1 AND p.post_status NOT IN( 'publish', 'disabled' ) ) OR
+                                       ( u.available = 0 AND p.post_status IN( 'publish', 'disabled' ) ) OR
+                                       (
+                                               pm_closed.meta_value IS NOT NULL AND (
+                                                       u.meta NOT LIKE '%closed_at%' OR
+                                                       (
+                                                               u.meta NOT LIKE '%closed_reason%' AND
+                                                               DATE_ADD( pm_closed.meta_value, INTERVAL 60 DAY ) <= NOW()
+                                                       )
+                                               )
+                                       )
</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">@@ -67,13 +77,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        return true;
</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">+                $version          = get_post_meta( $post->ID, 'version', true );
</ins><span class="cx" style="display: block; padding: 0 10px">                 $requires_plugins = get_post_meta( $post->ID, 'requires_plugins', true );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $meta             = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                if ( in_array( $post->post_status, array( 'disabled', 'closed' ) ) ) {
+                       $closed_data           = Template::get_close_data( $post );
+                       $meta['closed_at']     = $closed_data['date'] ?? false;
+                       if ( $closed_data['public'] ?? false ) {
+                               $meta['closed_reason'] = $closed_data['reason'];
+                               $meta['closed_label']  = $closed_data['label'];
+                       }
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $data = array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'plugin_id'        => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px">                        'plugin_slug'      => $post->post_name,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'available'        => 'publish'      === $post->post_status || 'disabled' === $post->post_status,
-                       'version'          => get_post_meta( $post->ID, 'version', true ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'available'        => (int) in_array( $post->post_status, array( 'publish', 'disabled' ) ),
+                       'version'          => $version,
</ins><span class="cx" style="display: block; padding: 0 10px">                         'stable_tag'       => get_post_meta( $post->ID, 'stable_tag', true ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'plugin_name'      => strip_tags( get_post_meta( $post->ID, 'header_name', true ) ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'plugin_name_san'  => sanitize_title_with_dashes( strip_tags( get_post_meta( $post->ID, 'header_name', true ) ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,15 +102,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        'tested'           => get_post_meta( $post->ID, 'tested', true ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'requires'         => get_post_meta( $post->ID, 'requires', true ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'requires_php'     => get_post_meta( $post->ID, 'requires_php', true ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'requires_plugins' => $requires_plugins ? serialize( get_post_meta( $post->ID, 'requires_plugins', true ) ) : '',
-                       'upgrade_notice'   => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'requires_plugins' => $requires_plugins ? serialize( $requires_plugins ) : '',
+                       'upgrade_notice'   => get_post_meta( $post->ID, 'upgrade_notice', true )[ $version ] ?? '',
</ins><span class="cx" style="display: block; padding: 0 10px">                         'assets'           => serialize( self::get_plugin_assets( $post ) ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        'meta'             => $meta ? serialize( $meta ) : '',
</ins><span class="cx" style="display: block; padding: 0 10px">                         'last_updated'     => $post->post_modified,
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $upgrade_notice = get_post_meta( $post->ID, 'upgrade_notice', true );
-               if ( isset( $upgrade_notice[ $data['version'] ] ) ) {
-                       $data['upgrade_notice'] = $upgrade_notice[ $data['version'] ];
-               }
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if (
</span><span class="cx" style="display: block; padding: 0 10px">                        ! $wpdb->update( $wpdb->prefix . 'update_source', $data, array( 'plugin_slug' => $post->post_name ) ) &&
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +199,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">   `requires_php` varchar(128) NOT NULL DEFAULT '',
</span><span class="cx" style="display: block; padding: 0 10px">   `requires_plugins` text NOT NULL DEFAULT '',
</span><span class="cx" style="display: block; padding: 0 10px">   `upgrade_notice` text,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-  `assets` text NOT NULL DEFAULT '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  `assets` text DEFAULT NULL,
+  `meta` text DEFAULT NULL,
</ins><span class="cx" style="display: block; padding: 0 10px">   `last_updated` datetime NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px">   PRIMARY KEY (`plugin_id`),
</span><span class="cx" style="display: block; padding: 0 10px">   UNIQUE KEY `plugin_slug` (`plugin_slug`),
</span></span></pre>
</div>
</div>

</body>
</html>