diff --git a/2016-12-11_debug_OpenTools_UpdateCredentialsCheck.patch b/2016-12-11_debug_OpenTools_UpdateCredentialsCheck.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b002d6c5867e506636a204e3fc0c0bce84c902a0
--- /dev/null
+++ b/2016-12-11_debug_OpenTools_UpdateCredentialsCheck.patch
@@ -0,0 +1,43 @@
+diff --git a/opentools-update-checker.php b/opentools-update-checker.php
+index b01fa1d..49f45ad 100644
+--- a/opentools-update-checker.php
++++ b/opentools-update-checker.php
+@@ -23,6 +23,7 @@ class OpenToolsPluginUpdateChecker extends PluginUpdateChecker_2_1 {
+ public function __construct($metadataUrl, $pluginFile, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = '')
+ {
+ parent::__construct($metadataUrl, $pluginFile, $slug, $checkPeriod, $optionName, $muPluginFile);
++ $this->debugMode = TRUE;
+ $this->installOTHooks();
+ }
+ public function declareCredentials($credential_def) {
+@@ -249,6 +250,9 @@ class OpenToolsPluginUpdateChecker extends PluginUpdateChecker_2_1 {
+ $success = ($status_code==200);
+ } else {
+ $message = __('Unable to access plugin download URL. Please check your credentials.');
++ if ($this->debugMode) {
++ $message .= "<pre>updateinfo: ".print_r($updateinfo,1)."</pre>";
++ }
+ }
+ return $success;
+ }
+diff --git a/plugin-update-checker/plugin-update-checker.php b/plugin-update-checker/plugin-update-checker.php
+index 8a5c92f..af74a8a 100644
+--- a/plugin-update-checker/plugin-update-checker.php
++++ b/plugin-update-checker/plugin-update-checker.php
+@@ -221,7 +221,7 @@ class PluginUpdateChecker_2_1 {
+ );
+
+ //Try to parse the response
+- $pluginInfo = null;
++ $pluginInfo = new stdClass();
+ if ( !is_wp_error($result) && isset($result['response']['code']) && ($result['response']['code'] == 200) && !empty($result['body']) ){
+ $pluginInfo = PluginInfo_2_1::fromJson($result['body'], $this->debugMode);
+ $pluginInfo->filename = $this->pluginFile;
+@@ -237,6 +237,7 @@ class PluginUpdateChecker_2_1 {
+ }
+ trigger_error($message, E_USER_WARNING);
+ }
++ $pluginInfo->response = $result;
+
+ $pluginInfo = apply_filters('puc_request_info_result-'.$this->slug, $pluginInfo, $result);
+ return $pluginInfo;
diff --git a/Makefile b/Makefile
index 325d99248f4b51f15b49e07db06096a5fa721e89..5a65c5ed401e55c1ec513c354d422c639f6d0214 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
BASE=shipping-by-rules
PLATTFORM=woocommerce
VENDOR=opentools
-VERSION=1.2.6
+VERSION=1.2.6debug
DIR = $(shell pwd)
SVNDIR=wordpress-plugin-svn
diff --git a/opentools-update-checker.php b/opentools-update-checker.php
index b01fa1d8b1dd2cf0a9f89de7d11f840cb2aeb00d..49f45ad0fa8e664a010c051c2f434af858edd72b 100644
--- a/opentools-update-checker.php
+++ b/opentools-update-checker.php
@@ -23,6 +23,7 @@ class OpenToolsPluginUpdateChecker extends PluginUpdateChecker_2_1 {
public function __construct($metadataUrl, $pluginFile, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = '')
{
parent::__construct($metadataUrl, $pluginFile, $slug, $checkPeriod, $optionName, $muPluginFile);
+ $this->debugMode = TRUE;
$this->installOTHooks();
}
public function declareCredentials($credential_def) {
@@ -249,6 +250,9 @@ class OpenToolsPluginUpdateChecker extends PluginUpdateChecker_2_1 {
$success = ($status_code==200);
} else {
$message = __('Unable to access plugin download URL. Please check your credentials.');
+ if ($this->debugMode) {
+ $message .= "<pre>updateinfo: ".print_r($updateinfo,1)."</pre>";
+ }
}
return $success;
}
diff --git a/opentools-woocommerce-advanced-shipping-by-rules_v1.2.6debug.zip b/opentools-woocommerce-advanced-shipping-by-rules_v1.2.6debug.zip
new file mode 100644
index 0000000000000000000000000000000000000000..ea5d103e0736fd8b3377d0dca4feee0551ee5589
Binary files /dev/null and b/opentools-woocommerce-advanced-shipping-by-rules_v1.2.6debug.zip differ
diff --git a/opentools-woocommerce-shipping-by-rules_v1.2.6debug.zip b/opentools-woocommerce-shipping-by-rules_v1.2.6debug.zip
new file mode 100644
index 0000000000000000000000000000000000000000..0108848a0d7528a5242aeb5a87d7fa3dccf99950
Binary files /dev/null and b/opentools-woocommerce-shipping-by-rules_v1.2.6debug.zip differ
diff --git a/plugin-update-checker/plugin-update-checker.php b/plugin-update-checker/plugin-update-checker.php
index 8a5c92f29099ba8ed01b82ed9ccd03351d5c6d6c..af74a8a127f44f1fbd4aa3612359c0c14b74ce11 100644
--- a/plugin-update-checker/plugin-update-checker.php
+++ b/plugin-update-checker/plugin-update-checker.php
@@ -221,11 +221,11 @@ class PluginUpdateChecker_2_1 {
);
//Try to parse the response
- $pluginInfo = null;
+ $pluginInfo = new stdClass();
if ( !is_wp_error($result) && isset($result['response']['code']) && ($result['response']['code'] == 200) && !empty($result['body']) ){
$pluginInfo = PluginInfo_2_1::fromJson($result['body'], $this->debugMode);
- $pluginInfo->filename = $this->pluginFile;
- $pluginInfo->slug = $this->slug;
+ $pluginInfo->filename = $this->pluginFile;
+ $pluginInfo->slug = $this->slug;
} else if ( $this->debugMode ) {
$message = sprintf("The URL %s does not point to a valid plugin metadata file. ", $url);
if ( is_wp_error($result) ) {
@@ -237,6 +237,7 @@ class PluginUpdateChecker_2_1 {
}
trigger_error($message, E_USER_WARNING);
}
+ $pluginInfo->response = $result;
$pluginInfo = apply_filters('puc_request_info_result-'.$this->slug, $pluginInfo, $result);
return $pluginInfo;
diff --git a/readme-adv.txt b/readme-adv.txt
index dd4ad2617e9412d31f410506e506c2b319961fde..a030b85962ca3a9647f06d59be0eec323424713d 100644
--- a/readme-adv.txt
+++ b/readme-adv.txt
@@ -3,7 +3,7 @@ Contributors: opentools
Tags: WooCommerce, Shipment, Shipping
Requires at least: 4.0
Tested up to: 4.5
-Stable tag: 1.2.6
+Stable tag: 1.2.6debug
License: GPLv3 or later
License URI: http://www.gnu.org/licenses/gpl.html
diff --git a/woocommerce-advanced-shipping-by-rules.php b/woocommerce-advanced-shipping-by-rules.php
index 0c40d67b030ea2a09e1ed6d5d7541d01814e209c..1cab4ae310f07482daa68690728ec5f70467342e 100644
--- a/woocommerce-advanced-shipping-by-rules.php
+++ b/woocommerce-advanced-shipping-by-rules.php
@@ -3,7 +3,7 @@
* Plugin Name: WooCommerce Advanced Shipping By Rules
* Plugin URI: http://open-tools.net/woocommerce/advanced-shipping-by-rules-for-woocommerce.html
* Description: Define Shipping cost by very general and flexible (text-based) rules. The advanced version also provides mathematical expressions and functions
- * Version: 1.2.6
+ * Version: 1.2.6debug
* Author: Open Tools, Reinhold Kainhofer
* Author URI: http://open-tools.net
* Text Domain: woocommerce-advanced-shipping-by-rules
diff --git a/woocommerce-shipping-by-rules.php b/woocommerce-shipping-by-rules.php
index 99818abae8aadcbc0effa4521c86a9f28ee62b9c..74861358038417f43f69078f9b37a3b32b94ba43 100644
--- a/woocommerce-shipping-by-rules.php
+++ b/woocommerce-shipping-by-rules.php
@@ -3,7 +3,7 @@
* Plugin Name: WooCommerce Shipping By Rules
* Plugin URI: http://open-tools.net/woocommerce/advanced-shipping-by-rules-for-woocommerce.html
* Description: Define Shipping cost by very general and flexible (text-based) rules.
- * Version: 1.2.6
+ * Version: 1.2.6debug
* Author: Open Tools, Reinhold Kainhofer
* Author URI: http://open-tools.net
* Text Domain: woocommerce-shipping-by-rules