Changeset 2483930

Timestamp:

03/02/2021 12:45:03 AM (5 years ago)

Author:

shorthandconnect

Message:

Updated API handling and php tag syntax

Location:

shorthand-connect/trunk

Files:

• README.txt (modified) (1 diff)
• config.default.php (modified) (1 diff)
• includes/api-v2.php (modified) (3 diffs)
• includes/api.php (modified) (1 diff)
• shorthand_connect.php (modified) (2 diffs)
• templates/abstract.php (modified) (1 diff)

shorthand-connect/trunk/README.txt

@@ -5 +5 @@
 Requires at least: 4
 Tested up to: 5.0.3
-Stable tag: 1.3.6
+Stable tag: 1.3.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

shorthand-connect/trunk/config.default.php

@@ -12 +12 @@
     $noabstract = false;
 }
-
-?>

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

@@ -3 +3 @@
 // VERSION 2 API
 
-function sh_get_profile() {
-
+function sh_v2_api_get($url, $options) {
     global $serverv2URL;
     $token = get_option('sh_v2_token');
 
-    $tokeninfo = array();
+    if (!$token) {
+        return false;
+    }
 
-    if($token) {
-        $url = $serverv2URL.'/v2/token-info';
-        $response = wp_remote_get( $url, array(
-            headers => array(
+    $url = $serverv2URL.$url;
+    $request_options = array_merge(
+        array(
+            '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',
             )
-        ) );
-        $body = wp_remote_retrieve_body( $response );
-        $data = json_decode($body);
-        if(isset($data) && isset($data->name)) {
-            $tokeninfo['username'] = $data->name . ' ('.$data->token_type.' Token)';
-            $tokeninfo['gravatar'] = $data->logo;
-            $tokeninfo = (object)$tokeninfo;
-        }
+        ),
+        $options
+    );
+
+    return wp_remote_get($url, $request_options);
+}
+
+function sh_v2_api_get_json($url, $options) {
+    $response = sh_v2_api_get($url, $options);
+    $body = wp_remote_retrieve_body($response);
+    return json_decode($body);
+}
+
+function sh_get_profile() {
+    $tokeninfo = array();
+
+    $data = sh_v2_api_get_json('/v2/token-info', array());
+    if ($data && isset($data->name)) {
+        $tokeninfo['username'] = $data->name . ' ('.$data->token_type.' Token)';
+        $tokeninfo['gravatar'] = $data->logo;
+        $tokeninfo = (object)$tokeninfo;
     }
 
@@ -31 +45 @@
 
 function sh_get_stories() {
-    global $serverv2URL;
-    $token = get_option('sh_v2_token');
-
-    $valid_token = true;
-
     $stories = null;
 
-    //Attempt to connect to the server
-    if($token) {
-        $url = $serverv2URL.'/v2/stories';
-        $response = wp_remote_get( $url, array(
-            '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',
-            ),
-            'timeout' => '240'
-        ) );
-        $body = wp_remote_retrieve_body( $response );
-        $data = json_decode($body);
-        if(isset($data)) {
-            $stories = array();
-            $valid_token = true;
-            //Something went wrong
-            if ($data->status) {
-                return null;
-            }
-            foreach($data as $storydata) {
-                $story = array(
-                    'image' => $storydata->cover,
-                    'id' => $storydata->id,
-                    'metadata' => (object)array(
-                        'description' => $storydata->description
-                    ),
-                    'title' => $storydata->title,
-                    'story_version' => ''.$storydata->version
-                );
-                $stories[] = (object)$story;
-            }
+    $data = sh_v2_api_get_json('/v2/stories', array('timeout' => '240'));
+    if($data) {
+        $stories = array();
+        //Something went wrong
+        if ($data->status) {
+            return null;
+        }
+        foreach($data as $storydata) {
+            $story = array(
+                'image' => $storydata->cover,
+                'id' => $storydata->id,
+                'metadata' => (object)array(
+                    'description' => $storydata->description
+                ),
+                'title' => $storydata->title,
+                'story_version' => ''.$storydata->version
+            );
+            $stories[] = (object)$story;
         }
     }
+    
     return $stories;
 }
@@ -102 +99 @@
     $destination_path = $destination['path'].'/shorthand/'.$post_id;
 
-    global $serverv2URL;
-    $token = get_option('sh_v2_token');
-
-    $valid_token = false;
-
     $story = array();
 
     //Attempt to connect to the server
-    if($token) {
-        $url = $serverv2URL.'/v2/stories/'.$story_id;
-        $zipfile = tempnam($tmpdir, 'sh_zip');
-        $unzipdir = tempnam($tmpdir, 'sh_unzip').'_dir';
-        $response = wp_remote_get( $url, array(
-            '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',
-            ),
-            'timeout' => '600',
-            'stream' => true,
-            'filename' => $zipfile
-        ) );
-        if($response['response']['code'] == 200) {
-            $unzipfile = unzip_file( $zipfile, $unzipdir);
-                if ( $unzipfile == 1 ) {
-                    wp_mkdir_p($destination_path.'/'.$story_id);
-                    $err = copy_dir($unzipdir, $destination_path.'/'.$story_id);
-                    $story['path'] = $destination_path.'/'.$story_id;
-                } else {
-                    $story['error'] = array(
+    $zipfile = tempnam($tmpdir, 'sh_zip');
+    $unzipdir = tempnam($tmpdir, 'sh_unzip').'_dir';
+    $response = sh_v2_api_get('/v2/stories/'.$story_id, array(
+        'timeout' => '600',
+        'stream' => true,
+        'filename' => $zipfile
+    ));
+    if($response['response']['code'] == 200) {
+        $unzipfile = unzip_file( $zipfile, $unzipdir);
+            if ( $unzipfile == 1 ) {
+                wp_mkdir_p($destination_path.'/'.$story_id);
+                $err = copy_dir($unzipdir, $destination_path.'/'.$story_id);
+                $story['path'] = $destination_path.'/'.$story_id;
+            } else {
+                $story['error'] = array(
                     'pretty' => 'Could not unzip file'
                 );
-                }
-        } else {
-            $story['error'] = array(
-                'pretty' => 'Could not get zip file',
-                'error' => curl_error($ch),
-                'response' => $response
-            );
-        }
+            }
+    } else {
+        $story['error'] = array(
+            'pretty' => 'Could not get zip file',
+            'response' => $response
+        );
     }
+
     return $story;
 }
-
-?>

shorthand-connect/trunk/includes/api.php

@@ -138 +138 @@
     return $story;
 }
-
-?>

shorthand-connect/trunk/shorthand_connect.php

@@ -3 +3 @@
 /**
  * @package Shorthand Connect
- * @version 1.3.6
+ * @version 1.3.7
  */
 /*
@@ -10 +10 @@
 Description: Import your Shorthand stories into your Wordpress CMS as simply as possible - magic!
 Author: Shorthand
-Version: 1.3.6
+Version: 1.3.7
 Author URI: http://shorthand.com
 */

shorthand-connect/trunk/templates/abstract.php

@@ -9 +9 @@
     return $abstract;
 }
-
-?>