Making WordPress.org

Changeset 7350


Ignore:
Timestamp:
06/29/2018 08:57:02 PM (7 years ago)
Author:
obenland
Message:

Main: phpcs updates

Location:
sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main
Files:
25 edited

Legend:

Unmodified
Added
Removed
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/functions.php

    r7348 r7350  
    7474    if ( is_page( 'stats' ) ) {
    7575        wp_enqueue_script( 'google-charts', 'https://www.gstatic.com/charts/loader.js', [], null, true );
    76         wp_enqueue_script( 'wporg-page-stats', get_theme_file_uri( '/js/page-stats.js' ), [ 'jquery', 'google-charts'], 1, true );
     76        wp_enqueue_script( 'wporg-page-stats', get_theme_file_uri( '/js/page-stats.js' ), [ 'jquery', 'google-charts' ], 1, true );
    7777        wp_localize_script( 'wporg-page-stats', 'wporgPageStats', [
    7878            'trunk'         => number_format( WP_CORE_STABLE_BRANCH + 0.1, 1 ), /* trunk */
     
    159159
    160160        // We want it before page-{page_name}.php but after {Page Template}.php.
    161         $page_name_index = array_search( "page-{$page->post_name}.php", $templates );
     161        $page_name_index = array_search( "page-{$page->post_name}.php", $templates, true );
    162162        $top             = array_slice( $templates, 0, $page_name_index );
    163163        $bottom          = array_slice( $templates, $page_name_index );
    164164
    165         $templates = array_merge( $top, ["page-{$parent->post_name}-{$page->post_name}.php"], $bottom );
     165        $templates = array_merge( $top, [ "page-{$parent->post_name}-{$page->post_name}.php" ], $bottom );
    166166    }
    167167
     
    187187add_filter( 'theme_page_templates', __NAMESPACE__ . '\rosetta_page_templates' );
    188188
     189/**
     190 * Passes SEO-optimized title and description to embeds.
     191 */
    189192function use_opengraph_data_for_embed_template() {
    190193    global $post;
    191     if ( 'page' != $post->post_type || ! $post->page_template || 'default' == $post->page_template ) {
     194
     195    if ( 'page' !== $post->post_type || ! $post->page_template || 'default' === $post->page_template ) {
    192196        return;
    193197    }
     
    195199    $meta = custom_open_graph_tags();
    196200    if ( $meta ) {
    197         add_filter( 'the_title', function( $title ) use( $meta ) {
     201        add_filter( 'the_title', function( $title ) use ( $meta ) {
    198202            return $meta['og:title'] ?? $title;
    199203        } );
    200         add_filter( 'the_content', function( $content ) use( $meta ) {
     204        add_filter( 'the_content', function( $content ) use ( $meta ) {
    201205            return $meta['og:description'] ?? $content;
    202206        } );
     
    208212 * Custom template tags.
    209213 */
    210 require_once get_stylesheet_directory() . '/inc/template-tags.php';
     214require_once __DIR__ . '/inc/template-tags.php';
    211215
    212216/**
    213217 * Custom meta descriptions for page templates.
    214218 */
    215 require_once get_stylesheet_directory() . '/inc/page-meta-descriptions.php';
     219require_once __DIR__ . '/inc/page-meta-descriptions.php';
    216220
    217221/**
    218222 * Include reCAPTCHA functions for privacy requests.
    219223 */
    220 include __DIR__ . '/inc/recaptcha.php';
     224require_once __DIR__ . '/inc/recaptcha.php';
    221225
    222226/**
    223227 * Include the Privacy request functions.
    224228 */
    225 include __DIR__ . '/inc/privacy-functions.php';
     229require_once __DIR__ . '/inc/privacy-functions.php';
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/header-child-page.php

    r7218 r7350  
    3232                            // The last found menu item that patches is the one that's shown as active.
    3333                            foreach ( $menu_items as $path => $text ) {
     34                                // phpcs:ignore WordPress.VIP
    3435                                if ( false !== strpos( $_SERVER['REQUEST_URI'], $path ) ) {
    3536                                    $active_item = $path;
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/page-meta-descriptions.php

    r7298 r7350  
    2525        default:
    2626            return $tags;
    27             break;
    2827
    2928        case 'page-about-domains.php':
     
    4544            $title = esc_html__( 'WordPress Features', 'wporg' );
    4645            /* translators: 1: WordPress market share: 30 - Note: The following percent sign is '%%' for escaping purposes; 2: Number of WordPress.org hosted plugins; */
    47             $desc  = sprintf( esc_html__( 'Discover why WordPress powers more than %1$s%% of the web. WordPress is a simple, flexible, user-friendly platform, with key features that include media management, SEO, and endless options for customization. More than %2$s plugins extend the core functionality of WordPress even more. Build your site today.', 'wporg' ), number_format_i18n( WP_MARKET_SHARE ), number_format_i18n( 50000 ) );
     46            $desc = sprintf( esc_html__( 'Discover why WordPress powers more than %1$s%% of the web. WordPress is a simple, flexible, user-friendly platform, with key features that include media management, SEO, and endless options for customization. More than %2$s plugins extend the core functionality of WordPress even more. Build your site today.', 'wporg' ), number_format_i18n( WP_MARKET_SHARE ), number_format_i18n( 50000 ) );
    4847            break;
    4948
     
    5150            $title = esc_html__( 'The History of WordPress', 'wporg' );
    5251            /* translators: WordPress market share: 30 - Note: The following percent sign is '%%' for escaping purposes; */
    53             $desc  = sprintf( esc_html__( 'WordPress currently powers more than %s%% of the web. How did it grow to become the world’s leading web publishing platform? Learn about the history of WordPress: an open source software project built by an active community of contributors who are passionate about collaboration, empowerment, and the open web.', 'wporg' ), number_format_i18n( WP_MARKET_SHARE ) );
     52            $desc = sprintf( esc_html__( 'WordPress currently powers more than %s%% of the web. How did it grow to become the world’s leading web publishing platform? Learn about the history of WordPress: an open source software project built by an active community of contributors who are passionate about collaboration, empowerment, and the open web.', 'wporg' ), number_format_i18n( WP_MARKET_SHARE ) );
    5453            break;
    5554
     
    6160        case 'page-about-logos.php':
    6261            $title = esc_html__( 'Graphics & Logos', 'wporg' );
    63             $desc  = sprintf( __( 'When you need the official WordPress logo for a web site or publication, please use one of the following. Please only use logos in accordance with the <a href="%s">WordPress trademark&nbsp;policy</a>.', 'wporg' ), esc_url( 'http://wordpressfoundation.org/trademark-policy/' ) );
     62            /* translators: Link to foundation trademark policy ; */
     63            $desc = sprintf( __( 'When you need the official WordPress logo for a web site or publication, please use one of the following. Please only use logos in accordance with the <a href="%s">WordPress trademark&nbsp;policy</a>.', 'wporg' ), esc_url( 'http://wordpressfoundation.org/trademark-policy/' ) );
    6464            break;
    6565
     
    8787            $title = esc_html__( 'WordPress is Secure', 'wporg' );
    8888            /* translators: WordPress market share: 30 - Note: The following percent sign is '%%' for escaping purposes; */
    89             $desc  = sprintf( esc_html__( 'Why is WordPress recommended as a secure website-building solution? With a passionate open source community and an extensible, easy-to-use platform, WordPress provides flexible and secure options for all levels of users, from beginners to pros. Learn how WordPress guarantees the security of %s%% of the web.', 'wporg' ), number_format_i18n( WP_MARKET_SHARE ) );
     89            $desc = sprintf( esc_html__( 'Why is WordPress recommended as a secure website-building solution? With a passionate open source community and an extensible, easy-to-use platform, WordPress provides flexible and secure options for all levels of users, from beginners to pros. Learn how WordPress guarantees the security of %s%% of the web.', 'wporg' ), number_format_i18n( WP_MARKET_SHARE ) );
    9090            break;
    9191
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/privacy-functions.php

    r7251 r7350  
    22/**
    33 * Functions for the Privacy Tools - Exports and Erasures.
     4 *
     5 * @package WordPressdotorg\MainTheme
    46 */
     7
     8// phpcs:disable WordPress.VIP.SuperGlobalInputUsage.AccessDetected, WordPress.VIP.ValidatedSanitizedInput
     9
    510namespace WordPressdotorg\MainTheme;
     11
    612use WordPressdotorg\GDPR\Main as GDPR_Main;
    713
     14/**
     15 * Processes privacy requests.
     16 *
     17 * @param string $type Type of request.
     18 *
     19 * @return array
     20 */
    821function privacy_process_request( $type ) {
    9     $email = $error_message = $success = false;
    10     $nonce_action = 'request_' . $type;
     22    $email         = false;
     23    $error_message = false;
     24    $success       = false;
     25    $nonce_action  = 'request_' . $type;
    1126
    12     if ( empty( $_POST['email'] ) || ! $type || ! in_array( $type, [ 'erase', 'export' ] ) ) {
     27    if ( empty( $_POST['email'] ) || ! $type || ! in_array( $type, [ 'erase', 'export' ], true ) ) {
    1328        return compact( 'email', 'error_message', 'success', 'nonce_action' );
    1429    }
    1530
    16     $email = trim( wp_unslash( $_POST['email'] ) );
    17 
    18     $requesting_user = false;
    19     if ( is_user_logged_in() ) {
    20         $requesting_user = wp_get_current_user()->user_login;
    21     }
     31    // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
     32    $email           = trim( wp_unslash( $_POST['email'] ) );
     33    $requesting_user = is_user_logged_in() ? wp_get_current_user()->user_login : false;
     34    $email_user      = get_user_by( 'email', $email );
    2235
    2336    // Currently only enabled for special accounts.
    24     if ( 'export' === $type && ( ! is_user_logged_in() || ! wporg_user_has_restricted_password() ) ) {
     37    if ( 'export' === $type && ( ! is_user_logged_in() || ! function_exists( 'wporg_user_has_restricted_password' ) || ! wporg_user_has_restricted_password() ) ) {
    2538        $error_message = 'This form is currently unavailable.';
    26     } else
    27 
    28     if ( ! reCAPTCHA\check_status() ) {
     39    } elseif ( ! reCAPTCHA\check_status() ) {
    2940        $error_message = esc_html__( 'Your form session has expired. Please try again.', 'wporg' );
    3041    } elseif (
    3142        is_user_logged_in() &&
    32         ! wp_verify_nonce( $_POST['_wpnonce'], $nonce_action )
     43        ! wp_verify_nonce( wp_unslash( $_POST['_wpnonce'] ), $nonce_action )
    3344    ) {
    3445        $error_message = esc_html__( 'Your form session has expired. Please try again.', 'wporg' );
    35 
    3646    } elseif (
    3747        // Check if a user account exists for this email before processing.
    38         false != ( $email_user = get_user_by( 'email', $email ) ) &&
    39         $email_user->user_login !== $requesting_user
     48        false !== $email_user && $email_user->user_login !== $requesting_user
    4049    ) {
    4150        if ( is_user_logged_in() ) {
     
    5261            );
    5362        }
    54 
    5563    } else {
    56         if ( 'export' == $type ) {
     64        if ( 'export' === $type ) {
    5765            $api_method = 'create-data-export-request';
    58         } elseif ( 'erase' == $type ) {
     66        } elseif ( 'erase' === $type ) {
    5967            $api_method = 'create-account-erasure-request';
    6068        }
     
    7381            $error_message = $api_request->get_error_message();
    7482
    75             if ( 'duplicate_request' == $api_request->get_error_code() ) {
     83            if ( 'duplicate_request' === $api_request->get_error_code() ) {
    7684                // TODO This should never have to be displayed to an end user. See API for details.
    7785                $error_message = esc_html__( 'A request for this email address already exists. Please check your spam folder for your confirmation email.', 'wporg' );
    7886
    79             } elseif ( 'invalid_identifier' == $api_request->get_error_code() ) {
     87            } elseif ( 'invalid_identifier' === $api_request->get_error_code() ) {
    8088                $error_message = esc_html__( 'The provided email was invalid. Please check the address and try again.', 'wporg' );
    8189
    8290            }
    83         } elseif ( !empty( $api_request['created'] ) ) {
     91        } elseif ( ! empty( $api_request['created'] ) ) {
    8492            $success = true;
    8593        }
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/recaptcha.php

    r7218 r7350  
    22/**
    33 * Functions for reCAPTCHA.
     4 *
     5 * @package WordPressdotorg\MainTheme
    46 */
     7
    58namespace WordPressdotorg\MainTheme\reCAPTCHA;
    69
     10/**
     11 * Enqueues reCAPTCHA scripts.
     12 *
     13 * @param mixed $form_id Form ID.
     14 */
    715function enqueue_script( $form_id ) {
    816    if ( ! defined( 'RECAPTCHA_INVIS_PUBKEY' ) ) {
     
    1119
    1220    wp_enqueue_script( 'recaptcha-api', 'https://www.google.com/recaptcha/api.js', array(), '2' );
    13     wp_add_inline_script( 'recaptcha-api', 'function reCAPTCHAPostSubmit(token) { document.getElementById(' . json_encode( (string)$form_id ) . ').submit(); }' );
     21    wp_add_inline_script( 'recaptcha-api', 'function reCAPTCHAPostSubmit(token) { document.getElementById(' . wp_json_encode( (string) $form_id ) . ').submit(); }' );
    1422}
    1523
     24/**
     25 * Displays a submit button.
     26 *
     27 * @param string $submit_text Button text.
     28 * @param string $classes     CSS classes.
     29 */
    1630function display_submit_button( $submit_text = 'Submit', $classes = 'button' ) {
    1731    echo '<input' .
     
    2539}
    2640
     41// phpcs:disable WordPress.VIP, WordPress.CSRF.NonceVerification.NoNonceVerification
     42
     43/**
     44 * Response status.
     45 *
     46 * @return bool
     47 */
    2748function check_status() {
    2849    // If reCAPTCHA is not setup, skip it.
     
    3758    $verify = array(
    3859        'secret'   => RECAPTCHA_INVIS_PRIVKEY,
    39         'remoteip' => $_SERVER['REMOTE_ADDR'],
    40         'response' => $_POST['g-recaptcha-response'],
     60        'remoteip' => wp_unslash( $_SERVER['REMOTE_ADDR'] ),
     61        'response' => wp_unslash( $_POST['g-recaptcha-response'] ),
    4162    );
    4263
    4364    $resp = wp_remote_post( 'https://www.google.com/recaptcha/api/siteverify', array( 'body' => $verify ) );
    4465
    45     if ( is_wp_error( $resp ) || 200 != wp_remote_retrieve_response_code( $resp ) ) {
     66    if ( is_wp_error( $resp ) || 200 !== wp_remote_retrieve_response_code( $resp ) ) {
    4667        return false;
    4768    }
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-accessibility.php

    r7294 r7350  
    2323} );
    2424
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     25/* See inc/page-meta-descriptions.php for the meta description for this page. */
    2626
    2727get_header( 'child-page' );
     
    3939                <section class="col-8">
    4040
    41                     <p><?php _e( 'The WordPress community and the open source WordPress project is committed to being as inclusive and accessible as possible. We want users, regardless of device or ability, to be able to publish content and maintain a website or application built with WordPress.', 'wporg' ); ?></p>
     41                    <p><?php esc_html_e( 'The WordPress community and the open source WordPress project is committed to being as inclusive and accessible as possible. We want users, regardless of device or ability, to be able to publish content and maintain a website or application built with WordPress.', 'wporg' ); ?></p>
    4242
    43                     <p><?php _e( 'WordPress aims to make the WordPress Admin and bundled themes fully WCAG 2.0 AA compliant where possible.', 'wporg' ); ?></p>
    44                     <p><?php
    45                         /* translators: 1: Link to the Core Handbook Accessibility Standards; 2: Link to Core Trac Accessibility focus. */
     43                    <p><?php esc_html_e( 'WordPress aims to make the WordPress Admin and bundled themes fully WCAG 2.0 AA compliant where possible.', 'wporg' ); ?></p>
     44                    <p>
     45                    <?php
    4646                        printf(
    47                             __( 'All new and updated code released in WordPress must conform with these guidelines as per the <a href="%1$s">WordPress Accessibility Coding Standards</a>. Some current features and functionality in development may not yet fully comply, and known issues are listed in the <a href="%2$s">WordPress Trac &#8220;accessibility&#8221; focus</a>.', 'wporg' ),
     47                            /* translators: 1: Link to the Core Handbook Accessibility Standards; 2: Link to Core Trac Accessibility focus. */
     48                            wp_kses_post( __( 'All new and updated code released in WordPress must conform with these guidelines as per the <a href="%1$s">WordPress Accessibility Coding Standards</a>. Some current features and functionality in development may not yet fully comply, and known issues are listed in the <a href="%2$s">WordPress Trac &#8220;accessibility&#8221; focus</a>.', 'wporg' ) ),
    4849                            'https://make.wordpress.org/core/handbook/best-practices/coding-standards/accessibility-coding-standards/',
    4950                            'https://core.trac.wordpress.org/focus/accessibility'
    5051                        );
    51                     ?></p>
     52                    ?>
     53                    </p>
    5254
    53                     <p><?php
    54                         /* translators: 1: Link to the Theme Directory Accessible Themes; 2: Link to Accessibility Handbook requirements. */
     55                    <p>
     56                    <?php
    5557                        printf(
    56                             __( 'While the WordPress project cannot guarantee that all Themes are compliant, the <a href="%1$s">accessibility-ready themes</a> have been checked by the Theme Review Team to ensure that these themes pass their <a href="%2$s">basic accessibility requirements</a>.', 'wporg' ),
    57                             site_url( '/themes/tags/accessibility-ready/' ),
     58                            /* translators: 1: Link to the Theme Directory Accessible Themes; 2: Link to Accessibility Handbook requirements. */
     59                            wp_kses_post( __( 'While the WordPress project cannot guarantee that all Themes are compliant, the <a href="%1$s">accessibility-ready themes</a> have been checked by the Theme Review Team to ensure that these themes pass their <a href="%2$s">basic accessibility requirements</a>.', 'wporg' ) ),
     60                            esc_url( site_url( '/themes/tags/accessibility-ready/' ) ),
    5861                            'https://make.wordpress.org/themes/handbook/review/accessibility/required/'
    5962                        );
    60                     ?></p>
     63                    ?>
     64                    </p>
    6165
    62                     <h3><?php _e( 'The Accessibility Team', 'wporg' ); ?></h3>
    63                     <p><?php
    64                         /* translators: %s: Link to the Accessibility team P2 */
     66                    <h3><?php esc_html_e( 'The Accessibility Team', 'wporg' ); ?></h3>
     67                    <p>
     68                    <?php
    6569                        printf(
    66                             __( 'The <a href="%s">WordPress Accessibility Team</a> provides accessibility expertise across the project to improve the accessibility of WordPress core and resources.', 'wporg' ),
     70                            /* translators: %s: Link to the Accessibility team P2 */
     71                            wp_kses_post( __( 'The <a href="%s">WordPress Accessibility Team</a> provides accessibility expertise across the project to improve the accessibility of WordPress core and resources.', 'wporg' ) ),
    6772                            'https://make.wordpress.org/accessibility/'
    6873                        );
    69                     ?></p>
     74                    ?>
     75                    </p>
    7076
    71                     <p><?php
    72                         /* translators: 1: Link to the Accessibility handbook; 2: Link to the Accessibility handbook's Best Practices; 3: Link to the Accessibility handbook's Useful Tools; 4: Link to the Accessibility handbook's Audits & Testing; 5: Link to the Accessibility handbook's Get Involved */
     77                    <p>
     78                    <?php
    7379                        printf(
    74                             __( 'The <a href="%1$s">Accessibility Handbook</a> shares the <a href="%2$s">best practices</a> for web accessibility, a list of <a href="%3$s">accessibility tools</a>, the <a href="%4$s">testing we do</a> to improve WordPress, themes, and plugins, and <a href="%5$s">how to get involved</a> in WordPress accessibility.', 'wporg' ),
     80                            /* translators: 1: Link to the Accessibility handbook; 2: Link to the Accessibility handbook's Best Practices; 3: Link to the Accessibility handbook's Useful Tools; 4: Link to the Accessibility handbook's Audits & Testing; 5: Link to the Accessibility handbook's Get Involved */
     81                            wp_kses_post( __( 'The <a href="%1$s">Accessibility Handbook</a> shares the <a href="%2$s">best practices</a> for web accessibility, a list of <a href="%3$s">accessibility tools</a>, the <a href="%4$s">testing we do</a> to improve WordPress, themes, and plugins, and <a href="%5$s">how to get involved</a> in WordPress accessibility.', 'wporg' ) ),
    7582                            'https://make.wordpress.org/accessibility/handbook/',
    7683                            'https://make.wordpress.org/accessibility/handbook/best-practices/',
     
    7986                            'https://make.wordpress.org/accessibility/handbook/get-involved/'
    8087                        );
    81                     ?></p>
     88                    ?>
     89                    </p>
    8290
    83                     <p><?php
    84                         /* translators: %s: Link to the Accessibility handbook's Reporting Issues */
     91                    <p>
     92                    <?php
    8593                        printf(
    86                             __( 'To report an Accessibility issue you’ve encountered in WordPress or on WordPress.org, please see the Accessibility Handbook on <a href="%s">Reporting Accessibility Issues</a>.', 'wporg' ),
     94                            /* translators: %s: Link to the Accessibility handbook's Reporting Issues */
     95                            wp_kses_post( __( 'To report an Accessibility issue you’ve encountered in WordPress or on WordPress.org, please see the Accessibility Handbook on <a href="%s">Reporting Accessibility Issues</a>.', 'wporg' ) ),
    8796                            'https://make.wordpress.org/accessibility/handbook/reporting-issues/'
    8897                        );
    89                     ?></p>
     98                    ?>
     99                    </p>
    90100
    91101                </section>
    92102            </div><!-- .entry-content -->
    93 
    94103        </article><!-- #post-## -->
    95104
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-domains.php

    r6972 r7350  
    2323} );
    2424
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     25/* See inc/page-meta-descriptions.php for the meta description for this page.*/
    2626
    2727get_header( 'child-page' );
     
    5454                </section>
    5555            </div><!-- .entry-content -->
    56 
    5756        </article><!-- #post-## -->
    5857
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-etiquette.php

    r6972 r7350  
    2323} );
    2424
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     25/* See inc/page-meta-descriptions.php for the meta description for this page. */
    2626
    2727get_header( 'child-page' );
     
    6868                </section>
    6969            </div><!-- .entry-content -->
    70 
    7170        </article><!-- #post-## -->
    7271
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-features.php

    r7073 r7350  
    2323} );
    2424
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     25/* See inc/page-meta-descriptions.php for the meta description for this page. */
    2626
    2727get_header( 'child-page' );
     
    4040                    <p>
    4141                        <?php
    42                         /* translators: WordPress market share: 30 - Note: The following percent sign is '%%' for escaping purposes; */
    43                         printf( esc_html__( 'WordPress powers more than %s%% of the web &mdash; a figure that rises every day. Everything from simple websites, to blogs, to complex portals and enterprise websites, and even applications, are built with WordPress.', 'wporg' ), number_format_i18n( WP_MARKET_SHARE ) );
     42                        printf(
     43                            /* translators: WordPress market share: 30 - Note: The following percent sign is '%%' for escaping purposes; */
     44                            esc_html__( 'WordPress powers more than %s%% of the web &mdash; a figure that rises every day. Everything from simple websites, to blogs, to complex portals and enterprise websites, and even applications, are built with WordPress.', 'wporg' ),
     45                            esc_html( number_format_i18n( WP_MARKET_SHARE ) )
     46                        );
    4447                        ?>
    4548                    </p>
    46 
    4749                    <p><?php esc_html_e( 'WordPress combines simplicity for users and publishers with under-the-hood complexity for developers. This makes it flexible while still being easy-to-use.', 'wporg' ); ?></p>
    48 
    4950                    <p><?php esc_html_e( 'The following is a list of some of the features that come as standard with WordPress; however, there are literally thousands of plugins that extend what WordPress does, so the actual functionality is nearly limitless. You are also free to do whatever you like with the WordPress code, extend it or modify in any way or use it for commercial projects without any licensing fees. That is the beauty of free software, free refers not only to price but also the freedom to have complete control over it.', 'wporg' ); ?></p>
    50 
    5151                    <p><?php esc_html_e( 'Here are some of the features that we think that you&#8217;ll love.', 'wporg' ); ?></p>
    5252
    5353                    <ul>
    54                         <li><strong><?php _ex( 'Simplicity', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     54                        <li><strong><?php echo esc_html_x( 'Simplicity', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    5555                            <?php esc_html_e( 'Simplicity makes it possible for you to get online and get publishing, quickly. Nothing should get in the way of you getting your website up and your content out there. WordPress is built to make that happen.', 'wporg' ); ?>
    5656                        </li>
    57                         <li><strong><?php _ex( 'Flexibility', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     57                        <li><strong><?php echo esc_html_x( 'Flexibility', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    5858                            <?php esc_html_e( 'With WordPress, you can create any type of website you want: a personal blog or website, a photoblog, a business website, a professional portfolio, a government website, a magazine or news website, an online community, even a network of websites. You can make your website beautiful with themes, and extend it with plugins. You can even build your very own application.', 'wporg' ); ?>
    5959                        </li>
    60                         <li><strong><?php _ex( 'Publish with Ease', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     60                        <li><strong><?php echo esc_html_x( 'Publish with Ease', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    6161                            <?php esc_html_e( 'If you&#8217;ve ever created a document, you&#8217;re already a whizz at creating content with WordPress. You can create Posts and Pages, format them easily, insert media, and with the click of a button your content is live and on the web.', 'wporg' ); ?>
    6262                        </li>
    63                         <li><strong><?php _ex( 'Publishing Tools', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     63                        <li><strong><?php echo esc_html_x( 'Publishing Tools', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    6464                            <?php esc_html_e( 'WordPress makes it easy for you to manage your content. Create drafts, schedule publication, and look at your post revisions. Make your content public or private, and secure posts and pages with a password.', 'wporg' ); ?>
    6565                        </li>
    66                         <li><strong><?php _ex( 'User Management', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     66                        <li><strong><?php echo esc_html_x( 'User Management', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    6767                            <?php esc_html_e( 'Not everyone requires the same access to your website. Administrators manage the site, editors work with content, authors and contributors write that content, and subscribers have a profile that they can manage. This lets you have a variety of contributors to your website, and let others simply be part of your community.', 'wporg' ); ?>
    6868                        </li>
    69                         <li><strong><?php _ex( 'Media Management', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     69                        <li><strong><?php echo esc_html_x( 'Media Management', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    7070                            <?php esc_html_e( 'They say a picture says a thousand words, which is why it&#8217;s important for you to be able to quickly and easily upload images and media to WordPress. Drag and drop your media into the uploader to add it to your website. Add alt text, captions, and titles, and insert images and galleries into your content. We&#8217;ve even added a few image editing tools you can have fun with.', 'wporg' ); ?>
    7171                        </li>
    72                         <li><strong><?php _ex( 'Full Standards Compliance', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     72                        <li><strong><?php echo esc_html_x( 'Full Standards Compliance', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    7373                            <?php esc_html_e( 'Every piece of WordPress generated code is in full compliance with the standards set by the W3C. This means that your website will work in today&#8217;s browser, while maintaining forward compatibility with the next generation of browser. Your website is a beautiful thing, now and in the future.', 'wporg' ); ?>
    7474                        </li>
    75                         <li><strong><?php _ex( 'Easy Theme System', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     75                        <li><strong><?php echo esc_html_x( 'Easy Theme System', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    7676                            <?php esc_html_e( 'WordPress comes bundled with two default themes, but if they aren&#8217;t for you there&#8217;s a theme directory with thousands of themes for you to create a beautiful website. None of those to your taste? Upload your own theme with the click of a button. It only takes a few seconds for you to give your website a complete makeover.', 'wporg' ); ?>
    7777                        </li>
    78                         <li><strong><?php _ex( 'Extend with Plugins', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     78                        <li><strong><?php echo esc_html_x( 'Extend with Plugins', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    7979                            <?php esc_html_e( 'WordPress comes packed full of features for every user, for every other feature there&#8217;s a plugin directory with thousands of plugins. Add complex galleries, social networking, forums, social media widgets, spam protection, calendars, fine-tune controls for search engine optimization, and forms.', 'wporg' ); ?>
    8080                        </li>
    81                         <li><strong><?php _ex( 'Built-in Comments', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     81                        <li><strong><?php echo esc_html_x( 'Built-in Comments', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    8282                            <?php esc_html_e( 'Your blog is your home, and comments provide a space for your friends and followers to engage with your content. WordPress&#8217;s comment tools give you everything you need to be a forum for discussion and to moderate that discussion.', 'wporg' ); ?>
    8383                        </li>
    84                         <li><strong><?php _ex( 'Search Engine Optimized', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     84                        <li><strong><?php echo esc_html_x( 'Search Engine Optimized', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    8585                            <?php
    8686                            /* translators: Link to Plugin Directory search for SEO */
     
    8888                            ?>
    8989                        </li>
    90                         <li><strong><?php _ex( 'Multilingual', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     90                        <li><strong><?php echo esc_html_x( 'Multilingual', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    9191                            <?php
    9292                            /* translators: Link to polyglots teams */
     
    9494                            ?>
    9595                        </li>
    96                         <li><strong><?php _ex( 'Easy Installation and Upgrades', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     96                        <li><strong><?php echo esc_html_x( 'Easy Installation and Upgrades', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    9797                            <?php esc_html_e( 'WordPress has always been easy to install and upgrade. If you&#8217;re happy using an FTP program, you can create a database, upload WordPress using FTP, and run the installer. Not familiar with FTP? Plenty of web hosts offer one-click WordPress installers that let you install WordPress with, well, just one click!', 'wporg' ); ?>
    9898                        </li>
    99                         <li><strong><?php _ex( 'Importers', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     99                        <li><strong><?php echo esc_html_x( 'Importers', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    100100                            <?php esc_html_e( 'Using blog or website software that you aren&#8217;t happy with? Running your blog on a hosted service that&#8217;s about to shut down? WordPress comes with importers for blogger, LiveJournal, Movable Type, TypePad, Tumblr, and WordPress. If you&#8217;re ready to make the move, we&#8217;ve made it easy for you.', 'wporg' ); ?>
    101101                        </li>
    102                         <li><strong><?php _ex( 'Own Your Data', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     102                        <li><strong><?php echo esc_html_x( 'Own Your Data', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    103103                            <?php esc_html_e( 'Hosted services come and go. If you&#8217;ve ever used a service that disappeared, you know how traumatic that can be. If you&#8217;ve ever seen adverts appear on your website, you&#8217;ve probably been pretty annoyed. Using WordPress means no one has access to your content. Own your data, all of it &mdash; your website, your content, your data.', 'wporg' ); ?>
    104104                        </li>
    105                         <li><strong><?php _ex( 'Freedom', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     105                        <li><strong><?php echo esc_html_x( 'Freedom', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    106106                            <?php esc_html_e( 'WordPress is licensed under the GPL which was created to protect your freedoms. You are free to use WordPress in any way you choose: install it, use it, modify it, distribute it. Software freedom is the foundation that WordPress is built on.', 'wporg' ); ?>
    107107                        </li>
    108                         <li><strong><?php _ex( 'Community', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     108                        <li><strong><?php echo esc_html_x( 'Community', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    109109                            <?php esc_html_e( 'As the most popular open source CMS on the web, WordPress has a vibrant and supportive community. Ask a question on the support forums and get help from a volunteer, attend a WordCamp or Meetup to learn more about WordPress, read blogs posts and tutorials about WordPress. Community is at the heart of WordPress, making it what it is today.', 'wporg' ); ?>
    110110                        </li>
    111                         <li><strong><?php _ex( 'Contribute', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     111                        <li><strong><?php echo esc_html_x( 'Contribute', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    112112                            <?php esc_html_e( 'You can be WordPress too! Help to build WordPress, answer questions on the support forums, write documentation, translate WordPress into your language, speak at a WordCamp, write about WordPress on your blog. Whatever your skill, we&#8217;d love to have you!', 'wporg' ); ?>
    113113                        </li>
    114114                    </ul>
    115                     <h3><?php _ex( 'Developer Features', 'Features page: Section Header', 'wporg' ); ?></h3>
     115                    <h3><?php echo esc_html_x( 'Developer Features', 'Features page: Section Header', 'wporg' ); ?></h3>
    116116                    <p><?php esc_html_e( 'For developers, we&#8217;ve got lots of goodies packed under the hood that you can use to extend WordPress in whatever direction takes your fancy.', 'wporg' ); ?></p>
    117117
    118118                    <ul>
    119                         <li><strong><?php _ex( 'Plugin System', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     119                        <li><strong><?php echo esc_html_x( 'Plugin System', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    120120                            <?php
    121121                            /* translators: 1: Link to Codex page about APIs; 2: Link to Plugin Directory */
     
    123123                            ?>
    124124                        </li>
    125                         <li><strong><?php _ex( 'Theme System', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     125                        <li><strong><?php echo esc_html_x( 'Theme System', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    126126                            <?php
    127127                            /* translators: 1: Link to Codex page about APIs; 2: Link to Theme Directory */
     
    129129                            ?>
    130130                        </li>
    131                         <li><strong><?php _ex( 'Application Framework', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     131                        <li><strong><?php echo esc_html_x( 'Application Framework', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    132132                            <?php esc_html_e( 'If you want to build an application, WordPress can help with that too. Under the hood WordPress provides a lot of the features that your app will need, things like translations, user management, HTTP requests, databases, URL routing and much, much more.', 'wporg' ); ?>
    133133                        </li>
    134                         <li><strong><?php _ex( 'Custom Content Types', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     134                        <li><strong><?php echo esc_html_x( 'Custom Content Types', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    135135                            <?php
    136136                            /* translators: 1: Link to Codex page about Custom Post Types; 2: Link to Codex page about Custom Taxonomies; 3: Link to Codex page about Custom Fields */
     
    138138                            ?>
    139139                        </li>
    140                         <li><strong><?php _ex( 'The Latest Libraries', 'Features page: Section Header', 'wporg' ); ?></strong><br>
     140                        <li><strong><?php echo esc_html_x( 'The Latest Libraries', 'Features page: Section Header', 'wporg' ); ?></strong><br>
    141141                            <?php
    142142                            /* translators: 1: Link to Developer Handbook page about default scripts */
     
    147147                </section>
    148148            </div><!-- .entry-content -->
    149 
    150149        </article><!-- #post-## -->
    151150
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-history.php

    r6972 r7350  
    2323} );
    2424
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     25/* See inc/page-meta-descriptions.php for the meta description for this page. */
    2626
    2727get_header( 'child-page' );
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-license.php

    r6972 r7350  
    2323} );
    2424
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     25/* See inc/page-meta-descriptions.php for the meta description for this page. */
    2626
    2727get_header( 'child-page' );
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-logos.php

    r7018 r7350  
    2323} );
    2424
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     25/* See inc/page-meta-descriptions.php for the meta description for this page. */
    2626
    2727get_header( 'child-page' );
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-philosophy.php

    r7346 r7350  
    2323} );
    2424
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     25/* See inc/page-meta-descriptions.php for the meta description for this page. */
    2626
    2727get_header( 'child-page' );
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-cookies.php

    r7277 r7350  
    1111
    1212$GLOBALS['menu_items'] = [
    13     'about/privacy'                      => _x( 'Privacy Policy',      'Page title', 'wporg' ),
     13    'about/privacy' => _x( 'Privacy Policy', 'Page title', 'wporg' ),
    1414];
    1515
     
    2727
    2828
    29 // See inc/page-meta-descriptions.php for the meta description for this page.
     29/* See inc/page-meta-descriptions.php for the meta description for this page. */
    3030
    3131get_header( 'child-page' );
     
    4141            <div class="entry-content row">
    4242                <section class="col-8">
    43                     <h3><?php esc_html_e( '', 'wporg' ); ?></h3>
    44                     <p><?php esc_html_e( '', 'wporg' ); ?></p>
    45                     <p><?php echo wp_kses_post( __( '', 'wporg' ) ); ?></p>
    46 
    4743                    <h3><?php esc_html_e( 'Cookies', 'wporg' ); ?></h3>
    4844                    <p><?php esc_html_e( 'Our Privacy Policy explains our principles when it comes to the collection, processing, and storage of your information. This policy specifically explains how we, our partners, and users of our services deploy cookies, as well as the options you have to control them.', 'wporg' ); ?></p>
     
    174170                                <th>trac_form_token</th>
    175171                                <td><?php esc_html_e( 'Session', 'wporg' ); ?></td>
    176                                 <td><?php esc_html_e( '', 'wporg' ); ?></td>
     172                                <td></td>
    177173                                <td><?php esc_html_e( 'Used to check whether the current visitor is a logged in WordPress.org user.', 'wporg' ); ?></td>
    178174                            </tr>
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php

    r7277 r7350  
    1111
    1212$GLOBALS['menu_items'] = [
    13     'about/privacy'                      => _x( 'Privacy Policy',      'Page title', 'wporg' ),
    14     #'about/privacy/data-export-request'  => _x( 'Data Export Request', 'Page title', 'wporg' ),
    15     'about/privacy/data-erasure-request' => _x( 'Data Erasure Request', 'Page title', 'wporg' ),
     13    'about/privacy'                      => esc_html_x( 'Privacy Policy', 'Page title', 'wporg' ),
     14    // 'about/privacy/data-export-request'  => esc_html_x( 'Data Export Request', 'Page title', 'wporg' ),
     15    'about/privacy/data-erasure-request' => esc_html_x( 'Data Erasure Request', 'Page title', 'wporg' ),
    1616];
    1717
     
    4343}
    4444
    45 // See inc/page-meta-descriptions.php for the meta description for this page.
     45/* See inc/page-meta-descriptions.php for the meta description for this page. */
    4646
    4747add_action( 'wp_head', function() {
    4848    // TODO: Move to Theme once styled.
    4949    echo '<style>
    50         p.error {
    51             border: 1px solid red;
    52             border-left: 4px solid red;
    53             padding: 6px;
    54         }
    55         p.success {
    56             border: 1px solid green;
    57             border-left: 4px solid green;
    58             padding: 6px;
    59         }
    60         div.alert {
    61             border: 1px solid red;
    62             border-left: 4px solid red;
    63             padding: 6px;
    64             margin-bottom: 2rem;
    65         }   
    6650        form.request-form label {
    6751            display: block;
     
    9781                    <p><?php esc_html_e( 'The following form will allow you to request deletion of your account and relevant personal and private data. You will be required to authenticate ownership of that address, and may be asked to provide additional identification or information necessary to verify the request.', 'wporg' ); ?></p>
    9882
    99                     <div class="alert">
     83                    <div class="notice notice-info notice-alt">
    10084                        <h5><?php esc_html_e( 'Important!', 'wporg' ); ?></h5>
    10185
    102                         <p><?php printf( wp_kses_post( __( 'This will request permanent deletion of your <strong>WordPress.org</strong> account, and relevant personal or private data stored on <strong>%s</strong>, and other related domains and sites.', 'wporg') ), 'WordPress.org, WordPress.net, WordCamp.org, BuddyPress.org, bbPress.org' ); ?></p>
    103 
     86                        <p>
     87                            <?php
     88                            printf(
     89                                /* translators: List of sites that use WordPress.org account. */
     90                                wp_kses_post( __( 'This will request permanent deletion of your <strong>WordPress.org</strong> account, and relevant personal or private data stored on <strong>%s</strong>, and other related domains and sites.', 'wporg' ) ),
     91                                'WordPress.org, WordPress.net, WordCamp.org, BuddyPress.org, bbPress.org'
     92                            );
     93                            ?>
     94                        </p>
    10495                        <p><?php esc_html_e( 'Please note that we cannot remove or provide access to data stored on WordPress sites hosted or administered by third parties.', 'wporg' ); ?></p>
    105 
    106                         <p><?php
     96                        <p>
     97                            <?php
    10798                            printf(
    10899                                /* translators: link to privacy policy. */
    109                                 wp_kses_post( __('Not all data can be erased, please review the <a href="%s">Privacy Policy</a> for details.', 'wporg' ) ),
    110                                 'https://wordpress.org/about/privacy/'
     100                                wp_kses_post( __( 'Not all data can be erased, please review the <a href="%s">Privacy Policy</a> for details.', 'wporg' ) ),
     101                                esc_url( home_url( '/about/privacy/' ) )
    111102                            );
    112                         ?></p>
     103                            ?>
     104                        </p>
    113105                    </div>
    114106
    115107                    <?php if ( $error_message ) : ?>
    116                         <p class="error">
    117                             <strong><?php esc_html_e( 'An error occurred with your request:', 'wporg' ); ?></strong><br>
    118                             <?php echo $error_message; ?>
    119                         </p>
     108                        <div class="notice notice-error notice-alt">
     109                            <p><?php echo esc_html( $error_message ); ?></p>
     110                        </div>
    120111                    <?php elseif ( $success ) : ?>
    121                         <p class="success"><strong><?php esc_html_e( 'Please check your email for a confirmation link, and follow the instructions to authenticate your request.', 'wporg' ); ?></strong></p>
     112                        <div class="notice notice-success notice-alt">
     113                            <p><?php esc_html_e( 'Please check your email for a confirmation link, and follow the instructions to authenticate your request.', 'wporg' ); ?></p>
     114                        </div>
    122115                    <?php endif; ?>
    123116
    124                     <?php if ( !$success ) : ?>
    125                     <form id="erase-request-form" class="request-form" method="POST" action="#">
    126                         <label for="email">
    127                             <?php esc_html_e( 'Email Address', 'wporg' ); ?>
    128                         </label>
    129                         <input
    130                             type="email"
    131                             name="email" id="email"
    132                             placeholder="<?php
     117                    <?php if ( ! $success ) : ?>
     118                        <form id="erase-request-form" class="request-form" method="POST" action="#">
     119                            <label for="email"><?php esc_html_e( 'Email Address', 'wporg' ); ?></label>
     120                            <?php
     121                            printf( '<input type="email" name="email" id="email" placeholder="%1$s" required value="%2$s" />',
    133122                                /* translators: Example placeholder email address */
    134                                 esc_attr_e( 'you@example.com', 'wporg' )
    135                             ?>"
    136                             required
    137                             value="<?php echo esc_attr( $email ); ?>"
    138                         >
    139                         <p><?php esc_html_e( 'By submitting this form, you declare that you are the individual owner of the specified email address and its associated accounts; and that all submitted information including any supplemental details necessary to verify your identity are true. You also declare that it is your intention for accounts associated with that email address to be permanently deleted.', 'wporg' ); ?></p>
    140                         <?php reCAPTCHA\display_submit_button( __( 'Accept Declaration and Request Permanent Account Deletion', 'wporg' ) ); ?>
    141                         <?php if ( is_user_logged_in() ) wp_nonce_field( $nonce_action ); ?>
    142                     </form>
    143 
     123                                esc_attr__( 'you@example.com', 'wporg' ),
     124                                esc_attr( $email )
     125                            );
     126                            ?>
     127                            <p><?php esc_html_e( 'By submitting this form, you declare that you are the individual owner of the specified email address and its associated accounts; and that all submitted information including any supplemental details necessary to verify your identity are true. You also declare that it is your intention for accounts associated with that email address to be permanently deleted.', 'wporg' ); ?></p>
     128                            <?php
     129                            reCAPTCHA\display_submit_button( __( 'Accept Declaration and Request Permanent Account Deletion', 'wporg' ) );
     130                            if ( is_user_logged_in() ) :
     131                                wp_nonce_field( $nonce_action );
     132                            endif;
     133                            ?>
     134                        </form>
    144135                        <p><?php esc_html_e( 'Please Note: Before we can begin processing your request, we&#8217;ll require that you verify ownership of the email address. If the email address is associated with an account, we&#8217;ll also require you to log in to that account first.', 'wporg' ); ?></p>
    145 
    146136                    <?php endif; ?>
    147137
    148138                </section>
    149139            </div><!-- .entry-content -->
    150 
    151140        </article><!-- #post-## -->
    152141
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-export-request.php

    r7225 r7350  
    1111
    1212$GLOBALS['menu_items'] = [
    13     'about/privacy'                      => _x( 'Privacy Policy',      'Page title', 'wporg' ),
    14     'about/privacy/data-export-request'  => _x( 'Data Export Request', 'Page title', 'wporg' ),
    15     'about/privacy/data-erasure-request' => _x( 'Data Erasure Request', 'Page title', 'wporg' ),
     13    'about/privacy'                      => esc_html_x( 'Privacy Policy', 'Page title', 'wporg' ),
     14    'about/privacy/data-export-request'  => esc_html_x( 'Data Export Request', 'Page title', 'wporg' ),
     15    'about/privacy/data-erasure-request' => esc_html_x( 'Data Erasure Request', 'Page title', 'wporg' ),
    1616];
    1717
     
    4343}
    4444
    45 // See inc/page-meta-descriptions.php for the meta description for this page.
     45/* See inc/page-meta-descriptions.php for the meta description for this page. */
    4646
    4747add_action( 'wp_head', function() {
    4848    // TODO: Move to Theme once styled.
    4949    echo '<style>
    50         p.error {
    51             border: 1px solid red;
    52             border-left: 4px solid red;
    53             padding: 6px;
    54         }
    55         p.success {
    56             border: 1px solid green;
    57             border-left: 4px solid green;
    58             padding: 6px;
    59         }
    60 
    6150        form.request-form label {
    6251            display: block;
     
    8877                    <p><?php esc_html_e( 'The following form will allow you to request an export of any data linked to your email address. You will be required to authenticate ownership of that address, and may be asked to provide additional identification or information necessary to verify the request and search our records.', 'wporg' ); ?></p>
    8978
    90                     <p><?php esc_html_e( 'This export will contain relevant personal or private data stored on WordPress.org, WordPress.net, WordCamp.org, BuddyPress.org, bbPress.org, and other related domains and sites.', 'wporg'); ?></p>
     79                    <p><?php esc_html_e( 'This export will contain relevant personal or private data stored on WordPress.org, WordPress.net, WordCamp.org, BuddyPress.org, bbPress.org, and other related domains and sites.', 'wporg' ); ?></p>
    9180
    9281                    <?php if ( $error_message ) : ?>
    93                         <p class="error">
    94                             <strong><?php esc_html_e( 'An error occured with your request:', 'wporg' ); ?></strong><br>
    95                             <?php echo $error_message; ?>
    96                         </p>
     82                        <div class="notice notice-error notice-alt">
     83                            <p><?php echo esc_html( $error_message ); ?></p>
     84                        </div>
    9785                    <?php elseif ( $success ) : ?>
    98                     <p class="success"><strong><?php esc_html_e( 'Please check your email for a confirmation link, and follow the instructions to authenticate your request.', 'wporg' ); ?></strong></p>
     86                    <div class="notice notice-success notice-alt">
     87                        <p><?php esc_html_e( 'Please check your email for a confirmation link, and follow the instructions to authenticate your request.', 'wporg' ); ?></p>
     88                    </div>
    9989                    <?php endif; ?>
    10090
    101                     <p class="error"><strong>This is currently disabled unless you have a 'special' WordPress.org account.</strong></p>
    102                     <?php if ( is_user_logged_in() && wporg_user_has_restricted_password() ) : ?>
    103                         <p class="success">PS: You have a special account.</p>
     91                    <div class="notice notice-error notice-alt">
     92                        <p>This is currently disabled unless you have a 'special' WordPress.org account.</p>
     93                    </div>
     94                    <?php if ( is_user_logged_in() && function_exists( 'wporg_user_has_restricted_password' ) && wporg_user_has_restricted_password() ) : ?>
     95                        <div class="notice notice-info notice-alt"><p>PS: You have a special account.</p></div>
    10496                    <?php endif; ?>
    10597
    10698                    <form id="export-request-form" class="request-form" method="POST" action="#">
    107                         <label for="email">
    108                             <?php esc_html_e( 'Email Address', 'wporg' ); ?>
    109                         </label>
    110                         <input
    111                             type="email"
    112                             name="email" id="email"
    113                             placeholder="<?php
    114                                 /* translators: Example placeholder email address */
    115                                 esc_attr_e( 'you@example.com', 'wporg' )
    116                             ?>"
    117                             required
    118                             value="<?php echo esc_attr( $email ); ?>"
    119                         >
     99                        <label for="email"><?php esc_html_e( 'Email Address', 'wporg' ); ?></label>
     100                        <?php
     101                        printf( '<input type="email" name="email" id="email" placeholder="%1$s" required value="%2$s" />',
     102                            /* translators: Example placeholder email address */
     103                            esc_attr__( 'you@example.com', 'wporg' ),
     104                            esc_attr( $email )
     105                        );
     106                        ?>
    120107                        <p><?php esc_html_e( 'By submitting this form, you declare that you are the individual owner of the specified email address and its associated accounts; and that all submitted information including any supplemental details necessary to verify your identity are true.', 'wporg' ); ?></p>
    121                         <?php reCAPTCHA\display_submit_button( __( 'Accept Declaration and Request Export', 'wporg' ) ); ?>
    122                         <?php if ( is_user_logged_in() ) wp_nonce_field( $nonce_action ); ?>
     108                        <?php
     109                        reCAPTCHA\display_submit_button( __( 'Accept Declaration and Request Export', 'wporg' ) );
     110                        if ( is_user_logged_in() ) :
     111                            wp_nonce_field( $nonce_action );
     112                        endif;
     113                        ?>
    123114                    </form>
    124 
    125                     <p><?php esc_html_e( "Please Note: Before we can begin processing your request, we'll require that you verify ownership of the email address. If the email address is associated with an account, we'll also require you to log in to that account first.", 'wporg' ); ?></p>
    126 
     115                    <p><?php esc_html_e( 'Please Note: Before we can begin processing your request, we&#8217;ll require that you verify ownership of the email address. If the email address is associated with an account, we&#8217;ll also require you to log in to that account first.', 'wporg' ); ?></p>
    127116                </section>
    128117            </div><!-- .entry-content -->
    129 
    130118        </article><!-- #post-## -->
    131119
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy.php

    r7277 r7350  
    2323} );
    2424
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     25/* See inc/page-meta-descriptions.php for the meta description for this page. */
    2626
    2727get_header( 'child-page' );
     
    7373                    <p><?php esc_html_e( 'You have the right to request a copy of the information we hold about you. If you would like a copy of some or all your personal information, please follow the instructions at the end of this policy.', 'wporg' ); ?></p>
    7474                    <p><?php esc_html_e( 'All WordCamp attendee-provided data can be viewed and changed by the attendee via the Access Token URL that is emailed to confirm a successful ticket purchase.', 'wporg' ); ?></p>
    75                     <p><?php echo wp_kses_post( __( 'WordPress.org user accounts can be edited by following these steps:<br/>
    76 1) Visit <a href="https://login.wordpress.org/">https://login.wordpress.org</a>, and then enter your username and password.<br/>
    77 2) You will be redirected to https://profiles.wordpress.org/your_username.<br/>
    78 3) Click the &#8220;Edit&#8221; link next to your username.', 'wporg' ) ); ?></p>
     75                    <p><?php esc_html_e( 'WordPress.org user accounts can be edited by following these steps:', 'wporg' ); ?></p>
     76                    <ol>
     77                        <li>
     78                            <?php
     79                            printf(
     80                                /* translators: Login URL */
     81                                wp_kses_post( __( 'Visit <a href="%s">https://login.wordpress.org</a>, and enter your username and password.', 'wporg' ) ),
     82                                esc_url( 'https://login.wordpress.org/' )
     83                            );
     84                            ?>
     85                        </li>
     86                        <li><?php esc_html_e( 'You will be redirected to https://profiles.wordpress.org/your_username.', 'wporg' ); ?></li>
     87                        <li><?php esc_html_e( 'Click the &#8220;Edit&#8221; link next to your username.', 'wporg' ); ?></li>
     88                    </ol>
    7989
    8090                    <h3><?php esc_html_e( 'Retention of personal information', 'wporg' ); ?></h3>
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-requirements.php

    r6972 r7350  
    2323} );
    2424
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     25/* See inc/page-meta-descriptions.php for the meta description for this page. */
    2626
    2727get_header( 'child-page' );
     
    6868                    </p>
    6969
    70                     <p><?php
     70                    <p>
     71                        <?php
    7172                        printf(
    7273                            /* translators: 1: PHP Version including; 2: MySQL Version */
     
    7576                            '5.0'
    7677                        );
    77                     ?></p>
     78                        ?>
     79                    </p>
    7880
    7981                    <h3><?php esc_html_e( 'Ask for it', 'wporg' ); ?></h3>
     
    8587
    8688                        <ul>
    87                             <li><?php
     89                            <li>
     90                                <?php
    8891                                /* translators: PHP Version */
    8992                                printf( esc_html__( 'PHP %s or greater', 'wporg' ), '7.2' );
    90                             ?></li>
    91                             <li><?php
     93                                ?>
     94                            </li>
     95                            <li>
     96                                <?php
    9297                                /* translators: 1: MySQL version; 2: MariaDB Version */
    9398                                printf( esc_html__( 'MySQL %1$s or greater OR MariaDB %2$s or greater', 'wporg' ), '5.6', '10.0' );
    94                             ?></li>
     99                                ?>
     100                            </li>
    95101                            <li><?php esc_html_e( 'Nginx or Apache with mod_rewrite module', 'wporg' ); ?></li>
    96102                            <li><?php esc_html_e( 'HTTPS support', 'wporg' ); ?></li>
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-roadmap.php

    r6972 r7350  
    2323} );
    2424
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     25/* See inc/page-meta-descriptions.php for the meta description for this page. */
    2626
    2727get_header( 'child-page' );
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-security.php

    r7279 r7350  
    2323} );
    2424
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     25/* See inc/page-meta-descriptions.php for the meta description for this page. */
    2626
    2727/*
     
    4343            <div class="entry-content row">
    4444                <section class="col-8">
    45                     <p><?php
     45                    <p>
     46                    <?php
    4647                        printf(
    4748                            /* translators: %s: URL to English PDF */
     
    4950                            'https://github.com/WordPress/Security-White-Paper/blob/master/WordPressSecurityWhitePaper.pdf?raw=true'
    5051                        );
    51                     ?></p>
     52                    ?>
     53                    </p>
    5254
    5355                    <img src="//s.w.org/about/images/logos/wordpress-logo-stacked-rgb.png" class="aligncenter" />
     
    5961                    <p><?php esc_html_e( 'The information in this document is up-to-date for the latest stable release of the software, WordPress 4.7 at time of publication, but should be considered relevant also to the most recent versions of the software as backwards compatibility is a strong focus for the WordPress development team. Specific security measures and changes will be noted as they have been added to the core software in specific releases. It is strongly encouraged to always be running the latest stable version of WordPress to ensure the most secure experience possible.', 'wporg' ); ?></p>
    6062                    <h2><?php esc_html_e( 'Executive Summary', 'wporg' ); ?></h2>
    61                     <p><?php
     63                    <p>
     64                    <?php
    6265                        printf(
    6366                            /* translators: %s: WordPress Market share - 30. Note the following % sign is escaped as %%. */
    6467                            esc_html__( 'WordPress is a dynamic open-source content management system which is used to power millions of websites, web applications, and blogs. It currently powers more than %s%% of the top 10 million websites on the Internet. WordPress&#8217; usability, extensibility, and mature development community make it a popular and secure choice for websites of all sizes.', 'wporg' ),
    65                             WP_MARKET_SHARE
    66                         );
    67                     ?></p>
     68                            esc_html( WP_MARKET_SHARE )
     69                        );
     70                    ?>
     71                    </p>
    6872
    6973                    <p><?php esc_html_e( 'Since its inception in 2003, WordPress has undergone continual hardening so its core software can address and mitigate common security threats, including the Top 10 list identified by The Open Web Application Security Project (OWASP) as common security vulnerabilities, which are discussed in this document.', 'wporg' ); ?></p>
     
    7377                    <p><?php esc_html_e( 'Site developers and administrators should pay particular attention to the correct use of core APIs and underlying server configuration which have been the source of common vulnerabilities, as well as ensuring all users employ strong passwords to access WordPress.', 'wporg' ); ?></p>
    7478                    <h2><?php esc_html_e( 'An Overview of WordPress', 'wporg' ); ?></h2>
    75                     <p><?php
     79                    <p>
     80                    <?php
    7681                        printf(
    7782                            /* translators: 1: WordPress Market share - 30. Note the following % sign is escaped as %%. 2: Footnote 3: Market Penetration - 60.  Note the following % sign is escaped as %%. */
    78                             esc_html__( 'WordPress is a free and open source content management system (CMS). It is the most widely-used CMS software in the world and it powers more than %1$s%% of the top 10 million websites%2$s, giving it an estimated %3$s%% market share of all sites
    79 using a CMS.', 'wporg' ),
    80                             WP_MARKET_SHARE,
     83                            esc_html__( 'WordPress is a free and open source content management system (CMS). It is the most widely-used CMS software in the world and it powers more than %1$s%% of the top 10 million websites%2$s, giving it an estimated %3$s%% market share of all sites using a CMS.', 'wporg' ),
     84                            esc_html( WP_MARKET_SHARE ),
    8185                            '<sup id="ref1"><a href="#footnote1">1</a></a></sup>',
    8286                            60
    8387                        );
    84                     ?></p>
     88                    ?>
     89                    </p>
    8590
    8691                    <p><?php esc_html_e( 'WordPress is licensed under the General Public License (GPLv2 or later) which provides four core freedoms, and can be considered as the WordPress &#8220;bill of rights&#8221;:', 'wporg' ); ?></p>
     
    102107                    <p><?php esc_html_e( 'Each WordPress release cycle is led by one or more of the core WordPress developers. A release cycle usually lasts around 4 months from the initial scoping meeting to launch of the version.', 'wporg' ); ?></p>
    103108
    104                     <p><?php
     109                    <p>
     110                    <?php
    105111                        printf(
    106112                            /* translators: %s: Footnote*/
     
    108114                            '<sup id="ref2"><a href="#footnote2">2</a></sup>'
    109115                        );
    110                     ?></p>
     116                    ?>
     117                    </p>
    111118                    <ul>
    112119                        <li><?php esc_html_e( 'Phase 1: Planning and securing team leads. This is done in the #core chat room on Slack. The release lead discusses features for the next release of WordPress. WordPress contributors get involved with that discussion. The release lead will identify team leads for each of the features.', 'wporg' ); ?></li>
     
    121128                    <p><?php esc_html_e( 'Major releases may add new user features and developer APIs. Though typically in the software world, a &#8220;major&#8221; version means you can break backwards compatibility, WordPress strives to never break backwards compatibility. Backwards compatibility is one of the project&#8217;s most important philosophies, with the aim of making updates much easier on users and developers alike.', 'wporg' ); ?></p>
    122129
    123                     <p><?php
     130                    <p>
     131                    <?php
    124132                        printf(
    125133                            /* translators: %s: Footnote */
     
    127135                            '<sup id="ref3"><a href="#footnote3">3</a></sup>'
    128136                        );
    129                     ?></p>
     137                    ?>
     138                    </p>
    130139
    131140                    <h3><?php esc_html_e( 'Version Backwards Compatibility', 'wporg' ); ?></h3>
     
    133142                    <h2><?php esc_html_e( 'WordPress and Security', 'wporg' ); ?></h2>
    134143                    <h3><?php esc_html_e( 'The WordPress Security Team', 'wporg' ); ?></h3>
    135                     <p><?php
     144                    <p>
     145                    <?php
    136146                        printf(
    137147                            /* translators: 1: Number - 50; 2: Footnote*/
     
    140150                            '<sup><a href="#footnote3">3</a></sup>'
    141151                        );
    142                     ?></p>
    143 
    144                     <p><?php
     152                    ?>
     153                    </p>
     154
     155                    <p>
     156                    <?php
    145157                        printf(
    146158                            /* translators: %s: Footnote */
     
    148160                            '<sup id="ref4"><a href="#footnote4">4</a></sup>'
    149161                        );
    150                     ?></p>
     162                    ?>
     163                    </p>
    151164                    <h3><?php esc_html_e( 'WordPress Security Risks, Process, and History', 'wporg' ); ?></h3>
    152                     <p><?php
     165                    <p>
     166                    <?php
    153167                        printf(
    154168                            /* translators: 1: HackerOne URL 2: Footnote */
     
    157171                            '<sup id="ref5"><a href="#footnote5">5</a></sup>'
    158172                        );
    159                     ?></p>
     173                    ?>
     174                    </p>
    160175
    161176                    <p><?php esc_html_e( 'Each security report is acknowledged upon receipt, and the team works to verify the vulnerability and determine its severity. If confirmed, the security team then plans for a patch to fix the problem which can be committed to an upcoming release of the WordPress software or it can be pushed as an immediate security release, depending on the severity of the issue.', 'wporg' ); ?></p>
    162177
    163                     <p><?php
     178                    <p>
     179                    <?php
    164180                        printf(
    165181                            /* translators: %s: Footnote */
     
    167183                            '<sup id="ref6"><a href="#footnote6">6</a></sup>'
    168184                        );
    169                     ?></p>
     185                    ?>
     186                    </p>
    170187
    171188                    <p><?php esc_html_e( 'Administrators of the WordPress software see a notification on their site dashboard to upgrade when a new release is available, and following the manual upgrade users are redirected to the About WordPress screen which details the changes. If administrators have automatic background updates enabled, they will receive an email after an upgrade has been completed.', 'wporg' ); ?></p>
    172189
    173190                    <h3><?php esc_html_e( 'Automatic Background Updates for Security Releases', 'wporg' ); ?></h3>
    174                     <p><?php
     191                    <p>
     192                    <?php
    175193                        printf(
    176194                            /* translators: %s: Footnote */
     
    178196                            '<sup id="ref7"><a href="#footnote7">7</a></sup>'
    179197                        );
    180                     ?></p>
     198                    ?>
     199                    </p>
    181200
    182201                    <p><?php esc_html_e( 'When a security update is pushed for the current stable release of WordPress, the core team will also push security updates for all the releases that are capable of background updates (since WordPress 3.7), so these older but still recent versions of WordPress will receive security enhancements.', 'wporg' ); ?></p>
     
    184203                    <p><?php esc_html_e( 'Individual site owners can opt to remove automatic background updates through a simple change in their configuration file, but keeping the functionality is strongly recommended by the core team, as well as running the latest stable release of WordPress.', 'wporg' ); ?></p>
    185204                    <h3><?php esc_html_e( '2013 OWASP Top 10', 'wporg' ); ?></h3>
    186                     <p><?php
     205                    <p>
     206                    <?php
    187207                        printf(
    188208                            /* translators: %s: Footnote */
     
    190210                            '<sup id="ref8"><a href="#footnote8">8</a></sup>'
    191211                        );
    192                     ?></p>
     212                    ?>
     213                    </p>
    193214
    194215                    <p><?php esc_html_e( 'The following sections discuss the APIs, resources, and policies that WordPress uses to strengthen the core software and 3rd party plugins and themes against these potential risks.', 'wporg' ); ?></p>
    195216                    <h4><?php esc_html_e( 'A1 - Injection', 'wporg' ); ?></h4>
    196                     <p><?php
     217                    <p>
     218                    <?php
    197219                        printf(
    198220                            /* translators: %s: Footnote */
     
    200222                            '<sup id="ref9"><a href="#footnote9">9</a></sup>'
    201223                        );
    202                     ?></p>
     224                    ?>
     225                    </p>
    203226                    <h4><?php esc_html_e( 'A2 - Broken Authentication and Session Management', 'wporg' ); ?></h4>
    204227                    <p><?php esc_html_e( 'WordPress core software manages user accounts and authentication and details such as the user ID, name, and password are managed on the server-side, as well as the authentication cookies. Passwords are protected in the database using standard salting and stretching techniques. Existing sessions are destroyed upon logout for versions of WordPress after 4.0.', 'wporg' ); ?></p>
    205228                    <h4><?php esc_html_e( 'A3 - Cross Site Scripting (XSS)', 'wporg' ); ?></h4>
    206                     <p><?php
     229                    <p>
     230                    <?php
    207231                        printf(
    208232                            /* translators: 1: Footnote, 2: wp_kses() */
     
    211235                            '<code>wp_kses</code>'
    212236                        );
    213                     ?></p>
    214 
    215                     <p><?php
     237                    ?>
     238                    </p>
     239
     240                    <p>
     241                    <?php
    216242                        printf(
    217243                            /* translators: %s: the_search_query() */
     
    219245                            '<code>the_search_query()</code>'
    220246                        );
    221                     ?></p>
     247                    ?>
     248                    </p>
    222249                    <h4><?php esc_html_e( 'A4 - Insecure Direct Object Reference', 'wporg' ); ?></h4>
    223250                    <p><?php esc_html_e( 'WordPress often provides direct object reference, such as unique numeric identifiers of user accounts or content available in the URL or form fields. While these identifiers disclose direct system information, WordPress&#8217; rich permissions and access control system prevent unauthorized requests.', 'wporg' ); ?></p>
    224251                    <h4><?php esc_html_e( 'A5 - Security Misconfiguration', 'wporg' ); ?></h4>
    225                     <p><?php
     252                    <p>
     253                    <?php
    226254                        printf(
    227255                            /* translators: %s: Footnote */
     
    229257                            '<sup id="ref11"><a href="#footnote11">11</a></sup>'
    230258                        );
    231                     ?></p>
     259                    ?>
     260                    </p>
    232261                    <h4><?php esc_html_e( 'A6 - Sensitive Data Exposure', 'wporg' ); ?></h4>
    233                     <p><?php
     262                    <p>
     263                    <?php
    234264                        printf(
    235265                            /* translators: %s: Footnote */
     
    237267                            '<sup id="ref12"><a href="#footnote12">12</a></sup>'
    238268                        );
    239                     ?></p>
     269                    ?>
     270                    </p>
    240271
    241272                    <h4><?php esc_html_e( 'A7 - Missing Function Level Access Control', 'wporg' ); ?></h4>
     
    243274
    244275                    <h4><?php esc_html_e( 'A8 - Cross Site Request Forgery (CSRF)', 'wporg' ); ?></h4>
    245                     <p><?php
     276                    <p>
     277                    <?php
    246278                        printf(
    247279                            /* translators: %s: Footnote */
     
    249281                            '<sup id="ref13"><a href="#footnote13">13</a></sup>'
    250282                        );
    251                     ?></p>
     283                    ?>
     284                    </p>
    252285
    253286                    <h4><?php esc_html_e( 'A9 - Using Components with Known Vulnerabilities', 'wporg' ); ?></h4>
    254                     <p><?php
     287                    <p>
     288                    <?php
    255289                        printf(
    256290                            /* translators: %s: Footnote */
     
    258292                            '<sup id="ref14"><a href="#footnote14">14</a></sup>'
    259293                        );
    260                     ?></p>
    261 
    262                     <p><?php
     294                    ?>
     295                    </p>
     296
     297                    <p>
     298                    <?php
    263299                        printf(
    264300                            /* translators: %s: Footnote */
     
    266302                            '<sup id="ref15"><a href="#footnote15">15</a></sup>'
    267303                        );
    268                     ?></p>
     304                    ?>
     305                    </p>
    269306
    270307                    <h4><?php esc_html_e( 'A10 - Unvalidated Redirects and Forwards', 'wporg' ); ?></h4>
    271                     <p><?php
     308                    <p>
     309                    <?php
    272310                        printf(
    273311                            /* translators: %s: Footnote */
     
    275313                            '<sup id="ref16"><a href="#footnote16">16</a></sup>'
    276314                        );
    277                     ?></p>
     315                    ?>
     316                    </p>
    278317                    <h3><?php esc_html_e( 'Further Security Risks and Concerns', 'wporg' ); ?></h3>
    279318                    <h4><?php esc_html_e( 'XXE (XML eXternal Entity) processing attacks', 'wporg' ); ?></h4>
     
    283322                    <h2><?php esc_html_e( 'WordPress Plugin and Theme Security', 'wporg' ); ?></h2>
    284323                    <h3><?php esc_html_e( 'The Default Theme', 'wporg' ); ?></h3>
    285                     <p><?php
     324                    <p>
     325                    <?php
    286326                        printf(
    287327                            /* translators: %s: The latest Core Theme release - Currently Twenty Seventeen */
    288328                            esc_html__( 'WordPress requires a theme to be enabled to render content visible on the frontend. The default theme which ships with core WordPress (currently "%s") has been vigorously reviewed and tested for security reasons by both the team of theme developers plus the core development team.', 'wporg' ),
    289                             wp_get_theme( 'core/' . WP_CORE_DEFAULT_THEME )->display( 'Name' )
    290                         );
    291                     ?></p>
     329                            esc_html( wp_get_theme( 'core/' . WP_CORE_DEFAULT_THEME )->display( 'Name' ) )
     330                        );
     331                    ?>
     332                    </p>
    292333
    293334                    <p><?php esc_html_e( 'The default theme can serve as a starting point for custom theme development, and site developers can create a child theme which includes some customization but falls back on the default theme for most functionality and security. The default theme can be easily removed by an administrator if not needed.', 'wporg' ); ?></p>
     
    295336                    <h3><?php esc_html_e( 'WordPress.org Theme and Plugin Repositories', 'wporg' ); ?></h3>
    296337
    297                     <p><?php
     338                    <p>
     339                    <?php
    298340                        printf(
    299341                            /* translators: 1: Number of plugins - 50,000; 2: Number of themes - 5,000 */
    300                             esc_html__( 'There are approximately %1$s+ plugins and %2$s+ themes listed on the WordPress.org site. These themes and plugins are submitted for inclusion and are manually reviewed by volunteers before making them available on the repository.', 'wporg'
    301 ),
    302                             number_format_i18n( 50000 ),
    303                             number_format_i18n( 5000 )
    304                         );
    305                     ?></p>
    306 
    307                     <p><?php
     342                            esc_html__(
     343                                'There are approximately %1$s+ plugins and %2$s+ themes listed on the WordPress.org site. These themes and plugins are submitted for inclusion and are manually reviewed by volunteers before making them available on the repository.', 'wporg'
     344                            ),
     345                            esc_html( number_format_i18n( 50000 ) ),
     346                            esc_html( number_format_i18n( 5000 ) )
     347                        );
     348                    ?>
     349                    </p>
     350
     351                    <p>
     352                    <?php
    308353                        printf(
    309354                            /* translators: 1: Footnote; 2: Footnote */
     
    312357                            '<sup id="ref18"><a href="#footnote18">18</a></sup>'
    313358                        );
    314                     ?></p>
     359                    ?>
     360                    </p>
    315361
    316362                    <p><?php esc_html_e( 'Each plugin and theme has the ability to be continually developed by the plugin or theme owner, and any subsequent fixes or feature development can be uploaded to the repository and made available to users with that plugin or theme installed with a description of that change. Site administrators are notified of plugins which need to be updated via their administration dashboard.', 'wporg' ); ?></p>
     
    318364                    <p><?php esc_html_e( 'When a plugin vulnerability is discovered by the WordPress Security Team, they contact the plugin author and work together to fix and release a secure version of the plugin. If there is a lack of response from the plugin author or if the vulnerability is severe, the plugin/theme is pulled from the public directory, and in some cases, fixed and updated directly by the Security Team.', 'wporg' ); ?></p>
    319365                    <h3><?php esc_html_e( 'The Theme Review Team', 'wporg' ); ?></h3>
    320                     <p><?php
     366                    <p>
     367                    <?php
    321368                        printf(
    322369                            /* translators: 1: Footnote; 2: Footnote; 3: Footnote */
     
    326373                            '<sup id="ref21"><a href="#footnote21">21</a></sup>'
    327374                        );
    328                     ?></p>
     375                    ?>
     376                    </p>
    329377                    <h2><?php esc_html_e( 'The Role of the Hosting Provider in WordPress Security', 'wporg' ); ?></h2>
    330378                    <p><?php esc_html_e( 'WordPress can be installed on a multitude of platforms. Though WordPress core software provides many provisions for operating a secure web application, which were covered in this document, the configuration of the operating system and the underlying web server hosting the software is equally important to keep the WordPress applications secure.', 'wporg' ); ?></p>
    331379                    <h3><?php esc_html_e( 'A Note about WordPress.com and WordPress security', 'wporg' ); ?></h3>
    332                     <p><?php
     380                    <p>
     381                    <?php
    333382                        printf(
    334383                            /* translators: %s: Footnote */
     
    336385                            '<sup id="ref22"><a href="#footnote22">22</a></sup>'
    337386                        );
    338                     ?></p>
     387                    ?>
     388                    </p>
    339389                    <h2><?php esc_html_e( 'Appendix', 'wporg' ); ?></h2>
    340390                    <h3><?php esc_html_e( 'Core WordPress APIs', 'wporg' ); ?></h3>
    341                     <p><?php
     391                    <p>
     392                    <?php
    342393                        printf(
    343394                            /* translators: %s: Footnote */
     
    345396                            '<sup id="ref23"><a href="#footnote23">23</a></sup>'
    346397                        );
    347                     ?></p>
     398                    ?>
     399                    </p>
    348400
    349401                    <p><?php esc_html_e( 'While each WordPress API provides best practices and standardized ways to interact with and extend WordPress core software, the following WordPress APIs are the most pertinent to enforcing and hardening WordPress security:', 'wporg' ); ?></p>
     
    351403                    <h3><?php esc_html_e( 'Database API', 'wporg' ); ?></h3>
    352404
    353                     <p><?php
     405                    <p>
     406                    <?php
    354407                        printf(
    355408                            /* translators: %s: Footnote */
     
    357410                            '<sup id="ref24"><a href="#footnote24">24</a></sup>'
    358411                        );
    359                     ?></p>
     412                    ?>
     413                    </p>
    360414
    361415                    <h3><?php esc_html_e( 'Filesystem API', 'wporg' ); ?></h3>
    362416
    363                     <p><?php
     417                    <p>
     418                    <?php
    364419                        printf(
    365420                            /* translators: 1: Footnote; 2: Footnote */
     
    368423                            '<sup id="ref26"><a href="#footnote26">26</a></sup>'
    369424                        );
    370                     ?></p>
     425                    ?>
     426                    </p>
    371427
    372428                    <p><?php echo wp_kses_post( __( 'It does this through the <code>WP_Filesystem_Base</code> class, and several subclasses which implement different ways of connecting to the local filesystem, depending on individual host support. Any theme or plugin that needs to write files locally should do so using the WP_Filesystem family of classes.', 'wporg' ) ); ?></p>
     
    374430                    <h3><?php esc_html_e( 'HTTP API', 'wporg' ); ?></h3>
    375431
    376                     <p><?php
     432                    <p>
     433                    <?php
    377434                        printf(
    378435                            /* translators: 1: Footnote; 2: Footnote */
     
    381438                            '<sup id="ref28"><a href="#footnote28">28</a></sup>'
    382439                        );
    383                     ?></p>
     440                    ?>
     441                    </p>
    384442
    385443                    <h3><?php esc_html_e( 'Permissions and current user API', 'wporg' ); ?></h3>
    386444
    387                     <p><?php
     445                    <p>
     446                    <?php
    388447                        printf(
    389448                            /* translators: %s: Footnote */
     
    391450                            '<sup id="ref29"><a href="#footnote29">29</a></sup>'
    392451                        );
    393                     ?></p>
     452                    ?>
     453                    </p>
    394454                    <h3><?php esc_html_e( 'White paper content License', 'wporg' ); ?></h3>
    395                     <p><?php
     455                    <p>
     456                    <?php
    396457                        printf(
    397458                            /* translators: 1: Link to WordPress Foundation Trademark Polocy (English); 2: Link to Creative Commons CC0 license (English) */
     
    400461                            'https://creativecommons.org/publicdomain/zero/1.0/'
    401462                        );
    402                     ?></p>
    403 
    404                     <p><?php
     463                    ?>
     464                    </p>
     465
     466                    <p>
     467                    <?php
    405468                        printf(
    406469                            /* translators: %s: Link to the Drupal Security Whitepaper (english). */
     
    408471                            'http://drupalsecurityreport.org/'
    409472                        );
    410                     ?></p>
     473                    ?>
     474                    </p>
    411475                    <h3><?php esc_html_e( 'Additional Reading', 'wporg' ); ?></h3>
    412476                    <ul>
    413                         <li><?php
     477                        <li>
     478                        <?php
    414479                            printf(
    415480                                /* translators: %s: Link to News Blog including the <a> tags. */
     
    417482                                '<a href="https://wordpress.org/news/">https://wordpress.org/news/</a>'
    418483                            );
    419                         ?></li>
    420                         <li><?php
     484                        ?>
     485                        </li>
     486                        <li>
     487                        <?php
    421488                            printf(
    422489                                /* translators: %s: Link to News Blog Security Release Archive including the <a> tags. */
     
    424491                                '<a href="https://wordpress.org/news/category/security/">https://wordpress.org/news/category/security/</a>'
    425492                            );
    426                         ?></li>
    427                         <li><?php
     493                        ?>
     494                        </li>
     495                        <li>
     496                        <?php
    428497                            printf(
    429498                                /* translators: %s: Link to Developer.WordPress.org including the <a> tags. */
     
    431500                                '<a href="https://developer.wordpress.org/">https://developer.wordpress.org/</a>'
    432501                            );
    433                         ?></li>
     502                        ?>
     503                        </li>
    434504                    </ul>
    435505
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-stats.php

    r6972 r7350  
    2323} );
    2424
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     25/* See inc/page-meta-descriptions.php for the meta description for this page. */
    2626
    2727get_header( 'child-page' );
     
    4545                </section>
    4646            </div><!-- .entry-content -->
    47 
    4847        </article><!-- #post-## -->
    4948
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-swag.php

    r6972 r7350  
    2323} );
    2424
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     25/* See inc/page-meta-descriptions.php for the meta description for this page. */
    2626
    2727get_header( 'child-page' );
     
    5555                        ?>
    5656                    </p>
    57 
    5857                </section>
    59 
    6058            </div><!-- .entry-content -->
    61 
    6259        </article><!-- #post-## -->
    6360
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-testimonials.php

    r6972 r7350  
    77 * @package WordPressdotorg\MainTheme
    88 */
     9
     10// phpcs:disable WordPress.VIP.RestrictedFunctions
    911
    1012namespace WordPressdotorg\MainTheme;
     
    2325} );
    2426
    25 // See inc/page-meta-descriptions.php for the meta description for this page.
     27/* See inc/page-meta-descriptions.php for the meta description for this page. */
    2628
    27 // Pull list of testimonial URLs from the news page holding them
     29// Pull list of testimonial URLs from the news page holding them.
    2830switch_to_blog( 8 );
    29 $testpage = get_page_by_path( 'testimonials' );
     31$testimonials_post = get_page_by_path( 'testimonials' );
    3032restore_current_blog();
    3133
    32 // we only need the URLs in the post_content
    33 preg_match_all( '|https://\S+|', $testpage->post_content, $testimonials );
    34 $testimonials = $testimonials[0];
     34if ( $testimonials_post instanceof \WP_Post ) {
     35    // We only need the URLs in the post_content.
     36    preg_match_all( '|https://\S+|', $testimonials_post->post_content, $testimonials );
     37    $testimonials = $testimonials[0];
     38} else {
     39    $testimonials = [];
     40}
    3541
    36 // separate out the twiiter from the WPs
    37 $embed_tweets = array_values( array_filter( $testimonials, function ($t) { return strpos( $t, 'https://twitter.com' ) === 0; } ) );
    38 $embed_wps    = array_values( array_filter( $testimonials, function ($t) { return strpos( $t, 'https://twitter.com' ) !== 0; } ) );
     42// Separate out the twitter from the WPs.
     43$embed_tweets = array_values( array_filter( $testimonials, function( $t ) {
     44    return strpos( $t, 'https://twitter.com' ) === 0;
     45} ) );
     46$embed_wps = array_values( array_filter( $testimonials, function( $t ) {
     47    return strpos( $t, 'https://twitter.com' ) !== 0;
     48} ) );
    3949
    40 // Randomize the tweet order
     50// Randomize the tweet order.
    4151shuffle( $embed_tweets );
    4252
    43 // Strip out everything but the Tweet ID
     53// Strip out everything but the Tweet ID.
    4454array_walk( $embed_tweets, function ( &$tweet ) {
    4555    $tweet = preg_replace( '|https?://twitter.com/.*/status/([0-9]+)|', '$1', $tweet );
     
    7080                conversation: 'none',
    7181                cards: 'hidden',
    72                 margin: 0, width: 372
     82                margin: 0,
     83                width: 372
    7384            }
    7485        ).then( function() {
     
    92103wp_add_inline_script( 'twitter-widgets', $custom_js );
    93104wp_localize_script( 'twitter-widgets', 'embeds', array(
    94     'tweets' => $embed_tweets,
     105    'tweets'   => $embed_tweets,
    95106    'wpembeds' => $embed_wps,
    96107) );
     
    107118
    108119            <div class="entry-content row">
    109 
    110120                <section class="col-8">
    111                     <h3><?php _e( 'Share your WordPress story', 'wporg' ); ?></h3>
    112 
    113                     <p><?php _e( 'Want to have your story featured on this page?', 'wporg' ); ?></p>
    114 
    115                     <p><?php
     121                    <h3><?php esc_html_e( 'Share your WordPress story', 'wporg' ); ?></h3>
     122                    <p><?php esc_html_e( 'Want to have your story featured on this page?', 'wporg' ); ?></p>
     123                    <p>
     124                        <?php
    116125                        /* translators: Link to the twitter #ilovewp feed */
    117                         printf( __( "Make a blog post with your story and tweet a link to it using the <a href='%s'>#ilovewp</a> hashtag. We'll select the best ones and feature them here!", 'wporg' ), 'https://twitter.com/search?q=%23ilovewp' );
    118                     ?></p>
     126                        printf( wp_kses_post( __( 'Make a blog post with your story and tweet a link to it using the <a href="%s">#ilovewp</a> hashtag. We&#8217;ll select the best ones and feature them here!', 'wporg' ) ), 'https://twitter.com/search?q=%23ilovewp' );
     127                        ?>
     128                    </p>
    119129
    120130                    <p>
     
    126136                        </a>
    127137                    </p>
    128 
    129138                </section>
    130139
    131                 <section class="col-10" id="embeds">
    132                 </section>
     140                <section class="col-10" id="embeds"></section>
    133141            </div><!-- .entry-content -->
    134 
    135142        </article><!-- #post-## -->
    136143
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about.php

    r7332 r7350  
    1515} );
    1616
    17 // See inc/page-meta-descriptions.php for the meta description for this page.
     17/* See inc/page-meta-descriptions.php for the meta description for this page. */
    1818
    1919get_header();
     
    101101                        <?php
    102102                        /* translators: 1: Link to b2/cafelog; 2: WordPress market share: 30 - Note: The following percent sign is '%%' for escaping purposes; */
    103                         printf( wp_kses_post( __( 'WordPress started in 2003 when Mike Little and Matt Mullenweg created a <a href="%1$s">fork of b2/cafelog</a>. The need for an elegant, well-architected personal publishing system was clear even then. Today, WordPress is built on PHP and MySQL, and licensed under the GPLv2. It is also the platform of choice for over %2$s%% of all sites across the web.', 'wporg' ) ), esc_url( 'https://www.whoishostingthis.com/resources/b2-cafelog/' ), number_format_i18n( WP_MARKET_SHARE ) );
     103                        printf( wp_kses_post( __( 'WordPress started in 2003 when Mike Little and Matt Mullenweg created a <a href="%1$s">fork of b2/cafelog</a>. The need for an elegant, well-architected personal publishing system was clear even then. Today, WordPress is built on PHP and MySQL, and licensed under the GPLv2. It is also the platform of choice for over %2$s%% of all sites across the web.', 'wporg' ) ), esc_url( 'https://www.whoishostingthis.com/resources/b2-cafelog/' ), esc_html( number_format_i18n( WP_MARKET_SHARE ) ) );
    104104                        ?>
    105105                    </p>
  • sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-get.php

    r7335 r7350  
    4646                            <span class="dashicons-before dashicons-download">
    4747                                <?php
    48                                 echo apply_filters( 'no_orphans', sprintf(
     48                                echo esc_html( apply_filters( 'no_orphans', sprintf(
    4949                                    /* translators: WordPress version. */
    50                                     esc_html__( 'Download WordPress %s', 'wporg' ),
    51                                     esc_html( WP_CORE_LATEST_RELEASE )
    52                                 ) );
     50                                    __( 'Download WordPress %s', 'wporg' ),
     51                                    WP_CORE_LATEST_RELEASE
     52                                ) ) );
    5353                                ?>
    5454                            </span>
Note: See TracChangeset for help on using the changeset viewer.