Show results from page 1 when performing a new search (#34)

* Add more meaningful informations to errors
* Fix pagination in searches
* Change input type to search
* Bump version to 1.1.3

---------

Co-authored-by: xxsimoxx <simone@gieffeedizioni.it>

Author: xxsimoxx

classes/PluginInstall.class.php

@@ -161,8 +161,16 @@ public static function do_directory_request($args = [], $type = 'plugins')
 
 		$e = wp_remote_retrieve_response_code($response);
 		if ($e !== 200) {
-			$result['error'] = $response['response']['message'];
+			$result['error'] = $response['response']['message'].'.';
 			$result['code']  = $response['response']['code'];
+			if (!isset($response['body']) || !json_validate($response['body'])) {
+				return $result;
+			}
+			$api_message = json_decode($response['body'], true);
+			if(!isset($api_message['message'])) {
+				return $result;
+			}
+			$result['error'] .= ' '.$api_message['message'];
 			return $result;
 		}
 
@@ -343,6 +351,11 @@ public function render_menu()
 		if (isset($_REQUEST['searchfor'])) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			$args['search'] = sanitize_text_field(wp_unslash($_REQUEST['searchfor'])); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		}
+		// Reset paginations for new searches
+		$searching = $args['search'] ?? '';
+		if (isset($_REQUEST['searchingfor']) && $_REQUEST['searchingfor'] !== $searching) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			$args['page'] = 1;
+		}
 
 		$result = $this->do_directory_request($args);
 		if ($result['success'] === false) {
@@ -371,10 +384,11 @@ public function render_menu()
 				<form method="GET" action="<?php echo esc_url(add_query_arg(['page' => 'classicpress-directory-integration-plugin-install'], remove_query_arg(['getpage']))); ?>">
 					<p class="cp-plugin-search-box">
 						<label for="searchfor" class="screen-reader-text" ><?php echo esc_html__('Search for plugins', 'classicpress-directory-integration'); ?></label><br>
-						<input type="text" id="searchfor" name="searchfor" class="wp-filter-search" placeholder="<?php echo esc_html__('Search for a plugin...', 'classicpress-directory-integration'); ?>"><br>
+						<input type="hidden" name="searchingfor" value="<?php echo esc_html($searching); ?>">
+						<input type="search" id="searchfor" name="searchfor" class="wp-filter-search" <?php echo $searching !== '' ? 'value="'.esc_html($searching).'" ' : '' ?>placeholder="<?php echo esc_html__('Search for a plugin...', 'classicpress-directory-integration'); ?>"><br>
 						<?php
 						foreach ((array) $_GET as $key => $val) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-							if (in_array($key, ['searchfor'])) {
+							if (in_array($key, ['searchfor', 'getpage'])) {
 								continue;
 							}
 							echo '<input type="hidden" name="' . esc_attr($key) . '" value="' . esc_html($val) . '" />';

classes/ThemeInstall.class.php

@@ -155,8 +155,16 @@ public static function do_directory_request($args = [], $type = 'themes')
 
 		$e = wp_remote_retrieve_response_code($response);
 		if ($e !== 200) {
-			$result['error'] = $response['response']['message'];
+			$result['error'] = $response['response']['message'].'.';
 			$result['code']  = $response['response']['code'];
+			if (!isset($response['body']) || !json_validate($response['body'])) {
+				return $result;
+			}
+			$api_message = json_decode($response['body'], true);
+			if(!isset($api_message['message'])) {
+				return $result;
+			}
+			$result['error'] .= ' '.$api_message['message'];
 			return $result;
 		}
 
@@ -340,6 +348,11 @@ public function render_menu()
 		if (isset($_REQUEST['searchfor'])) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			$args['search'] = sanitize_text_field(wp_unslash($_REQUEST['searchfor'])); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		}
+		// Reset paginations for new searches
+		$searching = $args['search'] ?? '';
+		if (isset($_REQUEST['searchingfor']) && $_REQUEST['searchingfor'] !== $searching) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			$args['page'] = 1;
+		}
 
 		$result = $this->do_directory_request($args);
 		if ($result['success'] === false) {
@@ -368,10 +381,11 @@ public function render_menu()
 				<form method="GET" action="<?php echo esc_url(add_query_arg(['page' => 'classicpress-directory-integration-theme-install'], remove_query_arg(['getpage']))); ?>">
 					<p class="cp-plugin-search-box">
 						<label for="searchfor" class="screen-reader-text"><?php echo esc_html__('Search for a theme', 'classicpress-directory-integration'); ?></label><br>
-						<input type="text" id="searchfor" name="searchfor" class="wp-filter-search" placeholder="<?php echo esc_html__('Search for a theme...', 'classicpress-directory-integration'); ?>"><br>
+						<input type="hidden" name="searchingfor" value="<?php echo esc_html($searching); ?>">
+						<input type="search" id="searchfor" name="searchfor" class="wp-filter-search" <?php echo $searching !== '' ? 'value="'.esc_html($searching).'" ' : '' ?>placeholder="<?php echo esc_html__('Search for a theme...', 'classicpress-directory-integration'); ?>"><br>
 						<?php
 						foreach ((array) $_GET as $key => $val) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-							if (in_array($key, ['searchfor'])) {
+							if (in_array($key, ['searchfor', 'getpage'])) {
 								continue;
 							}
 							echo '<input type="hidden" name="' . esc_attr($key) . '" value="' . esc_html($val) . '" />';

classicpress-directory-integration.php

@@ -4,7 +4,7 @@
  * -----------------------------------------------------------------------------
  * Plugin Name:  ClassicPress Directory Integration
  * Description:  Install and update plugins and themes from ClassicPress directory.
- * Version:      1.1.2
+ * Version:      1.1.3
  * Author:       ClassicPress Contributors
  * Author URI:   https://www.classicpress.net
  * Plugin URI:   https://www.classicpress.net