Changeset 13618

Timestamp:

04/30/2024 04:41:42 AM (3 months ago)

Author:

dd32

Message:

Plugin Directory: Readme: Validate that the license field contains a likely valid license.

This adds to the existing "no license" with two new ones:

• Warning: License appears to be not-GPL-compatible, invalid
• Note: We could not parse the license specified, unknown

Fixes #1944.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme

Files:

• class-parser.php (modified) (2 diffs)
• class-validator.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme/class-parser.php

@@ -342 +342 @@
             // Handle the many cases of "License: GPLv2 - http://..."
             if ( empty( $headers['license_uri'] ) && preg_match( '!(https?://\S+)!i', $headers['license'], $url ) ) {
-                $headers['license_uri'] = $url[1];
-                $headers['license']     = trim( str_replace( $url[1], '', $headers['license'] ), " -*\t\n\r\n" );
-            }
+                $headers['license_uri'] = trim( $url[1], " -*\t\n\r\n(" );
+                $headers['license']     = trim( str_replace( $url[1], '', $headers['license'] ), " -*\t\n\r\n(" );
+            }
+
             $this->license = $headers['license'];
         }
         if ( ! empty( $headers['license_uri'] ) ) {
             $this->license_uri = $headers['license_uri'];
+
+
+
+
+
+
+
+
+
+
         }
 
@@ -920 +931 @@
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme/class-validator.php

@@ -145 +145 @@
         }
 
-        if ( empty( $readme->license ) ) {
+        if (  ) ) {
             $warnings['license_missing'] = true;
+
+
+
+
         }
 
@@ -398 +402 @@
             case 'donate_link_missing':
                 return __( 'No donate link was found', 'wporg-plugins' );
+
             case 'license_missing':
                 return sprintf(
-                    /* translators: 1: 'License' */
-                    __( 'The %1$s field is missing or invalid. A GPLv2 or later compatible license should be specified.', 'wporg-plugins' ),
-                    '<code>License</code>'
+                    /* translators: 1: 'License', 2: Link to a compatible licenses page. */
+                    __( 'The %1$s field is missing. <a href="%2$s">A GPLv2 or later compatible license</a> should be specified.', 'wporg-plugins' ),
+                    '<code>License</code>',
+                    'https://www.gnu.org/licenses/license-list.en.html'
+                );
+
+            case 'invalid_license':
+                return sprintf(
+                    /* translators: 1: 'License', 2: Link to a compatible licenses page. */
+                    __( 'The %1$s field appears to be invalid. <a href="%2$s">A GPLv2 or later compatible license</a> should be specified.', 'wporg-plugins' ),
+                    '<code>License</code>',
+                    'https://www.gnu.org/licenses/license-list.en.html'
+                );
+
+            case 'unknown_license':
+                return sprintf(
+                    /* translators: 1: 'License', 2: Link to a compatible licenses page. */
+                    __( 'The %1$s field could not be validated. <a href="%2$s">A GPLv2 or later compatible license</a> should be specified. The specified license may be compatible.', 'wporg-plugins' ),
+                    '<code>License</code>',
+                    'https://www.gnu.org/licenses/license-list.en.html'
                 );