Changeset 2789381 for gdpr-cache-scripts-styles

Timestamp:

09/23/2022 03:04:29 PM (4 years ago)

Author:

stracker.phil

Message:

1.0.3

Location:

gdpr-cache-scripts-styles

Files:

• assets/screenshot-3.png (modified) (previous)
• tags/1.0.3 (added)
• tags/1.0.3/LICENSE (added)
• tags/1.0.3/constants.php (added)
• tags/1.0.3/includes (added)
• tags/1.0.3/includes/admin (added)
• tags/1.0.3/includes/admin/actions.php (added)
• tags/1.0.3/includes/admin/options.php (added)
• tags/1.0.3/includes/libs (added)
• tags/1.0.3/includes/libs/cache.php (added)
• tags/1.0.3/includes/libs/scanner.php (added)
• tags/1.0.3/includes/libs/utils.php (added)
• tags/1.0.3/includes/libs/worker.php (added)
• tags/1.0.3/plugin.php (added)
• tags/1.0.3/readme.txt (added)
• tags/1.0.3/scripts (added)
• tags/1.0.3/scripts/sortable.js (added)
• tags/1.0.3/start.php (added)
• tags/1.0.3/styles (added)
• tags/1.0.3/styles/admin.css (added)
• tags/1.0.3/templates (added)
• tags/1.0.3/templates/admin-options.php (added)
• trunk/constants.php (modified) (2 diffs)
• trunk/includes/admin/options.php (modified) (1 diff)
• trunk/includes/libs/cache.php (modified) (1 diff)
• trunk/plugin.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/scripts (added)
• trunk/scripts/sortable.js (added)
• trunk/styles (added)
• trunk/styles/admin.css (added)
• trunk/templates/admin-options.php (modified) (10 diffs)

gdpr-cache-scripts-styles/trunk/constants.php

@@ -17 +17 @@
  */
 define( 'GDPR_CACHE_PATH', plugin_dir_path( GDPR_CACHE_PLUGIN_FILE ) );
+
+/**
+ * Absolute URL to the current plugins base folder, with trailing slash. Used
+ * to enqueue scripts that are shipped with this plugin.
+ *
+ * @var string
+ */
+define( 'GDPR_CACHE_PLUGIN_URL', plugin_dir_url( GDPR_CACHE_PLUGIN_FILE ) );
 
 /**
@@ -51 +59 @@
      * in TTF fonts being used.
      *
-     * @see https://developers.google.com/fonts/docs/technical_considerations
+     * @see   https://developers.google.com/fonts/docs/technical_considerations
      *
      * @since 1.0.1

gdpr-cache-scripts-styles/trunk/includes/admin/options.php

@@ -77 +77 @@
  */
 function render_admin_page() {
+    // Flush plugin cache when the Options Page is opened.
+    wp_cache_delete( 'data', 'gdpr-cache' );
+
     require GDPR_CACHE_PATH . 'templates/admin-options.php';
 }

gdpr-cache-scripts-styles/trunk/includes/libs/cache.php

@@ -217 +217 @@
         'expires' => time() + $expiration,
         'file'    => $file,
+        'type'    => get_url_type( $url ),
     ];
 

gdpr-cache-scripts-styles/trunk/plugin.php

@@ -12 +12 @@
  * Plugin URI:  https://github.com/divimode/gdpr-cache-script-styles
  * Description: Caches external scripts and styles and serves them from your local website to make it more compliant with GDPR regulations
- * Version:     1.0.2
+ * Version:     1.0.3
  * Author:      Divimode
  * Author URI:  https://divimode.com/
@@ -46 +46 @@
  * @var string
  */
