diff --git a/README.md b/README.md index 5a6eb62..e3269d6 100644 --- a/README.md +++ b/README.md @@ -30,10 +30,8 @@ The other plugins available from **azurecurve** are: * Add Open Graph Tags - [details](https://development.azurecurve.co.uk/classicpress-plugins/add-open-graph-tags/) / [download](https://github.com/azurecurve/azrcrv-add-open-graph-tags/releases/latest/) * Add Twitter Cards - [details](https://development.azurecurve.co.uk/classicpress-plugins/add-twitter-cards/) / [download](https://github.com/azurecurve/azrcrv-add-twitter-cards/releases/latest/) * Avatars - [details](https://development.azurecurve.co.uk/classicpress-plugins/avatars/) / [download](https://github.com/azurecurve/azrcrv-avatars/releases/latest/) - * BBCode - [details](https://development.azurecurve.co.uk/classicpress-plugins/bbcode/) / [download](https://github.com/azurecurve/azrcrv-bbcode/releases/latest/) * Breadcrumbs - [details](https://development.azurecurve.co.uk/classicpress-plugins/breadcrumbs/) / [download](https://github.com/azurecurve/azrcrv-breadcrumbs/releases/latest/) * Call-out Boxes - [details](https://development.azurecurve.co.uk/classicpress-plugins/call-out-boxes/) / [download](https://github.com/azurecurve/azrcrv-call-out-boxes/releases/latest/) - * Check Plugin Status - [details](https://development.azurecurve.co.uk/classicpress-plugins/check-plugin-status/) / [download](https://github.com/azurecurve/azrcrv-check-plugin-status/releases/latest/) * Code - [details](https://development.azurecurve.co.uk/classicpress-plugins/code/) / [download](https://github.com/azurecurve/azrcrv-code/releases/latest/) * Comment Validator - [details](https://development.azurecurve.co.uk/classicpress-plugins/comment-validator/) / [download](https://github.com/azurecurve/azrcrv-comment-validator/releases/latest/) * Conditional Links - [details](https://development.azurecurve.co.uk/classicpress-plugins/conditional-links/) / [download](https://github.com/azurecurve/azrcrv-conditional-links/releases/latest/) @@ -45,9 +43,9 @@ The other plugins available from **azurecurve** are: * Filtered Categories - [details](https://development.azurecurve.co.uk/classicpress-plugins/filtered-categories/) / [download](https://github.com/azurecurve/azrcrv-filtered-categories/releases/latest/) * Flags - [details](https://development.azurecurve.co.uk/classicpress-plugins/flags/) / [download](https://github.com/azurecurve/azrcrv-flags/releases/latest/) * Floating Featured Image - [details](https://development.azurecurve.co.uk/classicpress-plugins/floating-featured-image/) / [download](https://github.com/azurecurve/azrcrv-floating-featured-image/releases/latest/) - * From Twitter - [details](https://development.azurecurve.co.uk/classicpress-plugins/from-twitter/) / [download](https://github.com/azurecurve/azrcrv-from-twitter/releases/latest/) * Gallery From Folder - [details](https://development.azurecurve.co.uk/classicpress-plugins/gallery-from-folder/) / [download](https://github.com/azurecurve/azrcrv-gallery-from-folder/releases/latest/) * Get GitHub File - [details](https://development.azurecurve.co.uk/classicpress-plugins/get-github-file/) / [download](https://github.com/azurecurve/azrcrv-get-github-file/releases/latest/) + * Icons - [details](https://development.azurecurve.co.uk/classicpress-plugins/icons/) / [download](https://github.com/azurecurve/azrcrv-icons/releases/latest/) * Images - [details](https://development.azurecurve.co.uk/classicpress-plugins/images/) / [download](https://github.com/azurecurve/azrcrv-images/releases/latest/) * Insult Generator - [details](https://development.azurecurve.co.uk/classicpress-plugins/insult-generator/) / [download](https://github.com/azurecurve/azrcrv-insult-generator/releases/latest/) * Load Admin CSS - [details](https://development.azurecurve.co.uk/classicpress-plugins/load-admin-css/) / [download](https://github.com/azurecurve/azrcrv-load-admin-css/releases/latest/) @@ -75,10 +73,8 @@ The other plugins available from **azurecurve** are: * Taxonomy Order - [details](https://development.azurecurve.co.uk/classicpress-plugins/taxonomy-order/) / [download](https://github.com/azurecurve/azrcrv-taxonomy-order/releases/latest/) * Theme Switcher - [details](https://development.azurecurve.co.uk/classicpress-plugins/theme-switcher/) / [download](https://github.com/azurecurve/azrcrv-theme-switcher/releases/latest/) * Timelines - [details](https://development.azurecurve.co.uk/classicpress-plugins/timelines/) / [download](https://github.com/azurecurve/azrcrv-timelines/releases/latest/) - * To Twitter - [details](https://development.azurecurve.co.uk/classicpress-plugins/to-twitter/) / [download](https://github.com/azurecurve/azrcrv-to-twitter/releases/latest/) * Toggle Show/Hide - [details](https://development.azurecurve.co.uk/classicpress-plugins/toggle-showhide/) / [download](https://github.com/azurecurve/azrcrv-toggle-showhide/releases/latest/) * Update Admin Menu - [details](https://development.azurecurve.co.uk/classicpress-plugins/update-admin-menu/) / [download](https://github.com/azurecurve/azrcrv-update-admin-menu/releases/latest/) * URL Shortener - [details](https://development.azurecurve.co.uk/classicpress-plugins/url-shortener/) / [download](https://github.com/azurecurve/azrcrv-url-shortener/releases/latest/) * Username Protection - [details](https://development.azurecurve.co.uk/classicpress-plugins/username-protection/) / [download](https://github.com/azurecurve/azrcrv-username-protection/releases/latest/) - * Widget Announcements - [details](https://development.azurecurve.co.uk/classicpress-plugins/widget-announcements/) / [download](https://github.com/azurecurve/azrcrv-widget-announcements/releases/latest/) - \ No newline at end of file + * Widget Announcements - [details](https://development.azurecurve.co.uk/classicpress-plugins/widget-announcements/) / [download](https://github.com/azurecurve/azrcrv-widget-announcements/releases/latest/) \ No newline at end of file diff --git a/azrcrv-icons.php b/azrcrv-icons.php index 69987e7..68f6d64 100644 --- a/azrcrv-icons.php +++ b/azrcrv-icons.php @@ -1,14 +1,18 @@ 'azrcrv-check-plugin-status/azrcrv-check-plugin-status.php', 'admin_URL' => 'admin.php?page=azrcrv-check-plugin-status', 'dev_URL' => 'https://development.azurecurve.co.uk/classicpress-plugins/check-plugin-status/', - 'retired' => 0, - 'updated' => '2020-02-23', + 'retired' => 1, + 'updated' => '2024-02-02', ), 'Code' => array( 'plugin_link' => 'azrcrv-code/azrcrv-code.php', @@ -60,13 +60,6 @@ 'retired' => 0, 'updated' => '2020-04-04', ), - 'Check Plugin Status' => array( - 'plugin_link' => 'azrcrv-check-plugin-status/azrcrv-check-plugin-status.php', - 'admin_URL' => 'admin.php?page=azrcrv-cps', - 'dev_URL' => 'https://development.azurecurve.co.uk/classicpress-plugins/check-plugin-status/', - 'retired' => 0, - 'updated' => '2021-01-11', - ), 'Comment Validator' => array( 'plugin_link' => 'azrcrv-comment-validator/azrcrv-comment-validator.php', 'admin_URL' => 'admin.php?page=azrcrv-cv', @@ -148,8 +141,8 @@ 'plugin_link' => 'azrcrv-from-twitter/azrcrv-from-twitter.php', 'admin_URL' => 'admin.php?page=azrcrv-ft', 'dev_URL' => 'https://development.azurecurve.co.uk/classicpress-plugins/from-twitter/', - 'retired' => 0, - 'updated' => '2020-12-26', + 'retired' => 1, + 'updated' => '2024-01-20', ), 'Gallery From Folder' => array( 'plugin_link' => 'azrcrv-gallery-from-folder/azrcrv-gallery-from-folder.php', @@ -365,8 +358,8 @@ 'plugin_link' => 'azrcrv-to-twitter/azrcrv-to-twitter.php', 'admin_URL' => 'admin.php?page=azrcrv-tt', 'dev_URL' => 'https://development.azurecurve.co.uk/classicpress-plugins/to-twitter/', - 'retired' => 0, - 'updated' => '2020-04-04', + 'retired' => 1, + 'updated' => '2024-01-20', ), 'Toggle Show/Hide' => array( 'plugin_link' => 'azrcrv-toggle-showhide/azrcrv-toggle-showhide.php', diff --git a/libraries/updateclient/UpdateClient.class.php b/libraries/updateclient/UpdateClient.class.php index 7e1ea8b..d8b4d6f 100644 --- a/libraries/updateclient/UpdateClient.class.php +++ b/libraries/updateclient/UpdateClient.class.php @@ -6,7 +6,7 @@ * Author: Simone Fioravanti * Author URI: https://software.gieffeedizioni.it * API Version: 2.0.0 - * Last modified on Update Manager release: 2.4.3 + * Last modified on Update Manager release: 2.5.0 * ----------------------------------------------------------------------------- * This is free software released under the terms of the General Public License, * version 2, or later. It is distributed WITHOUT ANY WARRANTY; without even the @@ -14,7 +14,7 @@ * text of the license is available at https://www.gnu.org/licenses/gpl-2.0.txt. * ----------------------------------------------------------------------------- * Copyright 2021, John Alarcon (Code Potent) - * 2021-2022, Simone Fioravanti + * 2021-2023, Simone Fioravanti * ----------------------------------------------------------------------------- */ @@ -24,6 +24,11 @@ // EDIT: URL where Update Manager is installed; with trailing slash! const UPDATE_SERVER = 'https://update.development.azurecurve.co.uk/'; +// EDIT: Choose what to do in ClassicPress v.2 and above. +// Set to true to disable UpdateClient if updates are provided +// using the Classicpress Plugin Directory. +const USE_DIRECTORY = false; + // EDIT: Comment this out and fill with the first part of the url // of your Download link to make sure that updates // are served from your trusted source. @@ -37,6 +42,12 @@ die(); } +// Should directory take over? +$running_on = function_exists('classicpress_version') ? classicpress_version() : '0'; +if (USE_DIRECTORY && version_compare($running_on, '2', '>=')) { + return; +} + /** * Remote updater class for ClassicPress plugin and themes. * @@ -69,6 +80,9 @@ class UpdateClient { */ private $component_data = ''; + private $identifier = null; + private $server_slug = null; + /** * Constructor. * @@ -579,7 +593,7 @@ private function get_component_data($action, $component='') { // Initialize the data to be posted. $body = apply_filters('codepotent_update_manager_filter_'.$this->config['id'].'_client_request', $this->config['post']); - + if ($action === 'plugin_information') { // If querying a single plugin, assign it to the post body. @@ -885,4 +899,4 @@ public function get_latest_version_number() { } // Run it! -UpdateClient::get_instance(); \ No newline at end of file +UpdateClient::get_instance(); diff --git a/readme.txt b/readme.txt index 33e61a2..b179c52 100644 --- a/readme.txt +++ b/readme.txt @@ -1,24 +1,5 @@ === Icons === -Description: Allows a 16x16 icon to be displayed in a post or page using a shortcode. -Version: 2.1.3 -Tags: icon, icons, posts, pages -Author: azurecurve -Author URI: https://development.azurecurve.co.uk/ -Plugin URI: https://development.azurecurve.co.uk/classicpress-plugins/icons/ -Download link: https://github.com/azurecurve/azrcrv-icons/releases/download/v2.1.3/azrcrv-icons.zip -Donate link: https://development.azurecurve.co.uk/support-development/ -Requires PHP: 5.6 -Requires CP: 1.0 -Requires: 1.0.0 -Tested: 4.9.99 -Text Domain: azrcrv-i -Domain Path: /languages -License: GPLv2 or later -License URI: http://www.gnu.org/licenses/gpl-2.0.html - -Allows a 16x16 icon to be displayed in a post or page using a shortcode. - == Description == # Description @@ -58,6 +39,10 @@ This plugin is developed for ClassicPress, but will likely work on WordPress. # Changelog +### [Version 2.1.4](https://github.com/azurecurve/azrcrv-icons/releases/tag/v2.1.4) + * Update plugin header and readme for compatibility with ClassicPress Directory v2. + * Update Update Manager to version 2.5.0. + ### [Version 2.1.3](https://github.com/azurecurve/azrcrv-icons/releases/tag/v2.1.3) * Update readme file for compatibility with ClassicPress Directory. @@ -169,7 +154,6 @@ The other plugins available from **azurecurve** are: * Filtered Categories - [details](https://development.azurecurve.co.uk/classicpress-plugins/filtered-categories/) / [download](https://github.com/azurecurve/azrcrv-filtered-categories/releases/latest/) * Flags - [details](https://development.azurecurve.co.uk/classicpress-plugins/flags/) / [download](https://github.com/azurecurve/azrcrv-flags/releases/latest/) * Floating Featured Image - [details](https://development.azurecurve.co.uk/classicpress-plugins/floating-featured-image/) / [download](https://github.com/azurecurve/azrcrv-floating-featured-image/releases/latest/) - * From Twitter - [details](https://development.azurecurve.co.uk/classicpress-plugins/from-twitter/) / [download](https://github.com/azurecurve/azrcrv-from-twitter/releases/latest/) * Gallery From Folder - [details](https://development.azurecurve.co.uk/classicpress-plugins/gallery-from-folder/) / [download](https://github.com/azurecurve/azrcrv-gallery-from-folder/releases/latest/) * Get GitHub File - [details](https://development.azurecurve.co.uk/classicpress-plugins/get-github-file/) / [download](https://github.com/azurecurve/azrcrv-get-github-file/releases/latest/) * Images - [details](https://development.azurecurve.co.uk/classicpress-plugins/images/) / [download](https://github.com/azurecurve/azrcrv-images/releases/latest/) @@ -199,7 +183,6 @@ The other plugins available from **azurecurve** are: * Taxonomy Order - [details](https://development.azurecurve.co.uk/classicpress-plugins/taxonomy-order/) / [download](https://github.com/azurecurve/azrcrv-taxonomy-order/releases/latest/) * Theme Switcher - [details](https://development.azurecurve.co.uk/classicpress-plugins/theme-switcher/) / [download](https://github.com/azurecurve/azrcrv-theme-switcher/releases/latest/) * Timelines - [details](https://development.azurecurve.co.uk/classicpress-plugins/timelines/) / [download](https://github.com/azurecurve/azrcrv-timelines/releases/latest/) - * To Twitter - [details](https://development.azurecurve.co.uk/classicpress-plugins/to-twitter/) / [download](https://github.com/azurecurve/azrcrv-to-twitter/releases/latest/) * Toggle Show/Hide - [details](https://development.azurecurve.co.uk/classicpress-plugins/toggle-showhide/) / [download](https://github.com/azurecurve/azrcrv-toggle-showhide/releases/latest/) * Update Admin Menu - [details](https://development.azurecurve.co.uk/classicpress-plugins/update-admin-menu/) / [download](https://github.com/azurecurve/azrcrv-update-admin-menu/releases/latest/) * URL Shortener - [details](https://development.azurecurve.co.uk/classicpress-plugins/url-shortener/) / [download](https://github.com/azurecurve/azrcrv-url-shortener/releases/latest/)