Changeset 2898299

Timestamp:

04/13/2023 08:02:08 AM (3 years ago)

Author:

shorthandconnect

Message:

Created tag 1.3.28

Location:

shorthand-connect

Files:

• tags/1.3.28 (copied) (copied from shorthand-connect/trunk)
• tags/1.3.28/README.txt (modified) (2 diffs)
• tags/1.3.28/config.default.php (modified) (1 diff)
• tags/1.3.28/includes/api.php (modified) (1 diff)
• tags/1.3.28/includes/mass_pull.php (modified) (7 diffs)
• tags/1.3.28/includes/shorthand_options.php (modified) (8 diffs)
• tags/1.3.28/shorthand_connect.php (modified) (21 diffs)
• tags/1.3.28/templates/single-shorthand_story.php (modified) (1 diff)
• trunk/README.txt (modified) (2 diffs)
• trunk/config.default.php (modified) (1 diff)
• trunk/includes/api.php (modified) (1 diff)
• trunk/includes/mass_pull.php (modified) (7 diffs)
• trunk/includes/shorthand_options.php (modified) (8 diffs)
• trunk/shorthand_connect.php (modified) (21 diffs)
• trunk/templates/single-shorthand_story.php (modified) (1 diff)

shorthand-connect/tags/1.3.28/README.txt

@@ -5 +5 @@
 Requires at least: 4.0
 Tested up to: 6.1
-Stable tag: 1.3.27
+Stable tag: 1.3.28
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -64 +64 @@
 == Changelog ==
 
+= 1.3.28 =
+* Code clean up & bug fixes
+* Remove legacy API code
+* Introduce a 'Disable Advanced Custom Fields' option under Experimental Features
+
 = 1.3.27 =
 * Added Mass Publishing Feature

shorthand-connect/tags/1.3.28/config.default.php

@@ -2 +2 @@
 
 global $serverURL;
-global $serverv2URL;
-global $allowversionswitch;
-global $showServerURL;
 global $showArchivedStories;
 global $noabstract;
 
 $serverURL = 'https://api.shorthand.com';
-$serverv2URL = 'https://api.shorthand.com';
-$allowversionswitch = true;
-$showServerURL = false;
 $showArchivedStories = false;
 
