Merge branch 'master' into fix-array-string-generation

Author: jtsternberg

README.md

@@ -6,6 +6,8 @@ This plugin uses the OAuth 1.0a protocol to allow delegated authorization; that
 
 This plugin only supports WordPress >= 4.4.
 
+The latest stable version is also available from the [WordPress Plugin Directory](https://wordpress.org/plugins/rest-api-oauth1/).
+
 ## New to OAuth
 
 We strongly recommend you use an existing OAuth library. You'll be best off if you understand the authorization process, but leave the actual implementation to well-tested libraries, as there are a lot of edge cases.

admin.php

@@ -18,10 +18,13 @@ function rest_oauth1_profile_section( $user ) {
 	global $wpdb;
 
 	$results = $wpdb->get_col( "SELECT option_value FROM {$wpdb->options} WHERE option_name LIKE 'oauth1_access_%'", 0 );
-	$results = array_map( 'unserialize', $results );
-	$approved = array_filter( $results, function ( $row ) use ( $user ) {
-		return $row['user'] === $user->ID;
-	} );
+	$approved = array();
+	foreach ( $results as $result ) {
+		$row = unserialize( $result );
+		if ( $row['user'] === $user->ID ) {
+			$approved[] = $row;
+		}
+	}
 
 	$authenticator = new WP_REST_OAuth1();
 
@@ -46,7 +49,7 @@ function rest_oauth1_profile_section( $user ) {
 								?>
 								<tr>
 									<td><?php echo esc_html( $application->post_title ) ?></td>
-									<td><button class="button" name="oauth_revoke" value="<?php echo esc_attr( $row['key'] ) ?>"><?php esc_html_e( 'Revoke', 'rest_oauth1' ) ?></button>
+									<td><button class="button" name="rest_oauth1_revoke" value="<?php echo esc_attr( $row['key'] ) ?>"><?php esc_html_e( 'Revoke', 'rest_oauth1' ) ?></button>
 								</tr>
 
 							<?php endforeach ?>

assets/banner-1544x500.png

@@ -0,0 +1,15 @@
+=== WordPress REST API - OAuth 1.0a Server ===
+Contributors: rmccue, rachelbaker, danielbachhuber, joehoyle
+Tags: json, rest, api, rest-api
+Requires at least: 4.4
+Tested up to: 4.7-alpha
+Stable tag: {{TAG}}
+License: GPLv2 or later
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
+
+== Description ==
+Connect applications to your WordPress site without ever giving away your password.
+
+This plugin uses the OAuth 1.0a protocol to allow delegated authorization; that is, to allow applications to access a site using a set of secondary credentials. This allows server administrators to control which applications can access the site, as well as allowing users to control which applications have access to their data.
+
+This plugin only supports WordPress >= 4.4.

assets/banner-772x250.png

@@ -0,0 +1,66 @@
+# release.sh
+#
+# Takes a tag to release, and syncs it to WordPress.org
+
+TAG=$1
+
+PLUGIN="rest-api-oauth1"
+TMPDIR=/tmp/rest-api-oauth1-release-svn
+PLUGINDIR="$PWD"
+PLUGINSVN="https://plugins.svn.wordpress.org/$PLUGIN"
+
+# Fail on any error
+set -e
+
+# Is the tag valid?
+if [ -z "$TAG" ] || ! git rev-parse "$TAG" > /dev/null; then
+	echo "Invalid tag. Make sure you tag before trying to release."
+	exit 1
+fi
+
+if [[ $VERSION == "v*" ]]; then
+	# Starts with an extra "v", strip for the version
+	VERSION=${TAG:1}
+else
+	VERSION="$TAG"
+fi
+
+if [ -d "$TMPDIR" ]; then
+	# Wipe it clean
+	rm -r "$TMPDIR"
+fi
+
+# Ensure the directory exists first
+mkdir "$TMPDIR"
+
+# Grab an unadulterated copy of SVN
+svn co "$PLUGINSVN/trunk" "$TMPDIR" > /dev/null
+
+# Extract files from the Git tag to there
+git archive --format="zip" -0 "$TAG" | tar -C "$TMPDIR" -xf -
+
+# Switch to build dir
+cd "$TMPDIR"
+
+# Run build tasks
+sed -e "s/{{TAG}}/$VERSION/g" < "$PLUGINDIR/bin/readme.txt" > readme.txt
+
+# Remove special files
+rm ".gitignore"
+rm "composer.json"
+rm "book.json"
+rm -r "bin"
+rm -r "docs"
+
+# Add any new files
+svn status | grep -v "^.[ \t]*\..*" | grep "^?" | awk '{print $2}' | xargs svn add
+
+# Pause to allow checking
+echo "About to commit $VERSION. Double-check $TMPDIR to make sure everything looks fine."
+read -p "Hit Enter to continue."
+
+# Commit the changes
+svn commit -m "Tag $VERSION"
+
+# tag_ur_it
+svn copy "$PLUGINSVN/trunk" "$PLUGINSVN/tags/$VERSION" -m "Tag $VERSION"

assets/icon-128x128.png

@@ -13,12 +13,18 @@ public function prepare_items() {
 					'value' => 'oauth1',
 				),
 			),
-
 			'paged' => $paged,
 		);
 
-		$query = new WP_Query();
-		$this->items = $query->query( $args );
+		$query = new WP_Query( $args );
+		$this->items = $query->posts;
+
+		$pagination_args = array(
+			'total_items' => $query->found_posts,
+			'total_pages' => $query->max_num_pages,
+			'per_page' => $query->get('posts_per_page')
+		);
+		$this->set_pagination_args( $pagination_args );
 	}
 
 	/**

assets/icon-256x256.png

@@ -136,11 +136,7 @@ public function page_fields() {
 	 * @return null|WP_Error Null on success, error otherwise
 	 */
 	public function handle_callback_redirect( $verifier ) {
-		if ( ! empty( $this->token['callback'] ) && $this->token['callback'] === 'oob' ) {
-			return apply_filters( 'json_oauth1_handle_callback', null, $this->token );
-		}
-
-		if ( empty( $this->token['callback'] ) ) {
+		if ( empty( $this->token['callback'] ) || $this->token['callback'] === 'oob' ) {
 			// No callback registered, display verification code to the user
 			login_header( __( 'Access Token', 'rest_oauth1' ) );
 			echo '<p>' . sprintf( __( 'Your verification token is <code>%s</code>', 'rest_oauth1' ), $verifier ) . '</p>';