Changeset 6462

Timestamp:

01/30/2018 03:18:52 AM (7 years ago)

Author:

dd32

Message:

Theme Directory: API: Move the Themes_API class into the plugin, making api.wordpress.org/themes/info/ a wrapper for it.

See #1630

Location:

sites/trunk

Files:

• api.wordpress.org/public_html/themes/info/1.0/class-themes-api.php (deleted)
• api.wordpress.org/public_html/themes/info/1.0/index.php (modified) (2 diffs)
• api.wordpress.org/public_html/themes/theme-directory/1.0/index.php (modified) (1 diff)
• wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php (modified) (1 diff)
• wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/themes/info/1.0/index.php

@@ -9 +9 @@
 if ( defined( 'JSON_RESPONSE' ) && JSON_RESPONSE ) {
     $request = isset( $_REQUEST['request'] ) ? (object) wp_unslash( $_REQUEST['request'] ) : '';
+    $format = 'json';
 } else {
     $post_request = isset( $_POST['request'] ) ? urldecode( wp_unslash( $_POST['request'] ) ) : '';
@@ -16 +17 @@
 
     $request = unserialize( $post_request );
+
+    $format = 'php';
 }
+
 $action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : '';
 
-// Load the Themes API.
-if ( ! class_exists( 'Themes_API' ) ) {
-    require_once __DIR__ . '/class-themes-api.php';
-}
-
-// Instantiate the API and serve the result.
-$api = new Themes_API( $action, $request );
-echo $api->get_result();
+// Serve an API request.
+echo wporg_themes_query_api( $action, $request, $format );

sites/trunk/api.wordpress.org/public_html/themes/theme-directory/1.0/index.php

@@ -55 +55 @@
         }
 
-        $theme_slug = $_REQUEST['theme'];
+        $theme_slug = wp_unslash( $_REQUEST['theme'] );
 
         if ( 'add-favorite' == $_REQUEST['action'] ) {

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php

@@ -118 +118 @@
      * @return string|void
      */
-    public function get_result() {
-        if ( defined( 'JSON_RESPONSE' ) && JSON_RESPONSE ) {
+    public function get_result( $format = 'raw' ) {
+        if ( 'json' === $format ) {
             return wp_json_encode( $this->response );
-        } else {
+        } elseif ( 'php' === $format ) {
             return serialize( $this->response );
+        } else { // 'raw' === $format, or anything else.
+            return $this->response;
         }
     }

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php

@@ -788 +788 @@
 
 /**
- * Makes a query against api.wordpress.org/themes/info/1.0/ without making a HTTP call
- * Switches to the appropriate blog for the query.
- */
-function wporg_themes_query_api( $method, $args = array() ) {
+ * Make a query against the api.wordpress.org/themes/info/ API
+ * This function can be used to access the API without making an external HTTP call.
+ *
+ * NOTE: The API also calls this function.
+ *
+ * @param $method string The Method being called. Valid values: 'query_themes', 'theme_information', 'hot_tags', 'feature_list', and 'get_commercial_shops'
+ * @param $args   array  The arguements for the call.
+ * @param $format string The format to return the data in. Valid values: 'json', 'php', 'raw' (default)
+ */
+function wporg_themes_query_api( $method, $args = array(), $format = 'raw' ) {
     if ( ! class_exists( 'Themes_API' ) ) {
-        if ( file_exists( __DIR__ . '/class-themes-api.php' ) ) {
-            include_once __DIR__ . '/class-themes-api.php';
-        } else {
-            include_once API_WPORGPATH . 'themes/info/1.0/class-themes-api.php';
-        }
+        include_once __DIR__ . '/class-themes-api.php';
     }
 
     $api = new Themes_API( $method, $args );
 
-    return $api->response;
+    return $api->get_result( $format );
 }