Changeset 2633085

Timestamp:

11/20/2021 11:26:40 PM (4 years ago)

Author:

codealfa

Message:

Uploading version 3.0.2

Location:

jch-optimize/trunk

Files:

• Awf/Mvc/Model.php (modified) (2 diffs)
• jch-optimize.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• src/Platform/Cache.php (modified) (6 diffs)
• vendor/composer/installed.json (modified) (2 diffs)
• vendor/composer/installed.php (modified) (3 diffs)
• vendor/jchoptimize/core/src/Browser.php (modified) (4 diffs)
• version.php (modified) (1 diff)

jch-optimize/trunk/Awf/Mvc/Model.php

@@ -82 +82 @@
     protected $config = array();
 
+    private $hash;
+
 
     /**
@@ -342 +344 @@
     public function getHash()
     {
-        static $hash = null;
-
-        if (is_null($hash))
-        {
-            $hash = ucfirst($this->container->application->getName()) . '.' . $this->getName() . '.';
-        }
-
-        return $hash;
+        if (is_null($this->hash))
+        {
+            $this->hash = ucfirst($this->container->application->getName()) . '.' . $this->getName() . '.';
+        }
+
+        return $this->hash;
     }
 

jch-optimize/trunk/jch-optimize.php

@@ -5 +5 @@
  * Plugin URI: http://www.jch-optimize.net/
  * Description: JCH Optimize performs several front-end optimizations to your webpages for fast downloads
- * Version: 3.0.1
+ * Version: 3.0.2
  * Author: Samuel Marshall
  * License: GNU/GPLv3
@@ -30 +30 @@
 define( 'JCH_PLUGIN_URL', plugin_dir_url( JCH_PLUGIN_FILE ) );
 define( 'JCH_PLUGIN_DIR', plugin_dir_path( JCH_PLUGIN_FILE ) );
+define( 'JCH_CACHE_DIR', WP_CONTENT_DIR . '/cache/jch-optimize/' );
 
 require_once( JCH_PLUGIN_DIR . 'autoload.php' );

jch-optimize/trunk/readme.txt

@@ -3 +3 @@
 Contributors: codealfa
 Tags: performance, pagespeed, cache, optimize, seo
-Tested up to: 5.8.1
-Stable tag: 3.0.1
+Tested up to: 5.8.2
+Stable tag: 3.0.2
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -73 +73 @@
 
 == Changelog ==
+
+= 3.0.2 =
+* Bug Fix: Fix issue with sites using FTP to upgrade
 
 = 3.0.1 =

jch-optimize/trunk/src/Platform/Cache.php

@@ -62 +62 @@
         if ( ! isset( self::$wp_filesystem ) )
         {
+            // Set the permission constants if not already set.
+            if ( ! defined( 'FS_CHMOD_DIR' ) )
+            {
+                define( 'FS_CHMOD_DIR', ( fileperms( ABSPATH ) & 0777 | 0755 ) );
+            }
+            if ( ! defined( 'FS_CHMOD_FILE' ) )
+            {
+                define( 'FS_CHMOD_FILE', ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 ) );
+            }
+
+            require_once ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php';
+            require_once ABSPATH . 'wp-admin/includes/class-wp-filesystem-direct.php';
+
+            self::$wp_filesystem = new \WP_Filesystem_Direct( true );
+
+
             /** @var \WP_Filesystem_Base $wp_filesystem */
+            /*
             global $wp_filesystem;
-
             $wp_filesystem_cache = $wp_filesystem;
 
@@ -77 +93 @@
             ), 10, 7 );
 
-            if ( false === ( $creds = request_filesystem_credentials( admin_url( 'options-general.php?page=jchoptimize-settings' ), '', false,
+
+            if ( false === ( $creds = request_filesystem_credentials( admin_url( 'options-general.php?page=jch_optimize' ), '', false,
                     WP_CONTENT_DIR, null, true ) ) )
             {
@@ -120 +137 @@
 
             $wp_filesystem = $wp_filesystem_cache;
+
+*/
         }
 
         return self::$wp_filesystem;
-    }
-
-    /**
-     *
-     * @param   string  $id
-     * @param   bool    $page_cache
-     *
-     * @return string
-     */
-    private static function _getFileName( $id, $page_cache = false )
-    {
-        return JCH_CACHE_DIR . ( $page_cache ? 'page/' : '' ) . md5( NONCE_SALT . $id );
     }
 
@@ -168 +175 @@
 
         return self::_getCacheFile( $file, $wp_filesystem );
-    }
-
-    protected static function getLifetime( $page_cache = false )
-    {
-        static $lifetime, $page_cache_lifetime;
-
-        if ( $page_cache )
-        {
-            if ( ! $page_cache_lifetime )
-            {
-                $params              = Plugin::getPluginParams();
-                $page_cache_lifetime = $params->get( 'page_cache_lifetime', '900' );
-            }
-
-            return (int) $page_cache_lifetime;
-        }
-
-        if ( ! $lifetime )
-        {
-            $params = Plugin::getPluginParams();
-
-            $lifetime = $params->get( 'cache_lifetime', '900' );
-        }
-
-        return (int) $lifetime;
-    }
-
-    /**
-     *
-     * @param   string               $file
-     * @param   \WP_Filesystem_Base  $wp_filesystem
-     *
-     * @return string
-     */
-    private static function _getCacheFile( $file, $wp_filesystem )
-    {
-        $content = $wp_filesystem->get_contents( $file );
-
-        return unserialize( base64_decode( $content ) );
     }
 
