Check in 1.8.4

Author: gwanglst

CMakeLists.txt

@@ -197,6 +197,7 @@ add_definitions(-DUSE_UDNS)
 
 add_subdirectory(src)
 add_subdirectory(support)
+add_subdirectory(lshostexec)
 
 if (BUILD_TEST)
 add_subdirectory(test)

LSQUICCOMMIT

@@ -1 +1 @@
-c201607dbced72a1f74a803ac0d49e8c0c8b6bba
+70486141724f85e97b08f510673e29f399bbae8f

build.sh

@@ -669,6 +669,10 @@ if [ -e build/support/cmd_ns/cmd_ns ] ; then
     cp build/support/cmd_ns/cmd_ns  dist/lsns/bin/
 fi
 
+if [ -e build/lshostexec/lshostexec ] ; then
+    cp build/lshostexec/lshostexec  dist/lsns/bin/
+fi
+
 
 cpModuleSoFiles
 

dist/add-ons/webcachemgr/VERSION

@@ -1 +1 @@
-1.17.4.1
+1.17.4.2

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

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

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

@@ -765,6 +765,8 @@ 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.
@@ -897,8 +899,26 @@ protected function checkFlagActions()
 
         $info = &$_SESSION["{$action}_info"];
 
+        $doOld = false;
+
+        if ( $action == WPInstallStorage::CMD_MASS_UNFLAG ) {
+            /**
+             * Set to maintain compatibility with old ViewModel + Tpl.
+             *
+             * @deprecated  release_ver_placeholder
+             */
+            $oldInfo = &$_SESSION['unflagInfo'];
+            $doOld   = true;
+        }
+
+
         if ( $init ) {
             $info = [ 'installs' => $this->wpInstallStorage->getPaths() ];
+
+            if ( $doOld ) {
+                $oldInfo = $info;
+            }
+
             return true;
         }
 
@@ -927,6 +947,13 @@ protected function checkFlagActions()
 
         if ( empty($info['installs']) ) {
             unset($_SESSION["{$action}_info"]);
+
+            if ( $doOld ) {
+                unset($_SESSION['unflagInfo']);
+            }
+        }
+        elseif ( $doOld ) {
+            $oldInfo = $info;
         }
 
         $msgs = $this->wpInstallStorage->getAllCmdMsgs();

dist/functions.sh

@@ -1018,7 +1018,7 @@ installation()
 
     util_ccpfile "$SDIR_OWN" $EXEC_MOD fcgi-bin/lsperld.fpl fcgi-bin/RackRunner.rb fcgi-bin/lsnode.js
     util_cpfile "$SDIR_OWN" $EXEC_MOD  fcgi-bin/RailsRunner.rb  fcgi-bin/RailsRunner.rb.2.3
-    util_cpfile "$SDIR_OWN" $EXEC_MOD lsns/bin/common.py lsns/bin/lscgctl lsns/bin/lscgstats lsns/bin/lspkgctl lsns/bin/lsnsctl lsns/bin/unmount_ns lsns/bin/cmd_ns lsns/bin/lssetup
+    util_cpfile "$SDIR_OWN" $EXEC_MOD lsns/bin/common.py lsns/bin/lshostexec lsns/bin/lscgctl lsns/bin/lscgstats lsns/bin/lspkgctl lsns/bin/lsnsctl lsns/bin/unmount_ns lsns/bin/cmd_ns lsns/bin/lssetup
 
     pkill _recaptcha
     util_cpfile "$SDIR_OWN" $EXEC_MOD  lsrecaptcha/_recaptcha lsrecaptcha/_recaptcha.shtml

dist/lsns/bin/lspkgctl

@@ -171,9 +171,8 @@ def plesk_home_dict():
             home_dict[user.pw_dir] = user
     return home_dict
 
-def read_pleskplans():
+def read_pleskplans(plans):
     home_dict = plesk_home_dict()
