diff --git a/admin/src/PluginUpdater.php b/admin/src/PluginUpdater.php index e2d1c81..cdf765f 100644 --- a/admin/src/PluginUpdater.php +++ b/admin/src/PluginUpdater.php @@ -4,201 +4,215 @@ class PluginUpdater { - private $file; + private $file; - private $plugin; + private $plugin; - private $basename; + private $basename; - private $active; + private $active; - private $username; + private $username; - private $repository; + private $repository; - private $authorize_token; + private $authorize_token; - private $github_response; + private $github_response; - public function __construct( $file, $repository, $token = "" ) - { - $this->file = $file; - $this->username = 'Trizelos'; - $this->repository = $repository; - $this->authorize_token = $token; + public function __construct($file, $repository, $token = "") + { + $this->file = $file; + $this->username = 'Trizelos'; + $this->repository = $repository; + $this->authorize_token = $token; - $this->set_plugin_properties(); + $this->set_plugin_properties(); - $this->initialize(); - } + $this->initialize(); + } - private function set_plugin_properties(): void - { - if ( ! function_exists( 'get_plugin_data' ) ) { - require_once( ABSPATH . 'wp-admin/includes/plugin.php' ); - } - $this->plugin = get_plugin_data( $this->file ); - $this->basename = plugin_basename( $this->file ); - $this->active = is_plugin_active( $this->basename ); - } + private function set_plugin_properties(): void + { + if (!function_exists('get_plugin_data')) { + require_once(ABSPATH . 'wp-admin/includes/plugin.php'); + } + $this->plugin = get_plugin_data($this->file); + $this->basename = plugin_basename($this->file); + $this->active = is_plugin_active($this->basename); + } - private function initialize(): void - { - add_filter( 'site_transient_update_plugins', array( $this, 'modify_transient' ), 10, 1 ); - add_filter( 'plugins_api', array( $this, 'plugin_popup' ), 10, 3 ); - add_filter( 'upgrader_post_install', array( &$this, 'after_install' ), 10, 3 ); - - // Add Authorization Token to download_package - add_filter( 'upgrader_pre_download', function () - { - add_filter( 'http_request_args', [ $this, 'download_package' ], 15, 2 ); - - return false; // upgrader_pre_download filter default return value. - } ); - } - - public function modify_transient( $transient ): mixed - { - if ( ! str_contains( parse_url( $_SERVER["REQUEST_URI"], PHP_URL_PATH ), '/wp-admin/plugins.php' ) ) { - return $transient; - } - - if ( empty( $checked = $transient->checked ) ) { - return $transient; - } - - if ( ! array_key_exists( $this->basename, $checked ) ) { - return $transient; - } - - $this->get_repository_info(); // Get the repo info - if ( ! isset( $this->github_response['tag_name'] ) ) { - return $transient; - } - - prew( $transient ); - - $out_of_date = version_compare( $this->github_response['tag_name'], $checked[ $this->basename ], 'gt' ); // Check if we're out of date - - if ( $out_of_date ) { - - $new_files = $this->github_response['zipball_url']; // Get the ZIP - - $slug = current( explode( '/', $this->basename ) ); // Create valid slug - - $plugin = array( // setup our plugin info - 'url' => $this->plugin["PluginURI"], - 'slug' => $slug, - 'package' => $new_files, - 'new_version' => $this->github_response['tag_name'] - ); - - $transient->response[ $this->basename ] = (object) $plugin; // Return it in response - } - - return $transient; // Return filtered transient - } - - private function get_repository_info(): void - { - if ( is_null( $this->github_response ) ) { // Do we have a response? - $args = array(); - $request_uri = sprintf( 'https://api.github.com/repos/%s/%s/releases', $this->username, $this->repository ); // Build URI - - if ( $this->authorize_token ) { // Is there an access token? - $args['headers']['Authorization'] = "bearer {$this->authorize_token}"; // Set the headers - } - - $response = json_decode( wp_remote_retrieve_body( wp_remote_get( $request_uri, $args ) ), true ); // Get JSON and parse it - - if ( is_array( $response ) ) { // If it is an array - $response = current( $response ); // Get the first item - } - - $this->github_response = $response; // Set it to our property - } - } - - public function plugin_popup( $result, $action, $args ): mixed - { - if ( 'plugin_information' !== $action ) { - return $result; - } - if ( $args->slug !== current( explode( '/', $this->basename ) ) ) { // And it's our slug - return $result; - } - $this->get_repository_info(); // Get our repo info - - if ( isset( $this->github_response['tag_name'] ) ) { - return $result; - } - - // Set it to an array - $plugin = array( - 'name' => $this->plugin["Name"], - 'slug' => $this->basename, - 'requires' => '5.3', + private function initialize(): void + { + add_filter('pre_set_site_transient_update_plugins', [$this, 'modify_transient'], 10, 1); + add_filter('plugins_api', [$this, 'plugin_popup'], 10, 3); + add_filter('upgrader_post_install', [&$this, 'after_install'], 10, 3); + + // Add Authorization Token to download_package + add_filter('upgrader_pre_download', function () { + add_filter('http_request_args', [$this, 'download_package'], 15, 2); + + return false; // upgrader_pre_download filter default return value. + }); + } + + public function modify_transient($transient): mixed + { + if (empty($checked = $transient->checked)) { + return $transient; + } + + if (!array_key_exists($this->basename, $checked)) { + return $transient; + } + + $cb_repo_update_check = get_option('cb_repo_update_check', []); + if (isset($cb_repo_update_check[$this->basename]) && $cb_repo_update_check[$this->basename]['time'] > time()) { + if (isset($cb_repo_update_check[$this->basename]['response'])) { + $transient->response[$this->basename] = $cb_repo_update_check[$this->basename]['response']; + } + + return $transient; + } + + $this->get_repository_info(); // Get the repo info + if (!isset($this->github_response['tag_name'])) { + return $transient; + } + + if (isset($cb_repo_update_check[$this->basename]['response'])) { + unset($cb_repo_update_check[$this->basename]['response']); + } + $out_of_date = version_compare($this->github_response['tag_name'], $checked[$this->basename], 'gt'); // Check if we're out of date + + if ($out_of_date) { + $new_files = $this->github_response['zipball_url']; // Get the ZIP + + $slug = current(explode('/', $this->basename)); // Create valid slug + + $plugin = [ // setup our plugin info + 'url' => $this->plugin["PluginURI"], + 'slug' => $slug, + 'package' => $new_files, + 'new_version' => $this->github_response['tag_name'] + ]; + + $transient->response[$this->basename] = (object)$plugin; // Return it in response + $cb_repo_update_check[$this->basename]['response'] = (object)$plugin; + } + + $cb_repo_update_check[$this->basename]['time'] = time() + 3 * 60; // minutes * seconds + update_option('cb_repo_update_check', $cb_repo_update_check); + + return $transient; // Return filtered transient + } + + private function get_repository_info(): void + { + if (is_null($this->github_response)) { // Do we have a response? + $args = []; + $request_uri = sprintf('https://api.github.com/repos/%s/%s/releases', $this->username, $this->repository); // Build URI + + if ($this->authorize_token) { // Is there an access token? + $args['headers']['Authorization'] = "bearer {$this->authorize_token}"; // Set the headers + } + + $response = json_decode(wp_remote_retrieve_body(wp_remote_get($request_uri, $args)), true); // Get JSON and parse it + + if (is_array($response)) { // If it is an array + $response = current($response); // Get the first item + } + + $this->github_response = $response; // Set it to our property + } + } + + public function plugin_popup($result, $action, $args): mixed + { + if ('plugin_information' !== $action) { + return $result; + } + if ($args->slug !== current(explode('/', $this->basename))) { // And it's our slug + return $result; + } + $this->get_repository_info(); // Get our repo info + + if (isset($this->github_response['tag_name'])) { + return $result; + } + + // Set it to an array + $plugin = [ + 'name' => $this->plugin["Name"], + 'slug' => $this->basename, + 'requires' => '5.3', // 'tested' => '5.*', // 'rating' => '100.0', // 'num_ratings' => '1', // 'downloaded' => '1', // 'added' => '2016-01-05', - 'version' => $this->github_response['tag_name'], - 'author' => $this->plugin["AuthorName"], - 'author_profile' => $this->plugin["AuthorURI"], - 'last_updated' => $this->github_response['published_at'], - 'homepage' => $this->plugin["PluginURI"], - 'short_description' => $this->plugin["Description"], - 'sections' => array( - 'Updates' => $this->github_response['body'], - 'Description' => $this->plugin["Description"], - ), - 'download_link' => $this->github_response['zipball_url'] - ); - - return (object) $plugin; // Return the data - } - - public function download_package( $args, $url ): mixed - { - - if ( null !== $args['filename'] ) { - if ( $this->authorize_token ) { - $args = array_merge( $args, array( "headers" => array( "Authorization" => "token {$this->authorize_token}" ) ) ); - } - } - - remove_filter( 'http_request_args', [ $this, 'download_package' ] ); - - return $args; - } - - public function after_install( $response, $hook_extra, $result ): mixed - { - global $wp_filesystem; // Get global FS object - - $install_directory = plugin_dir_path( $this->file ); // Our plugin directory - $wp_filesystem->move( $result['destination'], $install_directory ); // Move files to the plugin dir - $result['destination'] = $install_directory; // Set the destination for the rest of the stack - - if ( $this->active ) { // If it was active - activate_plugin( $this->basename ); // Reactivate - } - - $this->composer_dump_autoload(); - - return $result; - } - - private function composer_dump_autoload(): void - { - $cwd = getcwd(); - $path = plugin_dir_path( $this->file ); - - exec( "cd $path && composer dump-autoload -o" ); - exec( "cd $cwd" ); - - prew( 'updated plugin: ' . $this->file ); - } + 'version' => $this->github_response['tag_name'], + 'author' => $this->plugin["AuthorName"], + 'author_profile' => $this->plugin["AuthorURI"], + 'last_updated' => $this->github_response['published_at'], + 'homepage' => $this->plugin["PluginURI"], + 'short_description' => $this->plugin["Description"], + 'sections' => [ + 'Updates' => $this->github_response['body'], + 'Description' => $this->plugin["Description"], + ], + 'download_link' => $this->github_response['zipball_url'] + ]; + + return (object)$plugin; // Return the data + } + + public function download_package($args, $url): mixed + { + + if (null !== $args['filename']) { + if ($this->authorize_token) { + $args = array_merge($args, ["headers" => ["Authorization" => "token {$this->authorize_token}"]]); + } + } + + remove_filter('http_request_args', [$this, 'download_package']); + + return $args; + } + + public function after_install($response, $hook_extra, $result): mixed + { + global $wp_filesystem; // Get global FS object + + $install_directory = plugin_dir_path($this->file); // Our plugin directory + $wp_filesystem->move($result['destination'], $install_directory); // Move files to the plugin dir + $result['destination'] = $install_directory; // Set the destination for the rest of the stack + + if ($this->active) { // If it was active + activate_plugin($this->basename); // Reactivate + } + + $this->composer_dump_autoload(); + + $cb_repo_update_check = get_option('cb_repo_update_check', []); + if (isset($cb_repo_update_check[$this->basename]['response'])) { + unset($cb_repo_update_check[$this->basename]['response']); + } + update_option('cb_repo_update_check', $cb_repo_update_check); + + return $result; + } + + private function composer_dump_autoload(): void + { + $cwd = getcwd(); + $path = plugin_dir_path($this->file); + + exec("cd $path && composer dump-autoload -o"); + exec("cd $cwd"); + + prew('updated plugin: ' . $this->file); + } } diff --git a/cerberus-plugins-manager.php b/cerberus-plugins-manager.php index a91dfc8..d695d94 100644 --- a/cerberus-plugins-manager.php +++ b/cerberus-plugins-manager.php @@ -3,7 +3,7 @@ /** * Plugin Name: Cerberus Plugins Manager * Description: Manages the cerberus plugins - * Version: 1.0.8 + * Version: 1.0.9 * Requires at least: 5.7 * Author: Casey */ @@ -13,7 +13,7 @@ require_once "vendor/autoload.php"; -if ( is_admin() ) { - $settingsPage = new SettingsPage( __FILE__ ); - $pluginUpdater = new PluginUpdater( __FILE__, 'cerberus-plugins-manager' ); +if (is_admin()) { + $settingsPage = new SettingsPage(__FILE__); + $pluginUpdater = new PluginUpdater(__FILE__, 'cerberus-plugins-manager'); }