Merge branch 'v1_8'

Author: gwanglst

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 set( CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-Project(openlitespeed VERSION 1.8.4)
+Project(openlitespeed VERSION 1.8.5)
 INCLUDE( ${PROJECT_SOURCE_DIR}/CMakeModules/common.cmake)
 INCLUDE(GNUInstallDirs)
 

LSQUICCOMMIT

@@ -1 +1 @@
-70486141724f85e97b08f510673e29f399bbae8f
+133998f9581fe2ef672d858ffc45a079b533d753

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for openlitespeed 1.8.4.
+# Generated by GNU Autoconf 2.69 for openlitespeed 1.8.5.
 #
 # Report bugs to <info@litespeedtech.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='openlitespeed'
 PACKAGE_TARNAME='openlitespeed'
-PACKAGE_VERSION='1.8.4'
-PACKAGE_STRING='openlitespeed 1.8.4'
+PACKAGE_VERSION='1.8.5'
+PACKAGE_STRING='openlitespeed 1.8.5'
 PACKAGE_BUGREPORT='info@litespeedtech.com'
 PACKAGE_URL='http://www.litespeedtech.com/'
 
@@ -1409,7 +1409,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures openlitespeed 1.8.4 to adapt to many kinds of systems.
+\`configure' configures openlitespeed 1.8.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1480,7 +1480,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of openlitespeed 1.8.4:";;
+     short | recursive ) echo "Configuration of openlitespeed 1.8.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1641,7 +1641,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-openlitespeed configure 1.8.4
+openlitespeed configure 1.8.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2315,7 +2315,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by openlitespeed $as_me 1.8.4, which was
+It was created by openlitespeed $as_me 1.8.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3181,7 +3181,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openlitespeed'
- VERSION='1.8.4'
+ VERSION='1.8.5'
 
 
 # Some tools Automake needs.
@@ -19637,7 +19637,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by openlitespeed $as_me 1.8.4, which was
+This file was extended by openlitespeed $as_me 1.8.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19704,7 +19704,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-openlitespeed config.status 1.8.4
+openlitespeed config.status 1.8.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -7,7 +7,7 @@ m4_include(ax_check_libudns.m4)
 m4_include(ax_check_ip2location.m4)
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([openlitespeed],[1.8.4],[info@litespeedtech.com],[openlitespeed],[http://www.litespeedtech.com/])
+AC_INIT([openlitespeed],[1.8.5],[info@litespeedtech.com],[openlitespeed],[http://www.litespeedtech.com/])
 AM_INIT_AUTOMAKE([1.0 foreign no-define subdir-objects])
 
 AC_CONFIG_HEADERS(src/config.h:src/config.h.in)

dist/VERSION

@@ -1 +1 @@
-1.8.4
+1.8.5

dist/add-ons/webcachemgr/VERSION

@@ -1 +1 @@
-1.17.4.2
+1.17.5

dist/add-ons/webcachemgr/src/Panel/ControlPanel.php

@@ -36,7 +36,7 @@ abstract class ControlPanel
     /**
      * @var string
      */
-    const PANEL_API_VERSION = '1.17.4.2';
+    const PANEL_API_VERSION = '1.17.5';
 
     /**
      * @since 1.9
@@ -1047,6 +1047,7 @@ public static function meetsMinAPIVerRequirement()
     public static function checkPanelAPICompatibility( $panelAPIVer )
     {
         $supportedAPIVers = array(
+            '1.17.5',
             '1.17.4.2',
             '1.17.4.1',
             '1.17.4',

dist/add-ons/webcachemgr/src/PanelController.php

@@ -765,8 +765,6 @@ protected function checkRefreshAction()
     }
 
     /**
-     *
-     * @deprecated release_ver_placeholder
      *
      * @return bool|void  Function outputs ajax and exits without returning a
      *     value when $init is evaluated to be false.

dist/add-ons/webcachemgr/src/PluginVersion.php

@@ -3,15 +3,14 @@
 /** *********************************************
  * LiteSpeed Web Server Cache Manager
  *
- * @author Michael Alegre
- * @copyright (c) 2018-2023 LiteSpeed Technologies, Inc.
+ * @author    Michael Alegre
+ * @copyright 2018-2025 LiteSpeed Technologies, Inc.
  * *******************************************
  */
 
 namespace Lsc\Wp;
 
 use Lsc\Wp\Context\Context;
-use LsUserPanel\Lsc\UserLSCMException;
 
 class PluginVersion
 {
@@ -28,10 +27,16 @@ class PluginVersion
     const DOWNLOAD_DIR = '/usr/src/litespeed-wp-plugin';
 
     /**
-     * @var string
+     * @var string  Old conf file name.
      */
     const LSCWP_DEFAULTS_INI_FILE_NAME = 'const.default.ini';
 
+    /**
+     * @since 1.17.5
+     * @var   string  New conf file name.
+     */
+    const LSCWP_DEFAULTS_JSON_FILE_NAME = 'const.default.json';
+
     /**
      * @var string
      */
@@ -51,13 +56,13 @@ class PluginVersion
      * @deprecated 4.1.3  Will be removed in favor of $this->shortVersions.
      * @var string[]
      */
-    protected $knownVersions = array();
+    protected $knownVersions = [];
 
     /**
      * @since 4.1.3
      * @var string[]
      */
-    protected $shortVersions = array();
+    protected $shortVersions = [];
 
     /**
      * @var string[]
@@ -248,7 +253,8 @@ protected function createDownloadDir()
     protected function setVersionFiles()
     {
         $this->versionFile = Context::LOCAL_PLUGIN_DIR . '/lscwp_versions_v2';
-        $this->activeFile = Context::LOCAL_PLUGIN_DIR . '/lscwp_active_version';
+        $this->activeFile  =
+            Context::LOCAL_PLUGIN_DIR . '/lscwp_active_version';
     }
 
     /**
@@ -263,7 +269,7 @@ protected function setVersionFiles()
      */
     protected function checkOldVersionFiles()
     {
-        $dataDir = Context::getLSCMDataDir();
+        $dataDir       = Context::getLSCMDataDir();
         $oldActiveFile = "$dataDir/lscwp_active_version";
 
         if ( file_exists($oldActiveFile) ) {
@@ -319,9 +325,11 @@ public function setCurrentVersion()
      */
     private function getActiveVersion()
     {
-        if ( file_exists($this->activeFile)
-                && ($content = file_get_contents($this->activeFile)) ) {
-
+        if (
+                file_exists($this->activeFile)
+                &&
+                ($content = file_get_contents($this->activeFile))
+        ) {
             return trim($content);
         }
 
@@ -386,13 +394,11 @@ protected function setAllowedVersions()
             );
         }
 
-        $matchFound = preg_match(
-            '/allowed\s{(.*)}/sU',
-            trim($content),
-            $m
-        );
-
-        if ( !$matchFound || ($list = trim($m[1])) == '' ) {
+        if (
+                !preg_match('/allowed\s{(.*)}/sU', trim($content), $m)
+                ||
+                ($list = trim($m[1])) == ''
+        ) {
             throw new LSCMException(
                 'LSCWP version list is empty.',
                 LSCMException::E_NON_FATAL
@@ -426,13 +432,11 @@ protected function setShortVersions()
             );
         }
 
-        $matchFound = preg_match(
-            '/short\s{(.*)}/sU',
-            trim($content),
-            $m
-        );
-
-        if ( !$matchFound || ($list = trim($m[1])) == '' ) {
+        if (
+                !preg_match('/short\s{(.*)}/sU', trim($content), $m)
+                ||
+                ($list = trim($m[1])) == ''
+        ) {
             throw new LSCMException(
                 'LSCWP version list is empty.',
                 LSCMException::E_NON_FATAL
@@ -498,16 +502,21 @@ public function setActiveVersion( $version, $init = false )
 
     /**
      *
-     * @param bool $isforced
+     * @param bool $isForced
      *
      * @throws LSCMException  Thrown indirectly by Logger::info() call.
      */
-    protected function refreshVersionList( $isforced = false )
+    protected function refreshVersionList( $isForced = false )
     {
         clearstatcache();
 
-        if ( $isforced || !file_exists($this->versionFile)
-                || (time() - filemtime($this->versionFile)) > 86400 ) {
+        if (
+                $isForced
+                ||
+                !file_exists($this->versionFile)
+                ||
+                (time() - filemtime($this->versionFile)) > 86400
+        ) {
 
             if ( !file_exists(Context::LOCAL_PLUGIN_DIR) ) {
                 $this->createDownloadDir();
@@ -550,6 +559,34 @@ protected function filterVerList( $ver )
         return Util::betterVersionCompare($ver, '1.2.2', '>');
     }
 
+    /**
+     *
+     * @since 1.17.5
+     *
+     * @param string $pluginDir  The WordPress plugin directory.
+     */
+    public static function tryCopyLscwpDefaultConf( $pluginDir )
+    {
+        foreach (
+            [
+                self::LSCWP_DEFAULTS_INI_FILE_NAME,
+                self::LSCWP_DEFAULTS_JSON_FILE_NAME
+            ]
+            as
+            $customConfFileName
+        ) {
+            $customConfFilePath =
+                Context::LOCAL_PLUGIN_DIR . "/$customConfFileName";
+
+            if ( file_exists($customConfFilePath) ) {
+                copy(
+                    $customConfFilePath,
+                    "$pluginDir/litespeed-cache/data/$customConfFileName"
+                );
+            }
+        }
+    }
+
     /**
      * Checks the current installation for existing LSCWP plugin files and
      * copies them to the installation's plugins directory if not found.
@@ -596,7 +633,9 @@ public static function prepareUserInstall( $pluginDir, $version = '' )
 
         exec(
             '/bin/cp --preserve=mode -rf '
-                . Context::LOCAL_PLUGIN_DIR . "/$version/" . self::PLUGIN_NAME
+                . Context::LOCAL_PLUGIN_DIR
+                . "/$version/"
+                . self::PLUGIN_NAME
                 . " $pluginDir"
         );
 
@@ -607,16 +646,7 @@ public static function prepareUserInstall( $pluginDir, $version = '' )
             );
         }
 
-        $customIni = Context::LOCAL_PLUGIN_DIR . '/'
-            . self::LSCWP_DEFAULTS_INI_FILE_NAME;
-
-        if ( file_exists($customIni) ) {
-            copy(
-                $customIni,
-                "$pluginDir/litespeed-cache/data/"
-                    . self::LSCWP_DEFAULTS_INI_FILE_NAME
-            );
-        }
+        self::tryCopyLscwpDefaultConf($pluginDir);
 
         Logger::debug(
             'Copied LSCache for WordPress plugin files into plugins directory '
@@ -634,15 +664,15 @@ public static function prepareUserInstall( $pluginDir, $version = '' )
      */
     protected function hasDownloadedVersion( $version )
     {
-        $dir = Context::LOCAL_PLUGIN_DIR . "/$version";
+        $dir     = Context::LOCAL_PLUGIN_DIR . "/$version";
         $md5file = "$dir/" . self::VER_MD5;
-        $plugin = "$dir/" . self::PLUGIN_NAME;
+        $plugin  = "$dir/" . self::PLUGIN_NAME;
 
         if ( !file_exists($md5file) || !is_dir($plugin) ) {
             return false;
         }
 
-        return ( file_get_contents($md5file) == Util::DirectoryMd5($plugin) );
+        return (file_get_contents($md5file) == Util::DirectoryMd5($plugin));
     }
 
     /**
@@ -772,8 +802,7 @@ public static function retrieveTranslation( $locale, $pluginVer )
         exec(
             'wget -q --tries=1 --no-check-certificate '
                 . 'https://downloads.wordpress.org/translation/plugin/'
-                . "litespeed-cache/$pluginVer/$locale.zip "
-                . "-P $translationDir",
+                . "litespeed-cache/$pluginVer/$locale.zip -P $translationDir",
             $output,
             $return_var
         );
@@ -805,9 +834,11 @@ public static function removeTranslationZip( $locale, $pluginVer )
             Context::LOCAL_PLUGIN_DIR . "/$pluginVer/translations/$locale.zip"
         );
 
-        $realPathStart = substr($zipFile, 0, strlen(Context::LOCAL_PLUGIN_DIR));
-
-        if ( $realPathStart === Context::LOCAL_PLUGIN_DIR ) {
+        if (
+            substr($zipFile, 0, strlen(Context::LOCAL_PLUGIN_DIR))
+                ===
+                Context::LOCAL_PLUGIN_DIR
+        ) {
             unlink($zipFile);
         }
     }