sun

The following patch resolves the issue by giving other code access to the class instance. It would be great if you could include this change in the next release.

diff --git a/language-fallback.php b/language-fallback.php
index bf363a1..7b7d27d 100644
--- a/language-fallback.php
+++ b/language-fallback.php
@@ -13,6 +13,8 @@
 
 class Language_Fallback {
 
+       private static = $instance;
+
        /**
         * used to store the current locale e.g. "de_DE"
         *
@@ -28,6 +30,7 @@ class Language_Fallback {
        private $fallback_locale;
 
        function __construct() {
+               self::$instance = $this;
 
                // get current locale
                $this->locale = get_locale();
@@ -48,6 +51,13 @@ class Language_Fallback {
                load_plugin_textdomain( 'language-fallback', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
        }
 
+       public static function getInstance() {
+               if (!isset(self::$instance)) {
+                       new self();
+               }
+               return self::$instance;
+       }
+
        /**
         * A function to check if the requested mofile exists and if not, it checks if a mofile for the fallback locale exists
         *

• This reply was modified 9 years, 3 months ago by sun. Reason: Removed windows line ending markers from diff

diff --git a/wp-content/plugins/etsy-shop/etsy-shop.php b/wp-content/plugins/etsy-shop/etsy-shop.php
index 4f289e0..b44dd39 100644
--- a/wp-content/plugins/etsy-shop/etsy-shop.php
+++ b/wp-content/plugins/etsy-shop/etsy-shop.php
@@ -28,7 +28,6 @@ Version: 0.18
  */

 /* Roadmap to version 1.x
- * TODO: touch() file in tmp folder
  * TODO: reset cache function
  * TODO: edit cache life
  * TODO: allow more than 100 items
@@ -39,7 +38,7 @@ Version: 0.18
  */

 define( 'ETSY_SHOP_VERSION',  '0.18');
-define( 'ETSY_SHOP_CACHE_LIFE',  21600 ); // 6 hours in seconds
+define( 'ETSY_SHOP_CACHE_LIFE', 6 * HOUR_IN_SECONDS );

 // load translation
 add_action( 'init', 'etsy_shop_load_translation_file' );
@@ -264,38 +263,28 @@ function etsy_shop_shortcode( $atts ) {
 add_shortcode( 'etsy-shop', 'etsy_shop_shortcode' );

 function etsy_shop_getShopSectionListings( $etsy_shop_id, $etsy_section_id, $language ) {
-    $etsy_cache_file = etsy_shop_get_data_dir().'/'.$etsy_shop_id.'-'.$etsy_section_id.'_cache.json';
-
-    // if no cache file exist
-    if (!file_exists( $etsy_cache_file ) or ( time() - filemtime( $etsy_cache_file ) >= ETSY_SHOP_CACHE_LIFE ) or get_option( 'etsy_shop_debug_mode' ) ) {
-        // if language set
-        if ($language != null) {
-            $reponse = etsy_shop_api_request( "shops/$etsy_shop_id/sections/$etsy_section_id/listings/active", '&limit=100&includes=Images&language='.$language );
-        } else {
-            $reponse = etsy_shop_api_request( "shops/$etsy_shop_id/sections/$etsy_section_id/listings/active", '&limit=100&includes=Images' );
+    $transient_id = 'etsy-shop_' . $etsy_shop_id . '-' . $etsy_section_id;
+    if ($language) {
+        $transient_id .= '-' . $language;
+    }
+    if (get_option('etsy_shop_debug_mode') || !$response = get_transient($transient_id)) {
+        $api_parameters = '&limit=100&includes=Images';
+        if ($language) {
+            $api_parameters .= '&language=' . $language;
         }
-
-        if ( !is_wp_error( $reponse ) ) {
-            // if request OK
-            $tmp_file = $etsy_cache_file.rand().'.tmp';
-            file_put_contents( $tmp_file, $reponse );
-            rename( $tmp_file, $etsy_cache_file );
-        } else {
-            // return WP_Error
-            return $reponse;
+        $response = etsy_shop_api_request("shops/$etsy_shop_id/sections/$etsy_section_id/listings/active", $api_parameters);
+        if (is_wp_error($response)) {
+            return $response;
         }
-    } else {
-        // read cache file
-        $reponse = file_get_contents( $etsy_cache_file );
+        set_transient($transient_id, $response, ETSY_SHOP_CACHE_LIFE);
     }

     if ( get_option( 'etsy_shop_debug_mode' ) ) {
-        $file_content = file_get_contents( $etsy_cache_file );
-        print_r( '<h3>--- Etsy Cache File:' . $etsy_cache_file . ' ---</h3>' );
-        print_r( $file_content );
+        print_r( '<h3>--- Etsy Transient: ' . $transient_id . ' ---</h3>' );
+        print_r( $response );
     }

-    $data = json_decode( $reponse );
+    $data = json_decode( $response );
     return $data;
 }

@@ -426,11 +415,14 @@ function etsy_shop_menu() {
 }

 function etsy_shop_options_page() {
+    global $wpdb;
+
     // did the user is allowed?
     if ( !current_user_can( 'manage_options' ) )  {
         wp_die( __( 'You do not have sufficient permissions to access this page.', 'etsyshop' ) );
     }

+    $updated = FALSE;
     if ( isset( $_POST['submit'] ) ) {
         // did the user enter an API Key?
         if ( isset( $_POST['etsy_shop_api_key'] ) ) {
@@ -485,30 +477,11 @@ function etsy_shop_options_page() {
         }
     }

-    // delete cache file
-    if ( isset( $_GET['delete'] ) ) {
-
-        // did a file was choosed?
-        if ( isset( $_GET['file'] ) ) {
-            $tmp_directory = etsy_shop_get_data_dir() . '/';
-
-            // REGEX for security!
-            $filename = str_replace( '.json', '', $_GET['file'] );
-            $filename = preg_replace( '/[^a-zA-Z0-9-_]/', '', $filename );
-
-            $fullpath_filename = $tmp_directory . $filename . '.json';
-            if ( file_exists( $fullpath_filename ) ) {
-                $deletion = unlink( $fullpath_filename );
-            } else {
-                $deletion = false;
-            }
-
-            if ( $deletion ) {
-                // and remember to note deletion to user
-                $deleted = true;
-                $deleted_file = $fullpath_filename;
-            }
-        }
+    // delete cache
+    $deleted = FALSE;
+    if (isset($_GET['delete']) && isset($_GET['transient_id'])) {
+        delete_transient($_GET['transient_id']);
+        $deleted = TRUE;
     }

     // grab the Etsy API key
@@ -544,7 +517,7 @@ function etsy_shop_options_page() {
     }

     if ( $deleted ) {
-        echo '<div class="updated fade"><p><strong>'. __( 'Cache file deleted:', 'etsyshop' ) . ' ' . $deleted_file . '</strong></p></div>';
+        echo '<div class="updated fade"><p><strong>'. __( 'Cache deleted:', 'etsyshop' ) . ' ' . $_GET['transient_id'] . '</strong></p></div>';
     }

     // print the Options Page
@@ -616,29 +589,35 @@ function etsy_shop_options_page() {
                                         <thead id="EtsyShopCacheTableHead">
                                         <tr>
                                             <th><?php _e('Shop Section', 'etsyshop'); ?></th>
-                                            <th><?php _e('Filename', 'etsyshop'); ?></th>
-                                            <th><?php _e('Last update', 'etsyshop'); ?></th>
+                                            <th><?php _e('Transient ID', 'etsyshop'); ?></th>
+                                            <th><?php _e('Expires', 'etsyshop'); ?></th>
                                             <th></th>
                                         </tr>
                                         </thead>
                                         <?php
-                                $files = glob( etsy_shop_get_data_dir().'/*.json' );
-                                $time_zone = get_option('timezone_string');
-                                date_default_timezone_set( $time_zone );
-                                foreach ($files as $file) {
-                                    // downgrade to support PHP 5.2.4
-                                    //$etsy_shop_section = explode( "-", strstr(basename( $file ), '_cache.json', true ) );
-                                    $etsy_shop_section = explode( "-", substr( basename( $file ), 0, strpos( basename( $file ), '_cache.json' ) ) );
-                                    $etsy_shop_section_info = etsy_shop_getShopSection($etsy_shop_section[0], $etsy_shop_section[1]);
+                                $transients = $wpdb->get_results("SELECT * FROM {$wpdb->options} WHERE option_name LIKE '_transient_etsy-shop_%'");
+                                foreach ($transients as $transient) {
+                                    $transient_id = substr($transient->option_name, strlen('_transient_'));
+                                    @list($shop_name, $shop_section_id, $language) = explode('-', substr($transient_id, strlen('etsy-shop_')), 3);
+                                    $etsy_shop_section_info = etsy_shop_getShopSection($shop_name, $shop_section_id, $language);
+                                    $expiration = $wpdb->get_var("SELECT option_value FROM {$wpdb->options} WHERE option_name = '_transient_timeout_{$transient_id}'");
                                     if ( !is_wp_error( $etsy_shop_section_info ) ) {
-                                       echo '<tr><td>' . $etsy_shop_section[0] . ' / ' . $etsy_shop_section_info->results[0]->title . '</td><td>' . basename( $file ) . '</td><td>' .  date( "Y-m-d H:i:s", filemtime( $file ) ) . '</td><td><a href="options-general.php?page=etsy-shop.php&delete&file=' . basename( $file ) . '" title="'. __('Delete cache file', 'etsyshop') .'"><span class="dashicons dashicons-trash"></span></a></td></tr>';
-                                       // echo '<tr><td>' . $etsy_shop_section[0] . ' / ' . $etsy_shop_section_info->results[0]->title . '</td><td>' . basename( $file ) . '</td><td>' .  date( "Y-m-d H:i:s", filemtime( $file ) ) . '</td><td><a href="" title="' . _e('Delete cache file', 'etsyshop'); . '"><span class="dashicons dashicons-trash"></span></a></td></tr>';
+                                       echo '<tr>
+<td>' . $shop_name . ' / ' . $etsy_shop_section_info->results[0]->title . '</td>
+<td>' . $transient_id . '</td>
+<td>' . date_i18n( "Y-m-d H:i:s", $expiration ) . '</td>
+<td><a href="options-general.php?page=etsy-shop.php&delete&transient_id=' . urlencode($transient_id) . '" title="'. __('Delete cache', 'etsyshop') .'"><span class="dashicons dashicons-trash"></span></a></td>
+</tr>';
                                     } else {
-                                        echo '<tr><td>' . $etsy_shop_section[0] . ' / <span style="color:red;">Error on API Request</span>' . '</td><td>' . basename( $file ) . '</td><td>' .  date( "Y-m-d H:i:s", filemtime( $file ) ) . '</td><td></td></tr>';
+                                        echo '<tr>
+<td>' . $shop_name . ' / <span style="color:red;">Error on API Request</span>' . '</td>
+<td>' . $transient_id . '</td>
+<td>' . ($expiration ? date_i18n( "Y-m-d H:i:s", $expiration ) : $expiration ) . '</td>
+<td></td>
+</tr>';
                                     }
                                 }
                                     ?></table><?php } else { _e('You must enter your Etsy API Key to view cache status!', 'etsyshop'); } ?>
-                                <p class="description"><?php _e( 'You may reset cache a any time by deleting files in tmp folder of the plugin.', 'etsyshop' ); ?></p>
                                 </td>
                         </tr>
         </table>
@@ -681,12 +660,3 @@ function etsy_shop_plugin_action_links( $links, $file ) {
     return $links;
 }

-function etsy_shop_get_data_dir() {
-    $uploads_config = wp_upload_dir(NULL, FALSE);
-    $dir = $uploads_config['basedir'] . '/etsy-shop/tmp';
-    if ( !file_exists($dir) ) {
-        wp_mkdir_p($dir);
-    }
-    return $dir;
-}
-