Merge pull request #637 from udx/latest

Updated requirments

Author: planv

changelog.txt

@@ -1,3 +1,8 @@
+== Changelog ==
+= 3.2.1 =
+* FIX - Updated requirments.
+* FIX - WP-Stateless 3.2.0 doesn’t upload docs, only images [#638](https://github.com/udx/wp-stateless/issues/638).
+
 == Changelog ==
 = 3.2.0 =
 * ENHANCEMENT - Upgraded `wpmetabox` library.

changes.md

@@ -1,3 +1,8 @@
+#### 3.2.1
+
+- FIX - Updated requirments.
+- FIX - WP-Stateless 3.2.0 doesn’t upload docs, only images [#638](https://github.com/udx/wp-stateless/issues/638).
+
 #### 3.2.0
 
 - ENHANCEMENT - Upgraded `wpmetabox` library.

lib/classes/class-bootstrap.php

@@ -315,12 +315,13 @@ private function _init_filters($type = '') {
 
             /**
              * Delete original in the end of generating metadata
+             * it does not work with PDF
              */
-            add_filter('wp_generate_attachment_metadata', function ($metadata, $attachment_id, $state) {
-              if (!in_array(ud_get_stateless_media()->get('sm.mode'), array('ephemeral'))) return $metadata;
-              @unlink(get_attached_file($attachment_id, true));
-              return $metadata;
-            }, 99, 3);
+            // add_filter('wp_generate_attachment_metadata', function ($metadata, $attachment_id, $state) {
+            //   if (!in_array(ud_get_stateless_media()->get('sm.mode'), array('ephemeral'))) return $metadata;
+            //   @unlink(get_attached_file($attachment_id, true));
+            //   return $metadata;
+            // }, 99, 3);
 
             /**
              * Rewrite Image URLS

lib/classes/class-utility.php

@@ -210,7 +210,7 @@ public static function add_media($metadata, $attachment_id, $force = false, $arg
 
           $image_host          = ud_get_stateless_media()->get_gs_host();
           $bucketLink          = apply_filters('wp_stateless_bucket_link', $image_host);
-          $fullsizepath        = wp_normalize_path(wp_get_original_image_path($attachment_id));
+          $fullsizepath        = wp_normalize_path(get_attached_file($attachment_id));
           $_cacheControl       = self::getCacheControl($attachment_id, $metadata, null);
           $_contentDisposition = self::getContentDisposition($attachment_id, $metadata, null);
 
@@ -443,7 +443,7 @@ public static function get_path_and_url($metadata, $attachment_id) {
         }
 
         $gs_name_path = array();
-        $full_size_path = wp_get_original_image_path($attachment_id);
+        $full_size_path = get_attached_file($attachment_id);
         $base_dir = dirname($full_size_path);
 
         $gs_name = apply_filters('wp_stateless_file_name', $full_size_path, true, $attachment_id, '');
@@ -969,7 +969,7 @@ public static function process_image_by_id($id) {
         if (!$image || 'attachment' != $image->post_type || 'image/' != substr($image->post_mime_type, 0, 6))
           throw new UnprocessableException(sprintf(__('Failed to process item: %s is an invalid image ID.', ud_get_stateless_media()->domain), $id));
 
-        $fullsizepath = wp_get_original_image_path($image->ID);
+        $fullsizepath = get_attached_file($image->ID);
 
         // If no file found
         if (false === $fullsizepath || !file_exists($fullsizepath)) {
@@ -1026,7 +1026,7 @@ public static function process_file_by_id($id) {
           throw new UnprocessableException(sprintf(__('Attachment not found: %s is an invalid file ID.', ud_get_stateless_media()->domain), $id));
         }
 
-        $fullsizepath = wp_get_original_image_path($file->ID);
+        $fullsizepath = get_attached_file($file->ID);
         $local_file_exists = file_exists($fullsizepath);
 
         if (false === $fullsizepath || !$local_file_exists) {

package.json

@@ -2,7 +2,7 @@
   "name": "wp-stateless",
   "title": "WP-Stateless",
   "description": "wpCloud Stateless Media for GCE",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "homepage": "https://udx.io",
   "author": {
     "name": "UDX",

readme.md

@@ -53,7 +53,7 @@ For a more detailed installation and setup walkthrough, please see the [manual s
 
 ### What are the minimum server requirements for this plugin?
 
-Beyond the [official WordPress minimum requirements](https://codex.wordpress.org/Template:Server_requirements), WP-Stateless requires a minimum PHP version of 5.6 or higher and OpenSSL to be enabled.
+Beyond the [official WordPress minimum requirements](https://codex.wordpress.org/Template:Server_requirements), WP-Stateless requires a minimum PHP version of 7.2 or higher and OpenSSL to be enabled.
 
 ### What wp-config constants are supported?
 

readme.txt

@@ -3,10 +3,10 @@ Contributors: usability_dynamics, andypotanin, ideric, maxim.peshkov, Anton Koro
 Donate link: https://udx.io
 Tags: google, google cloud, google cloud storage, cdn, uploads, media, stateless, backup
 License: GPLv2 or later
-Requires PHP: 5.6
+Requires PHP: 7.2
 Requires at least: 5.0
 Tested up to: 5.9.3
-Stable tag: 3.2.0
+Stable tag: 3.2.1
 
 Upload and serve your WordPress media files from Google Cloud Storage.
 
@@ -72,7 +72,7 @@ For a more detailed installation and setup walkthrough, please see the [manual s
 
 = What are the minimum server requirements for this plugin? =
 
-Beyond the [official WordPress minimum requirements](https://codex.wordpress.org/Template:Server_requirements), WP-Stateless requires a minimum PHP version of 5.6 or higher and OpenSSL to be enabled.
+Beyond the [official WordPress minimum requirements](https://codex.wordpress.org/Template:Server_requirements), WP-Stateless requires a minimum PHP version of 7.2 or higher and OpenSSL to be enabled.
 
 = What wp-config constants are supported? =
 
@@ -103,11 +103,19 @@ To ensure new releases cause as little disruption as possible, we rely on a numb
 
 == Upgrade Notice ==
 
+= 3.2.0 =
+Before upgrading to WP-Stateless 3.2.0, please, make sure you use PHP 7.2 or above.
+
 = 3.0 =
 Before upgrading to WP-Stateless 3.0, please, make sure you tested it on your development environment.
 
 == Changelog ==
+= 3.2.1 =
+* FIX - Updated requirments.
+* FIX - WP-Stateless 3.2.0 doesn’t upload docs, only images [#638](https://github.com/udx/wp-stateless/issues/638).
+
 = 3.2.0 =
+* **Before upgrading to WP-Stateless 3.2.0, please, make sure you tested it on your development environment. It may have breaking changes.**
 * ENHANCEMENT - Upgraded `wpmetabox` library.
 * ENHANCEMENT - Updated Client library for Google APIs.
 * ENHANCEMENT - Updated Guzzle library to version 7.

static/views/settings_interface.php

@@ -10,7 +10,6 @@
       <a href="#stless_sync_tab" class="stless_setting_tab nav-tab"><?php _e('Sync', ud_get_stateless_media()->domain); ?></a>
     <?php endif; ?>
     <a href="#stless_compatibility_tab" class="stless_setting_tab nav-tab"><?php _e('Compatibility', ud_get_stateless_media()->domain); ?></a>
-    <a href="#stless_questions_tab" class="stless_setting_tab nav-tab"><?php _e('Support', ud_get_stateless_media()->domain); ?></a>
   </h2>
 
   <div class="stless_settings">
@@ -243,7 +242,7 @@
     <div id="stless_compatibility_tab" class="stless_settings_content" ng-controller="wpStatelessCompatibility">
       <div class="container-fluid">
         <h2><?php _e("Enable or disable compatibility with other plugins."); ?></h2>
-        <p><?php _e(sprintf("Having an issue with another plugin? <a class='stless_setting_tab' href='%s'>Submit feedback</a> and let us know your issue!", "#stless_questions_tab")); ?></p>
+        <p><?php _e(sprintf("Having an issue with another plugin? <a class='' target='_blank' href='%s' >Submit feedback</a> and let us know your issue!", "https://wordpress.org/support/plugin/wp-stateless/")); ?></p>
         <form method="post" action="">
           <input type="hidden" name="action" value="stateless_modules">
           <?php wp_nonce_field('wp-stateless-modules', '_smnonce'); ?>
@@ -277,19 +276,6 @@
         </form>
       </div>
     </div>
-    <div id="stless_questions_tab" class="stless_settings_content">
-      <!--[if lte IE 8]>
-            <script charset="utf-8" type="text/javascript" src="//js.hsforms.net/forms/v2-legacy.js"></script>
-            <![endif]-->
-      <script charset="utf-8" type="text/javascript" src="//js.hsforms.net/forms/v2.js"></script>
-      <script>
-        hbspt.forms.create({
-          portalId: '3453418',
-          formId: 'cad1f6e1-7825-4e6d-a3e7-278c91abce7e',
-          submitButtonClass: 'button button-primary',
-        });
-      </script>
-    </div>
   </div>
 
 </div>

wp-stateless-media.php

@@ -4,7 +4,7 @@
  * Plugin URI: https://udx.io
  * Description: Upload and serve your WordPress media files from Google Cloud Storage.
  * Author: UDX
- * Version: 3.2.0
+ * Version: 3.2.1
  * Text Domain: stateless-media
  * Author URI: https://www.udx.io
  *