Changeset 2318858

Timestamp:

06/05/2020 09:29:47 AM (6 years ago)

Author:

cloudimage

Message:

Release 2.9.0

Location:

cloudimage/trunk

Files:

• README.txt (modified) (2 diffs)
• admin/class-cloudimage-admin.php (modified) (1 diff)
• admin/css/cloudimage-admin.css (modified) (1 diff)
• admin/partials/cloudimage-admin-display.php (modified) (2 diffs)
• cloudimage.php (modified) (2 diffs)
• includes/class-cloudimage.php (modified) (1 diff)
• public/class-cloudimage-public.php (modified) (7 diffs)

cloudimage/trunk/README.txt

@@ -6 +6 @@
 Tested up to: 5.4.0
 Requires PHP: 5.6
-Stable tag: 2.8.9
+Stable tag: 2.9.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -265 +265 @@
 * Instagram widget fix
 
+= 2.9.0 =
+* Add options to choose if plugin should work when user is logged in
+
 == Upgrade Notice ==
 * Upgrading from version 1 to 2 can show you warnings in the admin section

cloudimage/trunk/admin/class-cloudimage-admin.php

@@ -169 +169 @@
 
         $valid['cloudimage_use_js_powered_mode'] = empty($input['use_js_powered_mode']) ? 0 : 1;
+        $valid['cloudimage_use_for_logged_in_users'] = empty($input['use_for_logged_in_users']) ? 0 : 1;
 
         return $valid;

cloudimage/trunk/admin/css/cloudimage-admin.css

@@ -364 +364 @@
 }
 
-#cloudimage-current-mode {
+#cloudimage-current-mode, #cloudimage-user-mode {
     display: inline-block;
     font-size: 18px;

cloudimage/trunk/admin/partials/cloudimage-admin-display.php

@@ -20 +20 @@
 $domain = $options['cloudimage_domain'];
 $use_js_powered_mode = $options['cloudimage_use_js_powered_mode'];
+$use_for_logged_in_users = $options['cloudimage_use_for_logged_in_users'];
+
 ?>
 
@@ -137 +139 @@
                         </tr>
 
+                        <!-- Use if user is logged in -->
+                        <tr id="use-for-logged-in-users">
+                            <th scope="row" class="titledesc">
+                                <label for="<?php echo $this->plugin_name; ?>-use_for_logged_in_users">
+                                    <div id="cloudimage-user-mode"><?php esc_attr_e('Use when logged in', 'cloudimage'); ?></div>
+                                    <div class="tooltip">?
+                                        <span class="tooltiptext"><?php esc_attr_e('Use Cloudimage even the user is logged-in. You need to adapt to your need in some scenarious, it is better to save CDN bandwidth.', 'cloudimage') ?></span>
+                                    </div>
+                                </label>
+                            </th>
+
+                            <td class="forminp forminp-text">
+                                <label class="switch">
+                                    <input type="checkbox" id="<?php echo $this->plugin_name; ?>-use_for_logged_in_users"
+                                           name="<?php echo $this->plugin_name; ?>[use_for_logged_in_users]" <?php checked($use_for_logged_in_users, 1); ?> >
+                                    <span class="slider round"></span>
+                                </label>
+
+                            </td>
+                        </tr>
+
                         </tbody>
                     </table>

cloudimage/trunk/cloudimage.php

@@ -12 +12 @@
  * Plugin Name:       Cloudimage - Responsive Images as a Service
  * Description:       The easiest way to <strong>deliver lightning fast images</strong> to your users.
- * Version:           2.8.9
+ * Version:           2.9.0
  * Author:            Cloudimage
  * Author URI:        https://cloudimage.io
@@ -30 +30 @@
  * Start at version 1.0.0
  */