-if ( defined( 'SHORTHAND_NOABSTRACT' ) ){
+if (defined('SHORTHAND_NOABSTRACT')) {
     $noabstract = SHORTHAND_NOABSTRACT;
 } else {

shorthand-connect/tags/1.3.28/includes/api.php

@@ -1 +1 @@
 <?php
-
-// VERSION 1 API
-
-function sh_get_profile() {
-
+function sh_v2_api_get($url, $options)
+{
+    $token = get_option('sh_v2_token');
+    if (!$token) {
+        return false;
+    }
     global $serverURL;
-    $token = get_option('sh_token_key');
-    $user_id = get_option('sh_user_id');
-
-    $valid_token = false;
-
-    $data = array();
-
-    //Attempt to connect to the server
-    if($token && $user_id) {
-        $url = $serverURL.'/api/profile/';
-        $vars = 'user='.$user_id.'&token='.$token;
-        $response = wp_remote_post( $url, array(
+    $url = $serverURL . $url;
+    $plugin_path = plugin_dir_path( dirname( __FILE__ ) ) . '/shorthand_connect.php';
+    $plugin_data = get_file_data( $plugin_path, array( 'Version' => 'Version' ) );
+    $plugin_version = $plugin_data['Version'];
+    
+    $wp_version = $GLOBALS['wp_version'];
+    $user_agent = 'WordPress/' . $wp_version . ' Shorthand/' . $plugin_version;
+    
+    $request_options = array_merge(
+        array(
             'headers' => array(
-                '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',
+                'Authorization' => 'Token ' . $token,
+                'user-agent'  => $user_agent,
             ),
-            'body'    => array(
-                'user' => $user_id,
-                'token' => $token
-            ),
-        ));
-        $body = wp_remote_retrieve_body( $response );
-        $data = json_decode($body);
+            'http_api_args' => $options
+        ),
+        $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);
     }
-    return $data;
+    
 }
 
-function sh_get_stories() {
-    global $serverURL;
-    $token = get_option('sh_token_key');
-    $user_id = get_option('sh_user_id');
+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);
+}
 
-    $valid_token = false;
+function sh_get_profile()
+{
+    $tokeninfo = array();
+    
+    $data = sh_v2_api_get_json('/v2/token-info', array());
+    if ($data && isset($data->organisation_id)) {
+        $tokeninfo['username'] = $data->name . ' ('.$data->token_type.' Token)';
+        $tokeninfo['gravatar'] = $data->logo;
+        $tokeninfo = (object)$tokeninfo;
+    }
+    
+    return $tokeninfo;
+}
 
+function sh_get_stories()
+{
     $stories = null;
-
-    //Attempt to connect to the server
-    if($token && $user_id) {
-        $url = $serverURL.'/api/index/';
-        $response = wp_remote_post( $url, array(
-            'headers' => array(
-                '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'    => array(
-                'user' => $user_id,
-                'token' => $token
-            ),
-            'timeout' => '240'
-        ));
-        $body = wp_remote_retrieve_body( $response );
-        $data = json_decode($body);
-
-        if(isset($data->stories)) {
-            $valid_token = true;
-            $stories = $data->stories;
+    
+    $data = sh_v2_api_get_json('/v2/stories', array('timeout' => '240'));
+    if ($data) {
+        $stories = array();
+        //Something went wrong
+        if (isset($data->status) && $data->status) {
+            return null;
+        }
+        foreach ($data as $storydata) {
+            $story = array(
+                'image' => $storydata->signedCover,
+                'id' => $storydata->id,
+                'metadata' => (object)array(
+                    'description' => $storydata->description
+                ),
+                'title' => $storydata->title,
+                'story_version' => ''.$storydata->version
+            );
+            $stories[] = (object)$story;
         }
     }
+    
     return $stories;
 }
 
-function sh_get_story_path($post_id, $story_id) {
-    WP_Filesystem();
+function sh_get_story_path($post_id, $story_id)
+{
+    init_WP_Filesystem();
     $destination = wp_upload_dir();
     $destination_path = $destination['path'].'/shorthand/'.$post_id.'/'.$story_id;
-    if(!file_exists($destination_path)) {
+    
+    if (!file_exists($destination_path)) {
         $destination_path = null;
     }
+    
+    $destination_path = apply_filters('sh_get_story_path', $destination_path, $destination);
+    
     return $destination_path;
 }
 
-function sh_get_story_url($post_id, $story_id) {
-    WP_Filesystem();
+function sh_get_story_url($post_id, $story_id)
+{
+    init_WP_Filesystem();
     $destination = wp_upload_dir();
     $destination_url = $destination['url'].'/shorthand/'.$post_id.'/'.$story_id;
+    $destination_url = apply_filters('sh_get_story_url', $destination_url);
+    
     return $destination_url;
 }
 
-function sh_copy_story($post_id, $story_id) {
-
-    // Set the maximum memory limit for the entire operation (this is already called later by unzip_file, but lets do it earlier)
-    @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
-
-    WP_Filesystem();
+function sh_copy_story($post_id, $story_id, $without_assets=false, $assets_only=false)
+{
+    
+    wp_raise_memory_limit('admin');
+    init_WP_Filesystem();
     $destination = wp_upload_dir();
     $tmpdir = get_temp_dir();
-    $destination_path = $destination['path'].'/shorthand/'.$post_id.'/'.$story_id;
+    $destination_path = $destination['path'].'/shorthand/'.$post_id;
+    $story = array();
+    
+    //Attempt to connect to the server
+    $zip_file = wp_tempnam('sh_zip',$tmpdir);
+    $response = sh_v2_api_get('/v2/stories/'.$story_id.($without_assets?'?without_assets=true':'').($assets_only?'?assets_only=true':''), array(
+        'timeout' => '600',
+        'stream' => true,
+        'filename' => $zip_file
+    ));
+    if (is_wp_error($response)) {
+        $story['error'] = array(
+            'pretty' => ' Request to Shorthand failed',
+            'error' => $response->get_error_message($response)
+        );
+    } elseif (!$response || $response['response']['code'] != 200) {
+        $story['error'] = array(
+            'pretty' => 'Request to Shorthand failed; check the token is configured correctly',
+            'response' => $response
+        );
+    } else {
+        $story = extractStoryContent($zip_file, $destination_path, $story_id);
+    }
+    
+    do_action('sh_copy_story', $post_id, $story_id, $story);
+    unlink($zip_file);
+    
+    return $story;
+}
 
-    global $serverURL;
-    $token = get_option('sh_token_key');
-    $user_id = get_option('sh_user_id');
 
-    $valid_token = false;
+function init_WP_Filesystem()
+{
+    WP_Filesystem();
+    global $wp_filesystem;
+    if (!is_a($wp_filesystem, 'WP_Filesystem_Base')) {
+        $creds = request_filesystem_credentials(site_url());
+        wp_filesystem($creds);
+    }
+}
 
-    $story = array();
-
-    //Attempt to connect to the server
-    if($token && $user_id) {
-        $url = $serverURL.'/api/story/'.$story_id.'/';
-        $vars = 'user='.$user_id.'&token='.$token;
-        $zipfile = wp_tempnam($tmpdir, 'sh_zip');
-        $response = wp_remote_post( $url, array(
-            'headers' => array(
-                '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'    => array(
-                'user' => $user_id,
-                'token' => $token
-            ),
-            'timeout' => '600',
-            'stream' => true,
-            'filename' => $zipfile
-        ));
-        $body = wp_remote_retrieve_body( $response );
-        $data = json_decode($body);
-        if($response['response']['code'] == 200) {
-            $unzipfile = unzip_file( $zipfile, $destination_path);
-            if ( $unzipfile ) {
-                $story['path'] = $destination_path;
-            } else {
-                $story['error'] = array(
-                'pretty' => 'Could not unzip file'
+function extractStoryContent($zip_file, $destination_path, $story_id)
+{
+    //WP VIP HOSTING COMPATIBILITY
+    $zip = new ZipArchive;
+    if ($zip->open($zip_file)) {
+        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' => $zip->get_error_message(),
+                'unzip error'=> $zip_file
             );
+            if (function_exists("wp_filesize")){
+                $story['error']['downloaded zip size'] = wp_filesize($zip_file);
             }
         } else {
-            $story['error'] = array(
-                'pretty' => 'Could not upload file',
-                'error' => curl_error($ch),
-                'response' => $response
-            );
+            $story['path'] = $destination_path.'/'.$story_id;
         }
+    } else {
+        $story['error'] = array(
+            'pretty' => 'Could not unzip file'
+        );
     }
+    
     return $story;
 }

shorthand-connect/tags/1.3.28/includes/mass_pull.php

@@ -1 +1 @@
 <?php
-
 /*
 /* Name: Update Story Meta Fields Function */
@@ -6 +5 @@
 /* Note: Unzipping a fresh story copy won't update the fields
 */
-function shand_update_story($post_id, $story_id) {
-
+function shand_update_story($post_id, $story_id)
+{
     init_WP_Filesystem();
     global $wp_filesystem;
@@ -20 +19 @@
     
     $err = sh_copy_story($post_id, $safe_story_id, $sh_media_cron_offload);
-
-    $sh_title = get_post_meta( $post_id, 'title', true );
 
     $story_path = sh_get_story_path($post_id, $safe_story_id);
@@ -39 +36 @@
         update_post_meta($post_id, 'story_path', $story_path);
 
-        //Log any story-specific errors to the metadata 
+        //Log any story-specific errors to the metadata
         if(isset($err['error'])){
             update_post_meta($post_id, 'ERROR', json_encode($err));
@@ -50 +47 @@
 
         // Save the head and body
-        $version = get_option('sh_api_version');
-        
-        update_post_meta($post_id, 'api_version', $version);
-        $head_file = $story_path . '/head.html';
+                $head_file = $story_path . '/head.html';
         $article_file = $story_path . '/article.html';
 
@@ -87 +81 @@
 
     } else {
-
         update_post_meta($post_id, 'story_diagnostic', $err);
-
         echo 'Something went wrong, please try again';
         print_r($err);
@@ -96 +88 @@
 
 }
-?>

shorthand-connect/tags/1.3.28/includes/shorthand_options.php

@@ -1 +1 @@
 <?php
-
 /* Options */
 function shand_shorthand_menu() {
     add_options_page( 'Shorthand Options', 'Shorthand', 'manage_options', 'shorthand-options', 'shand_shorthand_options' );
 }
-
 $default_sh_site_css = '
 /* START CSS FOR DEFAULT WP THEMES */
@@ -28 +26 @@
 ';
 
-function shand_shorthand_options() {
-
+function shand_shorthand_options()
+{
     global $default_sh_site_css;
     global $serverURL;
-    global $serverv2URL;
-    global $allowversionswitch;
-    global $showServerURL;
 
     if ( !current_user_can( 'manage_options' ) )  {
@@ -42 +37 @@
         update_option('sh_v2_token', sanitize_text_field($_POST['sh_v2_token']));
     }
-
     $v2_token = esc_html(get_option('sh_v2_token'));
     
-
     if( isset($_POST['sh_submit_hidden_two']) && $_POST['sh_submit_hidden_two'] == 'Y' && check_admin_referer( 'sh-update-configuration' ) ) {
         update_option('sh_css', wp_kses_post($_POST['sh_css']));
@@ -60 +53 @@
         $permalink_structure = esc_html(get_option('sh_permalink'));
     }
-
     $sh_css = get_option('sh_css');
     $no_css = false;
     if ($sh_css == '') {
         $no_css = true;
-        if(isset($default_site_css)){
+        if (isset($default_site_css)){
             update_option('sh_css', $default_site_css);
         }
@@ -71 +63 @@
     }
 
-    if(isset($_POST['sh_submit_hidden_four']) && $_POST['sh_submit_hidden_four'] == 'Y' && check_admin_referer( 'sh-update-configuration' ) ) {
+    if (isset($_POST['sh_submit_hidden_four']) && $_POST['sh_submit_hidden_four'] == 'Y' && check_admin_referer( 'sh-update-configuration' )) {
         update_option('sh_regex_list', base64_encode(wp_unslash($_POST['sh_regex_list'])));
     }
@@ -77 +69 @@
     $sh_regex_list = base64_decode(get_option('sh_regex_list'));
 
-    //Experimental Settings
-    if( isset($_POST['sh_submit_hidden_experimental']) && $_POST['sh_submit_hidden_experimental'] == 'Y' && check_admin_referer( 'sh-update-configuration' ) ) {
-        update_option('sh_media_cron_offload', $_POST['sh_media_cron_offload']);
-    }
-    $sh_media_cron_offload = filter_var(get_option('sh_media_cron_offload'), FILTER_VALIDATE_BOOLEAN);
-
+    // Experimental Settings
+    if (isset($_POST['sh_submit_hidden_experimental']) && $_POST['sh_submit_hidden_experimental'] == 'Y' && check_admin_referer('sh-update-configuration')) {
+        $sh_media_cron_offload = isset($_POST['sh_media_cron_offload']) ? filter_var($_POST['sh_media_cron_offload'], FILTER_VALIDATE_BOOLEAN) : false;
+        $sh_disable_acf = isset($_POST['sh_disable_acf']) ? filter_var($_POST['sh_disable_acf'], FILTER_VALIDATE_BOOLEAN) : false;
+        update_option('sh_media_cron_offload', $sh_media_cron_offload);
+        update_option('sh_disable_acf', $sh_disable_acf);
+    }
+  $sh_media_cron_offload = filter_var(get_option('sh_media_cron_offload'), FILTER_VALIDATE_BOOLEAN);
+  $sh_disable_acf = filter_var(get_option('sh_disable_acf'), FILTER_VALIDATE_BOOLEAN);
+  
     $profile = sh_get_profile();
     $n_once = wp_nonce_field( 'sh-update-configuration' );
@@ -143 +139 @@
         <p><em>This Example removes title tags from within the head tag by replacing it with nothing.</em></p>
 <pre><code>
-  { 
+  {
     "head":
     [
-      { 
+      {
         &quot;query&quot;:&quot;/&lt;title.(.*?)&lt;\/title&gt;/&quot;,
         &quot;replace&quot;:&quot;&quot;
       }
     ],
-    "body":[] 
+    "body":[]
   }
-
 </code></pre>
         <form name="form2" method="post" onsubmit="padJson()">
@@ -218 +213 @@
 
 <h3>Experimental Features</h3>
-        <p>Early access features that are still subject to change.</p>
-        
-        <form name="form_experimental" method="post">
-            <?php echo $n_once ?>
-            <input type="hidden" name="sh_submit_hidden_experimental" value="Y" />
-            <input type="checkbox" id="sh_media_cron_offload" name="sh_media_cron_offload" value="true" <?php echo esc_attr($sh_media_cron_offload ? 'checked' : '') ?> />
-            <label for="sh_media_cron_offload">Import media assets via cron</label>
-            <p>Assets will be fetched after story save to prevent potential execution timeouts. Media won't be immediately available on save but progress will be updated based on the `media_status` field.</p>
-            <p>It is advised that Shorthand Story Posts are saved as a draft first to trigger the cron job prior to public publishing.</p>
-            <br/>
-            <p class="submit">
-                <input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" />
-            </p>
-        </form>
+<p>Early access features that are still subject to change.</p>
+<form name="form_experimental" method="post">
+<?php echo $n_once ?>
+<input type="hidden" name="sh_submit_hidden_experimental" value="Y" />
+<input type="checkbox" id="sh_media_cron_offload" name="sh_media_cron_offload" value="true" <?php echo esc_attr($sh_media_cron_offload ? 'checked' : '') ?> />
+<label for="sh_media_cron_offload">Import media assets via cron</label>
+<p>Assets will be fetched after story save to prevent potential execution timeouts. Media won't be immediately available on save but progress will be updated based on the `media_status` field.</p>
+<p>It is advised that Shorthand Story Posts are saved as a draft first to trigger the cron job prior to public publishing.</p>
+<br/>
+<input type="checkbox" id="sh_disable_acf" name="sh_disable_acf" value="true" <?php echo esc_attr($sh_disable_acf ? 'checked' : '') ?> />
+<label for="sh_disable_acf">Disable Advanced Custom Fields</label>
+<p>Used to prevent any potential issues that could cause the Shorthand Custom Fields to become hidden by Advanced Custom Fields.</p>
+</br>
+<p class="submit">
+<input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" />
+</p>
+</form>
 <?php
 }

shorthand-connect/tags/1.3.28/shorthand_connect.php

@@ -3 +3 @@
 /**
  * @package Shorthand Connect
- * @version 1.3.27
+ * @version 1.3.28
  */
 /*
@@ -10 +10 @@
 Description: Import your Shorthand stories into your Wordpress CMS as simply as possible - magic!
 Author: Shorthand
-Version: 1.3.27
+Version: 1.3.28
 Author URI: http://shorthand.com
 */
 
-$included = @include_once('config.php');
-if (!$included) {
+if (file_exists('config.php')) {
+    include_once('config.php');
+} else {
     require_once('config.default.php');
 }
-$version = 'v2';
-
-require_once('includes/api-v2.php');
+require_once('includes/api.php');
 require_once('includes/mass_pull.php');
 
@@ -70 +69 @@
 function shand_wpt_shorthand_story()
 {
-
     global $post;
-
     global $serverURL;
-    global $serverv2URL;
     global $showArchivedStories;
-
     $baseurl = '';
-
-    $version = 'v2';
 
 ?>
@@ -198 +191 @@
     }
     $stories = sh_get_stories();
-
-    if (!is_array($stories)) {
-        echo 'Could not connect to Shorthand, please check your <a href="options-general.php?page=shorthand-options">Wordpress Shorthand settings</a>.';
-    } else if (sizeOf($stories) == 0) {
+    $profile = sh_get_profile();
+
+    if (!($profile)) {
+        echo 'Could not connect to Shorthand, please check your API token in <a href="options-general.php?page=shorthand-options">Shorthand settings</a>.';
+    } elseif ($stories === null) {
         echo 'You currently have no stories ready for publishing on Shorthand. Please check that your story is set to be ready for publishing.';
     } else {
@@ -213 +207 @@
             }
             $archived = '';
-            if ($version == 'v2' && isset($story->story_version) && $story->story_version == '1') {
+            if (isset($story->story_version) && $story->story_version == '1') {
                 if ($showArchivedStories) {
                     $archived = ' (archived)';
@@ -279 +273 @@
 function shand_add_shorthand_metaboxes()
 {
-    global $version;
     global $post;
     global $noabstract;
@@ -332 +325 @@
 
 /* Save the shorthand story */
-function shand_save_shorthand_story($post_id, $post, $update)
+function shand_save_shorthand_story($post_id, $post)
 {
     WP_Filesystem();
-
     global $wp_filesystem;
-
+    
     if ( ! is_a( $wp_filesystem, 'WP_Filesystem_Base') ) {
         $creds = request_filesystem_credentials( site_url() );
@@ -355 +347 @@
     }
 
-    if(!get_post_meta($post_id, 'no_update')) {
+    if (!get_post_meta($post_id, 'no_update')) {
         update_post_meta($post_id, 'no_update', "false");
     }
@@ -378 +370 @@
             
         }
-        if($sh_media_cron_offload){
+        if ($sh_media_cron_offload){
             update_post_meta($post_id, 'media_status', '[Awaiting media fetch...]');
             wp_schedule_single_event(time() + 30, 'sh_media_fetch', array( $post_id, $safe_story_id ));
@@ -387 +379 @@
             update_post_meta($post_id, 'story_path', $story_path);
 
-            //Log any story-specific errors to the metadata 
+            //Log any story-specific errors to the metadata
             if(isset($err['error'])){
                 update_post_meta($post_id, 'ERROR', json_encode($err));
@@ -398 +390 @@
 
             // Save the head and body
-            $version = get_option('sh_api_version');
-            update_post_meta($post_id, 'api_version', $version);
             $head_file = $story_path . '/head.html';
             $article_file = $story_path . '/article.html';
@@ -411 +401 @@
             $head = apply_filters('sh_pre_process_head', $head, $assets_path, $head_file);
             
-            if(isset($post_processing_queries->body)){
+            if (isset($post_processing_queries->body)){
                 $body = shand_post_processing($body,$post_processing_queries->body);
             }
             
-            if(isset($post_processing_queries->head)){
+            if (isset($post_processing_queries->head)){
                 $head = shand_post_processing($head, $post_processing_queries->head);
             }
@@ -496 +486 @@
 function shand_shorthand_get_posts($query)
 {
-    if (is_home() && $query->is_main_query())
-        $query->set('post_type', array('post', 'shorthand_story'));
-
+    if (is_home() && $query->is_main_query()) {
+        $query->set( 'post_type', array( 'post', 'shorthand_story' ) );
+    }
     return $query;
 }
@@ -512 +502 @@
 
 
-/* Table Hook */
-function shand_shorthand_show_columns($name)
-{
-    global $post;
-    switch ($name) {
-        case 'story_id':
-            $views = get_post_meta($post->ID, 'story_id', true);
-            echo $views;
-            break;
-        case 'api_version':
-            $views = get_post_meta($post->ID, 'api_version', true);
-            if ($views == '') {
-                // Determine the version, save it if possible;
-                $views = 'Unknown';
-                $story_id = get_post_meta($post->ID, 'story_id', true);
-                if ($story_id) {
-                    $views = determine_version_id($story_id);
-                }
-            }
-            echo $views;
-            break;
-    }
-}
-add_action('manage_posts_custom_column',  'shand_shorthand_show_columns');
-
-
 /* Filter to fix post type tags */
 function shand_post_type_tags_fix($request)
@@ -561 +525 @@
 
 
-/* UTILITY FUNCTIONS */
-
 /* Fix content paths */
 function shand_fix_content_paths($assets_path, $content)
 {
-    
     $content = str_replace('./assets/', $assets_path . '/assets/', $content);
     $content = str_replace('./static/', $assets_path . '/static/', $content);
     $content = preg_replace('/.(\/theme-\w+.min.css)/', $assets_path . '$1', $content);
-    
     $content = apply_filters('shand_fix_content_paths', $content);
-    
     return $content;
 }
@@ -581 +540 @@
         return $content;
     }
-    
     foreach ($queries as $query) {
         if(isset($query->query) && isset($query->replace)){
@@ -587 +545 @@
         }
     }
-
     return $content;
-}
-
-function determine_version_id($story_id)
-{
-    if (substr($story_id, 0, 2) == 'v1') {
-        return 'v1';
-    }
-    if (intval($story_id) > 0) {
-        return 'v1';
-    }
-    return 'v2';
 }
 
@@ -620 +566 @@
 }
 
+function remove_wp_meta_box() {
+    if (function_exists('acf')) { // Check if ACF is installed and enabled
+      $sh_disable_acf = filter_var(get_option('sh_disable_acf'), FILTER_VALIDATE_BOOLEAN);
+      if ($sh_disable_acf) {
+        add_filter('acf/settings/remove_wp_meta_box', '__return_false');
+      }
+    }
+  }
+  add_action('acf/init', 'remove_wp_meta_box');
+  
 /* Add "Pull Story" to post dropdown */
-add_filter('bulk_actions-edit-shorthand_story', function($bulk_actions) {
+add_filter('bulk_actions-edit-shorthand_story', function ($bulk_actions) {
     $bulk_actions['bulk-pull-stories'] = __('Pull Story', 'txtdomain');
     return $bulk_actions;
@@ -627 +583 @@
 
 /* Pull the stories */
-add_filter('handle_bulk_actions-edit-shorthand_story', function($redirect_url, $action, $post_ids) {
+add_filter('handle_bulk_actions-edit-shorthand_story', function ($redirect_url, $action, $post_ids) {
     //Run on posts which have bulk-pull-stories set to true
     if ($action == 'bulk-pull-stories') {
@@ -649 +605 @@
 
 /* Add Notice after post has pulled */
-add_action('admin_notices', function() {
+add_action('admin_notices', function () {
     if (!empty($_REQUEST['bulk-pulled-stories'])) {
         $num_changed = (int) $_REQUEST['bulk-pulled-stories'];
@@ -655 +611 @@
     }
 });
-
-?>

shorthand-connect/tags/1.3.28/templates/single-shorthand_story.php

@@ -1 +1 @@
 <?php get_header();
-
     // Check to see if there is a password set against the post
-    if ( post_password_required( $post->ID ) ) {
-
+    if (post_password_required($post->ID)) {
          echo get_the_password_form();
-
     } else {
-
         while ( have_posts() ) : the_post();
             $meta = get_post_meta($post->ID);
         ?>
-
         <?php echo trim($meta['story_body'][0]); ?>
-
         <div id="extraHTML">
             <?php echo trim($meta['extra_html'][0]); ?>
         </div>
-
         <style type="text/css">
             <?php echo get_option('sh_css'); ?>
         </style>
-
         <?php
         endwhile;
-
     }
-
 get_footer();

shorthand-connect/trunk/README.txt

@@ -5 +5 @@
 Requires at least: 4.0
 Tested up to: 6.1
-Stable tag: 1.3.27
+Stable tag: 1.3.28
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -64 +64 @@
 == Changelog ==
 
+= 1.3.28 =
+* Code clean up & bug fixes
+* Remove legacy API code
+* Introduce a 'Disable Advanced Custom Fields' option under Experimental Features
+
 = 1.3.27 =
 * Added Mass Publishing Feature

shorthand-connect/trunk/config.default.php

@@ -2 +2 @@
 
 global $serverURL;
-global $serverv2URL;
-global $allowversionswitch;
-global $showServerURL;
 global $showArchivedStories;
 global $noabstract;
 
 $serverURL = 'https://api.shorthand.com';
-$serverv2URL = 'https://api.shorthand.com';
-$allowversionswitch = true;
-$showServerURL = false;
 $showArchivedStories = false;
 
-if ( defined( 'SHORTHAND_NOABSTRACT' ) ){
+if (defined('SHORTHAND_NOABSTRACT')) {
     $noabstract = SHORTHAND_NOABSTRACT;
 } else {

shorthand-connect/trunk/includes/api.php

@@ -1 +1 @@
 <?php
-
-// VERSION 1 API
-
-function sh_get_profile() {
-
+function sh_v2_api_get($url, $options)
+{
+    $token = get_option('sh_v2_token');
+    if (!$token) {
+        return false;
+    }
     global $serverURL;
-    $token = get_option('sh_token_key');
-    $user_id = get_option('sh_user_id');
-
-    $valid_token = false;
-
-    $data = array();
-
-    //Attempt to connect to the server
-    if($token && $user_id) {
-        $url = $serverURL.'/api/profile/';
-        $vars = 'user='.$user_id.'&token='.$token;
-        $response = wp_remote_post( $url, array(
+    $url = $serverURL . $url;
+    $plugin_path = plugin_dir_path( dirname( __FILE__ ) ) . '/shorthand_connect.php';
+    $plugin_data = get_file_data( $plugin_path, array( 'Version' => 'Version' ) );
+    $plugin_version = $plugin_data['Version'];
+    
+    $wp_version = $GLOBALS['wp_version'];
+    $user_agent = 'WordPress/' . $wp_version . ' Shorthand/' . $plugin_version;
+    
+    $request_options = array_merge(
+        array(
             'headers' => array(
-                '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',
+                'Authorization' => 'Token ' . $token,
+                'user-agent'  => $user_agent,
             ),
-            'body'    => array(
-                'user' => $user_id,
-                'token' => $token
-            ),
-        ));
-        $body = wp_remote_retrieve_body( $response );
-        $data = json_decode($body);
+            'http_api_args' => $options
+        ),
+        $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);
     }
-    return $data;
+    
 }
 
-function sh_get_stories() {
-    global $serverURL;
-    $token = get_option('sh_token_key');
-    $user_id = get_option('sh_user_id');
+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);
+}
 
-    $valid_token = false;
+function sh_get_profile()
+{
+    $tokeninfo = array();
+    
+    $data = sh_v2_api_get_json('/v2/token-info', array());
+    if ($data && isset($data->organisation_id)) {
+        $tokeninfo['username'] = $data->name . ' ('.$data->token_type.' Token)';
+        $tokeninfo['gravatar'] = $data->logo;
+        $tokeninfo = (object)$tokeninfo;
+    }
+    
+    return $tokeninfo;
+}
 
+function sh_get_stories()
+{
     $stories = null;
-
-    //Attempt to connect to the server
-    if($token && $user_id) {
-        $url = $serverURL.'/api/index/';
-        $response = wp_remote_post( $url, array(
-            'headers' => array(
-                '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'    => array(
-                'user' => $user_id,
-                'token' => $token
-            ),
-            'timeout' => '240'
-        ));
-        $body = wp_remote_retrieve_body( $response );
-        $data = json_decode($body);
-
-        if(isset($data->stories)) {
-            $valid_token = true;
-            $stories = $data->stories;
+    
+    $data = sh_v2_api_get_json('/v2/stories', array('timeout' => '240'));
+    if ($data) {
+        $stories = array();
+        //Something went wrong
+        if (isset($data->status) && $data->status) {
+            return null;
+        }
+        foreach ($data as $storydata) {
+            $story = array(
+                'image' => $storydata->signedCover,
+                'id' => $storydata->id,
+                'metadata' => (object)array(
+                    'description' => $storydata->description
+                ),
+                'title' => $storydata->title,
+                'story_version' => ''.$storydata->version
+            );
+            $stories[] = (object)$story;
         }
     }
+    
     return $stories;
 }
 
-function sh_get_story_path($post_id, $story_id) {
-    WP_Filesystem();
+function sh_get_story_path($post_id, $story_id)
+{
+    init_WP_Filesystem();
     $destination = wp_upload_dir();
     $destination_path = $destination['path'].'/shorthand/'.$post_id.'/'.$story_id;
-    if(!file_exists($destination_path)) {
+    
+    if (!file_exists($destination_path)) {
         $destination_path = null;
     }
+    
+    $destination_path = apply_filters('sh_get_story_path', $destination_path, $destination);
+    
     return $destination_path;
 }
 
-function sh_get_story_url($post_id, $story_id) {
-    WP_Filesystem();
+function sh_get_story_url($post_id, $story_id)
+{
+    init_WP_Filesystem();
     $destination = wp_upload_dir();
     $destination_url = $destination['url'].'/shorthand/'.$post_id.'/'.$story_id;
+    $destination_url = apply_filters('sh_get_story_url', $destination_url);
+    
     return $destination_url;
 }
 
-function sh_copy_story($post_id, $story_id) {
-
-    // Set the maximum memory limit for the entire operation (this is already called later by unzip_file, but lets do it earlier)
-    @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
-
-    WP_Filesystem();
+function sh_copy_story($post_id, $story_id, $without_assets=false, $assets_only=false)
+{
+    
+    wp_raise_memory_limit('admin');
+    init_WP_Filesystem();
     $destination = wp_upload_dir();
     $tmpdir = get_temp_dir();
-    $destination_path = $destination['path'].'/shorthand/'.$post_id.'/'.$story_id;
+    $destination_path = $destination['path'].'/shorthand/'.$post_id;
+    $story = array();
+    
+    //Attempt to connect to the server
+    $zip_file = wp_tempnam('sh_zip',$tmpdir);
+    $response = sh_v2_api_get('/v2/stories/'.$story_id.($without_assets?'?without_assets=true':'').($assets_only?'?assets_only=true':''), array(
+        'timeout' => '600',
+        'stream' => true,
+        'filename' => $zip_file
+    ));
+    if (is_wp_error($response)) {
+        $story['error'] = array(
+            'pretty' => ' Request to Shorthand failed',
+            'error' => $response->get_error_message($response)
+        );
+    } elseif (!$response || $response['response']['code'] != 200) {
+        $story['error'] = array(
+            'pretty' => 'Request to Shorthand failed; check the token is configured correctly',
+            'response' => $response
+        );
+    } else {
+        $story = extractStoryContent($zip_file, $destination_path, $story_id);
+    }
+    
+    do_action('sh_copy_story', $post_id, $story_id, $story);
+    unlink($zip_file);
+    
+    return $story;
+}
 
-    global $serverURL;
-    $token = get_option('sh_token_key');
-    $user_id = get_option('sh_user_id');
 
-    $valid_token = false;
+function init_WP_Filesystem()
+{
+    WP_Filesystem();
+    global $wp_filesystem;
+    if (!is_a($wp_filesystem, 'WP_Filesystem_Base')) {
+        $creds = request_filesystem_credentials(site_url());
+        wp_filesystem($creds);
+    }
+}
 
-    $story = array();
-
-    //Attempt to connect to the server
-    if($token && $user_id) {
-        $url = $serverURL.'/api/story/'.$story_id.'/';
-        $vars = 'user='.$user_id.'&token='.$token;
-        $zipfile = wp_tempnam($tmpdir, 'sh_zip');
-        $response = wp_remote_post( $url, array(
-            'headers' => array(
-                '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'    => array(
-                'user' => $user_id,
-                'token' => $token
-            ),
-            'timeout' => '600',
-            'stream' => true,
-            'filename' => $zipfile
-        ));
-        $body = wp_remote_retrieve_body( $response );
-        $data = json_decode($body);
-        if($response['response']['code'] == 200) {
-            $unzipfile = unzip_file( $zipfile, $destination_path);
-            if ( $unzipfile ) {
-                $story['path'] = $destination_path;
-            } else {
-                $story['error'] = array(
-                'pretty' => 'Could not unzip file'
+function extractStoryContent($zip_file, $destination_path, $story_id)
+{
+    //WP VIP HOSTING COMPATIBILITY
+    $zip = new ZipArchive;
+    if ($zip->open($zip_file)) {
+        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' => $zip->get_error_message(),
+                'unzip error'=> $zip_file
             );
+            if (function_exists("wp_filesize")){
+                $story['error']['downloaded zip size'] = wp_filesize($zip_file);
             }
         } else {
-            $story['error'] = array(
-                'pretty' => 'Could not upload file',
-                'error' => curl_error($ch),
-                'response' => $response
-            );
+            $story['path'] = $destination_path.'/'.$story_id;
         }
+    } else {
+        $story['error'] = array(
+            'pretty' => 'Could not unzip file'
+        );
     }
+    
     return $story;
 }

shorthand-connect/trunk/includes/mass_pull.php

@@ -1 +1 @@
 <?php
-
 /*
 /* Name: Update Story Meta Fields Function */
@@ -6 +5 @@
 /* Note: Unzipping a fresh story copy won't update the fields
 */
-function shand_update_story($post_id, $story_id) {
-
+function shand_update_story($post_id, $story_id)
+{
     init_WP_Filesystem();
     global $wp_filesystem;
@@ -20 +19 @@
     
     $err = sh_copy_story($post_id, $safe_story_id, $sh_media_cron_offload);
-
-    $sh_title = get_post_meta( $post_id, 'title', true );
 
     $story_path = sh_get_story_path($post_id, $safe_story_id);
@@ -39 +36 @@
         update_post_meta($post_id, 'story_path', $story_path);
 
-        //Log any story-specific errors to the metadata 
+        //Log any story-specific errors to the metadata
         if(isset($err['error'])){
             update_post_meta($post_id, 'ERROR', json_encode($err));
@@ -50 +47 @@
 
         // Save the head and body
-        $version = get_option('sh_api_version');
-        
-        update_post_meta($post_id, 'api_version', $version);
-        $head_file = $story_path . '/head.html';
+                $head_file = $story_path . '/head.html';
         $article_file = $story_path . '/article.html';
 
@@ -87 +81 @@
 
     } else {
-
         update_post_meta($post_id, 'story_diagnostic', $err);
-
         echo 'Something went wrong, please try again';
         print_r($err);
@@ -96 +88 @@
 
 }
-?>

shorthand-connect/trunk/includes/shorthand_options.php

@@ -1 +1 @@
 <?php
-
 /* Options */
 function shand_shorthand_menu() {
     add_options_page( 'Shorthand Options', 'Shorthand', 'manage_options', 'shorthand-options', 'shand_shorthand_options' );
 }
-
 $default_sh_site_css = '
 /* START CSS FOR DEFAULT WP THEMES */
@@ -28 +26 @@
 ';
 
-function shand_shorthand_options() {
-
+function shand_shorthand_options()
+{
     global $default_sh_site_css;
     global $serverURL;
-    global $serverv2URL;
-    global $allowversionswitch;
-    global $showServerURL;
 
     if ( !current_user_can( 'manage_options' ) )  {
@@ -42 +37 @@
         update_option('sh_v2_token', sanitize_text_field($_POST['sh_v2_token']));
     }
-
     $v2_token = esc_html(get_option('sh_v2_token'));
     
-
     if( isset($_POST['sh_submit_hidden_two']) && $_POST['sh_submit_hidden_two'] == 'Y' && check_admin_referer( 'sh-update-configuration' ) ) {
         update_option('sh_css', wp_kses_post($_POST['sh_css']));
@@ -60 +53 @@
         $permalink_structure = esc_html(get_option('sh_permalink'));
     }
-
     $sh_css = get_option('sh_css');
     $no_css = false;
     if ($sh_css == '') {
         $no_css = true;
-        if(isset($default_site_css)){
+        if (isset($default_site_css)){
             update_option('sh_css', $default_site_css);
         }
@@ -71 +63 @@
     }
 
-    if(isset($_POST['sh_submit_hidden_four']) && $_POST['sh_submit_hidden_four'] == 'Y' && check_admin_referer( 'sh-update-configuration' ) ) {
+    if (isset($_POST['sh_submit_hidden_four']) && $_POST['sh_submit_hidden_four'] == 'Y' && check_admin_referer( 'sh-update-configuration' )) {
         update_option('sh_regex_list', base64_encode(wp_unslash($_POST['sh_regex_list'])));
     }
@@ -77 +69 @@
     $sh_regex_list = base64_decode(get_option('sh_regex_list'));
 
-    //Experimental Settings
-    if( isset($_POST['sh_submit_hidden_experimental']) && $_POST['sh_submit_hidden_experimental'] == 'Y' && check_admin_referer( 'sh-update-configuration' ) ) {
-        update_option('sh_media_cron_offload', $_POST['sh_media_cron_offload']);
-    }
-    $sh_media_cron_offload = filter_var(get_option('sh_media_cron_offload'), FILTER_VALIDATE_BOOLEAN);
-
+    // Experimental Settings
+    if (isset($_POST['sh_submit_hidden_experimental']) && $_POST['sh_submit_hidden_experimental'] == 'Y' && check_admin_referer('sh-update-configuration')) {
+        $sh_media_cron_offload = isset($_POST['sh_media_cron_offload']) ? filter_var($_POST['sh_media_cron_offload'], FILTER_VALIDATE_BOOLEAN) : false;
+        $sh_disable_acf = isset($_POST['sh_disable_acf']) ? filter_var($_POST['sh_disable_acf'], FILTER_VALIDATE_BOOLEAN) : false;
+        update_option('sh_media_cron_offload', $sh_media_cron_offload);
+        update_option('sh_disable_acf', $sh_disable_acf);
+    }
+  $sh_media_cron_offload = filter_var(get_option('sh_media_cron_offload'), FILTER_VALIDATE_BOOLEAN);
+  $sh_disable_acf = filter_var(get_option('sh_disable_acf'), FILTER_VALIDATE_BOOLEAN);
+  
     $profile = sh_get_profile();
     $n_once = wp_nonce_field( 'sh-update-configuration' );
@@ -143 +139 @@
         <p><em>This Example removes title tags from within the head tag by replacing it with nothing.</em></p>
 <pre><code>
-  { 
+  {
     "head":
     [
-      { 
+      {
         &quot;query&quot;:&quot;/&lt;title.(.*?)&lt;\/title&gt;/&quot;,
         &quot;replace&quot;:&quot;&quot;
       }
     ],
-    "body":[] 
+    "body":[]
   }
-
 </code></pre>
         <form name="form2" method="post" onsubmit="padJson()">
@@ -218 +213 @@
 
 <h3>Experimental Features</h3>
-        <p>Early access features that are still subject to change.</p>
-        
-        <form name="form_experimental" method="post">
-            <?php echo $n_once ?>
-            <input type="hidden" name="sh_submit_hidden_experimental" value="Y" />
-            <input type="checkbox" id="sh_media_cron_offload" name="sh_media_cron_offload" value="true" <?php echo esc_attr($sh_media_cron_offload ? 'checked' : '') ?> />
-            <label for="sh_media_cron_offload">Import media assets via cron</label>
-            <p>Assets will be fetched after story save to prevent potential execution timeouts. Media won't be immediately available on save but progress will be updated based on the `media_status` field.</p>
-            <p>It is advised that Shorthand Story Posts are saved as a draft first to trigger the cron job prior to public publishing.</p>
-            <br/>
-            <p class="submit">
-                <input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" />
-            </p>
-        </form>
+<p>Early access features that are still subject to change.</p>
+<form name="form_experimental" method="post">
+<?php echo $n_once ?>
+<input type="hidden" name="sh_submit_hidden_experimental" value="Y" />
+<input type="checkbox" id="sh_media_cron_offload" name="sh_media_cron_offload" value="true" <?php echo esc_attr($sh_media_cron_offload ? 'checked' : '') ?> />
+<label for="sh_media_cron_offload">Import media assets via cron</label>
+<p>Assets will be fetched after story save to prevent potential execution timeouts. Media won't be immediately available on save but progress will be updated based on the `media_status` field.</p>
+<p>It is advised that Shorthand Story Posts are saved as a draft first to trigger the cron job prior to public publishing.</p>
+<br/>
+<input type="checkbox" id="sh_disable_acf" name="sh_disable_acf" value="true" <?php echo esc_attr($sh_disable_acf ? 'checked' : '') ?> />
+<label for="sh_disable_acf">Disable Advanced Custom Fields</label>
+<p>Used to prevent any potential issues that could cause the Shorthand Custom Fields to become hidden by Advanced Custom Fields.</p>
+</br>
+<p class="submit">
+<input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" />
+</p>
+</form>
 <?php
 }

shorthand-connect/trunk/shorthand_connect.php

@@ -3 +3 @@
 /**
  * @package Shorthand Connect
- * @version 1.3.27
+ * @version 1.3.28
  */
 /*
@@ -10 +10 @@
 Description: Import your Shorthand stories into your Wordpress CMS as simply as possible - magic!
 Author: Shorthand
-Version: 1.3.27
+Version: 1.3.28
 Author URI: http://shorthand.com
 */
 
-$included = @include_once('config.php');
-if (!$included) {
+if (file_exists('config.php')) {
+    include_once('config.php');
+} else {
     require_once('config.default.php');
 }
-$version = 'v2';
-
-require_once('includes/api-v2.php');
+require_once('includes/api.php');
 require_once('includes/mass_pull.php');
 
@@ -70 +69 @@
 function shand_wpt_shorthand_story()
 {
-
     global $post;
-
     global $serverURL;
-    global $serverv2URL;
     global $showArchivedStories;
-
     $baseurl = '';
-
-    $version = 'v2';
 
 ?>
@@ -198 +191 @@
     }
     $stories = sh_get_stories();
-
-    if (!is_array($stories)) {
-        echo 'Could not connect to Shorthand, please check your <a href="options-general.php?page=shorthand-options">Wordpress Shorthand settings</a>.';
-    } else if (sizeOf($stories) == 0) {
+    $profile = sh_get_profile();
+
+    if (!($profile)) {
+        echo 'Could not connect to Shorthand, please check your API token in <a href="options-general.php?page=shorthand-options">Shorthand settings</a>.';
+    } elseif ($stories === null) {
         echo 'You currently have no stories ready for publishing on Shorthand. Please check that your story is set to be ready for publishing.';
     } else {
@@ -213 +207 @@
             }
             $archived = '';
-            if ($version == 'v2' && isset($story->story_version) && $story->story_version == '1') {
+            if (isset($story->story_version) && $story->story_version == '1') {
                 if ($showArchivedStories) {
                     $archived = ' (archived)';
@@ -279 +273 @@
 function shand_add_shorthand_metaboxes()
 {
-    global $version;
     global $post;
     global $noabstract;
@@ -332 +325 @@
 
 /* Save the shorthand story */
-function shand_save_shorthand_story($post_id, $post, $update)
+function shand_save_shorthand_story($post_id, $post)
 {
     WP_Filesystem();
-
     global $wp_filesystem;
-
+    
     if ( ! is_a( $wp_filesystem, 'WP_Filesystem_Base') ) {
         $creds = request_filesystem_credentials( site_url() );
@@ -355 +347 @@
     }
 
-    if(!get_post_meta($post_id, 'no_update')) {
+    if (!get_post_meta($post_id, 'no_update')) {
         update_post_meta($post_id, 'no_update', "false");
     }
@@ -378 +370 @@
             
         }
-        if($sh_media_cron_offload){
+        if ($sh_media_cron_offload){
             update_post_meta($post_id, 'media_status', '[Awaiting media fetch...]');
             wp_schedule_single_event(time() + 30, 'sh_media_fetch', array( $post_id, $safe_story_id ));
@@ -387 +379 @@
             update_post_meta($post_id, 'story_path', $story_path);
 
-            //Log any story-specific errors to the metadata 
+            //Log any story-specific errors to the metadata
             if(isset($err['error'])){
                 update_post_meta($post_id, 'ERROR', json_encode($err));
@@ -398 +390 @@
 
             // Save the head and body
-            $version = get_option('sh_api_version');
-            update_post_meta($post_id, 'api_version', $version);
             $head_file = $story_path . '/head.html';
             $article_file = $story_path . '/article.html';
@@ -411 +401 @@
             $head = apply_filters('sh_pre_process_head', $head, $assets_path, $head_file);
             
-            if(isset($post_processing_queries->body)){
+            if (isset($post_processing_queries->body)){
                 $body = shand_post_processing($body,$post_processing_queries->body);
             }
             
-            if(isset($post_processing_queries->head)){
+            if (isset($post_processing_queries->head)){
                 $head = shand_post_processing($head, $post_processing_queries->head);
             }
@@ -496 +486 @@
 function shand_shorthand_get_posts($query)
 {
-    if (is_home() && $query->is_main_query())
-        $query->set('post_type', array('post', 'shorthand_story'));
-
+    if (is_home() && $query->is_main_query()) {
+        $query->set( 'post_type', array( 'post', 'shorthand_story' ) );
+    }
     return $query;
 }
@@ -512 +502 @@
 
 
-/* Table Hook */
-function shand_shorthand_show_columns($name)
-{
-    global $post;
-    switch ($name) {
-        case 'story_id':
-            $views = get_post_meta($post->ID, 'story_id', true);
-            echo $views;
-            break;
-        case 'api_version':
-            $views = get_post_meta($post->ID, 'api_version', true);
-            if ($views == '') {
-                // Determine the version, save it if possible;
-                $views = 'Unknown';
-                $story_id = get_post_meta($post->ID, 'story_id', true);
-                if ($story_id) {
-                    $views = determine_version_id($story_id);
-                }
-            }
-            echo $views;
-            break;
-    }
-}
-add_action('manage_posts_custom_column',  'shand_shorthand_show_columns');
-
-
 /* Filter to fix post type tags */
 function shand_post_type_tags_fix($request)
@@ -561 +525 @@
 
 
-/* UTILITY FUNCTIONS */
-
 /* Fix content paths */
 function shand_fix_content_paths($assets_path, $content)
 {
-    
     $content = str_replace('./assets/', $assets_path . '/assets/', $content);
     $content = str_replace('./static/', $assets_path . '/static/', $content);
     $content = preg_replace('/.(\/theme-\w+.min.css)/', $assets_path . '$1', $content);
-    
     $content = apply_filters('shand_fix_content_paths', $content);
-    
     return $content;
 }
@@ -581 +540 @@
         return $content;
     }
-    
     foreach ($queries as $query) {
         if(isset($query->query) && isset($query->replace)){
@@ -587 +545 @@
         }
     }
-
     return $content;
-}
-
-function determine_version_id($story_id)
-{
-    if (substr($story_id, 0, 2) == 'v1') {
-        return 'v1';
-    }
-    if (intval($story_id) > 0) {
-        return 'v1';
-    }
-    return 'v2';
 }
 
@@ -620 +566 @@
 }
 
+function remove_wp_meta_box() {
+    if (function_exists('acf')) { // Check if ACF is installed and enabled
+      $sh_disable_acf = filter_var(get_option('sh_disable_acf'), FILTER_VALIDATE_BOOLEAN);
+      if ($sh_disable_acf) {
+        add_filter('acf/settings/remove_wp_meta_box', '__return_false');
+      }
+    }
+  }
+  add_action('acf/init', 'remove_wp_meta_box');
+  
 /* Add "Pull Story" to post dropdown */
-add_filter('bulk_actions-edit-shorthand_story', function($bulk_actions) {
+add_filter('bulk_actions-edit-shorthand_story', function ($bulk_actions) {
     $bulk_actions['bulk-pull-stories'] = __('Pull Story', 'txtdomain');
     return $bulk_actions;
@@ -627 +583 @@
 
 /* Pull the stories */
-add_filter('handle_bulk_actions-edit-shorthand_story', function($redirect_url, $action, $post_ids) {
+add_filter('handle_bulk_actions-edit-shorthand_story', function ($redirect_url, $action, $post_ids) {
     //Run on posts which have bulk-pull-stories set to true
     if ($action == 'bulk-pull-stories') {
@@ -649 +605 @@
 
 /* Add Notice after post has pulled */
-add_action('admin_notices', function() {
+add_action('admin_notices', function () {
     if (!empty($_REQUEST['bulk-pulled-stories'])) {
         $num_changed = (int) $_REQUEST['bulk-pulled-stories'];
@@ -655 +611 @@
     }
 });
-
-?>

shorthand-connect/trunk/templates/single-shorthand_story.php

@@ -1 +1 @@
 <?php get_header();
-
     // Check to see if there is a password set against the post
-    if ( post_password_required( $post->ID ) ) {
-
+    if (post_password_required($post->ID)) {
          echo get_the_password_form();
-
     } else {
-
         while ( have_posts() ) : the_post();
             $meta = get_post_meta($post->ID);
         ?>
-
         <?php echo trim($meta['story_body'][0]); ?>
-
         <div id="extraHTML">
             <?php echo trim($meta['extra_html'][0]); ?>
         </div>
-
         <style type="text/css">
             <?php echo get_option('sh_css'); ?>
         </style>
-
         <?php
         endwhile;
-
     }
-
 get_footer();