Merge branch 'develop'

CHANGES.md

@@ -1,5 +1,12 @@
 #### [unreleased]
 
+#### 11.0.4 / 2022-08-27
+* composer update for class parser updates
+* back to `sanitize_url`
+* update `class Shim`
+* update Freemius/wordpress-sdk
+* update Slack invite link, need to update for every 100 uses
+
 #### 11.0.3 / 2022-05-29
 * call `wp_cache_flush()` after 'Refresh Cache'
 
@@ -60,7 +67,7 @@
 * composer update
 
 #### 10.6.13 / 2022-02-01
-* update nonce condtionals, require variables be set
+* update nonce conditionals, require variables be set
 
 #### 10.6.12 / 2022-01-18
 * composer update for `wp-dependency-installer` fixes

README.md

@@ -18,7 +18,6 @@ This renaming process makes automated updates, just for this time, fail as the u
 * Tags: plugin, theme, update, github, language pack
 * Requires at least: 5.2
 * Requires PHP: 7.2
-* Tested up to: trunk
 * Stable tag: [master](https://github.com/afragen/git-updater/releases/latest)
 * Donate link: <https://thefragens.com/git-updater-donate>
 * License: MIT
@@ -58,7 +57,7 @@ You can [sponsor me on GitHub](https://github.com/sponsors/afragen) to help with
 
 ## Slack
 
-We now have a [Slack team for Git Updater](https://git-updater.slack.com). Please [click here for an invite](https://git-updater.herokuapp.com). You will be automatically added to the _#general_ and _#support_ channels. Please take a look at other channels too.
+We now have a [Slack team for Git Updater](https://git-updater.slack.com). Please [click here for an invite](https://join.slack.com/t/git-updater/shared_invite/zt-1extq97hy-FjA1QAhjGNDzmFjjlRv3rg). You will be automatically added to the _#general_ and _#support_ channels. Please take a look at other channels too.
 
 ## Translations
 

git-updater.php

@@ -12,7 +12,7 @@
  * Plugin Name:       Git Updater
  * Plugin URI:        https://git-updater.com
  * Description:       A plugin to automatically update GitHub hosted plugins, themes, and language packs. Additional API plugins available for Bitbucket, GitLab, Gitea, and Gist.
- * Version:           11.0.3
+ * Version:           11.0.4
  * Author:            Andy Fragen
  * License:           MIT
  * Domain Path:       /languages

languages/git-updater.pot

@@ -2,21 +2,21 @@
 # This file is distributed under the MIT.
 msgid ""
 msgstr ""
-"Project-Id-Version: Git Updater 11.0.0\n"
+"Project-Id-Version: Git Updater 11.0.3\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/git-updater\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2022-04-25T06:31:19+00:00\n"
+"POT-Creation-Date: 2022-06-10T20:16:04+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.6.0\n"
 "X-Domain: git-updater\n"
 
 #. Plugin Name of the plugin
-#: src/Git_Updater/Settings.php:166
-#: src/Git_Updater/Settings.php:274
+#: src/Git_Updater/Settings.php:167
+#: src/Git_Updater/Settings.php:275
 msgid "Git Updater"
 msgstr ""
 
@@ -180,74 +180,74 @@ msgstr ""
 msgid "Please be patient while WP-Cron finishes making API calls."
 msgstr ""
 
-#: src/Git_Updater/Settings.php:138
-#: src/Git_Updater/Settings.php:818
+#: src/Git_Updater/Settings.php:139
+#: src/Git_Updater/Settings.php:819
 msgid "Settings"
 msgstr ""
 
-#: src/Git_Updater/Settings.php:216
-#: src/Git_Updater/Settings.php:374
+#: src/Git_Updater/Settings.php:217
+#: src/Git_Updater/Settings.php:375
 msgid "Git Updater Settings"
 msgstr ""
 
-#: src/Git_Updater/Settings.php:217
+#: src/Git_Updater/Settings.php:218
 msgctxt "Menu item"
 msgid "Git Updater"
 msgstr ""
 
-#: src/Git_Updater/Settings.php:298
+#: src/Git_Updater/Settings.php:299
 msgid "Refresh Cache"
 msgstr ""
 
-#: src/Git_Updater/Settings.php:343
+#: src/Git_Updater/Settings.php:344
 msgid "Settings saved."
 msgstr ""
 
-#: src/Git_Updater/Settings.php:345
+#: src/Git_Updater/Settings.php:346
 msgid "Cache refreshed."
 msgstr ""
 
-#: src/Git_Updater/Settings.php:387
+#: src/Git_Updater/Settings.php:388
 msgid "Enable Branch Switching"
 msgstr ""
 
-#: src/Git_Updater/Settings.php:400
+#: src/Git_Updater/Settings.php:401
 msgid "Bypass WP-Cron Background Processing for Debugging"
 msgstr ""
 
-#: src/Git_Updater/Settings.php:412
+#: src/Git_Updater/Settings.php:413
 msgid "Display `deprecated hook` messaging in debug.log"
 msgstr ""
 
-#: src/Git_Updater/Settings.php:575
+#: src/Git_Updater/Settings.php:576
 msgid "Check to enable."
 msgstr ""
 
-#: src/Git_Updater/Settings.php:614
+#: src/Git_Updater/Settings.php:615
 msgid "Overridden Plugins and Themes"
 msgstr ""
 
-#: src/Git_Updater/Settings.php:615
+#: src/Git_Updater/Settings.php:616
 msgid "The following plugins or themes might exist on wp.org, but any updates will be downloaded from their respective git repositories."
 msgstr ""
 
-#: src/Git_Updater/Settings.php:852
+#: src/Git_Updater/Settings.php:853
 msgid "This is a private repository."
 msgstr ""
 
-#: src/Git_Updater/Settings.php:853
+#: src/Git_Updater/Settings.php:854
 msgid "This repository has not connected to the API or was unable to connect."
 msgstr ""
 
-#: src/Git_Updater/Settings.php:854
+#: src/Git_Updater/Settings.php:855
 msgid "This repository is hosted on WordPress.org."
 msgstr ""
 
-#: src/Git_Updater/Settings.php:855
+#: src/Git_Updater/Settings.php:856
 msgid "This repository has been ignored and does not connect to the API."
 msgstr ""
 
-#: src/Git_Updater/Settings.php:899
+#: src/Git_Updater/Settings.php:900
 msgid "Installed Plugins and Themes"
 msgstr ""
 

readme.txt

@@ -5,7 +5,7 @@ Donate link: https://thefragens.com/git-updater-donate
 Tags: plugin, theme, language pack, updater
 Requires at least: 5.2
 Requires PHP: 7.2
-Tested up to: trunk
+Tested up to: 6.1
 Stable tag: master
 License: MIT
 
@@ -55,7 +55,7 @@ The following headers are available for use depending upon your hosting source.
 
 #### Slack
 
-We now have a [Slack team for Git Updater](https://git-updater.slack.com). Please [click here for an invite](https://git-updater.herokuapp.com). You will be automatically added to the _#general_ and _#support_ channels. Please take a look at other channels too.
+We now have a [Slack team for Git Updater](https://git-updater.slack.com). Please [click here for an invite](https://join.slack.com/t/git-updater/shared_invite/zt-1extq97hy-FjA1QAhjGNDzmFjjlRv3rg). You will be automatically added to the _#general_ and _#support_ channels. Please take a look at other channels too.
 
 #### Translations
 

src/Git_Updater/Add_Ons.php

@@ -284,7 +284,7 @@ public function install_api_plugin() {
 
 			// Redirect back to the Add-Ons.
 			$_POST                     = $_REQUEST;
-			$_POST['_wp_http_referer'] = isset( $_SERVER['HTTP_REFERER'] ) ? esc_url_raw( wp_unslash( $_SERVER['HTTP_REFERER'] ) ) : null;
+			$_POST['_wp_http_referer'] = isset( $_SERVER['HTTP_REFERER'] ) ? sanitize_url( wp_unslash( $_SERVER['HTTP_REFERER'] ) ) : null;
 
 			switch ( $_GET['install_api_plugin'] ) {
 			//phpcs:enable

src/Git_Updater/Bootstrap.php

@@ -160,7 +160,7 @@ public function rename_on_activation() {
 		}
 
 		if ( $slug && 'git-updater/git-updater.php' !== $slug ) {
-			@rename( $plugin_dir . dirname( $slug ), $plugin_dir . 'git-updater' );
+			move_dir( $plugin_dir . dirname( $slug ), $plugin_dir . 'git-updater' );
 		}
 	}
 }

src/Git_Updater/Plugin.php

@@ -350,25 +350,28 @@ public function plugins_api( $false, $action, $response ) {
 			return $false;
 		}
 
-		$response->slug          = $plugin->slug;
-		$response->plugin_name   = $plugin->name;
-		$response->name          = $plugin->name;
-		$response->author        = $plugin->author;
-		$response->homepage      = $plugin->homepage;
-		$response->donate_link   = $plugin->donate_link;
-		$response->version       = $plugin->remote_version ?: $plugin->local_version;
-		$response->sections      = $plugin->sections;
-		$response->requires      = $plugin->requires;
-		$response->requires_php  = $plugin->requires_php;
-		$response->tested        = $plugin->tested;
-		$response->downloaded    = $plugin->downloaded ?: 0;
-		$response->last_updated  = $plugin->last_updated ?: null;
-		$response->download_link = $plugin->download_link ?: null;
-		$response->banners       = $plugin->banners;
-		$response->icons         = $plugin->icons ?: [];
-		$response->contributors  = $plugin->contributors;
-		$response->rating        = $plugin->rating;
-		$response->num_ratings   = $plugin->num_ratings;
+		$response->slug        = $plugin->slug;
+		$response->plugin_name = $plugin->name;
+		$response->name        = $plugin->name;
+		$response->author      = $plugin->author;
+		$response->homepage    = $plugin->homepage;
+		$response->donate_link = $plugin->donate_link;
+		$response->version     = $plugin->remote_version ?: $plugin->local_version;
+		$response->sections    = $plugin->sections;
+		// phpcs:ignore WordPress.WP.AlternativeFunctions.strip_tags_strip_tags
+		$response->short_description = substr( strip_tags( trim( $plugin->sections['description'] ) ), 0, 175 ) . '...';
+		$response->requires          = $plugin->requires;
+		$response->requires_php      = $plugin->requires_php;
+		$response->tested            = $plugin->tested;
+		$response->downloaded        = $plugin->downloaded ?: 0;
+		$response->active_installs   = $response->downloaded;
+		$response->last_updated      = $plugin->last_updated ?: null;
+		$response->download_link     = $plugin->download_link ?: null;
+		$response->banners           = $plugin->banners;
+		$response->icons             = $plugin->icons ?: [];
+		$response->contributors      = $plugin->contributors;
+		$response->rating            = $plugin->rating;
+		$response->num_ratings       = $plugin->num_ratings;
 
 		return $response;
 	}

src/Git_Updater/Settings.php

@@ -763,7 +763,7 @@ protected function redirect_on_save() {
 		$redirect_url = is_multisite() ? network_admin_url( 'settings.php' ) : admin_url( 'options-general.php' );
 
 		if ( $is_option_page || $refresh_transients || $reset_api_key || $install_api_plugin ) {
-			$query = isset( $_POST['_wp_http_referer'] ) ? parse_url( html_entity_decode( esc_url_raw( wp_unslash( $_POST['_wp_http_referer'] ) ) ), PHP_URL_QUERY ) : null;
+			$query = isset( $_POST['_wp_http_referer'] ) ? parse_url( html_entity_decode( sanitize_url( wp_unslash( $_POST['_wp_http_referer'] ) ) ), PHP_URL_QUERY ) : null;
 			parse_str( $query, $arr );
 			$arr['tab']    = ! empty( $arr['tab'] ) ? $arr['tab'] : 'git_updater_settings';
 			$arr['subtab'] = ! empty( $arr['subtab'] ) ? $arr['subtab'] : 'git_updater';