Changeset 2765832

Timestamp:

08/03/2022 01:54:06 PM (4 years ago)

Author:

shorthandconnect

Message:

Created tag 1.3.17

Location:

shorthand-connect

Files:

• tags/1.3.17 (copied) (copied from shorthand-connect/trunk)
• tags/1.3.17/README.txt (copied) (copied from shorthand-connect/trunk/README.txt) (2 diffs)
• tags/1.3.17/includes/api-v2.php (copied) (copied from shorthand-connect/trunk/includes/api-v2.php) (4 diffs)
• tags/1.3.17/includes/shorthand_options.php (copied) (copied from shorthand-connect/trunk/includes/shorthand_options.php)
• tags/1.3.17/shorthand_connect.php (copied) (copied from shorthand-connect/trunk/shorthand_connect.php) (3 diffs)
• trunk/README.txt (modified) (2 diffs)
• trunk/includes/api-v2.php (modified) (4 diffs)
• trunk/shorthand_connect.php (modified) (3 diffs)

shorthand-connect/tags/1.3.17/README.txt

@@ -1 +1 @@
 === Shorthand Connect ===
 Contributors: shorthandconnect
-Donate link:
+Donate link: 
 Tags: shorthand, api
 Requires at least: 4.0
-Tested up to: 6.0.0
-Stable tag: 1.3.16
+Tested up to: 6.0.1
+Stable tag: 1.3.17
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -59 +59 @@
 
 == Changelog ==
+
+= 1.3.17 =
+* Added alternate method of story ZIP extraction for WP VIP-hosted customers.
 
 = 1.3.16 =

shorthand-connect/tags/1.3.17/includes/api-v2.php

@@ -6 +6 @@
     global $serverv2URL;
     $token = get_option('sh_v2_token');
-    
     if (!$token) {
         return false;
@@ -16 +15 @@
             'headers' => array(
                 'Authorization' => 'Token '.$token,
-                'user-agent'  =>  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8) AppleWebKit/535.6.2 (KHTML, like Gecko) Version/5.2 Safari/535.6.2',
-            )
+                'user-agent'  =>  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8) AppleWebKit/535.6.2 (KHTML, like Gecko) Version/5.2 Safari/535.6.2'
+            ),
+            'http_api_args' => $options
         ),
         $options
     );
