Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix php8.2

Browse Source
This commit is contained in:
VirtuBox
2022-12-11 16:30:40 +01:00
parent 887cc1d3f0
commit 319d1d0afc
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wo/cli/plugins/site_create.py
View File

@@ -174,7 +174,7 @@ class WOSiteCreateController(CementBaseController):
data['basic'] = True data['basic'] = True
if (pargs.php72 or pargs.php73 or pargs.php74 or 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( data = dict(
site_name=wo_domain, www_domain=wo_www_domain, site_name=wo_domain, www_domain=wo_www_domain,
static=False, basic=False, static=False, basic=False,
@@ -263,7 +263,7 @@ class WOSiteCreateController(CementBaseController):
elif config_php_ver == '8.1': elif config_php_ver == '8.1':
data['php81'] = True data['php81'] = True
data['wo_php'] = 'php81' data['wo_php'] = 'php81'
elif config_php_ver == '8.1': elif config_php_ver == '8.2':
data['php82'] = True data['php82'] = True
data['wo_php'] = 'php82' data['wo_php'] = 'php82'
else: else:

8
wo/cli/plugins/site_functions.py
View File

@@ -237,7 +237,7 @@ def setupdatabase(self, data):
data['wo_db_pass'] = wo_db_password data['wo_db_pass'] = wo_db_password
data['wo_db_host'] = WOVar.wo_mysql_host data['wo_db_host'] = WOVar.wo_mysql_host
data['wo_mysql_grant_host'] = wo_mysql_grant_host data['wo_mysql_grant_host'] = wo_mysql_grant_host
return(data) return (data)
def setupwordpress(self, data, vhostonly=False): 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_creds = dict(wp_user=wo_wp_user, wp_pass=wo_wp_pass,
wp_email=wo_wp_email) wp_email=wo_wp_email)
return(wp_creds) return (wp_creds)
def setupwordpressnetwork(self, data): def setupwordpressnetwork(self, data):
@@ -990,8 +990,8 @@ def site_package_check(self, stype):
"/usr/local/sbin/install-ngxblocker", "/usr/local/sbin/install-ngxblocker",
"ngxblocker"]] "ngxblocker"]]
return(stack.install(apt_packages=apt_packages, packages=packages, return (stack.install(apt_packages=apt_packages, packages=packages,
disp_msg=False)) disp_msg=False))
def updatewpuserpassword(self, wo_domain, wo_site_webroot): def updatewpuserpassword(self, wo_domain, wo_site_webroot):

5
wo/cli/plugins/site_update.py
View File

@@ -276,7 +276,8 @@ class WOSiteUpdateController(CementBaseController):
if (((stype == 'php' and if (((stype == 'php' and
oldsitetype not in ['html', 'proxy', 'php', 'php72', oldsitetype not in ['html', 'proxy', 'php', 'php72',
'php73', 'php74', 'php80', 'php81']) or 'php73', 'php74', 'php80',
'php81', 'php82']) or
(stype == 'mysql' and oldsitetype not in [ (stype == 'mysql' and oldsitetype not in [
'html', 'php', 'php72', 'php73', 'php74', 'php80', 'php81', 'html', 'php', 'php72', 'php73', 'php74', 'php80', 'php81',
'php82', 'proxy']) or 'php82', 'proxy']) or
@@ -337,7 +338,7 @@ class WOSiteUpdateController(CementBaseController):
(not data)): (not data)):
Log.debug( Log.debug(
self, "pargs php72, or php73, or php74, " self, "pargs php72, or php73, or php74, "
"or php80, or php81 enabled") "or php80, or php81 or php82 enabled")
data = dict( data = dict(
site_name=wo_domain, site_name=wo_domain,
www_domain=wo_www_domain, www_domain=wo_www_domain,