Make WordPress Core

Changeset 42343 for trunk/src/xmlrpc.php


Ignore:
Timestamp:
11/30/2017 11:09:33 PM (8 years ago)
Author:
pento
Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/xmlrpc.php

    r42228 r42343  
    1111 * @var bool
    1212 */
    13 define('XMLRPC_REQUEST', true);
     13define( 'XMLRPC_REQUEST', true );
    1414
    1515// Some browser-embedded clients send cookies. We don't want them.
     
    1818// A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default,
    1919// but we can do it ourself.
    20 if ( !isset( $HTTP_RAW_POST_DATA ) ) {
     20if ( ! isset( $HTTP_RAW_POST_DATA ) ) {
    2121    $HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );
    2222}
    2323
    2424// fix for mozBlog and other cases where '<?xml' isn't on the very first line
    25 if ( isset($HTTP_RAW_POST_DATA) )
    26     $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
     25if ( isset( $HTTP_RAW_POST_DATA ) ) {
     26    $HTTP_RAW_POST_DATA = trim( $HTTP_RAW_POST_DATA );
     27}
    2728
    2829/** Include the bootstrap for setting up WordPress environment */
     
    3031
    3132if ( isset( $_GET['rsd'] ) ) { // http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
    32 header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
     33    header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
    3334?>
    34 <?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
     35<?php echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>'; ?>
    3536<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
    3637    <service>
    3738        <engineName>WordPress</engineName>
    3839        <engineLink>https://wordpress.org/</engineLink>
    39         <homePageLink><?php bloginfo_rss('url') ?></homePageLink>
     40        <homePageLink><?php bloginfo_rss( 'url' ); ?></homePageLink>
    4041        <apis>
    41             <api name="WordPress" blogID="1" preferred="true" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
    42             <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
    43             <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
    44             <api name="Blogger" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
     42            <api name="WordPress" blogID="1" preferred="true" apiLink="<?php echo site_url( 'xmlrpc.php', 'rpc' ); ?>" />
     43            <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php echo site_url( 'xmlrpc.php', 'rpc' ); ?>" />
     44            <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php echo site_url( 'xmlrpc.php', 'rpc' ); ?>" />
     45            <api name="Blogger" blogID="1" preferred="false" apiLink="<?php echo site_url( 'xmlrpc.php', 'rpc' ); ?>" />
    4546            <?php
    4647            /**
     
    6061}
    6162
    62 include_once(ABSPATH . 'wp-admin/includes/admin.php');
    63 include_once(ABSPATH . WPINC . '/class-IXR.php');
    64 include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
     63include_once( ABSPATH . 'wp-admin/includes/admin.php' );
     64include_once( ABSPATH . WPINC . '/class-IXR.php' );
     65include_once( ABSPATH . WPINC . '/class-wp-xmlrpc-server.php' );
    6566
    6667/**
    6768 * Posts submitted via the XML-RPC interface get that title
     69 *
    6870 * @name post_default_title
    6971 * @var string
    7072 */
    71 $post_default_title = "";
     73$post_default_title = '';
    7274
    7375/**
     
    7981 */
    8082$wp_xmlrpc_server_class = apply_filters( 'wp_xmlrpc_server_class', 'wp_xmlrpc_server' );
    81 $wp_xmlrpc_server = new $wp_xmlrpc_server_class;
     83$wp_xmlrpc_server       = new $wp_xmlrpc_server_class;
    8284
    8385// Fire off the request
     
    9799function logIO( $io, $msg ) {
    98100    _deprecated_function( __FUNCTION__, '3.4.0', 'error_log()' );
    99     if ( ! empty( $GLOBALS['xmlrpc_logging'] ) )
     101    if ( ! empty( $GLOBALS['xmlrpc_logging'] ) ) {
    100102        error_log( $io . ' - ' . $msg );
     103    }
    101104}
Note: See TracChangeset for help on using the changeset viewer.