Merge branch 'v2.3.2-dev' of github.com:usmannasir/cyberpanel into v2.3.2-dev

This commit is contained in:
Usman Nasir
2022-06-18 13:07:13 +05:00
2 changed files with 29 additions and 8 deletions

View File

@@ -2743,11 +2743,11 @@ $parameters = array(
newWPpath = wpsite.path
newurl = wpsite.FinalURL
### get WPsite Database name and usr
## get WPsite Database name and usr
php = PHPManager.getPHPString(PhpVersion)
FinalPHPPath = '/usr/local/lsws/lsphp%s/bin/php' % (php)
######Get DBname
#####Get DBname
command = 'sudo -u %s %s -d error_reporting=0 /usr/bin/wp config get DB_NAME --skip-plugins --skip-themes --path=%s' % (
VHuser, FinalPHPPath, newWPpath)
result, stdout = ProcessUtilities.outputExecutioner(command, None, None, None, 1)
@@ -2757,7 +2757,7 @@ $parameters = array(
else:
raise BaseException(stdout)
######Get DBuser
#####Get DBuser
command = 'sudo -u %s %s -d error_reporting=0 /usr/bin/wp config get DB_USER --skip-plugins --skip-themes --path=%s' % (
VHuser, FinalPHPPath, newWPpath)
result, stdout = ProcessUtilities.outputExecutioner(command, None, None, None, 1)
@@ -2777,7 +2777,7 @@ $parameters = array(
else:
raise BaseException(stdout)
### Create secure folder
### ##Create secure folder
ACLManager.CreateSecureDir()
RandomPath = str(randint(1000, 9999))
@@ -2797,7 +2797,7 @@ $parameters = array(
logging.statusWriter(self.tempStatusPath, 'Extracting Backup File...,30')
###First copy backup file to temp and then Unzip
#####First copy backup file to temp and then Unzip
command = "sudo -u %s cp -R /home/backup/%s* %s" % (VHuser, BackUpFileName, self.tempPath)
result, stdout = ProcessUtilities.outputExecutioner(command, None, None, None, 1)
@@ -2819,8 +2819,8 @@ $parameters = array(
raise BaseException(stdout)
# dump Mysql file in unzippath path
unzippath2 = "%s/ab/usr/local/CyberCP/tmp/%s/%s" % (self.tempPath, oldtemppath, DumpFileName)
command = "mysql -u root %s < %s" % (Finaldbname, unzippath2)
unzippathdb = "%s/ab/usr/local/CyberCP/tmp/%s/%s" % (self.tempPath, oldtemppath, DumpFileName)
command = "mysql -u root %s < %s" % (Finaldbname, unzippathdb)
result, stdout = ProcessUtilities.outputExecutioner(command, None, None, None, 1)
if result == 0:

View File

@@ -101,6 +101,8 @@
<tr>
<th style="padding: 18px; color: white; width: 161px; font-size: 12px;">WordPress Site Title
</th>
<th style="padding: 18px; color: white; width: 161px; font-size: 12px;">WP-Login
</th>
<th style="padding: 18px; color: white; width: 161px; font-size: 12px;">Domain
</th>
<th style="padding: 18px; color: white; width: 161px; font-size: 12px;">Action
@@ -114,10 +116,29 @@
{% for sub in wpsite %}
<tr>
<td style="padding: 13px;">
<td style="padding: 13px;" >
<a href="{% url 'WPHome' %}?ID={{ sub.id }}">
<p style="font-weight: bold; text-transform: uppercase; ">{{ sub.title }}</p>
</a>
</td>
<td style="padding: 13px;">
<a target="_blank"
href="{% url 'AutoLogin' %}?id={{ sub.id }}"> WP-admin
<svg xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
aria-hidden="true" focusable="false" width="1em"
height="1em"
style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);"
preserveAspectRatio="xMidYMid meet"
viewBox="0 0 20 20">
<path d="M14 10L8 5v3H1v4h7v3l6-5zm3 7H9v2h8c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2H9v2h8v14z"
fill="#626262"></path>
</svg>
</a>
</td>
<td style="padding: 13px;">
<a target="_blank" style="color: #6aa7ff"