"+a.data.message+"
").show(),a.success&&as3cf.reloadUpdated()}.bind(this)).always(function(){this.$spinner.removeClass("is-active")}.bind(this))},a(document).ready(function(){j(),window.onhashchange=function(a){"function"==typeof history.replaceState&&"#"===location.href.slice(-1)&&history.replaceState({},"",location.href.slice(0,-1)),j()};var m=a(".as3cf-main .nav-tab-wrapper");a(".as3cf-compatibility-notice, div.updated, div.error, div.notice").not(".below-h2, .inline").insertAfter(m),p.length&&p.each(function(a,b){l[b.id]=c(b.id)}),a(window).on("beforeunload.as3cf-settings",function(){if(!a.isEmptyObject(l)){var b=k.attr("id");return c(b)!==l[b]?as3cf.strings.save_alert:void 0}}),a(document).on("submit",".as3cf-main-settings form",function(b){a(window).off("beforeunload.as3cf-settings")}),a(".as3cf-switch").on("click",function(b){a(this).hasClass("disabled")||d(a(this).attr("id"))}),p.on("change",".sub-toggle",function(b){var c=a(this).attr("id");a(".as3cf-setting."+c).toggleClass("hide")}),a(".as3cf-domain").on("change",'input[type="radio"]',function(b){var c=a(this).closest('input:radio[name="domain"]:checked'),d=c.val(),e=a(this).parents(".as3cf-domain").find(".as3cf-setting.cloudfront"),f="cloudfront"===d;e.toggleClass("hide",!f)}),a(".url-preview").on("change","input",function(a){g()}),h(),a("#as3cf-serve-from-s3,#as3cf-remove-local-file").on("change",function(a){h()}),i(),a("#as3cf-remove-local-file").on("change",function(a){i()}),a('.as3cf-setting input[type="text"]').keypress(function(a){if(13===a.which)return a.preventDefault(),!1}),a('input[name="cloudfront"]').on("keyup",function(b){e(a(this))}),a('input[name="domain"]').on("change",function(b){var c=a(this),d=a("#"+k.attr("id")+' form button[type="submit"]');"cloudfront"!==c.val()?d.prop("disabled",!1):e(c.next(".as3cf-setting").find('input[name="cloudfront"]'))}),a('input[name="object-prefix"]').on("change",function(a){f()}),a("#tab-media > .as3cf-bucket-error").detach().insertAfter(".as3cf-bucket-container h3"),o.on("click",".bucket-action-manual",function(c){c.preventDefault(),a(".as3cf-bucket-container."+b.prefix+" .as3cf-bucket-manual").show().siblings().hide()}),o.on("click",".bucket-action-browse",function(c){c.preventDefault(),a(".as3cf-bucket-container."+b.prefix+" .as3cf-bucket-select").show().siblings().hide(),as3cf.buckets.loadList(n),n=!1}),o.on("click",".bucket-action-create",function(c){c.preventDefault(),a(".as3cf-bucket-name").val(""),a(".as3cf-invalid-bucket-name").html(""),a(".as3cf-bucket-container."+b.prefix+" .as3cf-bucket-create").show().siblings().hide()}),o.on("click",".bucket-action-cancel",function(a){a.preventDefault(),as3cf.buckets.resetModal()}),o.on("click",".bucket-action-save",function(a){a.preventDefault(),as3cf.buckets.saveManual()}),o.on("click",'.as3cf-create-bucket-form button[type="submit"]',function(a){a.preventDefault(),as3cf.buckets.create()}),o.on("click",".bucket-action-refresh",function(a){a.preventDefault(),as3cf.buckets.loadList(!0)}),o.on("click",".as3cf-bucket-list a",function(b){b.preventDefault(),as3cf.buckets.saveSelected(a(this))}),a(".as3cf-bucket-container").on("click","a.js-link",function(b){return b.preventDefault(),window.open(a(this).attr("href")),!1}),o.on("as3cf-modal-open",function(c,d){if(".as3cf-bucket-container."+b.prefix===d){as3cf.buckets.resetModal();var e=a(".as3cf-bucket-manual h3").data("modal-title");a(".as3cf-bucket-manual h3").text(e),as3cf.buckets.disabledButtons()}}),as3cf.buckets.disabledButtons(),o.on("input keyup",".as3cf-create-bucket-form .as3cf-bucket-name",function(c){var d=a(this).val(),e=a(".as3cf-bucket-container."+b.prefix+" .as3cf-create-bucket-form");as3cf.buckets.isValidName(d)?e.find("button[type=submit]").prop("disabled",!1):e.find("button[type=submit]").prop("disabled",!0),as3cf.buckets.updateNameNotice(d)}),o.on("input keyup",".as3cf-manual-save-bucket-form .as3cf-bucket-name",function(c){var d=a(".as3cf-bucket-container."+b.prefix+" .as3cf-manual-save-bucket-form");d.find(".as3cf-bucket-name").val().length' . sprintf( __( 'You can %s the %s plugin to get rid of this notice.', 'amazon-s3-and-cloudfront' ), $deactivate_link, $this->plugin_name ) . ''; + // Check basic requirements for AWS SDK. + $sdk_errors = $this->get_sdk_requirements_errors(); + if ( ! empty( $sdk_errors ) ) { + $sdk_errors = $this->get_sdk_error_msg() . $hide_notice_msg; + return $this->set_error_msg( $sdk_errors ); + } + + // Remainder of tests are for addons. + if ( is_null( $this->parent_plugin_slug ) ) { + return false; + } + + $parent_basename = $this->get_parent_plugin_basename(); + $parent_plugin_link_html = sprintf( '%s', $this->get_parent_plugin_url(), $this->get_parent_plugin_name() ); + if ( ! $this->is_parent_plugin_enabled() ) { $msg = sprintf( __( '%s has been disabled as it requires the %s plugin.', 'amazon-s3-and-cloudfront' ), $this->plugin_name, $parent_plugin_link_html ); @@ -330,9 +339,9 @@ function get_error_msg() { if ( isset( $GLOBALS['aws_meta'][ $this->parent_plugin_slug ]['compatible'] ) && ! $GLOBALS['aws_meta'][ $this->parent_plugin_slug ]['compatible'] ) { $msg = rtrim( $msg, '.' ) . ', ' . __( 'which is currently disabled.', 'amazon-s3-and-cloudfront' ); } else { - $msg .= ' ' . __( 'It appears to be installed already.', 'amazon-s3-and-cloudfront' ); + $msg .= ' ' . __( 'It appears to be installed already.', 'amazon-s3-and-cloudfront' ); $activate_url = $this->get_plugin_action_url( 'activate', $parent_basename ); - $msg .= ' ' . _x( 'Activate it now.', 'Activate plugin', 'amazon-s3-and-cloudfront' ) . ''; + $msg .= ' ' . _x( 'Activate it now.', 'Activate plugin', 'amazon-s3-and-cloudfront' ) . ''; } } else { $install_url = 'https://deliciousbrains.com/my-account/'; @@ -368,8 +377,8 @@ function get_error_msg() { } $update_url = $this->get_plugin_action_url( 'upgrade', $parent_basename ); - $msg .= ' ' . __( 'Update to the latest version', 'amazon-s3-and-cloudfront' ) . ''; + $msg .= ' ' . __( 'Update to the latest version', 'amazon-s3-and-cloudfront' ) . ''; $msg .= $hide_notice_msg; return $this->set_error_msg( $msg ); @@ -438,7 +447,7 @@ function check_capabilities() { * Display compatibility notices to users who can manage plugins */ function hook_admin_notices() { - if ( ! $this->check_capabilities() ){ + if ( ! $this->check_capabilities() ) { return; } @@ -479,7 +488,7 @@ function get_admin_notice() { * @param string $message */ function render_notice( $message ) { - printf( '
%s
%s
Visit deliciousbrains." +"com to purchase in just a few clicks." msgstr "" -#: view/settings.php:48 +#: view/settings/media.php:13 +#, php-format +msgid "Define your AWS keys to configure WP Offload S3" +msgstr "" + +#: view/settings/media.php:47 msgid "Enable/Disable the Plugin" msgstr "" -#: view/settings.php:56 +#: view/settings/media.php:56 msgid "Copy Files to S3" msgstr "" -#: view/settings.php:58 +#: view/settings/media.php:58 msgid "" "When a file is uploaded to the Media Library, copy it to S3. Existing files " "are not copied to S3." msgstr "" -#: view/settings.php:71 +#: view/settings/media.php:71 msgid "Rewrite File URLs" msgstr "" -#: view/settings.php:73 +#: view/settings/media.php:73 msgid "" "For Media Library files that have been copied to S3, rewrite the URLs so " "that they are served from S3/CloudFront instead of your server." msgstr "" -#: view/settings.php:80 +#: view/settings/media.php:80 msgid "Configure File URLs" msgstr "" -#: view/settings.php:101 +#: view/settings/media.php:101 msgid "Path" msgstr "" -#: view/settings.php:103 +#: view/settings/media.php:103 msgid "By default the path is the same as your local WordPress files." msgstr "" -#: view/settings.php:120 +#: view/settings/media.php:120 msgid "Year/Month" msgstr "" -#: view/settings.php:122 +#: view/settings/media.php:122 msgid "Add the Year/Month in the URL." msgstr "" -#: view/settings.php:135 +#: view/settings/media.php:135 msgid "Force HTTPS" msgstr "" -#: view/settings.php:137 +#: view/settings/media.php:137 msgid "" "By default we use HTTPS when the request is HTTPS and regular HTTP when the " "request is HTTP, but you may want to force the use of HTTPS always, " "regardless of the request." msgstr "" -#: view/settings.php:144 +#: view/settings/media.php:144 msgid "Advanced Options" msgstr "" -#: view/settings.php:153 +#: view/settings/media.php:153 msgid "Remove Files From Server" msgstr "" -#: view/settings.php:154 +#: view/settings/media.php:154 msgid "Once a file has been copied to S3, remove it from the local server." msgstr "" -#: view/settings.php:158 +#: view/settings/media.php:158 msgid "" "Broken URLs — There will be broken URLs for files " "that don't exist locally. You can fix this by enabling Rewrite File " "URLs to use the S3 URLs." msgstr "" -#: view/settings.php:169 +#: view/settings/media.php:169 #, php-format msgid "" "Warning — Some plugins depend on the file being " "present on the local server and may not work when the file is removed. %s" msgstr "" -#: view/settings.php:187 +#: view/settings/media.php:187 msgid "Object Versioning" msgstr "" -#: view/settings.php:189 +#: view/settings/media.php:189 msgid "" "Append a timestamp to the S3 file path. Recommended when using CloudFront so " "you don't have to worry about cache invalidation." msgstr "" -#: view/settings.php:196 +#: view/settings/media.php:196 +#: view/settings/settings.php:112 msgid "Save Changes" msgstr "" +#: view/settings/settings.php:19 +msgid "AWS Access Keys" +msgstr "" + +#: view/settings/settings.php:23 +msgid "You have enabled the use of IAM roles for Amazon EC2 instances." +msgstr "" + +#: view/settings/settings.php:30 +msgid "" +"Please check your wp-config.php file as it looks like one of your defines is " +"missing or incorrect." +msgstr "" + +#: view/settings/settings.php:36 +#, php-format +msgid "" +"You’ve already defined your AWS access keys in your wp-config.php. If " +"you’d prefer to manage them here and store them in the database (not recommended), simply remove the lines from your wp-" +"config." +msgstr "" + +#: view/settings/settings.php:42 +msgid "" +"We recommend defining your Access Keys in wp-config.php so long as you " +"don’t commit it to source control (you shouldn’t be). Simply " +"copy the following snippet and replace the stars with the keys." +msgstr "" + +#: view/settings/settings.php:52 +#, php-format +msgid "" +"You’re storing your Access Keys in the database (not " +"recommended)." +msgstr "" + +#: view/settings/settings.php:56 +msgid "" +"If you’d rather store your Access Keys in the database, click here to reveal a form." +msgstr "" + +#: view/settings/settings.php:66 +msgid "Access Key ID" +msgstr "" + +#: view/settings/settings.php:83 +msgid "Secret Access Key" +msgstr "" + +#: view/settings/settings.php:103 +msgid "This will store your AWS access keys in the database (not recommended)." +msgstr "" + +#: view/settings/settings.php:115 +msgid "Remove Keys" +msgstr "" + +#: view/settings/settings.php:127 +#, php-format +msgid "" +"Need help getting your Access Keys? Check out the Quick Start " +"Guide →" +msgstr "" + #: view/sidebar.php:13 msgid "Upload existing Media Library to S3" msgstr "" diff --git a/readme.txt b/readme.txt index 385f6f14..141ce4d7 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: bradt, deliciousbrains Tags: uploads, amazon, s3, amazon s3, mirror, admin, media, cdn, cloudfront Requires at least: 4.6 Tested up to: 4.9 -Stable tag: 1.2.1 +Stable tag: 1.3 License: GPLv3 Copies files to Amazon S3 as they are uploaded to the Media Library. Optionally configure Amazon CloudFront for faster delivery. @@ -65,6 +65,23 @@ This version requires PHP 5.3.3+ and the Amazon Web Services plugin == Changelog == += WP Offload S3 Lite 1.3 - 2018-02-20 = +* [Release Summary Blog Post](https://deliciousbrains.com/wp-offload-s3-1-6-released/?utm_campaign=changelogs&utm_source=wordpress.org&utm_medium=free%2Bplugin%2Blisting) +* New: [Amazon Web Services plugin](https://wordpress.org/plugins/amazon-web-services/) is no longer required to run WP Offload S3 Lite +* New: Added [`as3cf_local_domains`](https://deliciousbrains.com/wp-offload-s3/doc/filtering-urls-for-multiple-domains/?utm_campaign=changelogs&utm_source=wordpress.org&utm_medium=free%2Bplugin%2Blisting) filter for when site content is updated through multiple domains +* Improvement: AWS keys can be set in new "Settings" tab if not defined in wp-config.php +* Improvement: Minor tweaks to settings page UI including right aligning tabs and consistent title across Lite and Pro plugins +* Improvement: cURL version, theme version and parent theme information added to diagnostics +* Bug fix: Incompatible with plugins that include AWS PHP SDK v3 +* Bug fix: Regenerate Thumbnails v3.0+ does not work with Remove Files From Server option +* Bug fix: "Warning: count(): Parameter must be an array or an object that implements Countable" error with PHP 7.2 +* Bug fix: Force HTTPS not being applied to non-srcset S3 URLs in pages served over HTTP +* Bug fix: Content URLs not filtered to S3 URLs if AWS keys not set +* Bug fix: URL preview can be coerced to display invalid URL +* Bug fix: Changes to upload made via `as3cf_object_meta` filter are not reflected in amazonS3_info records +* Bug fix: Settings link not showing in network admin plugins page +* Bug fix: License in composer.json fails Packagist validation + = WP Offload S3 Lite 1.2.1 - 2017-11-20 = * New: Compatibility with HTML Widget * New: Dismissible admin notice that WP Offload S3 Lite will soon require PHP 5.5+ diff --git a/vendor/Aws2/aws/aws-sdk-php/LICENSE.md b/vendor/Aws2/aws/aws-sdk-php/LICENSE.md new file mode 100644 index 00000000..8d53e9f5 --- /dev/null +++ b/vendor/Aws2/aws/aws-sdk-php/LICENSE.md @@ -0,0 +1,141 @@ +# Apache License +Version 2.0, January 2004 + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +## 1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 +through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the +License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled +by, or are under common control with that entity. For the purposes of this definition, "control" means +(i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract +or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial +ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software +source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, +including but not limited to compiled object code, generated documentation, and conversions to other media +types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, +as indicated by a copyright notice that is included in or attached to the work (an example is provided in the +Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) +the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, +as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not +include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work +and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any +modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to +Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to +submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of +electronic, verbal, or written communication sent to the Licensor or its representatives, including but not +limited to communication on electronic mailing lists, source code control systems, and issue tracking systems +that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but +excluding communication that is conspicuously marked or otherwise designated in writing by the copyright +owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been +received by Licensor and subsequently incorporated within the Work. + +## 2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare +Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +## 3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent +license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such +license applies only to those patent claims licensable by such Contributor that are necessarily infringed by +their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such +Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim +or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work +constitutes direct or contributory patent infringement, then any patent licenses granted to You under this +License for that Work shall terminate as of the date such litigation is filed. + +## 4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without +modifications, and in Source or Object form, provided that You meet the following conditions: + + 1. You must give any other recipients of the Work or Derivative Works a copy of this License; and + + 2. You must cause any modified files to carry prominent notices stating that You changed the files; and + + 3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, + trademark, and attribution notices from the Source form of the Work, excluding those notices that do + not pertain to any part of the Derivative Works; and + + 4. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that + You distribute must include a readable copy of the attribution notices contained within such NOTICE + file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed as part of the Derivative Works; within + the Source form or documentation, if provided along with the Derivative Works; or, within a display + generated by the Derivative Works, if and wherever such third-party notices normally appear. The + contents of the NOTICE file are for informational purposes only and do not modify the License. You may + add Your own attribution notices within Derivative Works that You distribute, alongside or as an + addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be + construed as modifying the License. + +You may add Your own copyright statement to Your modifications and may provide additional or different license +terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative +Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the +conditions stated in this License. + +## 5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by +You to the Licensor shall be under the terms and conditions of this License, without any additional terms or +conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate +license agreement you may have executed with Licensor regarding such Contributions. + +## 6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, service marks, or product names of +the Licensor, except as required for reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +## 7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor +provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express +or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, +MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the +appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +## 8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless +required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any +Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential +damages of any character arising as a result of this License or out of the use or inability to use the Work +(including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has been advised of the possibility +of such damages. + +## 9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, +acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this +License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole +responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold +each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason +of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS diff --git a/vendor/Aws2/aws/aws-sdk-php/NOTICE.md b/vendor/Aws2/aws/aws-sdk-php/NOTICE.md new file mode 100644 index 00000000..84858532 --- /dev/null +++ b/vendor/Aws2/aws/aws-sdk-php/NOTICE.md @@ -0,0 +1,112 @@ +# AWS SDK for PHP + +
+ * var_export($response->getLinks());
+ * array(
+ * array(
+ * 'url' => 'http:/.../front.jpeg',
+ * 'rel' => 'back',
+ * 'type' => 'image/jpeg',
+ * )
+ * )
+ *
+ *
+ * @return array
+ */
+ public function getLinks()
+ {
+ $links = $this->parseParams();
+ foreach ($links as &$link) {
+ $key = key($link);
+ unset($link[$key]);
+ $link['url'] = trim($key, '<> ');
+ }
+ return $links;
+ }
+}
diff --git a/vendor/Aws2/guzzle/guzzle/src/Guzzle/Http/Message/MessageInterface.php b/vendor/Aws2/guzzle/guzzle/src/Guzzle/Http/Message/MessageInterface.php
new file mode 100644
index 00000000..f253e6a4
--- /dev/null
+++ b/vendor/Aws2/guzzle/guzzle/src/Guzzle/Http/Message/MessageInterface.php
@@ -0,0 +1,92 @@
+fieldName = $fieldName;
+ $this->setFilename($filename);
+ $this->postname = $postname ? $postname : basename($filename);
+ $this->contentType = $contentType ?: $this->guessContentType();
+ }
+ public function setFieldName($name)
+ {
+ $this->fieldName = $name;
+ return $this;
+ }
+ public function getFieldName()
+ {
+ return $this->fieldName;
+ }
+ public function setFilename($filename)
+ {
+ // Remove leading @ symbol
+ if (strpos($filename, '@') === 0) {
+ $filename = substr($filename, 1);
+ }
+ if (!is_readable($filename)) {
+ throw new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Exception\InvalidArgumentException("Unable to open {$filename} for reading");
+ }
+ $this->filename = $filename;
+ return $this;
+ }
+ public function setPostname($postname)
+ {
+ $this->postname = $postname;
+ return $this;
+ }
+ public function getFilename()
+ {
+ return $this->filename;
+ }
+ public function getPostname()
+ {
+ return $this->postname;
+ }
+ public function setContentType($type)
+ {
+ $this->contentType = $type;
+ return $this;
+ }
+ public function getContentType()
+ {
+ return $this->contentType;
+ }
+ public function getCurlValue()
+ {
+ // PHP 5.5 introduced a CurlFile object that deprecates the old @filename syntax
+ // See: https://wiki.php.net/rfc/curl-file-upload
+ if (function_exists('curl_file_create')) {
+ return curl_file_create($this->filename, $this->contentType, $this->postname);
+ }
+ // Use the old style if using an older version of PHP
+ $value = "@{$this->filename};filename=" . $this->postname;
+ if ($this->contentType) {
+ $value .= ';type=' . $this->contentType;
+ }
+ return $value;
+ }
+ /**
+ * @deprecated
+ * @codeCoverageIgnore
+ */
+ public function getCurlString()
+ {
+ \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Version::warn(__METHOD__ . ' is deprecated. Use getCurlValue()');
+ return $this->getCurlValue();
+ }
+ /**
+ * Determine the Content-Type of the file
+ */
+ protected function guessContentType()
+ {
+ return \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Mimetypes::getInstance()->fromFilename($this->filename) ?: 'application/octet-stream';
+ }
+}
diff --git a/vendor/Aws2/guzzle/guzzle/src/Guzzle/Http/Message/PostFileInterface.php b/vendor/Aws2/guzzle/guzzle/src/Guzzle/Http/Message/PostFileInterface.php
new file mode 100644
index 00000000..f054929e
--- /dev/null
+++ b/vendor/Aws2/guzzle/guzzle/src/Guzzle/Http/Message/PostFileInterface.php
@@ -0,0 +1,74 @@
+method = strtoupper($method);
+ $this->curlOptions = new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Collection();
+ $this->setUrl($url);
+ if ($headers) {
+ // Special handling for multi-value headers
+ foreach ($headers as $key => $value) {
+ // Deal with collisions with Host and Authorization
+ if ($key == 'host' || $key == 'Host') {
+ $this->setHeader($key, $value);
+ } elseif ($value instanceof HeaderInterface) {
+ $this->addHeader($key, $value);
+ } else {
+ foreach ((array) $value as $v) {
+ $this->addHeader($key, $v);
+ }
+ }
+ }
+ }
+ $this->setState(self::STATE_NEW);
+ }
+ public function __clone()
+ {
+ if ($this->eventDispatcher) {
+ $this->eventDispatcher = clone $this->eventDispatcher;
+ }
+ $this->curlOptions = clone $this->curlOptions;
+ $this->params = clone $this->params;
+ $this->url = clone $this->url;
+ $this->response = $this->responseBody = null;
+ $this->headers = clone $this->headers;
+ $this->setState(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface::STATE_NEW);
+ $this->dispatch('request.clone', array('request' => $this));
+ }
+ /**
+ * Get the HTTP request as a string
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return $this->getRawHeaders() . "\r\n\r\n";
+ }
+ /**
+ * Default method that will throw exceptions if an unsuccessful response is received.
+ *
+ * @param Event $event Received
+ * @throws BadResponseException if the response is not successful
+ */
+ public static function onRequestError(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Event $event)
+ {
+ $e = \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Exception\BadResponseException::factory($event['request'], $event['response']);
+ $event['request']->setState(self::STATE_ERROR, array('exception' => $e) + $event->toArray());
+ throw $e;
+ }
+ public function setClient(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\ClientInterface $client)
+ {
+ $this->client = $client;
+ return $this;
+ }
+ public function getClient()
+ {
+ return $this->client;
+ }
+ public function getRawHeaders()
+ {
+ $protocolVersion = $this->protocolVersion ?: '1.1';
+ return trim($this->method . ' ' . $this->getResource()) . ' ' . strtoupper(str_replace('https', 'http', $this->url->getScheme())) . '/' . $protocolVersion . "\r\n" . implode("\r\n", $this->getHeaderLines());
+ }
+ public function setUrl($url)
+ {
+ if ($url instanceof Url) {
+ $this->url = $url;
+ } else {
+ $this->url = \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Url::factory($url);
+ }
+ // Update the port and host header
+ $this->setPort($this->url->getPort());
+ if ($this->url->getUsername() || $this->url->getPassword()) {
+ $this->setAuth($this->url->getUsername(), $this->url->getPassword());
+ // Remove the auth info from the URL
+ $this->url->setUsername(null);
+ $this->url->setPassword(null);
+ }
+ return $this;
+ }
+ public function send()
+ {
+ if (!$this->client) {
+ throw new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Exception\RuntimeException('A client must be set on the request');
+ }
+ return $this->client->send($this);
+ }
+ public function getResponse()
+ {
+ return $this->response;
+ }
+ public function getQuery($asString = false)
+ {
+ return $asString ? (string) $this->url->getQuery() : $this->url->getQuery();
+ }
+ public function getMethod()
+ {
+ return $this->method;
+ }
+ public function getScheme()
+ {
+ return $this->url->getScheme();
+ }
+ public function setScheme($scheme)
+ {
+ $this->url->setScheme($scheme);
+ return $this;
+ }
+ public function getHost()
+ {
+ return $this->url->getHost();
+ }
+ public function setHost($host)
+ {
+ $this->url->setHost($host);
+ $this->setPort($this->url->getPort());
+ return $this;
+ }
+ public function getProtocolVersion()
+ {
+ return $this->protocolVersion;
+ }
+ public function setProtocolVersion($protocol)
+ {
+ $this->protocolVersion = $protocol;
+ return $this;
+ }
+ public function getPath()
+ {
+ return '/' . ltrim($this->url->getPath(), '/');
+ }
+ public function setPath($path)
+ {
+ $this->url->setPath($path);
+ return $this;
+ }
+ public function getPort()
+ {
+ return $this->url->getPort();
+ }
+ public function setPort($port)
+ {
+ $this->url->setPort($port);
+ // Include the port in the Host header if it is not the default port for the scheme of the URL
+ $scheme = $this->url->getScheme();
+ if ($port && ($scheme == 'http' && $port != 80 || $scheme == 'https' && $port != 443)) {
+ $this->headers['host'] = $this->headerFactory->createHeader('Host', $this->url->getHost() . ':' . $port);
+ } else {
+ $this->headers['host'] = $this->headerFactory->createHeader('Host', $this->url->getHost());
+ }
+ return $this;
+ }
+ public function getUsername()
+ {
+ return $this->username;
+ }
+ public function getPassword()
+ {
+ return $this->password;
+ }
+ public function setAuth($user, $password = '', $scheme = CURLAUTH_BASIC)
+ {
+ static $authMap = array('basic' => CURLAUTH_BASIC, 'digest' => CURLAUTH_DIGEST, 'ntlm' => CURLAUTH_NTLM, 'any' => CURLAUTH_ANY);
+ // If we got false or null, disable authentication
+ if (!$user) {
+ $this->password = $this->username = null;
+ $this->removeHeader('Authorization');
+ $this->getCurlOptions()->remove(CURLOPT_HTTPAUTH);
+ return $this;
+ }
+ if (!is_numeric($scheme)) {
+ $scheme = strtolower($scheme);
+ if (!isset($authMap[$scheme])) {
+ throw new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Exception\InvalidArgumentException($scheme . ' is not a valid authentication type');
+ }
+ $scheme = $authMap[$scheme];
+ }
+ $this->username = $user;
+ $this->password = $password;
+ // Bypass CURL when using basic auth to promote connection reuse
+ if ($scheme == CURLAUTH_BASIC) {
+ $this->getCurlOptions()->remove(CURLOPT_HTTPAUTH);
+ $this->setHeader('Authorization', 'Basic ' . base64_encode($this->username . ':' . $this->password));
+ } else {
+ $this->getCurlOptions()->set(CURLOPT_HTTPAUTH, $scheme)->set(CURLOPT_USERPWD, $this->username . ':' . $this->password);
+ }
+ return $this;
+ }
+ public function getResource()
+ {
+ $resource = $this->getPath();
+ if ($query = (string) $this->url->getQuery()) {
+ $resource .= '?' . $query;
+ }
+ return $resource;
+ }
+ public function getUrl($asObject = false)
+ {
+ return $asObject ? clone $this->url : (string) $this->url;
+ }
+ public function getState()
+ {
+ return $this->state;
+ }
+ public function setState($state, array $context = array())
+ {
+ $oldState = $this->state;
+ $this->state = $state;
+ switch ($state) {
+ case self::STATE_NEW:
+ $this->response = null;
+ break;
+ case self::STATE_TRANSFER:
+ if ($oldState !== $state) {
+ // Fix Content-Length and Transfer-Encoding collisions
+ if ($this->hasHeader('Transfer-Encoding') && $this->hasHeader('Content-Length')) {
+ $this->removeHeader('Transfer-Encoding');
+ }
+ $this->dispatch('request.before_send', array('request' => $this));
+ }
+ break;
+ case self::STATE_COMPLETE:
+ if ($oldState !== $state) {
+ $this->processResponse($context);
+ $this->responseBody = null;
+ }
+ break;
+ case self::STATE_ERROR:
+ if (isset($context['exception'])) {
+ $this->dispatch('request.exception', array('request' => $this, 'response' => isset($context['response']) ? $context['response'] : $this->response, 'exception' => isset($context['exception']) ? $context['exception'] : null));
+ }
+ }
+ return $this->state;
+ }
+ public function getCurlOptions()
+ {
+ return $this->curlOptions;
+ }
+ public function startResponse(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\Response $response)
+ {
+ $this->state = self::STATE_TRANSFER;
+ $response->setEffectiveUrl((string) $this->getUrl());
+ $this->response = $response;
+ return $this;
+ }
+ public function setResponse(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\Response $response, $queued = false)
+ {
+ $response->setEffectiveUrl((string) $this->url);
+ if ($queued) {
+ $ed = $this->getEventDispatcher();
+ $ed->addListener('request.before_send', $f = function ($e) use($response, &$f, $ed) {
+ $e['request']->setResponse($response);
+ $ed->removeListener('request.before_send', $f);
+ }, -9999);
+ } else {
+ $this->response = $response;
+ // If a specific response body is specified, then use it instead of the response's body
+ if ($this->responseBody && !$this->responseBody->getCustomData('default') && !$response->isRedirect()) {
+ $this->getResponseBody()->write((string) $this->response->getBody());
+ } else {
+ $this->responseBody = $this->response->getBody();
+ }
+ $this->setState(self::STATE_COMPLETE);
+ }
+ return $this;
+ }
+ public function setResponseBody($body)
+ {
+ // Attempt to open a file for writing if a string was passed
+ if (is_string($body)) {
+ // @codeCoverageIgnoreStart
+ if (!($body = fopen($body, 'w+'))) {
+ throw new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Exception\InvalidArgumentException('Could not open ' . $body . ' for writing');
+ }
+ // @codeCoverageIgnoreEnd
+ }
+ $this->responseBody = \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\EntityBody::factory($body);
+ return $this;
+ }
+ public function getResponseBody()
+ {
+ if ($this->responseBody === null) {
+ $this->responseBody = \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\EntityBody::factory()->setCustomData('default', true);
+ }
+ return $this->responseBody;
+ }
+ /**
+ * Determine if the response body is repeatable (readable + seekable)
+ *
+ * @return bool
+ * @deprecated Use getResponseBody()->isSeekable()
+ * @codeCoverageIgnore
+ */
+ public function isResponseBodyRepeatable()
+ {
+ \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Version::warn(__METHOD__ . ' is deprecated. Use $request->getResponseBody()->isRepeatable()');
+ return !$this->responseBody ? true : $this->responseBody->isRepeatable();
+ }
+ public function getCookies()
+ {
+ if ($cookie = $this->getHeader('Cookie')) {
+ $data = \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Parser\ParserRegistry::getInstance()->getParser('cookie')->parseCookie($cookie);
+ return $data['cookies'];
+ }
+ return array();
+ }
+ public function getCookie($name)
+ {
+ $cookies = $this->getCookies();
+ return isset($cookies[$name]) ? $cookies[$name] : null;
+ }
+ public function addCookie($name, $value)
+ {
+ if (!$this->hasHeader('Cookie')) {
+ $this->setHeader('Cookie', "{$name}={$value}");
+ } else {
+ $this->getHeader('Cookie')->add("{$name}={$value}");
+ }
+ // Always use semicolons to separate multiple cookie headers
+ $this->getHeader('Cookie')->setGlue(';');
+ return $this;
+ }
+ public function removeCookie($name)
+ {
+ if ($cookie = $this->getHeader('Cookie')) {
+ foreach ($cookie as $cookieValue) {
+ if (strpos($cookieValue, $name . '=') === 0) {
+ $cookie->removeValue($cookieValue);
+ }
+ }
+ }
+ return $this;
+ }
+ public function setEventDispatcher(\DeliciousBrains\WP_Offload_S3\Aws2\Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher)
+ {
+ $this->eventDispatcher = $eventDispatcher;
+ $this->eventDispatcher->addListener('request.error', array(__CLASS__, 'onRequestError'), -255);
+ return $this;
+ }
+ public function getEventDispatcher()
+ {
+ if (!$this->eventDispatcher) {
+ $this->setEventDispatcher(new \DeliciousBrains\WP_Offload_S3\Aws2\Symfony\Component\EventDispatcher\EventDispatcher());
+ }
+ return $this->eventDispatcher;
+ }
+ public function dispatch($eventName, array $context = array())
+ {
+ $context['request'] = $this;
+ return $this->getEventDispatcher()->dispatch($eventName, new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Event($context));
+ }
+ public function addSubscriber(\DeliciousBrains\WP_Offload_S3\Aws2\Symfony\Component\EventDispatcher\EventSubscriberInterface $subscriber)
+ {
+ $this->getEventDispatcher()->addSubscriber($subscriber);
+ return $this;
+ }
+ /**
+ * Get an array containing the request and response for event notifications
+ *
+ * @return array
+ */
+ protected function getEventArray()
+ {
+ return array('request' => $this, 'response' => $this->response);
+ }
+ /**
+ * Process a received response
+ *
+ * @param array $context Contextual information
+ * @throws RequestException|BadResponseException on unsuccessful responses
+ */
+ protected function processResponse(array $context = array())
+ {
+ if (!$this->response) {
+ // If no response, then processResponse shouldn't have been called
+ $e = new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Exception\RequestException('Error completing request');
+ $e->setRequest($this);
+ throw $e;
+ }
+ $this->state = self::STATE_COMPLETE;
+ // A request was sent, but we don't know if we'll send more or if the final response will be successful
+ $this->dispatch('request.sent', $this->getEventArray() + $context);
+ // Some response processors will remove the response or reset the state (example: ExponentialBackoffPlugin)
+ if ($this->state == \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface::STATE_COMPLETE) {
+ // The request completed, so the HTTP transaction is complete
+ $this->dispatch('request.complete', $this->getEventArray());
+ // If the response is bad, allow listeners to modify it or throw exceptions. You can change the response by
+ // modifying the Event object in your listeners or calling setResponse() on the request
+ if ($this->response->isError()) {
+ $event = new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Event($this->getEventArray());
+ $this->getEventDispatcher()->dispatch('request.error', $event);
+ // Allow events of request.error to quietly change the response
+ if ($event['response'] !== $this->response) {
+ $this->response = $event['response'];
+ }
+ }
+ // If a successful response was received, dispatch an event
+ if ($this->response->isSuccessful()) {
+ $this->dispatch('request.success', $this->getEventArray());
+ }
+ }
+ }
+ /**
+ * @deprecated Use Guzzle\Plugin\Cache\DefaultCanCacheStrategy
+ * @codeCoverageIgnore
+ */
+ public function canCache()
+ {
+ \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Version::warn(__METHOD__ . ' is deprecated. Use Guzzle\\Plugin\\Cache\\DefaultCanCacheStrategy.');
+ if (class_exists('DeliciousBrains\\WP_Offload_S3\\Aws2\\Guzzle\\Plugin\\Cache\\DefaultCanCacheStrategy')) {
+ $canCache = new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Plugin\Cache\DefaultCanCacheStrategy();
+ return $canCache->canCacheRequest($this);
+ } else {
+ return false;
+ }
+ }
+ /**
+ * @deprecated Use the history plugin (not emitting a warning as this is built-into the RedirectPlugin for now)
+ * @codeCoverageIgnore
+ */
+ public function setIsRedirect($isRedirect)
+ {
+ $this->isRedirect = $isRedirect;
+ return $this;
+ }
+ /**
+ * @deprecated Use the history plugin
+ * @codeCoverageIgnore
+ */
+ public function isRedirect()
+ {
+ \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Version::warn(__METHOD__ . ' is deprecated. Use the HistoryPlugin to track this.');
+ return $this->isRedirect;
+ }
+}
diff --git a/vendor/Aws2/guzzle/guzzle/src/Guzzle/Http/Message/RequestFactory.php b/vendor/Aws2/guzzle/guzzle/src/Guzzle/Http/Message/RequestFactory.php
new file mode 100644
index 00000000..e2ba5d44
--- /dev/null
+++ b/vendor/Aws2/guzzle/guzzle/src/Guzzle/Http/Message/RequestFactory.php
@@ -0,0 +1,304 @@
+methods = array_flip(get_class_methods(__CLASS__));
+ }
+ public function fromMessage($message)
+ {
+ $parsed = \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Parser\ParserRegistry::getInstance()->getParser('message')->parseRequest($message);
+ if (!$parsed) {
+ return false;
+ }
+ $request = $this->fromParts($parsed['method'], $parsed['request_url'], $parsed['headers'], $parsed['body'], $parsed['protocol'], $parsed['version']);
+ // EntityEnclosingRequest adds an "Expect: 100-Continue" header when using a raw request body for PUT or POST
+ // requests. This factory method should accurately reflect the message, so here we are removing the Expect
+ // header if one was not supplied in the message.
+ if (!isset($parsed['headers']['Expect']) && !isset($parsed['headers']['expect'])) {
+ $request->removeHeader('Expect');
+ }
+ return $request;
+ }
+ public function fromParts($method, array $urlParts, $headers = null, $body = null, $protocol = 'HTTP', $protocolVersion = '1.1')
+ {
+ return $this->create($method, \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Url::buildUrl($urlParts), $headers, $body)->setProtocolVersion($protocolVersion);
+ }
+ public function create($method, $url, $headers = null, $body = null, array $options = array())
+ {
+ $method = strtoupper($method);
+ if ($method == 'GET' || $method == 'HEAD' || $method == 'TRACE') {
+ // Handle non-entity-enclosing request methods
+ $request = new $this->requestClass($method, $url, $headers);
+ if ($body) {
+ // The body is where the response body will be stored
+ $type = gettype($body);
+ if ($type == 'string' || $type == 'resource' || $type == 'object') {
+ $request->setResponseBody($body);
+ }
+ }
+ } else {
+ // Create an entity enclosing request by default
+ $request = new $this->entityEnclosingRequestClass($method, $url, $headers);
+ if ($body || $body === '0') {
+ // Add POST fields and files to an entity enclosing request if an array is used
+ if (is_array($body) || $body instanceof Collection) {
+ // Normalize PHP style cURL uploads with a leading '@' symbol
+ foreach ($body as $key => $value) {
+ if (is_string($value) && substr($value, 0, 1) == '@') {
+ $request->addPostFile($key, $value);
+ unset($body[$key]);
+ }
+ }
+ // Add the fields if they are still present and not all files
+ $request->addPostFields($body);
+ } else {
+ // Add a raw entity body body to the request
+ $request->setBody($body, (string) $request->getHeader('Content-Type'));
+ if ((string) $request->getHeader('Transfer-Encoding') == 'chunked') {
+ $request->removeHeader('Content-Length');
+ }
+ }
+ }
+ }
+ if ($options) {
+ $this->applyOptions($request, $options);
+ }
+ return $request;
+ }
+ /**
+ * Clone a request while changing the method. Emulates the behavior of
+ * {@see Guzzle\Http\Message\Request::clone}, but can change the HTTP method.
+ *
+ * @param RequestInterface $request Request to clone
+ * @param string $method Method to set
+ *
+ * @return RequestInterface
+ */
+ public function cloneRequestWithMethod(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $method)
+ {
+ // Create the request with the same client if possible
+ if ($request->getClient()) {
+ $cloned = $request->getClient()->createRequest($method, $request->getUrl(), $request->getHeaders());
+ } else {
+ $cloned = $this->create($method, $request->getUrl(), $request->getHeaders());
+ }
+ $cloned->getCurlOptions()->replace($request->getCurlOptions()->toArray());
+ $cloned->setEventDispatcher(clone $request->getEventDispatcher());
+ // Ensure that that the Content-Length header is not copied if changing to GET or HEAD
+ if (!$cloned instanceof EntityEnclosingRequestInterface) {
+ $cloned->removeHeader('Content-Length');
+ } elseif ($request instanceof EntityEnclosingRequestInterface) {
+ $cloned->setBody($request->getBody());
+ }
+ $cloned->getParams()->replace($request->getParams()->toArray());
+ $cloned->dispatch('request.clone', array('request' => $cloned));
+ return $cloned;
+ }
+ public function applyOptions(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, array $options = array(), $flags = self::OPTIONS_NONE)
+ {
+ // Iterate over each key value pair and attempt to apply a config using function visitors
+ foreach ($options as $key => $value) {
+ $method = "visit_{$key}";
+ if (isset($this->methods[$method])) {
+ $this->{$method}($request, $value, $flags);
+ }
+ }
+ }
+ protected function visit_headers(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if (!is_array($value)) {
+ throw new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Exception\InvalidArgumentException('headers value must be an array');
+ }
+ if ($flags & self::OPTIONS_AS_DEFAULTS) {
+ // Merge headers in but do not overwrite existing values
+ foreach ($value as $key => $header) {
+ if (!$request->hasHeader($key)) {
+ $request->setHeader($key, $header);
+ }
+ }
+ } else {
+ $request->addHeaders($value);
+ }
+ }
+ protected function visit_body(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if ($request instanceof EntityEnclosingRequestInterface) {
+ $request->setBody($value);
+ } else {
+ throw new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Exception\InvalidArgumentException('Attempting to set a body on a non-entity-enclosing request');
+ }
+ }
+ protected function visit_allow_redirects(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if ($value === false) {
+ $request->getParams()->set(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\RedirectPlugin::DISABLE, true);
+ }
+ }
+ protected function visit_auth(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if (!is_array($value)) {
+ throw new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Exception\InvalidArgumentException('auth value must be an array');
+ }
+ $request->setAuth($value[0], isset($value[1]) ? $value[1] : null, isset($value[2]) ? $value[2] : 'basic');
+ }
+ protected function visit_query(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if (!is_array($value)) {
+ throw new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Exception\InvalidArgumentException('query value must be an array');
+ }
+ if ($flags & self::OPTIONS_AS_DEFAULTS) {
+ // Merge query string values in but do not overwrite existing values
+ $query = $request->getQuery();
+ $query->overwriteWith(array_diff_key($value, $query->toArray()));
+ } else {
+ $request->getQuery()->overwriteWith($value);
+ }
+ }
+ protected function visit_cookies(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if (!is_array($value)) {
+ throw new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Exception\InvalidArgumentException('cookies value must be an array');
+ }
+ foreach ($value as $name => $v) {
+ $request->addCookie($name, $v);
+ }
+ }
+ protected function visit_events(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if (!is_array($value)) {
+ throw new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Exception\InvalidArgumentException('events value must be an array');
+ }
+ foreach ($value as $name => $method) {
+ if (is_array($method)) {
+ $request->getEventDispatcher()->addListener($name, $method[0], $method[1]);
+ } else {
+ $request->getEventDispatcher()->addListener($name, $method);
+ }
+ }
+ }
+ protected function visit_plugins(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if (!is_array($value)) {
+ throw new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Exception\InvalidArgumentException('plugins value must be an array');
+ }
+ foreach ($value as $plugin) {
+ $request->addSubscriber($plugin);
+ }
+ }
+ protected function visit_exceptions(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if ($value === false || $value === 0) {
+ $dispatcher = $request->getEventDispatcher();
+ foreach ($dispatcher->getListeners('request.error') as $listener) {
+ if (is_array($listener) && $listener[0] == 'DeliciousBrains\\WP_Offload_S3\\Aws2\\Guzzle\\Http\\Message\\Request' && ($listener[1] = 'onRequestError')) {
+ $dispatcher->removeListener('request.error', $listener);
+ break;
+ }
+ }
+ }
+ }
+ protected function visit_save_to(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ $request->setResponseBody($value);
+ }
+ protected function visit_params(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if (!is_array($value)) {
+ throw new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Exception\InvalidArgumentException('params value must be an array');
+ }
+ $request->getParams()->overwriteWith($value);
+ }
+ protected function visit_timeout(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if (defined('CURLOPT_TIMEOUT_MS')) {
+ $request->getCurlOptions()->set(CURLOPT_TIMEOUT_MS, $value * 1000);
+ } else {
+ $request->getCurlOptions()->set(CURLOPT_TIMEOUT, $value);
+ }
+ }
+ protected function visit_connect_timeout(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if (defined('CURLOPT_CONNECTTIMEOUT_MS')) {
+ $request->getCurlOptions()->set(CURLOPT_CONNECTTIMEOUT_MS, $value * 1000);
+ } else {
+ $request->getCurlOptions()->set(CURLOPT_CONNECTTIMEOUT, $value);
+ }
+ }
+ protected function visit_debug(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if ($value) {
+ $request->getCurlOptions()->set(CURLOPT_VERBOSE, true);
+ }
+ }
+ protected function visit_verify(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ $curl = $request->getCurlOptions();
+ if ($value === true || is_string($value)) {
+ $curl[CURLOPT_SSL_VERIFYHOST] = 2;
+ $curl[CURLOPT_SSL_VERIFYPEER] = true;
+ if ($value !== true) {
+ $curl[CURLOPT_CAINFO] = $value;
+ }
+ } elseif ($value === false) {
+ unset($curl[CURLOPT_CAINFO]);
+ $curl[CURLOPT_SSL_VERIFYHOST] = 0;
+ $curl[CURLOPT_SSL_VERIFYPEER] = false;
+ }
+ }
+ protected function visit_proxy(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ $request->getCurlOptions()->set(CURLOPT_PROXY, $value, $flags);
+ }
+ protected function visit_cert(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if (is_array($value)) {
+ $request->getCurlOptions()->set(CURLOPT_SSLCERT, $value[0]);
+ $request->getCurlOptions()->set(CURLOPT_SSLCERTPASSWD, $value[1]);
+ } else {
+ $request->getCurlOptions()->set(CURLOPT_SSLCERT, $value);
+ }
+ }
+ protected function visit_ssl_key(\DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Message\RequestInterface $request, $value, $flags)
+ {
+ if (is_array($value)) {
+ $request->getCurlOptions()->set(CURLOPT_SSLKEY, $value[0]);
+ $request->getCurlOptions()->set(CURLOPT_SSLKEYPASSWD, $value[1]);
+ } else {
+ $request->getCurlOptions()->set(CURLOPT_SSLKEY, $value);
+ }
+ }
+}
diff --git a/vendor/Aws2/guzzle/guzzle/src/Guzzle/Http/Message/RequestFactoryInterface.php b/vendor/Aws2/guzzle/guzzle/src/Guzzle/Http/Message/RequestFactoryInterface.php
new file mode 100644
index 00000000..ece01cbc
--- /dev/null
+++ b/vendor/Aws2/guzzle/guzzle/src/Guzzle/Http/Message/RequestFactoryInterface.php
@@ -0,0 +1,93 @@
+ 'Continue', 101 => 'Switching Protocols', 102 => 'Processing', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 207 => 'Multi-Status', 208 => 'Already Reported', 226 => 'IM Used', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect', 308 => 'Permanent Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 422 => 'Unprocessable Entity', 423 => 'Locked', 424 => 'Failed Dependency', 425 => 'Reserved for WebDAV advanced collections expired proposal', 426 => 'Upgrade required', 428 => 'Precondition Required', 429 => 'Too Many Requests', 431 => 'Request Header Fields Too Large', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported', 506 => 'Variant Also Negotiates (Experimental)', 507 => 'Insufficient Storage', 508 => 'Loop Detected', 510 => 'Not Extended', 511 => 'Network Authentication Required');
+ /** @var EntityBodyInterface The response body */
+ protected $body;
+ /** @var string The reason phrase of the response (human readable code) */
+ protected $reasonPhrase;
+ /** @var string The status code of the response */
+ protected $statusCode;
+ /** @var array Information about the request */
+ protected $info = array();
+ /** @var string The effective URL that returned this response */
+ protected $effectiveUrl;
+ /** @var array Cacheable response codes (see RFC 2616:13.4) */
+ protected static $cacheResponseCodes = array(200, 203, 206, 300, 301, 410);
+ /**
+ * Create a new Response based on a raw response message
+ *
+ * @param string $message Response message
+ *
+ * @return self|bool Returns false on error
+ */
+ public static function fromMessage($message)
+ {
+ $data = \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Parser\ParserRegistry::getInstance()->getParser('message')->parseResponse($message);
+ if (!$data) {
+ return false;
+ }
+ $response = new static($data['code'], $data['headers'], $data['body']);
+ $response->setProtocol($data['protocol'], $data['version'])->setStatus($data['code'], $data['reason_phrase']);
+ // Set the appropriate Content-Length if the one set is inaccurate (e.g. setting to X)
+ $contentLength = (string) $response->getHeader('Content-Length');
+ $actualLength = strlen($data['body']);
+ if (strlen($data['body']) > 0 && $contentLength != $actualLength) {
+ $response->setHeader('Content-Length', $actualLength);
+ }
+ return $response;
+ }
+ /**
+ * Construct the response
+ *
+ * @param string $statusCode The response status code (e.g. 200, 404, etc)
+ * @param ToArrayInterface|array $headers The response headers
+ * @param string|resource|EntityBodyInterface $body The body of the response
+ *
+ * @throws BadResponseException if an invalid response code is given
+ */
+ public function __construct($statusCode, $headers = null, $body = null)
+ {
+ parent::__construct();
+ $this->setStatus($statusCode);
+ $this->body = \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\EntityBody::factory($body !== null ? $body : '');
+ if ($headers) {
+ if (is_array($headers)) {
+ $this->setHeaders($headers);
+ } elseif ($headers instanceof ToArrayInterface) {
+ $this->setHeaders($headers->toArray());
+ } else {
+ throw new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\Exception\BadResponseException('Invalid headers argument received');
+ }
+ }
+ }
+ /**
+ * @return string
+ */
+ public function __toString()
+ {
+ return $this->getMessage();
+ }
+ public function serialize()
+ {
+ return json_encode(array('status' => $this->statusCode, 'body' => (string) $this->body, 'headers' => $this->headers->toArray()));
+ }
+ public function unserialize($serialize)
+ {
+ $data = json_decode($serialize, true);
+ $this->__construct($data['status'], $data['headers'], $data['body']);
+ }
+ /**
+ * Get the response entity body
+ *
+ * @param bool $asString Set to TRUE to return a string of the body rather than a full body object
+ *
+ * @return EntityBodyInterface|string
+ */
+ public function getBody($asString = false)
+ {
+ return $asString ? (string) $this->body : $this->body;
+ }
+ /**
+ * Set the response entity body
+ *
+ * @param EntityBodyInterface|string $body Body to set
+ *
+ * @return self
+ */
+ public function setBody($body)
+ {
+ $this->body = \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Http\EntityBody::factory($body);
+ return $this;
+ }
+ /**
+ * Set the protocol and protocol version of the response
+ *
+ * @param string $protocol Response protocol
+ * @param string $version Protocol version
+ *
+ * @return self
+ */
+ public function setProtocol($protocol, $version)
+ {
+ $this->protocol = $protocol;
+ $this->protocolVersion = $version;
+ return $this;
+ }
+ /**
+ * Get the protocol used for the response (e.g. HTTP)
+ *
+ * @return string
+ */
+ public function getProtocol()
+ {
+ return $this->protocol;
+ }
+ /**
+ * Get the HTTP protocol version
+ *
+ * @return string
+ */
+ public function getProtocolVersion()
+ {
+ return $this->protocolVersion;
+ }
+ /**
+ * Get a cURL transfer information
+ *
+ * @param string $key A single statistic to check
+ *
+ * @return array|string|null Returns all stats if no key is set, a single stat if a key is set, or null if a key
+ * is set and not found
+ * @link http://www.php.net/manual/en/function.curl-getinfo.php
+ */
+ public function getInfo($key = null)
+ {
+ if ($key === null) {
+ return $this->info;
+ } elseif (array_key_exists($key, $this->info)) {
+ return $this->info[$key];
+ } else {
+ return null;
+ }
+ }
+ /**
+ * Set the transfer information
+ *
+ * @param array $info Array of cURL transfer stats
+ *
+ * @return self
+ */
+ public function setInfo(array $info)
+ {
+ $this->info = $info;
+ return $this;
+ }
+ /**
+ * Set the response status
+ *
+ * @param int $statusCode Response status code to set
+ * @param string $reasonPhrase Response reason phrase
+ *
+ * @return self
+ * @throws BadResponseException when an invalid response code is received
+ */
+ public function setStatus($statusCode, $reasonPhrase = '')
+ {
+ $this->statusCode = (int) $statusCode;
+ if (!$reasonPhrase && isset(self::$statusTexts[$this->statusCode])) {
+ $this->reasonPhrase = self::$statusTexts[$this->statusCode];
+ } else {
+ $this->reasonPhrase = $reasonPhrase;
+ }
+ return $this;
+ }
+ /**
+ * Get the response status code
+ *
+ * @return integer
+ */
+ public function getStatusCode()
+ {
+ return $this->statusCode;
+ }
+ /**
+ * Get the entire response as a string
+ *
+ * @return string
+ */
+ public function getMessage()
+ {
+ $message = $this->getRawHeaders();
+ // Only include the body in the message if the size is < 2MB
+ $size = $this->body->getSize();
+ if ($size < 2097152) {
+ $message .= (string) $this->body;
+ }
+ return $message;
+ }
+ /**
+ * Get the the raw message headers as a string
+ *
+ * @return string
+ */
+ public function getRawHeaders()
+ {
+ $headers = 'HTTP/1.1 ' . $this->statusCode . ' ' . $this->reasonPhrase . "\r\n";
+ $lines = $this->getHeaderLines();
+ if (!empty($lines)) {
+ $headers .= implode("\r\n", $lines) . "\r\n";
+ }
+ return $headers . "\r\n";
+ }
+ /**
+ * Get the response reason phrase- a human readable version of the numeric
+ * status code
+ *
+ * @return string
+ */
+ public function getReasonPhrase()
+ {
+ return $this->reasonPhrase;
+ }
+ /**
+ * Get the Accept-Ranges HTTP header
+ *
+ * @return string Returns what partial content range types this server supports.
+ */
+ public function getAcceptRanges()
+ {
+ return (string) $this->getHeader('Accept-Ranges');
+ }
+ /**
+ * Calculate the age of the response
+ *
+ * @return integer
+ */
+ public function calculateAge()
+ {
+ $age = $this->getHeader('Age');
+ if ($age === null && $this->getDate()) {
+ $age = time() - strtotime($this->getDate());
+ }
+ return $age === null ? null : (int) (string) $age;
+ }
+ /**
+ * Get the Age HTTP header
+ *
+ * @return integer|null Returns the age the object has been in a proxy cache in seconds.
+ */
+ public function getAge()
+ {
+ return (string) $this->getHeader('Age');
+ }
+ /**
+ * Get the Allow HTTP header
+ *
+ * @return string|null Returns valid actions for a specified resource. To be used for a 405 Method not allowed.
+ */
+ public function getAllow()
+ {
+ return (string) $this->getHeader('Allow');
+ }
+ /**
+ * Check if an HTTP method is allowed by checking the Allow response header
+ *
+ * @param string $method Method to check
+ *
+ * @return bool
+ */
+ public function isMethodAllowed($method)
+ {
+ $allow = $this->getHeader('Allow');
+ if ($allow) {
+ foreach (explode(',', $allow) as $allowable) {
+ if (!strcasecmp(trim($allowable), $method)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ /**
+ * Get the Cache-Control HTTP header
+ *
+ * @return string
+ */
+ public function getCacheControl()
+ {
+ return (string) $this->getHeader('Cache-Control');
+ }
+ /**
+ * Get the Connection HTTP header
+ *
+ * @return string
+ */
+ public function getConnection()
+ {
+ return (string) $this->getHeader('Connection');
+ }
+ /**
+ * Get the Content-Encoding HTTP header
+ *
+ * @return string|null
+ */
+ public function getContentEncoding()
+ {
+ return (string) $this->getHeader('Content-Encoding');
+ }
+ /**
+ * Get the Content-Language HTTP header
+ *
+ * @return string|null Returns the language the content is in.
+ */
+ public function getContentLanguage()
+ {
+ return (string) $this->getHeader('Content-Language');
+ }
+ /**
+ * Get the Content-Length HTTP header
+ *
+ * @return integer Returns the length of the response body in bytes
+ */
+ public function getContentLength()
+ {
+ return (int) (string) $this->getHeader('Content-Length');
+ }
+ /**
+ * Get the Content-Location HTTP header
+ *
+ * @return string|null Returns an alternate location for the returned data (e.g /index.htm)
+ */
+ public function getContentLocation()
+ {
+ return (string) $this->getHeader('Content-Location');
+ }
+ /**
+ * Get the Content-Disposition HTTP header
+ *
+ * @return string|null Returns the Content-Disposition header
+ */
+ public function getContentDisposition()
+ {
+ return (string) $this->getHeader('Content-Disposition');
+ }
+ /**
+ * Get the Content-MD5 HTTP header
+ *
+ * @return string|null Returns a Base64-encoded binary MD5 sum of the content of the response.
+ */
+ public function getContentMd5()
+ {
+ return (string) $this->getHeader('Content-MD5');
+ }
+ /**
+ * Get the Content-Range HTTP header
+ *
+ * @return string Returns where in a full body message this partial message belongs (e.g. bytes 21010-47021/47022).
+ */
+ public function getContentRange()
+ {
+ return (string) $this->getHeader('Content-Range');
+ }
+ /**
+ * Get the Content-Type HTTP header
+ *
+ * @return string Returns the mime type of this content.
+ */
+ public function getContentType()
+ {
+ return (string) $this->getHeader('Content-Type');
+ }
+ /**
+ * Checks if the Content-Type is of a certain type. This is useful if the
+ * Content-Type header contains charset information and you need to know if
+ * the Content-Type matches a particular type.
+ *
+ * @param string $type Content type to check against
+ *
+ * @return bool
+ */
+ public function isContentType($type)
+ {
+ return stripos($this->getHeader('Content-Type'), $type) !== false;
+ }
+ /**
+ * Get the Date HTTP header
+ *
+ * @return string|null Returns the date and time that the message was sent.
+ */
+ public function getDate()
+ {
+ return (string) $this->getHeader('Date');
+ }
+ /**
+ * Get the ETag HTTP header
+ *
+ * @return string|null Returns an identifier for a specific version of a resource, often a Message digest.
+ */
+ public function getEtag()
+ {
+ return (string) $this->getHeader('ETag');
+ }
+ /**
+ * Get the Expires HTTP header
+ *
+ * @return string|null Returns the date/time after which the response is considered stale.
+ */
+ public function getExpires()
+ {
+ return (string) $this->getHeader('Expires');
+ }
+ /**
+ * Get the Last-Modified HTTP header
+ *
+ * @return string|null Returns the last modified date for the requested object, in RFC 2822 format
+ * (e.g. Tue, 15 Nov 1994 12:45:26 GMT)
+ */
+ public function getLastModified()
+ {
+ return (string) $this->getHeader('Last-Modified');
+ }
+ /**
+ * Get the Location HTTP header
+ *
+ * @return string|null Used in redirection, or when a new resource has been created.
+ */
+ public function getLocation()
+ {
+ return (string) $this->getHeader('Location');
+ }
+ /**
+ * Get the Pragma HTTP header
+ *
+ * @return Header|null Returns the implementation-specific headers that may have various effects anywhere along
+ * the request-response chain.
+ */
+ public function getPragma()
+ {
+ return (string) $this->getHeader('Pragma');
+ }
+ /**
+ * Get the Proxy-Authenticate HTTP header
+ *
+ * @return string|null Authentication to access the proxy (e.g. Basic)
+ */
+ public function getProxyAuthenticate()
+ {
+ return (string) $this->getHeader('Proxy-Authenticate');
+ }
+ /**
+ * Get the Retry-After HTTP header
+ *
+ * @return int|null If an entity is temporarily unavailable, this instructs the client to try again after a
+ * specified period of time.
+ */
+ public function getRetryAfter()
+ {
+ return (string) $this->getHeader('Retry-After');
+ }
+ /**
+ * Get the Server HTTP header
+ *
+ * @return string|null A name for the server
+ */
+ public function getServer()
+ {
+ return (string) $this->getHeader('Server');
+ }
+ /**
+ * Get the Set-Cookie HTTP header
+ *
+ * @return string|null An HTTP cookie.
+ */
+ public function getSetCookie()
+ {
+ return (string) $this->getHeader('Set-Cookie');
+ }
+ /**
+ * Get the Trailer HTTP header
+ *
+ * @return string|null The Trailer general field value indicates that the given set of header fields is present in
+ * the trailer of a message encoded with chunked transfer-coding.
+ */
+ public function getTrailer()
+ {
+ return (string) $this->getHeader('Trailer');
+ }
+ /**
+ * Get the Transfer-Encoding HTTP header
+ *
+ * @return string|null The form of encoding used to safely transfer the entity to the user
+ */
+ public function getTransferEncoding()
+ {
+ return (string) $this->getHeader('Transfer-Encoding');
+ }
+ /**
+ * Get the Vary HTTP header
+ *
+ * @return string|null Tells downstream proxies how to match future request headers to decide whether the cached
+ * response can be used rather than requesting a fresh one from the origin server.
+ */
+ public function getVary()
+ {
+ return (string) $this->getHeader('Vary');
+ }
+ /**
+ * Get the Via HTTP header
+ *
+ * @return string|null Informs the client of proxies through which the response was sent.
+ */
+ public function getVia()
+ {
+ return (string) $this->getHeader('Via');
+ }
+ /**
+ * Get the Warning HTTP header
+ *
+ * @return string|null A general warning about possible problems with the entity body
+ */
+ public function getWarning()
+ {
+ return (string) $this->getHeader('Warning');
+ }
+ /**
+ * Get the WWW-Authenticate HTTP header
+ *
+ * @return string|null Indicates the authentication scheme that should be used to access the requested entity
+ */
+ public function getWwwAuthenticate()
+ {
+ return (string) $this->getHeader('WWW-Authenticate');
+ }
+ /**
+ * Checks if HTTP Status code is a Client Error (4xx)
+ *
+ * @return bool
+ */
+ public function isClientError()
+ {
+ return $this->statusCode >= 400 && $this->statusCode < 500;
+ }
+ /**
+ * Checks if HTTP Status code is Server OR Client Error (4xx or 5xx)
+ *
+ * @return boolean
+ */
+ public function isError()
+ {
+ return $this->isClientError() || $this->isServerError();
+ }
+ /**
+ * Checks if HTTP Status code is Information (1xx)
+ *
+ * @return bool
+ */
+ public function isInformational()
+ {
+ return $this->statusCode < 200;
+ }
+ /**
+ * Checks if HTTP Status code is a Redirect (3xx)
+ *
+ * @return bool
+ */
+ public function isRedirect()
+ {
+ return $this->statusCode >= 300 && $this->statusCode < 400;
+ }
+ /**
+ * Checks if HTTP Status code is Server Error (5xx)
+ *
+ * @return bool
+ */
+ public function isServerError()
+ {
+ return $this->statusCode >= 500 && $this->statusCode < 600;
+ }
+ /**
+ * Checks if HTTP Status code is Successful (2xx | 304)
+ *
+ * @return bool
+ */
+ public function isSuccessful()
+ {
+ return $this->statusCode >= 200 && $this->statusCode < 300 || $this->statusCode == 304;
+ }
+ /**
+ * Check if the response can be cached based on the response headers
+ *
+ * @return bool Returns TRUE if the response can be cached or false if not
+ */
+ public function canCache()
+ {
+ // Check if the response is cacheable based on the code
+ if (!in_array((int) $this->getStatusCode(), self::$cacheResponseCodes)) {
+ return false;
+ }
+ // Make sure a valid body was returned and can be cached
+ if ((!$this->getBody()->isReadable() || !$this->getBody()->isSeekable()) && ($this->getContentLength() > 0 || $this->getTransferEncoding() == 'chunked')) {
+ return false;
+ }
+ // Never cache no-store resources (this is a private cache, so private
+ // can be cached)
+ if ($this->getHeader('Cache-Control') && $this->getHeader('Cache-Control')->hasDirective('no-store')) {
+ return false;
+ }
+ return $this->isFresh() || $this->getFreshness() === null || $this->canValidate();
+ }
+ /**
+ * Gets the number of seconds from the current time in which this response is still considered fresh
+ *
+ * @return int|null Returns the number of seconds
+ */
+ public function getMaxAge()
+ {
+ if ($header = $this->getHeader('Cache-Control')) {
+ // s-max-age, then max-age, then Expires
+ if ($age = $header->getDirective('s-maxage')) {
+ return $age;
+ }
+ if ($age = $header->getDirective('max-age')) {
+ return $age;
+ }
+ }
+ if ($this->getHeader('Expires')) {
+ return strtotime($this->getExpires()) - time();
+ }
+ return null;
+ }
+ /**
+ * Check if the response is considered fresh.
+ *
+ * A response is considered fresh when its age is less than or equal to the freshness lifetime (maximum age) of the
+ * response.
+ *
+ * @return bool|null
+ */
+ public function isFresh()
+ {
+ $fresh = $this->getFreshness();
+ return $fresh === null ? null : $fresh >= 0;
+ }
+ /**
+ * Check if the response can be validated against the origin server using a conditional GET request.
+ *
+ * @return bool
+ */
+ public function canValidate()
+ {
+ return $this->getEtag() || $this->getLastModified();
+ }
+ /**
+ * Get the freshness of the response by returning the difference of the maximum lifetime of the response and the
+ * age of the response (max-age - age).
+ *
+ * Freshness values less than 0 mean that the response is no longer fresh and is ABS(freshness) seconds expired.
+ * Freshness values of greater than zero is the number of seconds until the response is no longer fresh. A NULL
+ * result means that no freshness information is available.
+ *
+ * @return int
+ */
+ public function getFreshness()
+ {
+ $maxAge = $this->getMaxAge();
+ $age = $this->calculateAge();
+ return $maxAge && $age ? $maxAge - $age : null;
+ }
+ /**
+ * Parse the JSON response body and return an array
+ *
+ * @return array|string|int|bool|float
+ * @throws RuntimeException if the response body is not in JSON format
+ */
+ public function json()
+ {
+ $data = json_decode((string) $this->body, true);
+ if (JSON_ERROR_NONE !== json_last_error()) {
+ throw new \DeliciousBrains\WP_Offload_S3\Aws2\Guzzle\Common\Exception\RuntimeException('Unable to parse response body into JSON: ' . json_last_error());
+ }
+ return $data === null ? array() : $data;
+ }
+ /**
+ * Parse the XML response body and return a \SimpleXMLElement.
+ *
+ * In order to prevent XXE attacks, this method disables loading external
+ * entities. If you rely on external entities, then you must parse the
+ * XML response manually by accessing the response body directly.
+ *
+ * @return \SimpleXMLElement
+ * @throws RuntimeException if the response body is not in XML format
+ * @link http://websec.io/2012/08/27/Preventing-XXE-in-PHP.html
+ */
+ public function xml()
+ {
+ $errorMessage = null;
+ $internalErrors = libxml_use_internal_errors(true);
+ $disableEntities = libxml_disable_entity_loader(true);
+ libxml_clear_errors();
+ try {
+ $xml = new \SimpleXMLElement((string) $this->body ?: '
+
diff --git a/view/footer.php b/view/footer.php
new file mode 100644
index 00000000..7f5eaa32
--- /dev/null
+++ b/view/footer.php
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/view/header.php b/view/header.php
new file mode 100644
index 00000000..16e8ba76
--- /dev/null
+++ b/view/header.php
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/view/settings-tabs.php b/view/settings-tabs.php
index eb39b9aa..7b6d4a5d 100644
--- a/view/settings-tabs.php
+++ b/view/settings-tabs.php
@@ -1,8 +1,10 @@
- get_settings_tabs() as $tab => $label ) : ?> - - - - -
\ No newline at end of file + + diff --git a/view/settings.php b/view/settings.php index 4d7f25b0..94ef57b8 100644 --- a/view/settings.php +++ b/view/settings.php @@ -1,217 +1,12 @@ get_plugin_prefix_slug(); +/* @var \Amazon_S3_And_CloudFront|\Amazon_S3_And_CloudFront_Pro $this */ ?> -
-
-get_setting( 'bucket' );
-$selected_bucket_prefix = $this->get_object_prefix(); ?>
-- -
-
-
-
- render_bucket_permission_errors(); ?>
-
-
-
-get_settings_tabs();
-if ( ! empty( $tabs['support'] ) ) {
- $this->render_view( 'support' );
-}
-?>
+render_view( 'settings/media' ) ?>
+render_view( 'settings/addons' ) ?>
+render_view( 'settings/settings' ) ?>
+render_view( 'settings/support' ) ?>
-is_pro() ) {
- $this->render_view( 'sidebar' );
-}
-?>
+render_view( 'sidebar' ); ?>
diff --git a/view/settings/addons.php b/view/settings/addons.php
new file mode 100644
index 00000000..4cf870e9
--- /dev/null
+++ b/view/settings/addons.php
@@ -0,0 +1,21 @@
+
+
-
-
-
- render_view( 'bucket-select', array( 'prefix' => $prefix, 'selected_bucket' => $selected_bucket ) ); ?>
-
+
+ is_pro() ) : ?>
+
diff --git a/view/settings/media.php b/view/settings/media.php
new file mode 100644
index 00000000..89f6531d
--- /dev/null
+++ b/view/settings/media.php
@@ -0,0 +1,204 @@
+get_plugin_prefix_slug();
+$selected_bucket = $this->get_setting( 'bucket' );
+$selected_bucket_prefix = $this->get_object_prefix();
+?>
+
+
+
+
+
+ Get Addons — The following addons are available with a WP Offload S3 Gold license or better.
Visit deliciousbrains.com to purchase in just a few clicks.', 'amazon-s3-and-cloudfront' ),
+ esc_url( $this->get_my_account_url() )
+ );
+ ?>
+
+ render_addons(); ?>
+
+
+
+ get_aws()->needs_access_keys() ) : ?>
+
+
diff --git a/view/settings/settings.php b/view/settings/settings.php
new file mode 100644
index 00000000..756d422f
--- /dev/null
+++ b/view/settings/settings.php
@@ -0,0 +1,136 @@
+get_aws();
+$key_constant = $aws->access_key_id_constant();
+$secret_constant = $aws->secret_access_key_constant();
+$any_constant_defined = (bool) $key_constant || $secret_constant;
+$hide_form_initially = false;
+$database_warning_url = $aws->dbrains_url( '/wp-offload-s3/doc/quick-start-guide/#save-access-keys', array(
+ 'utm_campaign' => 'support+docs',
+) );
+?>
+
+
+ Define your AWS keys to configure WP Offload S3', 'amazon-s3-and-cloudfront' ), '#settings' ) ?>
+
+
+
+
+
+
+
+ render_bucket_permission_errors() ?>
+
+
+
+
+
+ render_view( 'bucket-select', array( 'prefix' => $prefix, 'selected_bucket' => $selected_bucket ) ); ?>
+
+
+
+
+
diff --git a/view/support.php b/view/settings/support.php
similarity index 79%
rename from view/support.php
rename to view/settings/support.php
index 29cf0cd0..a1be2b94 100644
--- a/view/support.php
+++ b/view/settings/support.php
@@ -1,4 +1,4 @@
-
+
+
+
+
+  ) ?>)
+
+
+ use_ec2_iam_roles() ) : ?>
+
+
+ needs_access_keys() ) : ?>
+
+
+
+
+ use_ec2_iam_roles() ) : ?>
+ + +
+ + + are_access_keys_set() ) : ?> +
+
+
+
+ + +
++ not recommended), simply remove the lines from your wp-config.', 'amazon-s3-and-cloudfront' ), $database_warning_url ) ?> +
+ + + ++ +
+ + + + get_access_key_id() || $aws->get_secret_access_key() ) : ?> ++ not recommended).', 'amazon-s3-and-cloudfront' ), $database_warning_url ) ?> +
+ ++ click here to reveal a form.', 'amazon-s3-and-cloudfront' ) ?> +
+ + + + + ++ + Check out the Quick Start Guide →', 'amazon-s3-and-cloudfront' ), $aws->dbrains_url( '/wp-offload-s3/doc/quick-start-guide/', array( + 'utm_campaign' => 'support+docs', + ) ) ) ?> +
+ + + +
+
is_pro() ) {
$this->render_view( 'wordpress-org-support' );
diff --git a/wordpress-s3.php b/wordpress-s3.php
index 610ee949..63965d21 100644
--- a/wordpress-s3.php
+++ b/wordpress-s3.php
@@ -4,7 +4,7 @@
Plugin URI: http://wordpress.org/extend/plugins/amazon-s3-and-cloudfront/
Description: Automatically copies media uploads to Amazon S3 for storage and delivery. Optionally configure Amazon CloudFront for even faster delivery.
Author: Delicious Brains
-Version: 1.2.1
+Version: 1.3
Author URI: https://deliciousbrains.com/
Network: True
Text Domain: amazon-s3-and-cloudfront
@@ -26,29 +26,27 @@
// Then completely rewritten.
*/
-$GLOBALS['aws_meta']['amazon-s3-and-cloudfront']['version'] = '1.2.1';
+$GLOBALS['aws_meta']['amazon-s3-and-cloudfront']['version'] = '1.3';
-$aws_plugin_version_required = '1.0.4';
+require_once dirname( __FILE__ ) . '/classes/as3cf-compatibility-check.php';
-require_once dirname( __FILE__ ) . '/classes/wp-aws-compatibility-check.php';
-require_once dirname( __FILE__ ) . '/classes/as3cf-utils.php';
-
-add_action( 'activated_plugin', array( 'AS3CF_Utils', 'deactivate_other_instances' ) );
+add_action( 'activated_plugin', array( 'AS3CF_Compatibility_Check', 'deactivate_other_instances' ) );
global $as3cf_compat_check;
-$as3cf_compat_check = new WP_AWS_Compatibility_Check(
+$as3cf_compat_check = new AS3CF_Compatibility_Check(
'WP Offload S3 Lite',
'amazon-s3-and-cloudfront',
- __FILE__,
- 'Amazon Web Services',
- 'amazon-web-services',
- $aws_plugin_version_required
+ __FILE__
);
-function as3cf_init( $aws ) {
+function as3cf_init() {
+ if ( class_exists( 'Amazon_S3_And_CloudFront' ) ) {
+ return;
+ }
+
global $as3cf_compat_check;
- if ( method_exists( 'WP_AWS_Compatibility_Check', 'is_plugin_active' ) && $as3cf_compat_check->is_plugin_active( 'amazon-s3-and-cloudfront-pro/amazon-s3-and-cloudfront-pro.php' ) ) {
+ if ( method_exists( 'AS3CF_Compatibility_Check', 'is_plugin_active' ) && $as3cf_compat_check->is_plugin_active( 'amazon-s3-and-cloudfront-pro/amazon-s3-and-cloudfront-pro.php' ) ) {
// Don't load if pro plugin installed
return;
}
@@ -59,21 +57,31 @@ function as3cf_init( $aws ) {
global $as3cf;
$abspath = dirname( __FILE__ );
+
+ // Autoloaders
+ require_once $abspath . '/vendor/Aws2/vendor/autoload.php';
+ require_once $abspath . '/wp-offload-s3-autoloader.php';
+
require_once $abspath . '/include/functions.php';
+ require_once $abspath . '/classes/as3cf-utils.php';
require_once $abspath . '/classes/as3cf-error.php';
require_once $abspath . '/classes/as3cf-filter.php';
require_once $abspath . '/classes/filters/as3cf-local-to-s3.php';
require_once $abspath . '/classes/filters/as3cf-s3-to-local.php';
require_once $abspath . '/classes/as3cf-notices.php';
require_once $abspath . '/classes/as3cf-stream-wrapper.php';
+ require_once $abspath . '/classes/as3cf-plugin-base.php';
require_once $abspath . '/classes/as3cf-plugin-compatibility.php';
require_once $abspath . '/classes/amazon-s3-and-cloudfront.php';
- // Autoloader
- require_once $abspath . '/wp-offload-s3-autoloader.php';
new WP_Offload_S3_Autoloader( 'WP_Offload_S3', $abspath );
- $as3cf = new Amazon_S3_And_CloudFront( __FILE__, $aws );
+ $as3cf = new Amazon_S3_And_CloudFront( __FILE__ );
+
+ do_action( 'as3cf_init', $as3cf );
}
-add_action( 'aws_init', 'as3cf_init' );
+add_action( 'init', 'as3cf_init' );
+
+// If AWS still active need to be around to satisfy addon version checks until upgraded.
+add_action( 'aws_init', 'as3cf_init', 11 );