-    if(function_exists("vip_safe_wp_remote_get")){
-        return vip_safe_wp_remote_get($url, $request_options);
+    if(function_exists("vip_safe_wp_remote_get") && !isset($options['timeout'])){
+        return vip_safe_wp_remote_get($url,false,1,3,10, $request_options);
     }else{
         return wp_remote_get($url, $request_options);
@@ -122 +122 @@
 
     //Attempt to connect to the server
-    $zipfile = wp_tempnam($tmpdir, 'sh_zip');
-    $unzipdir = wp_tempnam($tmpdir, 'sh_unzip').'_dir';
+    $zipfile = wp_tempnam('sh_zip',$tmpdir);
+    $unzipdir = wp_tempnam('sh_unzip',$tmpdir).'_dir';
     $response = sh_v2_api_get('/v2/stories/'.$story_id, array(
         'timeout' => '600',
@@ -140 +140 @@
         );
     } else {
-        $unzipfile = unzip_file( $zipfile, $unzipdir);
-        if ( $unzipfile == 1 ) {
-            wp_mkdir_p($destination_path.'/'.$story_id);
-            $err = copy_dir($unzipdir, $destination_path.'/'.$story_id);
-            if (is_wp_error($err)) {
+        if(function_exists("vip_safe_wp_remote_get")){
+            //WP VIP HOSTING
+            $zip = new ZipArchive;
+            if ( $zip->open($zipfile) == true ) {
+                wp_mkdir_p($destination_path.'/'.$story_id);
+                $zip->extractTo($destination_path.'/'.$story_id);
+                $zip->close();
+                if (is_wp_error($zip)) {
+                    $story['error'] = array(
+                        'pretty' => 'Could not copy story into Wordpress',
+                        'error' => $err->get_error_message(),
+                        'unzip error'=> $unzipfile
+                    );
+                    if(function_exists("wp_filesize")){
+                        $story['error']['downloaded zip size'] = wp_filesize($zipfile);
+                    }
+                } else {
+                    $story['path'] = $destination_path.'/'.$story_id;
+                }
+            } else {
                 $story['error'] = array(
-                    'pretty' => 'Could not copy story into Wordpress',
-                    'error' => $err->get_error_message()
+                    'pretty' => 'Could not unzip file'
                 );
+            }
+        }else{
+            //Standard WP
+            $unzipfile = unzip_file( $zipfile, $unzipdir);
+            if ( $unzipfile == 1 ) {
+                wp_mkdir_p($destination_path.'/'.$story_id);
+                $err = copy_dir($unzipdir, $destination_path.'/'.$story_id);
+                if (is_wp_error($err)) {
+                    $story['error'] = array(
+                        'pretty' => 'Could not copy story into Wordpress',
+                        'error' => $err->get_error_message(),
+                        'unzip error'=> $unzipfile
+                    );
+                    if(function_exists("wp_filesize")){
+                        $story['error']['downloaded zip size'] = wp_filesize($zipfile);
+                    }
+                } else {
+                    $story['path'] = $destination_path.'/'.$story_id;
+                }
             } else {
-                $story['path'] = $destination_path.'/'.$story_id;
+                $story['error'] = array(
+                    'pretty' => 'Could not unzip file'
+                );
             }
-        } else {
-            $story['error'] = array(
-                'pretty' => 'Could not unzip file'
-            );
         }
     }

shorthand-connect/tags/1.3.17/shorthand_connect.php

@@ -3 +3 @@
 /**
  * @package Shorthand Connect
- * @version 1.3.16
+ * @version 1.3.17
  */
 /*
@@ -10 +10 @@
 Description: Import your Shorthand stories into your Wordpress CMS as simply as possible - magic!
 Author: Shorthand
-Version: 1.3.16
+Version: 1.3.17
 Author URI: http://shorthand.com
 */
@@ -291 +291 @@
             update_post_meta($post_id, 'story_path', $story_path);
 
+            //Log any story-specific errors to the metadata 
+            if(isset($err['error'])){
+                update_post_meta($post_id, 'ERROR', json_encode($err));
+            }
+
             // Get path to the assets
             $assets_path = sh_get_story_url($post_id, $safe_story_id);

shorthand-connect/trunk/README.txt

@@ -1 +1 @@
 === Shorthand Connect ===
 Contributors: shorthandconnect
-Donate link:
+Donate link: 
 Tags: shorthand, api
 Requires at least: 4.0
-Tested up to: 6.0.0
-Stable tag: 1.3.16
+Tested up to: 6.0.1
+Stable tag: 1.3.17
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -59 +59 @@
 
 == Changelog ==
+
+= 1.3.17 =
+* Added alternate method of story ZIP extraction for WP VIP-hosted customers.
 
 = 1.3.16 =

shorthand-connect/trunk/includes/api-v2.php

@@ -6 +6 @@
     global $serverv2URL;
     $token = get_option('sh_v2_token');
-    
     if (!$token) {
         return false;
@@ -16 +15 @@
             'headers' => array(
                 'Authorization' => 'Token '.$token,
-                'user-agent'  =>  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8) AppleWebKit/535.6.2 (KHTML, like Gecko) Version/5.2 Safari/535.6.2',
-            )
+                'user-agent'  =>  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8) AppleWebKit/535.6.2 (KHTML, like Gecko) Version/5.2 Safari/535.6.2'
+            ),
+            'http_api_args' => $options
         ),
         $options
     );
