Check in 1.6.17

LSQUICCOMMIT

@@ -1 +1 @@
-2d7c7f881cc3c7d45103ddb05f154b72a1f19188
+6eec0a76f7edc4e7c6e6d32305484065f2fa7478

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.6.16.
+# Generated by GNU Autoconf 2.69 for openlitespeed 1.6.17.
 #
 # Report bugs to <[email protected]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='openlitespeed'
 PACKAGE_TARNAME='openlitespeed'
-PACKAGE_VERSION='1.6.16'
-PACKAGE_STRING='openlitespeed 1.6.16'
+PACKAGE_VERSION='1.6.17'
+PACKAGE_STRING='openlitespeed 1.6.17'
 PACKAGE_BUGREPORT='[email protected]'
 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.6.16 to adapt to many kinds of systems.
+\`configure' configures openlitespeed 1.6.17 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.6.16:";;
+     short | recursive ) echo "Configuration of openlitespeed 1.6.17:";;
    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.6.16
+openlitespeed configure 1.6.17
 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.6.16, which was
+It was created by openlitespeed $as_me 1.6.17, 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.6.16'
+ VERSION='1.6.17'
 
 
 # Some tools Automake needs.
@@ -19624,7 +19624,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.6.16, which was
+This file was extended by openlitespeed $as_me 1.6.17, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19691,7 +19691,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.6.16
+openlitespeed config.status 1.6.17
 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.6.16],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
+AC_INIT([openlitespeed],[1.6.17],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
 AM_INIT_AUTOMAKE([1.0 foreign no-define subdir-objects])
 
 

dist/VERSION

@@ -1 +1 @@
-1.6.16
+1.6.17

dist/add-ons/webcachemgr/VERSION

@@ -1 +1 @@
-1.13.2.2
+1.13.3.1

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

@@ -680,7 +680,7 @@ private function displayCacheRoots()
     /**
      *
      * @param string[]  $args
-     * @throws LSCMException
+     * @throws LSCMException  Thrown directly and indirectly.
      */
     private function parseCommands( $args )
     {

dist/add-ons/webcachemgr/src/Context/RootPanelContextOption.php

@@ -1,6 +1,6 @@
 <?php
 
-/* * ******************************************
+/** ******************************************
  * LiteSpeed Web Server Cache Manager
  *
  * @author LiteSpeed Technologies, Inc. (https://www.litespeedtech.com)
@@ -9,7 +9,6 @@
 
 namespace Lsc\Wp\Context;
 
-use \Lsc\Wp\Context\ContextOption;
 use \Lsc\Wp\Logger;
 
 class RootPanelContextOption extends ContextOption

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

@@ -34,7 +34,7 @@ abstract class ControlPanel
     /**
      * @var string
      */
-    const PANEL_API_VERSION = '1.13.2.2';
+    const PANEL_API_VERSION = '1.13.3.1';
 
     /**
      * @since 1.9
@@ -940,6 +940,8 @@ public static function meetsMinAPIVerRequirement()
     public static function checkPanelAPICompatibility( $panelAPIVer )
     {
         $supportedAPIVers = array (
+            '1.13.3.1',
+            '1.13.3',
             '1.13.2.2',
             '1.13.2.1',
             '1.13.2',

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

@@ -86,6 +86,35 @@ public function getPleskOS()
         );
     }
 
+    /**
+     *
+     * @since 1.13.3
+     *
+     * @return string
+     */
+    protected function getVhDir()
+    {
+        $vhDir = '/var/www/vhosts';
+
+        $psaConfFile = '/etc/psa/psa.conf';
+
+        if ( file_exists($psaConfFile) ) {
+            $file_content = file_get_contents($psaConfFile);
+
+            $ret = preg_match(
+                '/HTTPD_VHOSTS_D\s+([^\s]+)/',
+                $file_content,
+                $m
+            );
+
+            if ( $ret == 1 ) {
+                $vhDir = $m[1];
+            }
+        }
+
+        return $vhDir;
+    }
+
     /**
      *
      * @throws LSCMException  Thrown indirectly.
@@ -213,8 +242,13 @@ public function applyVHConfChanges()
      */
     protected function prepareDocrootMap()
     {
-        $cmd = 'grep -hro --exclude="stat_ttl.conf" --exclude="*.bak" --exclude="last_httpd.conf" '
-                . '"DocumentRoot.*\|ServerName.*\|ServerAlias.*" /var/www/vhosts/system/*/conf/*';
+
+        $vhDir = $this->getVhDir();
+
+        $cmd = 'grep -hro --exclude="stat_ttl.conf" --exclude="*.bak" '
+            . '--exclude="last_httpd.conf" '
+            . '"DocumentRoot.*\|ServerName.*\|ServerAlias.*" '
+            . "{$vhDir}/system/*/conf/*";
         exec( $cmd, $lines);
 
         /**