-const GDPR_CACHE_VERSION = '1.0.2';
+const GDPR_CACHE_VERSION = '1.0.3';
 
 /**

gdpr-cache-scripts-styles/trunk/readme.txt

@@ -4 +4 @@
 Tested up to: 6.0.2
 Requires PHP: 7.2
-Stable tag: 1.0.2
+Stable tag: 1.0.3
 License: GPL v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.txt
@@ -121 +121 @@
 == Changelog ==
 
+= 1.0.3 =
+
+* New: Display file-type of cached assets in the plugin's option page.
+* New: Also in the plugin's option page - allow sorting of the "Cached Assets" list.
+* Improve: Flush the plugins internal cache when opening the options page.
+
 = 1.0.2 =
 

gdpr-cache-scripts-styles/trunk/templates/admin-options.php

@@ -10 +10 @@
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit;
+
+wp_enqueue_script( 'gdpr-sortable', GDPR_CACHE_PLUGIN_URL . 'scripts/sortable.js' );
+wp_enqueue_style( 'gdpr-sortable', GDPR_CACHE_PLUGIN_URL . 'styles/admin.css' );
 
 $assets = get_cached_data();
@@ -33 +36 @@
 foreach ( $assets as $url => $item ) {
     $status_label = '';
+    $local_url    = '';
     $item_status  = get_asset_status( $url );
+    $item_type    = isset( $item['type'] ) ? $item['type'] : '';
+
+    if ( ! $item_type ) {
+        $item_type = get_url_type( $url );
+    }
 
     if ( 'valid' !== $item_status ) {
@@ -44 +53 @@
         $status_label = $status_labels[ $item_status ];
     }
+    if ( in_array( $item_status, [ 'valid', 'expired' ] ) ) {
+        $local_url = build_cache_file_url( $item['file'] );
+    }
     $counts['all'] ++;
     $counts[ $item_status ] ++;
@@ -51 +63 @@
         'status'       => $item_status,
         'status_label' => $status_label,
+        'type'         => $item_type,
+        'local_url'    => $local_url,
         'created'      => gmdate( 'Y-m-d H:i', $item['created'] ),
         'expires'      => gmdate( 'Y-m-d H:i', $item['expires'] ),
@@ -61 +75 @@
     }
 
+    $item_type   = get_url_type( $url );
     $item_status = 'enqueued';
     $counts['all'] ++;
@@ -69 +84 @@
         'status'       => $item_status,
         'status_label' => $status_labels[ $item_status ],
+        'type'         => $item_type,
+        'local_url'    => '',
         'created'      => '',
         'expires'      => '',
@@ -84 +101 @@
 
 ?>
-<div class="wrap">
+<div class="wrap" id="gdpr-cache">
     <h1><?php esc_html_e( 'GDPR Cache Options', 'gdpr-cache' ); ?></h1>
 
@@ -131 +148 @@
         </p>
     <?php else : ?>
-        <table class="wp-list-table widefat fixed striped table-view-list">
+        <table class="wp-list-table widefat fixed striped table-view-list sortable">
             <thead>
             <tr>
-                <th class="asset-url"><?php esc_html_e( 'URL', 'gdpr-cache' ); ?></th>
-                <th
-                        class="asset-status" style="width:100px"
-                ><?php esc_html_e( 'Status', 'gdpr-cache' ); ?></th>
-                <th
-                        class="asset-created" style="width:125px"
-                ><?php esc_html_e( 'Created', 'gdpr-cache' ); ?></th>
-                <th
-                        class="asset-expires" style="width:125px"
-                ><?php esc_html_e( 'Expires', 'gdpr-cache' ); ?></th>
+                <th class="asset-url">
+                    <?php esc_html_e( 'URL', 'gdpr-cache' ); ?>
+                </th>
+                <th class="asset-type">
+                    <?php esc_html_e( 'Type', 'gdpr-cache' ); ?>
+                </th>
+                <th class="asset-status">
+                    <?php esc_html_e( 'Status', 'gdpr-cache' ); ?>
+                </th>
+                <th class="asset-created">
+                    <?php esc_html_e( 'Created', 'gdpr-cache' ); ?>
+
+                </th>
+                <th class="asset-expires">
+                    <?php esc_html_e( 'Expires', 'gdpr-cache' ); ?>
+                </th>
             </tr>
             </thead>
@@ -149 +172 @@
                 <tr class="status-<?php echo esc_attr( $item['status'] ); ?>">
                     <td class="asset-url"><?php echo esc_html( $item['url'] ); ?></td>
+                    <td class="asset-type"><?php echo esc_html( $item['type'] ); ?></td>
                     <td class="asset-status">
-                        <?php echo esc_html( $item['status_label'] ); ?>
+                        <?php if ( $item['local_url'] ): ?>
+                            <a
+                                    href="<?php echo esc_url( $item['local_url'] ); ?>"
+                                    title="<?php esc_attr_e( 'Open the cached file in a new window', 'gdpr-cache' ); ?>"
+                                    target="_blank"
+                            >
+                                <?php echo esc_html( $item['status_label'] ); ?>
+                            </a>
+                        <?php else: ?>
+                            <?php echo esc_html( $item['status_label'] ); ?>
+                        <?php endif; ?>
                     </td>
                     <td class="asset-created"><?php echo esc_html( $item['created'] ); ?></td>
@@ -159 +193 @@
     <?php endif; ?>
 </div>
-
-<style>
-    .subsubsub {
-        margin-bottom: 12px
-    }
-
-    .subsubsub li + li:before {
-        content: '|';
-        padding: 0 2px;
-    }
-
-    .subsubsub .count-all .status {
-        font-weight: bold;
-    }
-
-    .widefat .asset-status {
-        vertical-align: middle;
-        text-align: center;
-    }
-
-    .status-valid .asset-status {
-        background: #c8e6c940;
-        color: #005005;
-    }
-
-    .status-expired .asset-status {
-        background: #ffecb340;
-        color: #c56000;
-    }
-
-    .status-missing .asset-status {
-        background: #ffccbc40;
-        color: #9f0000;
-    }
-
-    .status-enqueued .asset-status {
-        background: #e1bee740;
-        color: #38006b;
-    }
-</style>