-    plans = {}
     userplans = {}
     # Thanks to Stas Karpinsky of vangus.co.il for correcting the SQL!
     plan_lines = run_program(['plesk', 'db', \
@@ -214,10 +213,20 @@ def read_pleskplans():
         userplans[user.pw_name] = plan
     return plans, userplans
 
+def read_diskplans():
+    plans = {}
+    logging.debug("read_diskplans")
+    if (os.path.exists(common.get_pkg_dir())):
+        for f in glob.glob(common.get_pkg_dir() + '/*.conf'):
+            finalfile = f[len(common.get_pkg_dir()) + 1:][:-5]
+            logging.debug("Found package file: %s, finalfile: %s" % (f, finalfile))
+            plans[finalfile] = []
+    return plans
+
 def read_usersplans():
+    plans = read_diskplans()
     if common.get_plesk():
-        return read_pleskplans()
-    plans = {}
+        return read_pleskplans(plans)
     userplans = {}
     planfiles = glob.glob('/var/cpanel/packages/*')
     for planfile in planfiles:
@@ -288,6 +297,9 @@ def write_pkg(pkg, pkg_json):
         f = open(common.pkg_to_filename(pkg), 'w', encoding="utf-8")
     except Exception as err:
         common.fatal_error('Error opening %s for write: %s' % (common.pkg_to_filename(pkg), err))
+    if 'size' in pkg_json:
+        logging.debug("Remove size")
+        del pkg_json['size']
     for opt in common.get_options():
         if opt in pkg_json and arrInfinite(opt, pkg_json):
             del pkg_json[opt]
@@ -297,8 +309,17 @@ def write_pkg(pkg, pkg_json):
         common.fatal_error('Error writing %s: %s' % (common.pkg_to_filename(pkg), err))
     f.close()
 
-def revalidate_pkg(pkg, users, users_vals, org_pkg, pkg_json, force, args_dict):
-    logging.debug("revalidate_pkg")
+def revalidate_pkg(pkg, pkg_sizes, users, users_vals, org_pkg, pkg_json, force, args_dict):
+    logging.debug("revalidate_pkg %s %d users" % (pkg, len(users)))
+    if len(users) == 0:
+        logging.debug("Delete package entirely: %s" % pkg)
+        filename = common.pkg_to_filename(pkg)
+        if os.path.exists(filename):
+            os.remove(filename)
+        if pkg in pkg_sizes:
+            del pkg_sizes[pkg]
+            write_pkg_sizes(pkg_sizes)
+        return
     test_users = []
     if force:
         test_users = users
@@ -324,7 +345,7 @@ def revalidate_pkg(pkg, users, users_vals, org_pkg, pkg_json, force, args_dict):
 
 def validate_pkg(pkg, pkg_sizes, users_vals, users):
     pkg_json = read_pkg(pkg, pkg_sizes)
-    revalidate_pkg(pkg, users, users_vals, pkg_json, pkg_json, False, None)
+    revalidate_pkg(pkg, pkg_sizes, users, users_vals, pkg_json, pkg_json, False, None)
 
 def command_validate(args, users_vals, usersplans, pkg_sizes):
     if args.command == 'validate-all' or args.command == 'list-all':
@@ -406,7 +427,7 @@ def command_set(args, users_vals, usersplans, pkg_sizes):
                     pkg_sizes[pkg] = args.size
             if not set_json(args, pkg_json) and not all_users:
                 continue
-        revalidate_pkg(pkg, usersplans[pkg], users_vals, org_pkg, pkg_json, all_users, vars(args))
+        revalidate_pkg(pkg, pkg_sizes, usersplans[pkg], users_vals, org_pkg, pkg_json, all_users, vars(args))
     if write_sizes:
         write_pkg_sizes(pkg_sizes)
     return 0

lshostexec/CMakeLists.txt

@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 2.8)
+
+SET(lshostexec_SRCS
+    lshostexec.c
+)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src/extensions/cgi)
+#link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/lib/)
+
+add_executable(lshostexec ${lshostexec_SRCS} )
+
+target_link_libraries(lshostexec
+    rt )
+
+