-    if(function_exists("vip_safe_wp_remote_get")){
-        return vip_safe_wp_remote_get($url, $request_options);
+    if(function_exists("vip_safe_wp_remote_get") && !isset($options['timeout'])){
+        return vip_safe_wp_remote_get($url,false,1,3,10, $request_options);
     }else{
         return wp_remote_get($url, $request_options);
@@ -122 +122 @@
 
     //Attempt to connect to the server
-    $zipfile = wp_tempnam($tmpdir, 'sh_zip');
-    $unzipdir = wp_tempnam($tmpdir, 'sh_unzip').'_dir';
+    $zipfile = wp_tempnam('sh_zip',$tmpdir);
+    $unzipdir = wp_tempnam('sh_unzip',$tmpdir).'_dir';
     $response = sh_v2_api_get('/v2/stories/'.$story_id, array(
         'timeout' => '600',
@@ -140 +140 @@
         );
     } else {
-        $unzipfile = unzip_file( $zipfile, $unzipdir);
-        if ( $unzipfile == 1 ) {
-            wp_mkdir_p($destination_path.'/'.$story_id);
-            $err = copy_dir($unzipdir, $destination_path.'/'.$story_id);
-            if (is_wp_error($err)) {
+        if(function_exists("vip_safe_wp_remote_get")){
+            //WP VIP HOSTING
+            $zip = new ZipArchive;
+            if ( $zip->open($zipfile) == true ) {
+                wp_mkdir_p($destination_path.'/'.$story_id);
+                $zip->extractTo($destination_path.'/'.$story_id);
+                $zip->close();
+                if (is_wp_error($zip)) {
+                    $story['error'] = array(
+                        'pretty' => 'Could not copy story into Wordpress',
+                        'error' => $err->get_error_message(),
+                        'unzip error'=> $unzipfile
+                    );
+                    if(function_exists("wp_filesize")){
+                        $story['error']['downloaded zip size'] = wp_filesize($zipfile);
+                    }
+                } else {
+                    $story['path'] = $destination_path.'/'.$story_id;
+                }
+            } else {
                 $story['error'] = array(
-                    'pretty' => 'Could not copy story into Wordpress',
-                    'error' => $err->get_error_message()
+                    'pretty' => 'Could not unzip file'
                 );
+            }
+        }else{
+            //Standard WP
+            $unzipfile = unzip_file( $zipfile, $unzipdir);
+            if ( $unzipfile == 1 ) {
+                wp_mkdir_p($destination_path.'/'.$story_id);
+                $err = copy_dir($unzipdir, $destination_path.'/'.$story_id);
+                if (is_wp_error($err)) {
+                    $story['error'] = array(
+                        'pretty' => 'Could not copy story into Wordpress',
+                        'error' => $err->get_error_message(),
+                        'unzip error'=> $unzipfile
+                    );
+                    if(function_exists("wp_filesize")){
+                        $story['error']['downloaded zip size'] = wp_filesize($zipfile);
+                    }
+                } else {
+                    $story['path'] = $destination_path.'/'.$story_id;
+                }
             } else {
-                $story['path'] = $destination_path.'/'.$story_id;
+                $story['error'] = array(
+                    'pretty' => 'Could not unzip file'
+                );
             }
-        } else {
-            $story['error'] = array(
-                'pretty' => 'Could not unzip file'
-            );
         }
     }

shorthand-connect/trunk/shorthand_connect.php

@@ -3 +3 @@
 /**
  * @package Shorthand Connect
- * @version 1.3.16
+ * @version 1.3.17
  */
 /*
@@ -10 +10 @@
 Description: Import your Shorthand stories into your Wordpress CMS as simply as possible - magic!
 Author: Shorthand
-Version: 1.3.16
+Version: 1.3.17
 Author URI: http://shorthand.com
 */
@@ -291 +291 @@
             update_post_meta($post_id, 'story_path', $story_path);
 
+            //Log any story-specific errors to the metadata 
+            if(isset($err['error'])){
+                update_post_meta($post_id, 'ERROR', json_encode($err));
+            }
+
             // Get path to the assets
             $assets_path = sh_get_story_url($post_id, $safe_story_id);