fix phpcs

includes/class-activity-dispatcher.php

@@ -103,7 +103,7 @@ class Activity_Dispatcher {
 		}
 
 		if ( ! $user_id ) {
-			$user_id  = $transformer->get_wp_user_id();
+			$user_id = $transformer->get_wp_user_id();
 		}
 
 		if ( is_user_disabled( $user_id ) ) {
@@ -115,8 +115,8 @@ class Activity_Dispatcher {
 		// TODO: properly fix this for the instance-to-instance federation with Mobilizon.
 		// Error:
 		//      Failed to map identity from signature (payload actor mismatch)
-		//  	key_id=http://wp.lan/wp-json/activitypub/1.0/application, actor=http://wp.lan/@blog
+		//      key_id=http://wp.lan/wp-json/activitypub/1.0/application, actor=http://wp.lan/@blog
-        // Of course, the announce must be sent as the Application actor because he also signed it!
+		// Of course, the announce must be sent as the Application actor because he also signed it!
 		if ( Users::APPLICATION_USER_ID === $user_id ) {
 			$activity->set_actor( get_rest_url_by_path( 'application' ) );
 		}

includes/collection/class-follow-requests.php

@@ -26,8 +26,8 @@ class Follow_Requests {
 	 * @return \Activitypub\Model\Follow|null The Follower object or null
 	 */
 	public static function get_follow_requests_for_user( $user_id, $per_page, $page, $args ) {
-		$order   = isset($args['order']) && strtolower($args['order']) === 'asc' ? 'ASC' : 'DESC';
+		$order   = isset( $args['order'] ) && strtolower( $args['order'] ) === 'asc' ? 'ASC' : 'DESC';
-		$orderby = isset($args['orderby']) ? sanitize_text_field($args['orderby']) : 'published';
+		$orderby = isset( $args['orderby'] ) ? sanitize_text_field( $args['orderby'] ) : 'published';
 
 		global $wpdb;
 		$follow_requests = $wpdb->get_results(
@@ -39,14 +39,16 @@ class Follow_Requests {
 				 WHERE follow_request.post_type = 'ap_follow_request'
 				 AND meta.meta_key = 'activitypub_user_id'
 				 AND meta.meta_value = %s
-				 ORDER BY {$orderby} {$order}
+				 ORDER BY %s %s
 				 LIMIT %d OFFSET %d",
+				$orderby,
+				$order,
 				$user_id,
 				$per_page,
 				0
 			)
 		);
-		$total_items = $wpdb->get_var("SELECT FOUND_ROWS()");
+		$total_items = $wpdb->get_var( 'SELECT FOUND_ROWS()' );
 
 		return compact( 'follow_requests', 'total_items' );
 	}

includes/collection/class-followers.php

@@ -266,7 +266,7 @@ class Followers {
 		// $inboxes = wp_cache_get( $cache_key, 'activitypub' );
 
 		// if ( $inboxes ) {
-		// 	return $inboxes;
+		//  return $inboxes;
 		// }
 
 		// get all Followers of a ID of the WordPress User

includes/handler/class-follow.php

@@ -63,7 +63,6 @@ class Follow {
 		if ( ! $user->get_manually_approves_followers() ) {
 			$follow_request->approve();
 		}
-	
 	}
 
 	/**

includes/model/class-follow-request.php

@@ -61,7 +61,7 @@ class Follow_Request extends Base_Object {
 	 */
 	public static function get_follow_request_id_by_uri( $uri ) {
 		global $wpdb;
-    	return $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE guid=%s", esc_sql( $uri ) ) );
+		return $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE guid=%s", esc_sql( $uri ) ) );
 	}
 
 
@@ -79,11 +79,11 @@ class Follow_Request extends Base_Object {
 			return false;
 		}
 
-    	$id = self::get_follow_request_id_by_uri( $follow_request->get_id() );
+		$id = self::get_follow_request_id_by_uri( $follow_request->get_id() );
 		if ( ! $id || is_wp_error( $id ) ) {
 			return false;
 		}
-		if ( self::FOLLOW_REQUEST_POST_TYPE != get_post_type( $id) ) {
+		if ( self::FOLLOW_REQUEST_POST_TYPE != get_post_type( $id ) ) {
 			return false;
 		}
 
@@ -100,12 +100,12 @@ class Follow_Request extends Base_Object {
 	 * @return Follow_Request $follow_request
 	 */
 	public static function from_wp_id( $id ) {
-		if ( self::FOLLOW_REQUEST_POST_TYPE != get_post_type( $id ) ){
+		if ( self::FOLLOW_REQUEST_POST_TYPE != get_post_type( $id ) ) {
 			return;
 		}
 		$post = get_post( $id );
 
-		$follow_request = new static;
+		$follow_request = new static();
 		$follow_request->set_id( $post->guid );
 		$follow_request->set__id( $post->ID );
 		$follow_request->set_type( 'Follow' );
@@ -133,12 +133,11 @@ class Follow_Request extends Base_Object {
 			'post_status'  => 'pending',
 			'post_parent'  => $follower_id,
 			'meta_input'   => $meta_input,
-			'mime_type'    => 'text/plain'
+			'mime_type'    => 'text/plain',
 		);
 
 		$post_id = wp_insert_post( $args );
 
-
 		return self::from_wp_id( $post_id );
 	}
 
@@ -149,8 +148,8 @@ class Follow_Request extends Base_Object {
 	 * @return bool Whether the user is allowed.
 	 */
 	public function can_handle_follow_request() {
-		$target_actor = get_post_meta( $this->get__id(), 'activitypub_user_id');
+		$target_actor = get_post_meta( $this->get__id(), 'activitypub_user_id' );
-		if ( get_current_user_id() == $target_actor || current_user_can( 'manage_options' )) {
+		if ( get_current_user_id() == $target_actor || current_user_can( 'manage_options' ) ) {
 			return true;
 		}
 	}
@@ -195,7 +194,7 @@ class Follow_Request extends Base_Object {
 	 * Prepere the sending of the follow request response and hand it over to the sending handler.
 	 */
 	public function send_response( $type ) {
-		$user_id = get_post_meta( $this->get__id(), 'activitypub_user_id')[0];
+		$user_id = get_post_meta( $this->get__id(), 'activitypub_user_id' )[0];
 		$user = Users::get_by_id( $user_id );
 
 		$follower_id = wp_get_post_parent_id( $this->get__id() );
@@ -210,6 +209,6 @@ class Follow_Request extends Base_Object {
 			'object' => $user,
 		);
 
-		do_action( 'activitypub_send_follow_response', $user, $follower, $object, $type);
+		do_action( 'activitypub_send_follow_response', $user, $follower, $object, $type );
 	}
 }

includes/table/class-follow-requests.php

@@ -51,7 +51,7 @@ class Follow_Requests extends WP_List_Table {
 
 	public function get_sortable_columns() {
 		$sortable_columns = array(
-			'status' => array( 'status', false),
+			'status' => array( 'status', false ),
 			'name' => array( 'name', true ),
 			'modified'   => array( 'modified', false ),
 			'published'  => array( 'published', false ),
@@ -179,21 +179,30 @@ class Follow_Requests extends WP_List_Table {
 	}
 
 	public function ajax_response() {
-		$follow_action = $_REQUEST['follow_action'];
+		global $_REQUEST;
-		$id = $_REQUEST['follow_request'];
+		$follow_action = isset( $_REQUEST['follow_action'] ) ? sanitize_title( wp_unslash( $_REQUEST['follow_action'] ) ) : null;
-		wp_verify_nonce( $_REQUEST['_wpnonce'], "activitypub_{$follow_action}_follow_request" );
+		$follow_request_id = isset( $_REQUEST['follow_request'] ) ? (int) $_REQUEST['follow_request'] : null;
-		$follow_request = Follow_Request::from_wp_id( $id );
+		$wp_nonce   = isset( $_REQUEST['_wpnonce'] ) ? (int) $_REQUEST['_wpnonce'] : null;
+		if ( ! $follow_action || ! $follow_request_id || ! $wp_nonce ) {
+			return;
+		}
+		wp_verify_nonce( $wp_nonce, "activitypub_{$follow_action}_follow_request" );
+		$follow_request = Follow_Request::from_wp_id( $follow_request_id );
+
 		if ( $follow_request->can_handle_follow_request() ) {
 			switch ( $follow_action ) {
 				case 'approve':
 					$follow_request->approve();
 					wp_die( 'approved' );
+					break;
 				case 'reject':
 					$follow_request->reject();
 					wp_die( 'rejected' );
+					break;
 				case 'delete':
 					$follow_request->delete();
 					wp_die( 'deleted' );
+					break;
 			}
 		}
 		return;
@@ -214,39 +223,53 @@ class Follow_Requests extends WP_List_Table {
 		} else {
 			$type = 'hidden';
 		}
+		switch ( $follow_action ) {
+			case 'approve':
+				$follow_action_text = __( 'Approve', 'activitypub' );
+				break;
+			case 'delete':
+				$follow_action_text = __( 'Delete', 'activitypub' );
+				break;
+			case 'reject':
+				$follow_action_text = __( 'Reject', 'activitypub' );
+				break;
+			default:
+				return;
+		}
+
 		printf(
 			'<input type="%s" class="button" value="%s" data-action="%s">',
 			esc_attr( $type ),
-			esc_attr__( ucfirst( $follow_action ), 'activitypub' ),
+			esc_attr( $follow_action_text ),
 			esc_url( $url )
 		);
 	}
 
-	public function column_action($item) {
+	public function column_action( $item ) {
 		$status = $item['status'];
 
-		printf('<div class="activitypub-settings-action-buttons">');
+		printf( '<div class="activitypub-settings-action-buttons">' );
 
 		// TODO this can be written smarter, but at least it is readable.
 		if ( 'pending' === $status ) {
-			self::display_follow_request_action_button( $item['id'], 'approve');
+			self::display_follow_request_action_button( $item['id'], 'approve' );
-			self::display_follow_request_action_button( $item['id'], 'reject');
+			self::display_follow_request_action_button( $item['id'], 'reject' );
-			self::display_follow_request_action_button( $item['id'], 'delete', false);
+			self::display_follow_request_action_button( $item['id'], 'delete', false );
 		}
 
 		if ( 'approved' === $status ) {
-			self::display_follow_request_action_button( $item['id'], 'approve', false);
+			self::display_follow_request_action_button( $item['id'], 'approve', false );
-			self::display_follow_request_action_button( $item['id'], 'reject');
+			self::display_follow_request_action_button( $item['id'], 'reject' );
-			self::display_follow_request_action_button( $item['id'], 'delete', false);
+			self::display_follow_request_action_button( $item['id'], 'delete', false );
 		}
 
 		if ( 'rejected' === $status ) {
-			self::display_follow_request_action_button( $item['id'], 'approve', false); // TODO: Clarify with Mobilizon
+			self::display_follow_request_action_button( $item['id'], 'approve', false ); // TODO: Clarify with Mobilizon
-			self::display_follow_request_action_button( $item['id'], 'reject', false);
+			self::display_follow_request_action_button( $item['id'], 'reject', false );
-			self::display_follow_request_action_button( $item['id'], 'delete');
+			self::display_follow_request_action_button( $item['id'], 'delete' );
 		}
 
-		printf('</div>');
+		printf( '</div>' );
 	}
 
 	public function process_action() {