@@ -311 +279 @@
         if ( in_array( '', $credentials ) )
         {
-            return false;
+            return $value;
         }
 
@@ -414 +382 @@
         return true;
     }
+
+    protected static function getLifetime( $page_cache = false )
+    {
+        static $lifetime, $page_cache_lifetime;
+
+        if ( $page_cache )
+        {
+            if ( ! $page_cache_lifetime )
+            {
+                $params              = Plugin::getPluginParams();
+                $page_cache_lifetime = $params->get( 'page_cache_lifetime', '900' );
+            }
+
+            return (int) $page_cache_lifetime;
+        }
+
+        if ( ! $lifetime )
+        {
+            $params = Plugin::getPluginParams();
+
+            $lifetime = $params->get( 'cache_lifetime', '900' );
+        }
+
+        return (int) $lifetime;
+    }
+
+    /**
+     *
+     * @param   string  $id
+     * @param   bool    $page_cache
+     *
+     * @return string
+     */
+    private static function _getFileName( $id, $page_cache = false )
+    {
+        return JCH_CACHE_DIR . ( $page_cache ? 'page/' : '' ) . md5( NONCE_SALT . $id );
+    }
+
+    /**
+     *
+     * @param   string               $file
+     * @param   \WP_Filesystem_Base  $wp_filesystem
+     *
+     * @return string
+     */
+    private static function _getCacheFile( $file, $wp_filesystem )
+    {
+        $content = $wp_filesystem->get_contents( $file );
+
+        return unserialize( base64_decode( $content ) );
+    }
 }

jch-optimize/trunk/vendor/composer/installed.json

@@ -155 +155 @@
                 "type": "git",
                 "url": "[email protected]:jchoptimize/core.git",
-                "reference": "a33911b719d87c865995452c320f7add6b56c6af"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/jchoptimize/core/zipball/a33911b719d87c865995452c320f7add6b56c6af",
-                "reference": "a33911b719d87c865995452c320f7add6b56c6af",
+                "reference": "d0efaf5ffe9904fddb8393ca6d897fb29f690329"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/jchoptimize/core/zipball/d0efaf5ffe9904fddb8393ca6d897fb29f690329",
+                "reference": "d0efaf5ffe9904fddb8393ca6d897fb29f690329",
                 "shasum": ""
             },
@@ -167 +167 @@
                 "php": ">=7"
             },
-            "time": "2021-10-31T00:13:46+00:00",
+            "time": "2021-11-17T18:25:31+00:00",
             "default-branch": true,
             "type": "jchoptimize-core",

jch-optimize/trunk/vendor/composer/installed.php

@@ -6 +6 @@
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '769fb84a26db9112daa91512eb9a9fd1a1eb8f84',
+        'reference' => '6feba8f0724bfdb3ee6b89606b04975dc599b606',
         'name' => 'jchoptimize/wordpress-platform',
         'dev' => false,
@@ -52 +52 @@
                 0 => '9999999-dev',
             ),
-            'reference' => 'a33911b719d87c865995452c320f7add6b56c6af',
+            'reference' => 'd0efaf5ffe9904fddb8393ca6d897fb29f690329',
             'dev_requirement' => false,
         ),
@@ -61 +61 @@
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '769fb84a26db9112daa91512eb9a9fd1a1eb8f84',
+            'reference' => '6feba8f0724bfdb3ee6b89606b04975dc599b606',
             'dev_requirement' => false,
         ),

jch-optimize/trunk/vendor/jchoptimize/core/src/Browser.php

@@ -29 +29 @@
         {
 
-                $this->oClient = new \Browser( $userAgent );
+                $this->oClient = Utility::userAgent($userAgent);
                 $this->calculateFontHash();
         }
@@ -35 +35 @@
         protected function calculateFontHash()
         {
-                $this->fontHash .= $this->oClient->getPlatform() . '/';
+                $this->fontHash .= $this->oClient->os . '/';
 
-                $sVersion = $this->oClient->getVersion();
+                $sVersion = $this->oClient->browserVersion;
 
-                switch ( $this->oClient->getBrowser() )
+                switch ( $this->oClient->browser )
                 {
                         case 'Chrome':
@@ -155 +155 @@
         public function getBrowser()
         {
-                return $this->oClient->getBrowser();
+                return $this->oClient->browser;
         }
 
@@ -165 +165 @@
         public function getVersion()
         {
-                return $this->oClient->getVersion();
+                return $this->oClient->browserVersion;
         }
 

jch-optimize/trunk/version.php

@@ -15 +15 @@
 defined( '_JCH_EXEC' ) or die;
 
-const JCH_VERSION  = '3.0.1';
-const JCH_DATE     = '2021-11-05';
+const JCH_VERSION  = '3.0.2';
+const JCH_DATE     = '2021-11-20';
 const JCH_PRO      = '0';
 const JCH_PLATFORM = 'WordPress';