Changeset 2652765

Timestamp:

01/04/2022 07:59:49 PM (4 years ago)

Author:

optipic

Message:

v1.27.0

Location:

optipic

Files:

• tags/1.27.0 (added)
• tags/1.27.0/images (added)
• tags/1.27.0/images/op_logo.png (added)
• tags/1.27.0/includes (added)
• tags/1.27.0/includes/functions.php (added)
• tags/1.27.0/includes/optipic-cdn-php (added)
• tags/1.27.0/includes/optipic-cdn-php/ImgUrlConverter.php (added)
• tags/1.27.0/includes/settings.php (added)
• tags/1.27.0/includes/template_loader.php (added)
• tags/1.27.0/optipic-ru_RU.mo (added)
• tags/1.27.0/optipic-ru_RU.po (added)
• tags/1.27.0/optipic.php (added)
• tags/1.27.0/optipic.pot (added)
• tags/1.27.0/readme.txt (added)
• tags/1.27.0/uninstall.php (added)
• trunk/includes/functions.php (modified) (3 diffs)
• trunk/includes/optipic-cdn-php/ImgUrlConverter.php (modified) (10 diffs)
• trunk/optipic.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)

optipic/trunk/includes/functions.php

@@ -2 +2 @@
 
 function optipic_version() {
-    return '1.25.1';
+    return '1.27.0';
 }
 
@@ -36 +36 @@
 //    die('-------------');
 
-    $optipicSiteID = $optipicSettings['cdn_site_id'];
-    $autoreplaceActive = $optipicSettings['cdn_autoreplace_active'];
+    $optipicSiteID = (!empty($optipicSettings['cdn_site_id']))? $optipicSettings['cdn_site_id']: '';
+    $autoreplaceActive = (!empty($optipicSettings['cdn_autoreplace_active']))? $optipicSettings['cdn_autoreplace_active']: '';
     //$domains = $optipicSettings['domains'];
     
