From 253fd05e312a269abc400ee95d50fc67ce80eee4 Mon Sep 17 00:00:00 2001 From: "usman@cyberpersons.com" Date: Mon, 24 Jul 2023 16:03:19 +0500 Subject: [PATCH] bug fix to mautic and default php --- install/install.py | 4 +- plogical/applicationInstaller.py | 5 +- plogical/upgrade.py | 4 +- .../websiteFunctions/websiteFunctions.js | 15 +- .../websiteFunctions/ApacheManager.html | 503 +++++++++++------- .../templates/websiteFunctions/WPCreate.html | 19 + .../websiteFunctions/createWebsite.html | 10 +- websiteFunctions/website.py | 8 +- 8 files changed, 364 insertions(+), 204 deletions(-) diff --git a/install/install.py b/install/install.py index 5905139dc..1ab1b78ef 100755 --- a/install/install.py +++ b/install/install.py @@ -1403,7 +1403,7 @@ $cfg['Servers'][$i]['LogoutURL'] = 'phpmyadminsignin.php?logout'; command = f'wget -O /usr/local/CyberCP/snappymail_cyberpanel.php https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/cyberpanel/install.php' preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) - command = f'/usr/local/lsws/lsphp74/bin/php /usr/local/CyberCP/snappymail_cyberpanel.php' + command = f'/usr/local/lsws/lsphp80/bin/php /usr/local/CyberCP/snappymail_cyberpanel.php' preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) @@ -1602,7 +1602,7 @@ $cfg['Servers'][$i]['LogoutURL'] = 'phpmyadminsignin.php?logout'; try: os.remove("/usr/local/lscp/fcgi-bin/lsphp") - shutil.copy("/usr/local/lsws/lsphp74/bin/lsphp", "/usr/local/lscp/fcgi-bin/lsphp") + shutil.copy("/usr/local/lsws/lsphp80/bin/lsphp", "/usr/local/lscp/fcgi-bin/lsphp") except: pass diff --git a/plogical/applicationInstaller.py b/plogical/applicationInstaller.py index c1d1cb530..407dd5bcb 100755 --- a/plogical/applicationInstaller.py +++ b/plogical/applicationInstaller.py @@ -31,7 +31,7 @@ class ApplicationInstaller(multi.Thread): LOCALHOST = 'localhost' REMOTE = 0 PORT = '3306' - MauticVersion = '4.1.2' + MauticVersion = '4.4.0' PrestaVersion = '1.7.8.3' def __init__(self, installApp, extraArgs): @@ -242,7 +242,7 @@ $parameters = array( command = 'cp %s %s/app/config/local.php' % (localDB, finalPath) ProcessUtilities.executioner(command, externalApp) - command = "/usr/local/lsws/lsphp74/bin/php bin/console mautic:install http://%s -f" % (finalURL) + command = "/usr/local/lsws/lsphp80/bin/php bin/console mautic:install http://%s -f" % (finalURL) result = ProcessUtilities.outputExecutioner(command, externalApp, None, finalPath) if result.find('Install complete') == -1: @@ -1699,6 +1699,7 @@ $parameters = array( DataToPass['dkimCheck'] = 0 DataToPass['openBasedir'] = 0 DataToPass['mailDomain'] = 0 + DataToPass['apacheBackend'] = self.extraArgs['apacheBackend'] UserID = self.data['adminID'] try: diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 2fa41840a..481125153 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -513,7 +513,7 @@ $cfg['Servers'][$i]['LogoutURL'] = 'phpmyadminsignin.php?logout'; command = f'wget -O /usr/local/CyberCP/snappymail_cyberpanel.php https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/cyberpanel/install.php' Upgrade.executioner(command, 'verify certificate', 0) - command = f'/usr/local/lsws/lsphp74/bin/php /usr/local/CyberCP/snappymail_cyberpanel.php' + command = f'/usr/local/lsws/lsphp80/bin/php /usr/local/CyberCP/snappymail_cyberpanel.php' Upgrade.executioner(command, 'verify certificate', 0) # labsPath = '/usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/configs/application.ini' @@ -3021,7 +3021,7 @@ vmail except: pass - command = 'cp /usr/local/lsws/lsphp74/bin/lsphp %s' % (phpPath) + command = 'cp /usr/local/lsws/lsphp80/bin/lsphp %s' % (phpPath) Upgrade.executioner(command, 0) try: diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index 915766d9b..05f3a7fb3 100755 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -301,6 +301,14 @@ app.controller('createWordpress', function ($scope, $http, $timeout, $compile, $ $scope.currentStatus = "Starting creation.."; + var apacheBackend = 0; + + if ($scope.apacheBackend === true) { + apacheBackend = 1; + } else { + apacheBackend = 0 + } + var package = $scope.packageForWebsite; var websiteOwner = $scope.websiteOwner; var WPtitle = $scope.WPtitle; @@ -361,6 +369,7 @@ app.controller('createWordpress', function ($scope, $http, $timeout, $compile, $ package: package, home: home, path: path, + apacheBackend: apacheBackend } var config = { @@ -512,7 +521,7 @@ function DeployToProductionInitial(vall) { var create_staging_domain_check = 0; function create_staging_checkbox_function() { - + try { var checkBox = document.getElementById("Create_Staging_Check"); @@ -530,8 +539,8 @@ function create_staging_checkbox_function() { document.getElementById('Website_Create_Own_Domain').style.display = "block"; create_staging_domain_check = 1; } - }catch (e) { - + } catch (e) { + } // alert(domain_check); diff --git a/websiteFunctions/templates/websiteFunctions/ApacheManager.html b/websiteFunctions/templates/websiteFunctions/ApacheManager.html index c440de014..a5727ebb3 100755 --- a/websiteFunctions/templates/websiteFunctions/ApacheManager.html +++ b/websiteFunctions/templates/websiteFunctions/ApacheManager.html @@ -7,212 +7,331 @@ {% get_current_language as LANGUAGE_CODE %} -
-
-

{% trans "Apache Manager" %}

-

{% trans "Switch between Apache (as reverse proxy) and OpenLiteSpeed." %}

-
+ {% if apachemanager %} +
+
+

{% trans "Apache Manager" %}

+

{% trans "Switch between Apache (as reverse proxy) and OpenLiteSpeed." %}

+
-
-
-

- {{ domainName }} -

+
+
+

+ {{ domainName }} +

-
-
{{ domainName }} is currently using Apache as Reverse - Proxy to - OpenLiteSpeed.
- -
-
-
- - -
-
-
- Switch to pure - OpenLiteSpeed. - - -
- -
- -
-

Apache Configurations

-
- -
-
-
- -
-
-
-
- -
- - - -
-

PHP-FPM Configurations +

{{ domainName }} is currently using Apache as Reverse + Proxy to + OpenLiteSpeed.
- -
-
-
-
- - -
-
-
-
- - -
-
-
- -
-
-
- - -
-
-
-
- - -
-
-
-
- Tune PHP-FPM Settings. - -

{{ domainName }} is currently using pure - OpenLiteSpeed, PHP-FPM - is - not used with OpenLiteSpeed, thus tuning is disabled.

- -

{{ domainName }} is using LiteSpeed Enterprise. - PHP-FPM is not - used - with LiteSpeed - Enterprise.

-
- - - - - - -
- -

{{ domainName }} is currently using pure OpenLiteSpeed.

-
-
-
- - -
-
-
- Switch to OpenLiteSpeed + - Apache - as reverse proxy. - -

{{ domainName }} is using LiteSpeed Enterprise. When - LiteSpeed - Enterprise is active switching is not required.

-
- - -
+ {% else %} + +
+
+

OpenLiteSpeed + Apache as Backend

+

Introducing CyberPanel's Revolutionary Hybrid Web Server: OpenLiteSpeed + Apache!

+

+ Are you seeking the ultimate web hosting solution that combines blazing-fast performance with + unparalleled feature versatility? Look no further! CyberPanel is proud to present its groundbreaking + new feature: the OpenLiteSpeed + Apache hybrid web server. This cutting-edge innovation is designed + to take your website's performance and functionality to unprecedented heights, offering the best of + both worlds in a single, seamless package. +

+ +

Unmatched Speed with OpenLiteSpeed:

+

+ Harness the raw power of OpenLiteSpeed, the industry-leading, high-performance web server that + ensures lightning-fast response times and unparalleled efficiency. OpenLiteSpeed is renowned for its + remarkable performance capabilities, enabling your websites to handle a massive influx of traffic + without compromising on speed or reliability. Experience near-instantaneous page loads and swift + data transfers, providing an unbeatable user experience that keeps visitors engaged and coming back + for more. +

+ +

Unrivaled Features with Apache:

+

+ While OpenLiteSpeed excels in speed and efficiency, we understand that Apache is favored by many web + developers for its extensive feature set and compatibility. CyberPanel's innovative hybrid approach + allows you to harness the full potential of Apache as a backend, granting access to an impressive + array of modules, scripts, and configurations. Enjoy the freedom to leverage the vast Apache + ecosystem, ensuring seamless integration with a wide range of applications and platforms. +

+ +

The Perfect Fusion:

+

+ By merging OpenLiteSpeed and Apache, CyberPanel has created a truly game-changing web server + solution that combines the unparalleled speed of OpenLiteSpeed with the feature-rich environment of + Apache. The result is a synergistic combination that sets new industry standards, empowering you to + elevate your web hosting to unprecedented levels of performance and functionality. +

+ +

Key Features and Benefits:

+
    +
  1. Lightning-Fast Performance: Experience unrivaled speed and responsiveness, ensuring your + websites load at blazing speeds, delighting visitors and improving search engine rankings. +
    2. +
  2. Versatile Feature Set: Harness the extensive features of Apache while benefiting from the speed + and efficiency of OpenLiteSpeed, providing unmatched flexibility and compatibility. +
    3. +
  3. Enhanced Security: CyberPanel's OpenLiteSpeed + Apache configuration includes robust security + measures to safeguard your websites and data against potential threats. +
    4. +
  4. Scalability and Stability: Enjoy the ability to handle high traffic loads effortlessly, ensuring + your websites remain stable and responsive under any circumstances. +
    5. +
  5. Easy Management: CyberPanel's user-friendly interface makes it simple to manage and configure + the OpenLiteSpeed + Apache hybrid web server, even for less experienced users. +
    6. +
  6. Cost-Effective Solution: Optimize your web hosting infrastructure with CyberPanel's innovative + hybrid web server, eliminating the need for costly hardware upgrades while boosting overall + performance. +
    7. +
+ +

+ Unleash the true potential of your websites with CyberPanel's OpenLiteSpeed + Apache hybrid web + server. Experience unparalleled speed, efficiency, and versatility in one unified solution. Upgrade + your web hosting experience today and revolutionize the way you deliver content to your audience. + Embrace the future of web hosting with CyberPanel's groundbreaking innovation! +

+
+

+ +

+
+ + + + + + +
+ +
+ {% endif %} {% endblock %} \ No newline at end of file diff --git a/websiteFunctions/templates/websiteFunctions/WPCreate.html b/websiteFunctions/templates/websiteFunctions/WPCreate.html index 3958fc76c..8e3fc9298 100644 --- a/websiteFunctions/templates/websiteFunctions/WPCreate.html +++ b/websiteFunctions/templates/websiteFunctions/WPCreate.html @@ -146,6 +146,25 @@ class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}
+
+ + +
+
+ +
+
+
+ {# My Work #} {#
#} diff --git a/websiteFunctions/templates/websiteFunctions/createWebsite.html b/websiteFunctions/templates/websiteFunctions/createWebsite.html index 18044b814..c9a7225cd 100755 --- a/websiteFunctions/templates/websiteFunctions/createWebsite.html +++ b/websiteFunctions/templates/websiteFunctions/createWebsite.html @@ -174,8 +174,14 @@
diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 5f0f74682..d3eb0a9c7 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -2065,6 +2065,7 @@ class WebsiteManager: extraArgs['websiteOwner'] = data['websiteOwner'] extraArgs['package'] = data['package'] extraArgs['home'] = data['home'] + extraArgs['apacheBackend'] = data['apacheBackend'] try: extraArgs['path'] = data['path'] if extraArgs['path'] == '': @@ -6447,7 +6448,12 @@ StrictHostKeyChecking no phps = PHPManager.findPHPVersions() - proc = httpProc(request, 'websiteFunctions/ApacheManager.html', {'domainName': self.domain, 'phps': phps}) + if ACLManager.CheckForPremFeature('all'): + apachemanager = 1 + else: + apachemanager = 0 + + proc = httpProc(request, 'websiteFunctions/ApacheManager.html', {'domainName': self.domain, 'phps': phps, 'apachemanager':apachemanager}) return proc.render() def saveApacheConfigsToFile(self, userID=None, data=None):