From ce19c7f2e5dbeaeea22aee151dc377a38c67a3be Mon Sep 17 00:00:00 2001 From: nickchomey <88559987+nickchomey@users.noreply.github.com> Date: Wed, 23 Mar 2022 14:02:50 -0600 Subject: [PATCH 1/9] add warning cant revert to OLS after trial --- serverStatus/templates/serverStatus/litespeedStatus.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/serverStatus/templates/serverStatus/litespeedStatus.html b/serverStatus/templates/serverStatus/litespeedStatus.html index 8f9cb00c7..747930922 100755 --- a/serverStatus/templates/serverStatus/litespeedStatus.html +++ b/serverStatus/templates/serverStatus/litespeedStatus.html @@ -174,6 +174,9 @@

{% trans "Note: If you select 15 days trial there is no need to enter the serial key, CyberPanel will auto fetch 15 days trial key for you. Make sure this server have not used trial already." %}

+
+

{% trans "WARNING: You cannot revert back to OpenLiteSpeed if you choose not to purchase a LiteSpeed Enterprise license after the 15 day trial period. We recommend you test the Enterprise trial on a separate server." %}

+
From fa4763224e6c293c58dc3f11880dcd200f8bdd43 Mon Sep 17 00:00:00 2001 From: nickchomey <88559987+nickchomey@users.noreply.github.com> Date: Wed, 23 Mar 2022 14:09:31 -0600 Subject: [PATCH 2/9] Update litespeedStatus.html --- serverStatus/templates/serverStatus/litespeedStatus.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverStatus/templates/serverStatus/litespeedStatus.html b/serverStatus/templates/serverStatus/litespeedStatus.html index 747930922..fcb0f936f 100755 --- a/serverStatus/templates/serverStatus/litespeedStatus.html +++ b/serverStatus/templates/serverStatus/litespeedStatus.html @@ -175,7 +175,7 @@

{% trans "Note: If you select 15 days trial there is no need to enter the serial key, CyberPanel will auto fetch 15 days trial key for you. Make sure this server have not used trial already." %}

-

{% trans "WARNING: You cannot revert back to OpenLiteSpeed if you choose not to purchase a LiteSpeed Enterprise license after the 15 day trial period. We recommend you test the Enterprise trial on a separate server." %}

+

{% trans "WARNING: You cannot revert back to OpenLiteSpeed if you choose not to purchase a LiteSpeed Enterprise license after the 15 day trial period. We recommend you test the Enterprise trial on a separate server." %}

From c00fb2f64c3908d226e9a77743f68992265c81fa Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Sun, 24 Apr 2022 14:36:40 +0500 Subject: [PATCH 3/9] add requests --- plogical/IncScheduler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plogical/IncScheduler.py b/plogical/IncScheduler.py index 30e786647..83b147668 100644 --- a/plogical/IncScheduler.py +++ b/plogical/IncScheduler.py @@ -252,7 +252,7 @@ class IncScheduler(multi.Thread): drive.files().list(pageSize=10, fields="files(id, name)").execute() except BaseException as msg: try: - + import requests finalData = json.dumps({'refresh_token': gDriveData['refresh_token']}) r = requests.post("https://platform.cyberpersons.com/refreshToken", data=finalData ) From 96167ac7e1f716309c3d22d7fca3a7965a7069fe Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Sun, 24 Apr 2022 22:01:54 +0500 Subject: [PATCH 4/9] v2.3.1 --- backup/templates/backup/googleDrive.html | 2 +- filemanager/views.py | 3 ++- plogical/IncScheduler.py | 19 ++++++++----------- version.txt | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/backup/templates/backup/googleDrive.html b/backup/templates/backup/googleDrive.html index 175a20508..50549d0c7 100755 --- a/backup/templates/backup/googleDrive.html +++ b/backup/templates/backup/googleDrive.html @@ -114,7 +114,7 @@
- +