From 319d1d0afc6c2e1a4ec5c52cb000c31b5d3a349b Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Sun, 11 Dec 2022 16:30:40 +0100
Subject: [PATCH] Fix php8.2

---
 wo/cli/plugins/site_create.py    | 4 ++--
 wo/cli/plugins/site_functions.py | 8 ++++----
 wo/cli/plugins/site_update.py    | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/wo/cli/plugins/site_create.py b/wo/cli/plugins/site_create.py
index 14343da..4be9bd2 100644
--- a/wo/cli/plugins/site_create.py
+++ b/wo/cli/plugins/site_create.py
@@ -174,7 +174,7 @@ class WOSiteCreateController(CementBaseController):
             data['basic'] = True
 
         if (pargs.php72 or pargs.php73 or pargs.php74 or
-                pargs.php80 or pargs.php81):
+                pargs.php80 or pargs.php81 or pargs.php82):
             data = dict(
                 site_name=wo_domain, www_domain=wo_www_domain,
                 static=False, basic=False,
@@ -263,7 +263,7 @@ class WOSiteCreateController(CementBaseController):
                 elif config_php_ver == '8.1':
                     data['php81'] = True
                     data['wo_php'] = 'php81'
-                elif config_php_ver == '8.1':
+                elif config_php_ver == '8.2':
                     data['php82'] = True
                     data['wo_php'] = 'php82'
             else:
diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py
index 1e712c0..cea13e8 100644
--- a/wo/cli/plugins/site_functions.py
+++ b/wo/cli/plugins/site_functions.py
@@ -237,7 +237,7 @@ def setupdatabase(self, data):
     data['wo_db_pass'] = wo_db_password
     data['wo_db_host'] = WOVar.wo_mysql_host
     data['wo_mysql_grant_host'] = wo_mysql_grant_host
-    return(data)
+    return (data)
 
 
 def setupwordpress(self, data, vhostonly=False):
@@ -628,7 +628,7 @@ def setupwordpress(self, data, vhostonly=False):
     wp_creds = dict(wp_user=wo_wp_user, wp_pass=wo_wp_pass,
                     wp_email=wo_wp_email)
 
-    return(wp_creds)
+    return (wp_creds)
 
 
 def setupwordpressnetwork(self, data):
@@ -990,8 +990,8 @@ def site_package_check(self, stype):
                   "/usr/local/sbin/install-ngxblocker",
                   "ngxblocker"]]
 
-    return(stack.install(apt_packages=apt_packages, packages=packages,
-                         disp_msg=False))
+    return (stack.install(apt_packages=apt_packages, packages=packages,
+                          disp_msg=False))
 
 
 def updatewpuserpassword(self, wo_domain, wo_site_webroot):
diff --git a/wo/cli/plugins/site_update.py b/wo/cli/plugins/site_update.py
index 4b23c0e..2b06e5d 100644
--- a/wo/cli/plugins/site_update.py
+++ b/wo/cli/plugins/site_update.py
@@ -276,7 +276,8 @@ class WOSiteUpdateController(CementBaseController):
 
         if (((stype == 'php' and
               oldsitetype not in ['html', 'proxy', 'php', 'php72',
-                                  'php73', 'php74', 'php80', 'php81']) or
+                                  'php73', 'php74', 'php80',
+                                  'php81', 'php82']) or
              (stype == 'mysql' and oldsitetype not in [
                  'html', 'php', 'php72', 'php73', 'php74', 'php80', 'php81',
                  'php82', 'proxy']) or
@@ -337,7 +338,7 @@ class WOSiteUpdateController(CementBaseController):
                 (not data)):
             Log.debug(
                 self, "pargs php72, or php73, or php74, "
-                "or php80, or php81 enabled")
+                "or php80, or php81 or php82 enabled")
             data = dict(
                 site_name=wo_domain,
                 www_domain=wo_www_domain,