Skip to content

Commit 3a8c3cf

Browse files
committed
bug fix: wp manager ref https://app.clickup.com/t/86enk2tcy
1 parent 3db2eea commit 3a8c3cf

File tree

3 files changed

+31
-7
lines changed

3 files changed

+31
-7
lines changed

plogical/DockerSites.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,20 @@
33
import os
44
import sys
55
import time
6-
7-
8-
96
sys.path.append('/usr/local/CyberCP')
10-
import django
7+
8+
try:
9+
import django
10+
except:
11+
pass
1112

1213
try:
1314
from plogical import randomPassword
1415
from plogical.acl import ACLManager
16+
from dockerManager.dockerInstall import DockerInstall
1517
except:
1618
pass
17-
from dockerManager.dockerInstall import DockerInstall
19+
1820
from plogical.processUtilities import ProcessUtilities
1921
from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
2022
import argparse

websiteFunctions/templates/websiteFunctions/WPsiteHome.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,6 @@ <h4 class="modal-title">{% trans "Updates" %}</h4>
791791
<div class="modal-body">
792792
<form>
793793

794-
795794
<h4 style="margin: 2%">Configure setting for automatic
796795
updates.</h4>
797796
<div class="row">
@@ -803,7 +802,7 @@ <h4 style="margin: 2%">Configure setting for automatic
803802
style="padding: 10px">
804803
<option>Disabled</option>
805804
<option>Minor and Security Updates</option>
806-
<option>All (minor and major)</option>
805+
<option>All minor and major</option>
807806
</select>
808807
</div>
809808
</div>

websiteFunctions/website.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,6 +1076,29 @@ def SaveUpdateConfig(self, userID=None, data=None):
10761076
else:
10771077
return ACLManager.loadError()
10781078

1079+
1080+
php = PHPManager.getPHPString(wpsite.owner.phpSelection)
1081+
FinalPHPPath = '/usr/local/lsws/lsphp%s/bin/php' % (php)
1082+
1083+
if AutomaticUpdates == 'Disabled':
1084+
command = f"{FinalPHPPath} -d error_reporting=0 /usr/bin/wp config set WP_AUTO_UPDATE_CORE false --raw --allow-root --path=" + wpsite.path
1085+
result = ProcessUtilities.outputExecutioner(command, wpsite.owner.externalApp)
1086+
1087+
if result.find('Success:') == -1:
1088+
raise BaseException(result)
1089+
elif AutomaticUpdates == 'Minor and Security Updates':
1090+
command = f"{FinalPHPPath} -d error_reporting=0 /usr/bin/wp config set WP_AUTO_UPDATE_CORE minor --allow-root --path=" + wpsite.path
1091+
result = ProcessUtilities.outputExecutioner(command, wpsite.owner.externalApp)
1092+
1093+
if result.find('Success:') == -1:
1094+
raise BaseException(result)
1095+
else:
1096+
command = f"{FinalPHPPath} -d error_reporting=0 /usr/bin/wp config set WP_AUTO_UPDATE_CORE true --raw --allow-root --path=" + wpsite.path
1097+
result = ProcessUtilities.outputExecutioner(command, wpsite.owner.externalApp)
1098+
1099+
if result.find('Success:') == -1:
1100+
raise BaseException(result)
1101+
10791102
wpsite.AutoUpdates = AutomaticUpdates
10801103
wpsite.PluginUpdates = Plugins
10811104
wpsite.ThemeUpdates = Themes

0 commit comments

Comments
 (0)