@@ -50 +50 @@
     foreach(array('domains', 'exclusions_url', 'whitelist_img_urls', 'srcset_attrs') as $attrName) {
         $list = array();
-        foreach(explode("\n", $optipicSettings[$attrName]) as $val) {
+        $attrVal = (!empty($optipicSettings[$attrName]))? $optipicSettings[$attrName]: '';
+        foreach(explode("\n", $attrVal) as $val) {
             $val = trim($val);
             if($val) {

optipic/trunk/includes/optipic-cdn-php/ImgUrlConverter.php

@@ -17 +17 @@
      * Library version number
      */
-    const VERSION = '1.25';
+    const VERSION = '1.27';
     
     /**
@@ -71 +71 @@
     {
         
-        if(empty(self::$url)) {
+        if (empty(self::$url)) {
             self::$url = $_SERVER['REQUEST_URI'];
         }
-        if(empty(self::$host)) {
+        if (empty(self::$host)) {
             self::$host = $_SERVER['HTTP_HOST'];
         }
@@ -123 +123 @@
         
         
-        if($detectBaseUrl) {
+        if ($detectBaseUrl) {
             self::$baseUrl = self::getBaseUrlFromHtml($content);
             if (self::$baseUrl) {
@@ -230 +230 @@
             $cdnDomainsForRegexp[] = '\/\/'.preg_quote($cdnDomain, '#');   // plain html
             $cdnDomainsForRegexp[] = '\\/\\/'.preg_quote($cdnDomain, '#'); // html in json
-            
         }
         $cdnDomainsForRegexp = implode("|", $cdnDomainsForRegexp);
@@ -398 +397 @@
             }
             //var_dump($parseUrl);exit;
-        }
-        else {
+        } else {
             $parseUrl = parse_url($urlOriginal);
         }
@@ -416 +414 @@
         $ext = self::strtolower(pathinfo($parseUrl['path'], PATHINFO_EXTENSION));
         if (!in_array($ext, array('png', 'jpg', 'jpeg'))) {
+            return $replaceWithoutOptiPic;
+        }
+        
+        if (self::urlHasPhpScript($urlOriginal)) {
             return $replaceWithoutOptiPic;
         }
@@ -520 +522 @@
         }
         
-        if (self::substr($relativeUrl, 0, strlen($slash))==$slash) {
+        if (self::substr($relativeUrl, 0, self::strlen($slash))==$slash) {
             return $relativeUrl;
         }
@@ -534 +536 @@
         
         // CASE filepath ".img.png" (remove first dot)
-        if (substr($relativeUrl, 0, 1) == '.' && substr($relativeUrl, 1, 1) != '.') {
-            $relativeUrl = substr($relativeUrl, 1);
+        if (self::substr($relativeUrl, 0, 1) == '.' && self::substr($relativeUrl, 1, 1) != '.') {
+            $relativeUrl = self::substr($relativeUrl, 1);
         }
         // CASE baseUrl "." (remove first dot)
-        if (strlen($baseUrl)>0 && substr($baseUrl, 0, 1) == '.' && substr($baseUrl, 1, 1) != '.') {
-            $baseUrl = (strlen($baseUrl)>1)? "".substr($baseUrl, 1): "";
+        if (self::strlen($baseUrl)>0 && self::substr($baseUrl, 0, 1) == '.' && self::substr($baseUrl, 1, 1) != '.') {
+            $baseUrl = (self::strlen($baseUrl)>1)? "".self::substr($baseUrl, 1): "";
         }
         
         // CASE /catalog + img.png (/catalogimg.png is wrong)
-        if (substr($baseUrl, -1)!='/' && substr($relativeUrl, 0, 1) != '/') {
+        if (self::substr($baseUrl, -1)!='/' && self::substr($relativeUrl, 0, 1) != '/') {
             $tryUrl = str_replace($slash.$slash, $slash, $baseUrl.$slash.$relativeUrl);
             // Try to /catalog/img.png
             if (file_exists(self::getDocumentDoot().$slash.$tryUrl)) {
                 return $tryUrl;
-            }
-            // Try to /img.png
-            else {
+            } else { // Try to /img.png
                 $tryUrl = str_replace($slash.$slash, $slash, '/'.$relativeUrl);
                 if (file_exists(self::getDocumentDoot().$slash.$tryUrl)) {
@@ -732 +732 @@
     public static function substr($string, $offset, $length = null)
     {
-        return substr($string, $offset, $length);
+        return (($length===null)? substr($string, $offset): substr($string, $offset, $length));
     }
     
@@ -757 +757 @@
          return $_SERVER['DOCUMENT_ROOT'];
     }
+    
+    
+    /**
+     * Check if URL has php script logic (no static image)
+     * Examples:
+     * - /index.php?route=product/image/catalog/payment.png
+     * - /manager/?a=system/file/edit&file=assets/template/css/../images/lines.png
+     */
+    public static function urlHasPhpScript($url)
+    {
+        $ext = pathinfo($url, PATHINFO_EXTENSION);
+        $posQ = stripos($url, '?');
+        
+        if (!$posQ) {
+            $posQ = stripos($url, '&');
+            if (!$posQ) {
+                return false;
+            }
+        }
+        
+        if (!$ext) {
+            return true;
+        }
+        
+        $posExt = stripos($url, $ext);
+        if ($posQ < $posExt) {
+            return true;
+        }
+        
+        return false;
+    }
 }

optipic/trunk/optipic.php

@@ -4 +4 @@
 Plugin URI:  https://optipic.io/en/webp/wordpress/
 Description:  OptiPic.io - image optimization via smart CDN. The module automates the process of optimizing and compressing all images on the site according to the recommendations of Google PageSpeed Insights.
-Version:  1.25.1
+Version:  1.27.0
 Author:  OptiPic.io
 Author URI:  https://optipic.io/en/

optipic/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.0
 Tested up to: 5.8.2
-Stable tag: 1.25.1
+Stable tag: 1.27.0
 License: GPL v2 - http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 
@@ -90 +90 @@
 = 1.25.1 =
 * Optimized images replacing logic.
+
+= 1.27.0 =
+* Optimized images replacing logic.