-define('CLOUDIMAGE_VERSION', '2.8.9');
+define('CLOUDIMAGE_VERSION', '2.9.0');
 
 /**

cloudimage/trunk/includes/class-cloudimage.php

@@ -83 +83 @@
             $this->version = CLOUDIMAGE_VERSION;
         } else {
-            $this->version = '2.8.9';
+            $this->version = '2.9.0';
         }
         $this->plugin_name = 'cloudimage';

cloudimage/trunk/public/class-cloudimage-public.php

@@ -69 +69 @@
     private $cloudimage_skip_classes;
 
+    /**
+     * Define if Cloudimage optimization should work when user is logged-in
+     *
+     * @since    2.9.0
+     * @access   private
+     * @var      int $cloudimage_use_in_admin 0 or 1 regarding is optimization should work when users are logged in
+     */
+    private $cloudimage_use_for_logged_in_users;
 
     /**
@@ -90 +98 @@
         $this->cloudimage_domain = $this->cloudimage_options['cloudimage_domain'];
         $this->cloudimage_use_js_powered_mode = $this->cloudimage_options['cloudimage_use_js_powered_mode'];
+
+        $cloudimage_use_for_logged_in_users = isset($this->cloudimage_options['cloudimage_use_for_logged_in_users']) ? $this->cloudimage_options['cloudimage_use_for_logged_in_users'] : 0;
+        $this->cloudimage_use_for_logged_in_users = $cloudimage_use_for_logged_in_users;
     }
 
@@ -143 +154 @@
     public function filter_cloudimage_wp_get_attachment_url($url, $post_id)
     {
-        if ($this->is_dev || !$this->cloudimage_domain || is_admin() || is_user_logged_in()) {
+        # Check if we need to perform the optimization for the current user state (logged in or not)
+        $logged_in_user = $this->cloudimage_check_logged_user();
+
+        if ($this->is_dev || !$this->cloudimage_domain || $logged_in_user) {
             return $url;
         }
@@ -171 +185 @@
     public function filter_cloudimage_wp_calculate_image_srcset($sources, $size_array, $image_src, $image_meta, $attachment_id)
     {
-        if ($this->is_dev || !$this->cloudimage_domain || is_admin() || is_user_logged_in()) {
-
+        # Check if we need to perform the optimization for the current user state (logged in or not)
+        $logged_in_user = $this->cloudimage_check_logged_user();
+
+        if ($this->is_dev || !$this->cloudimage_domain || $logged_in_user) {
+            # Return original sources
             return $sources;
         }
@@ -228 +245 @@
     public function filter_cloudimage_image_downsize($short_cut, $id, $size)
     {
-        if ($short_cut || $this->is_dev || !$this->cloudimage_domain || $this->cloudimage_use_js_powered_mode || is_admin() || is_user_logged_in()) {
+        # Check if we need to perform the optimization for the current user state (logged in or not)
+        $logged_in_user = $this->cloudimage_check_logged_user();
+
+        if ($short_cut || $this->is_dev || !$this->cloudimage_domain || $this->cloudimage_use_js_powered_mode || $logged_in_user) {
             return false;
         }
@@ -895 +915 @@
     public function cloudimage_buffer_start()
     {
-        if ($this->cloudimage_use_js_powered_mode && !is_admin() && !is_user_logged_in()) {
+        # Check if we need to perform the optimization for the current user state (logged in or not)
+        $logged_in_user = $this->cloudimage_check_logged_user();
+
+        if ($this->cloudimage_use_js_powered_mode && !$logged_in_user) {
             ob_start([$this, 'filter_cloudimage_the_content']);
         }
@@ -912 +935 @@
         return str_replace("/v7/", "/", $url);
     }
+
+    /**
+     * Function to return if we need to perform optimization with Cloudimage
+     *
+     * @return bool
+     *
+     * @since    2.9.0
+     */
+    public function cloudimage_check_logged_user()
+    {
+        if ((is_admin() || is_user_logged_in()) && !$this->cloudimage_use_for_logged_in_users) {
+            return 1;
+        }
+
+        return 0;
+    }
 }