diff --git a/CyberCP/__init__.pyc b/CyberCP/__init__.pyc index 2571db08e..b4c1a3d74 100644 Binary files a/CyberCP/__init__.pyc and b/CyberCP/__init__.pyc differ diff --git a/CyberCP/settings.pyc b/CyberCP/settings.pyc index 8462dbac1..a99037583 100644 Binary files a/CyberCP/settings.pyc and b/CyberCP/settings.pyc differ diff --git a/api/__init__.pyc b/api/__init__.pyc index d295767b8..b65fd3706 100644 Binary files a/api/__init__.pyc and b/api/__init__.pyc differ diff --git a/api/admin.pyc b/api/admin.pyc index c6eaab6f4..82f1d16fa 100644 Binary files a/api/admin.pyc and b/api/admin.pyc differ diff --git a/api/models.pyc b/api/models.pyc index 95e618eab..3561deb50 100644 Binary files a/api/models.pyc and b/api/models.pyc differ diff --git a/backup/__init__.pyc b/backup/__init__.pyc index f7ebdeb10..a070efdd6 100644 Binary files a/backup/__init__.pyc and b/backup/__init__.pyc differ diff --git a/backup/admin.pyc b/backup/admin.pyc index 75b5e34f1..18caa545d 100644 Binary files a/backup/admin.pyc and b/backup/admin.pyc differ diff --git a/backup/models.pyc b/backup/models.pyc index e88101322..4b928877f 100644 Binary files a/backup/models.pyc and b/backup/models.pyc differ diff --git a/baseTemplate/__init__.pyc b/baseTemplate/__init__.pyc index 552ff2862..25e5b7d66 100644 Binary files a/baseTemplate/__init__.pyc and b/baseTemplate/__init__.pyc differ diff --git a/baseTemplate/admin.pyc b/baseTemplate/admin.pyc index 096f35428..cb9c918b2 100644 Binary files a/baseTemplate/admin.pyc and b/baseTemplate/admin.pyc differ diff --git a/baseTemplate/models.pyc b/baseTemplate/models.pyc index 7fc838c18..0b1265b82 100644 Binary files a/baseTemplate/models.pyc and b/baseTemplate/models.pyc differ diff --git a/databases/__init__.pyc b/databases/__init__.pyc index 4c163040c..f8e7593fc 100644 Binary files a/databases/__init__.pyc and b/databases/__init__.pyc differ diff --git a/databases/admin.pyc b/databases/admin.pyc index 55bee3bfc..b3edea730 100644 Binary files a/databases/admin.pyc and b/databases/admin.pyc differ diff --git a/databases/models.pyc b/databases/models.pyc index 9dbdb578c..479ad2eee 100644 Binary files a/databases/models.pyc and b/databases/models.pyc differ diff --git a/dns/__init__.pyc b/dns/__init__.pyc index a107e8132..e13d9790c 100644 Binary files a/dns/__init__.pyc and b/dns/__init__.pyc differ diff --git a/dns/admin.pyc b/dns/admin.pyc index ea4ed62eb..590876449 100644 Binary files a/dns/admin.pyc and b/dns/admin.pyc differ diff --git a/dns/models.pyc b/dns/models.pyc index 2cd0d1084..0c689a527 100644 Binary files a/dns/models.pyc and b/dns/models.pyc differ diff --git a/filemanager/__init__.pyc b/filemanager/__init__.pyc index d6db003ca..6951e53e3 100644 Binary files a/filemanager/__init__.pyc and b/filemanager/__init__.pyc differ diff --git a/filemanager/admin.pyc b/filemanager/admin.pyc index d3021d379..df5374762 100644 Binary files a/filemanager/admin.pyc and b/filemanager/admin.pyc differ diff --git a/filemanager/models.pyc b/filemanager/models.pyc index 0f50e1697..2f5b0f198 100644 Binary files a/filemanager/models.pyc and b/filemanager/models.pyc differ diff --git a/firewall/__init__.pyc b/firewall/__init__.pyc index 378e2672e..b3cebf703 100644 Binary files a/firewall/__init__.pyc and b/firewall/__init__.pyc differ diff --git a/firewall/admin.pyc b/firewall/admin.pyc index 1f049a0bd..4a7e86e1f 100644 Binary files a/firewall/admin.pyc and b/firewall/admin.pyc differ diff --git a/firewall/models.pyc b/firewall/models.pyc index 04ea4b02e..31f9975ea 100644 Binary files a/firewall/models.pyc and b/firewall/models.pyc differ diff --git a/ftp/__init__.pyc b/ftp/__init__.pyc index c809dd320..d4609ae24 100644 Binary files a/ftp/__init__.pyc and b/ftp/__init__.pyc differ diff --git a/ftp/admin.pyc b/ftp/admin.pyc index 6e7d7cc72..c33a0295d 100644 Binary files a/ftp/admin.pyc and b/ftp/admin.pyc differ diff --git a/ftp/models.pyc b/ftp/models.pyc index b6810b81d..64b88c626 100644 Binary files a/ftp/models.pyc and b/ftp/models.pyc differ diff --git a/install/install.py b/install/install.py index e720d0176..f85aad22e 100644 --- a/install/install.py +++ b/install/install.py @@ -1883,6 +1883,34 @@ class preFlightsChecks: return 1 + def test_Requests(self): + try: + import requests + getVersion = requests.get('https://cyberpanel.net/version.txt') + latest = getVersion.json() + except BaseException,msg: + + command = "pip uninstall --yes requests" + subprocess.call(shlex.split(command)) + + command = "pip install requests==2.2.1" + res = subprocess.call(shlex.split(command)) + + if res == 1: + print("###############################################") + print(" Requests Test Ran ") + print("###############################################") + else: + print("###############################################") + print(" Request Test Fail ") + print("###############################################") + + + + logging.InstallLog.writeToFile(str(msg) + " [test_Requests]") + return 0 + + def main(): @@ -1938,6 +1966,7 @@ def main(): checks.install_python_requests() checks.install_default_keys() + checks.test_Requests() checks.download_install_CyberPanel(installCyberPanel.InstallCyberPanel.mysqlPassword) checks.setup_cron() diff --git a/locale/bs/LC_MESSAGES/django.po b/locale/bs/LC_MESSAGES/django.po index a7b5f21cb..247baf621 100644 --- a/locale/bs/LC_MESSAGES/django.po +++ b/locale/bs/LC_MESSAGES/django.po @@ -489,16 +489,16 @@ msgstr "Upotreba" #: baseTemplate/templates/baseTemplate/homePage.html:34 #: baseTemplate/templates/baseTemplate/index.html:221 msgid "CPU Usage" -msgstr "CPU" +msgstr "CPU Upotreba" #: baseTemplate/templates/baseTemplate/homePage.html:55 #: baseTemplate/templates/baseTemplate/index.html:232 msgid "Ram Usage" -msgstr "RAM" +msgstr "RAM Upotreba" #: baseTemplate/templates/baseTemplate/homePage.html:74 msgid "Disk Usage '/'" -msgstr "Disk '/'" +msgstr "Upotreba diska '/'" #: baseTemplate/templates/baseTemplate/homePage.html:98 msgid "HTTP Statistics" @@ -510,7 +510,7 @@ msgstr "Dostupno/Max konekcija" #: baseTemplate/templates/baseTemplate/homePage.html:118 msgid "Available/Max SSL Connections" -msgstr "Dostupno/Max SSL konekcija" +msgstr "Dostupno/Max ssl konekcija" #: baseTemplate/templates/baseTemplate/homePage.html:127 msgid "Requests Processing" @@ -994,7 +994,7 @@ msgstr "Server" #: baseTemplate/templates/baseTemplate/index.html:594 msgid "NEW" -msgstr "NOVO" +msgstr "Novi" #: baseTemplate/templates/baseTemplate/index.html:599 #: tuning/templates/tuning/index.html:24 tuning/templates/tuning/index.html:26 @@ -1452,7 +1452,7 @@ msgid "" "On this page you can add/delete firewall rules. (By default all ports are " "blocked, except mentioned below)" msgstr "" -"Na ovoj stranici možete dodati / izbrisati pravila firewalla. (Podrazumijevano " +"Na ovoj stranici možete dodati / izbrisati pravila firewalla. (Podrazumevano " "su svi portovi blokirani, osim što je navedeno ispod)" #: firewall/templates/firewall/firewall.html:19 @@ -1498,7 +1498,7 @@ msgstr "Bezbijednost - CyberPanel" #: firewall/templates/firewall/index.html:12 msgid "Security Functions" -msgstr "Bezbjednosne funkcije" +msgstr "Sigurnosne funkcije" #: firewall/templates/firewall/index.html:13 msgid "Manage the security of the server on this page." @@ -2788,7 +2788,7 @@ msgstr "Izmijeni PHP konfiguracije" #: websiteFunctions/templates/websiteFunctions/website.html:486 msgid "Edit vHost Main Configurations" -msgstr "Promjena vHost glavnih podešavanja" +msgstr "" #: websiteFunctions/templates/websiteFunctions/website.html:496 #: websiteFunctions/templates/websiteFunctions/website.html:498 @@ -2811,7 +2811,7 @@ msgstr "SLL spremljen" #: websiteFunctions/templates/websiteFunctions/website.html:530 msgid "Could not save SSL. Error message:" -msgstr "Nisam mogao sačuvati SSL. Poruka o grešci:" +msgstr "" #: websiteFunctions/templates/websiteFunctions/website.html:580 msgid "Current configuration in the file fetched." @@ -2820,12 +2820,12 @@ msgstr "" #: websiteFunctions/templates/websiteFunctions/website.html:585 #: websiteFunctions/templates/websiteFunctions/website.html:598 msgid "Could not fetch current configuration. Error message:" -msgstr "Nisam mogao dohvatiti trenutnu konfiguraciju. Greška poruke:" +msgstr "" #: websiteFunctions/templates/websiteFunctions/website.html:594 #: websiteFunctions/templates/websiteFunctions/website.html:649 msgid "Configuration saved. Restart LiteSpeed put them in effect." -msgstr "Postavke su sačuavane. Morate da restartujete LiteSpeed." +msgstr "" #: websiteFunctions/templates/websiteFunctions/website.html:635 msgid "Current rewrite rules in the file fetched." diff --git a/loginSystem/__init__.pyc b/loginSystem/__init__.pyc index ab90442a8..f65734b59 100644 Binary files a/loginSystem/__init__.pyc and b/loginSystem/__init__.pyc differ diff --git a/loginSystem/admin.pyc b/loginSystem/admin.pyc index 638cef3c9..f852b0ed2 100644 Binary files a/loginSystem/admin.pyc and b/loginSystem/admin.pyc differ diff --git a/loginSystem/models.pyc b/loginSystem/models.pyc index b99970fb1..a0669655b 100644 Binary files a/loginSystem/models.pyc and b/loginSystem/models.pyc differ diff --git a/loginSystem/templates/loginSystem/login.html b/loginSystem/templates/loginSystem/login.html index 0fcfe9c82..c8dcc8a4b 100755 --- a/loginSystem/templates/loginSystem/login.html +++ b/loginSystem/templates/loginSystem/login.html @@ -199,7 +199,7 @@
-

CyberPanel v 1.5

+

CyberPanel v 1.6

Web Hosting Control Panel

    diff --git a/mailServer/__init__.pyc b/mailServer/__init__.pyc index b26d87e16..49c4c226a 100644 Binary files a/mailServer/__init__.pyc and b/mailServer/__init__.pyc differ diff --git a/mailServer/admin.pyc b/mailServer/admin.pyc index 942a2ddac..467828123 100644 Binary files a/mailServer/admin.pyc and b/mailServer/admin.pyc differ diff --git a/mailServer/models.pyc b/mailServer/models.pyc index 99c6bc6fd..3d8d40b5d 100644 Binary files a/mailServer/models.pyc and b/mailServer/models.pyc differ diff --git a/managePHP/__init__.pyc b/managePHP/__init__.pyc index bccbfb967..6142ce7e2 100644 Binary files a/managePHP/__init__.pyc and b/managePHP/__init__.pyc differ diff --git a/managePHP/admin.pyc b/managePHP/admin.pyc index 9c8d4a1ab..272a18a6d 100644 Binary files a/managePHP/admin.pyc and b/managePHP/admin.pyc differ diff --git a/managePHP/models.pyc b/managePHP/models.pyc index 530faf72a..ea173e711 100644 Binary files a/managePHP/models.pyc and b/managePHP/models.pyc differ diff --git a/manageSSL/__init__.pyc b/manageSSL/__init__.pyc index 21eaca29f..9919c9f70 100644 Binary files a/manageSSL/__init__.pyc and b/manageSSL/__init__.pyc differ diff --git a/manageSSL/admin.pyc b/manageSSL/admin.pyc index 202b3fc1c..3fe69d414 100644 Binary files a/manageSSL/admin.pyc and b/manageSSL/admin.pyc differ diff --git a/manageSSL/models.pyc b/manageSSL/models.pyc index d208484fe..771436811 100644 Binary files a/manageSSL/models.pyc and b/manageSSL/models.pyc differ diff --git a/packages/__init__.pyc b/packages/__init__.pyc index 1eb701180..608d3b0df 100644 Binary files a/packages/__init__.pyc and b/packages/__init__.pyc differ diff --git a/packages/admin.pyc b/packages/admin.pyc index 1f940dc71..5cc47c1e5 100644 Binary files a/packages/admin.pyc and b/packages/admin.pyc differ diff --git a/packages/models.pyc b/packages/models.pyc index b0a5b0e46..1bf311c4e 100644 Binary files a/packages/models.pyc and b/packages/models.pyc differ diff --git a/plogical/sslUtilities.py b/plogical/sslUtilities.py index b5cdc1796..e5df76684 100644 --- a/plogical/sslUtilities.py +++ b/plogical/sslUtilities.py @@ -158,6 +158,8 @@ class sslUtilities: expectation.append("that you are serving files from the webroot path") #4 expectation.append("Enter email address") #5 expectation.append("There were too many requests") # 6 + expectation.append("--expand flag") #7 + try: @@ -248,6 +250,11 @@ class sslUtilities: elif index==6: return "Too many SSL requests for this domain, please try to get SSL at later time." + elif index==7: + command = "certbot certonly -n --agree-tos --email " + adminEmail + " --expand --webroot -w " + sslpath + " -d " + virtualHostName + " -d www." + virtualHostName + subprocess.call(shlex.split(command)) + logging.CyberCPLogFileWriter.writeToFile(virtualHostName + " SSL OK by expanding!") + except pexpect.EOF,msg: diff --git a/plogical/virtualHostUtilities.py b/plogical/virtualHostUtilities.py index f3430ad13..a6350de21 100644 --- a/plogical/virtualHostUtilities.py +++ b/plogical/virtualHostUtilities.py @@ -1393,6 +1393,9 @@ RewriteRule .* - [E=cache-control:max-age=120] installUtilities.installUtilities.reStartLiteSpeed() + print "1,None" + return + except BaseException, msg: # remove the downloaded files try: diff --git a/serverLogs/__init__.pyc b/serverLogs/__init__.pyc index 72b63b0ae..7010da2d8 100644 Binary files a/serverLogs/__init__.pyc and b/serverLogs/__init__.pyc differ diff --git a/serverLogs/admin.pyc b/serverLogs/admin.pyc index e769b61e1..fb494858d 100644 Binary files a/serverLogs/admin.pyc and b/serverLogs/admin.pyc differ diff --git a/serverLogs/models.pyc b/serverLogs/models.pyc index bc8257b6c..8905b554e 100644 Binary files a/serverLogs/models.pyc and b/serverLogs/models.pyc differ diff --git a/serverLogs/views.py b/serverLogs/views.py index 2e270066c..941a1a722 100644 --- a/serverLogs/views.py +++ b/serverLogs/views.py @@ -8,6 +8,8 @@ import json import plogical.CyberCPLogFileWriter as logging from plogical.installUtilities import installUtilities from loginSystem.models import Administrator +import subprocess +import shlex # Create your views here. @@ -104,10 +106,9 @@ def getLogsFromFile(request): elif type=="ftp": fileName="/var/log/messages" - fewLinesOfLogFile = logging.CyberCPLogFileWriter.readLastNFiles(50,fileName) - - fewLinesOfLogFile = str(fewLinesOfLogFile) + command = "sudo tail -50 " + fileName + fewLinesOfLogFile = subprocess.check_output(shlex.split(command)) status = {"logstatus":1,"logsdata":fewLinesOfLogFile} diff --git a/serverStatus/__init__.pyc b/serverStatus/__init__.pyc index 384f2927a..ab306a8b6 100644 Binary files a/serverStatus/__init__.pyc and b/serverStatus/__init__.pyc differ diff --git a/serverStatus/admin.pyc b/serverStatus/admin.pyc index f001a5096..d3b09cb22 100644 Binary files a/serverStatus/admin.pyc and b/serverStatus/admin.pyc differ diff --git a/serverStatus/models.pyc b/serverStatus/models.pyc index abd92c753..3e99fa5f0 100644 Binary files a/serverStatus/models.pyc and b/serverStatus/models.pyc differ diff --git a/static/websiteFunctions/websiteFunctions.js b/static/websiteFunctions/websiteFunctions.js index e2c8474a7..1446b50c5 100644 --- a/static/websiteFunctions/websiteFunctions.js +++ b/static/websiteFunctions/websiteFunctions.js @@ -1129,6 +1129,7 @@ app.controller('websitePages', function($scope,$http) { //////// Application Installation part $scope.installationDetailsForm = true; + $scope.installationDetailsFormJoomla = true; $scope.applicationInstallerLoading = true; $scope.installationFailed = true; $scope.installationSuccessfull = true; @@ -1138,8 +1139,15 @@ app.controller('websitePages', function($scope,$http) { $scope.installationDetails = function(){ - $scope.installationDetailsForm = false; + $scope.installationDetailsForm = !$scope.installationDetailsForm; + $scope.installationDetailsFormJoomla = true; + } + + $scope.installationDetailsJoomla = function(){ + + $scope.installationDetailsFormJoomla = !$scope.installationDetailsFormJoomla; + $scope.installationDetailsForm = true; } @@ -1224,6 +1232,95 @@ app.controller('websitePages', function($scope,$http) { }; + $scope.installJoomla = function(){ + + + $scope.installationDetailsFormJoomla = false; + $scope.applicationInstallerLoading = false; + $scope.installationFailed = true; + $scope.installationSuccessfull = true; + $scope.couldNotConnect = true; + + var domain = $("#domainNamePage").text(); + var path = $scope.installPath; + var sitename = $scope.sitename + var username = $scope.username + var password = $scope.password + var prefix = $scope.prefix + + + url = "/websites/installJoomla"; + + var home = "1"; + + if (typeof path != 'undefined'){ + home = "0"; + } + + + var data = { + domain: domain, + home:home, + path:path, + sitename:sitename, + username:username, + password:password, + prefix:prefix, + }; + + var config = { + headers : { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas); + + + function ListInitialDatas(response) { + + if (response.data.installStatus == 1) + { + if (typeof path != 'undefined'){ + $scope.installationURL = "http://"+domain+"/"+path; + } + else{ + $scope.installationURL = domain; + } + + $scope.installationDetailsFormJoomla = false; + $scope.applicationInstallerLoading = true; + $scope.installationFailed = true; + $scope.installationSuccessfull = false; + $scope.couldNotConnect = true; + + } + else{ + + $scope.installationDetailsFormJoomla = false; + $scope.applicationInstallerLoading = true; + $scope.installationFailed = false; + $scope.installationSuccessfull = true; + $scope.couldNotConnect = true; + + $scope.errorMessage = response.data.error_message; + + } + + + } + function cantLoadInitialDatas(response) { + + $scope.installationDetailsFormJoomla = false; + $scope.applicationInstallerLoading = true; + $scope.installationFailed = true; + $scope.installationSuccessfull = true; + $scope.couldNotConnect = false; + + } + + }; + diff --git a/tuning/__init__.pyc b/tuning/__init__.pyc index 9b0897c06..4d8b43840 100644 Binary files a/tuning/__init__.pyc and b/tuning/__init__.pyc differ diff --git a/tuning/admin.pyc b/tuning/admin.pyc index 3b7c90a12..6f8b7d940 100644 Binary files a/tuning/admin.pyc and b/tuning/admin.pyc differ diff --git a/tuning/models.pyc b/tuning/models.pyc index 2cc226702..ac6770294 100644 Binary files a/tuning/models.pyc and b/tuning/models.pyc differ diff --git a/userManagment/__init__.pyc b/userManagment/__init__.pyc index 44fb1ac61..932555a1f 100644 Binary files a/userManagment/__init__.pyc and b/userManagment/__init__.pyc differ diff --git a/userManagment/admin.pyc b/userManagment/admin.pyc index 26155ab20..0f08cf20c 100644 Binary files a/userManagment/admin.pyc and b/userManagment/admin.pyc differ diff --git a/userManagment/models.pyc b/userManagment/models.pyc index a097fe4d5..b8e025709 100644 Binary files a/userManagment/models.pyc and b/userManagment/models.pyc differ diff --git a/websiteFunctions/__init__.pyc b/websiteFunctions/__init__.pyc index 10023f6af..6cdcdddf3 100644 Binary files a/websiteFunctions/__init__.pyc and b/websiteFunctions/__init__.pyc differ diff --git a/websiteFunctions/admin.pyc b/websiteFunctions/admin.pyc index 842c0f378..a7f1d7fa0 100644 Binary files a/websiteFunctions/admin.pyc and b/websiteFunctions/admin.pyc differ diff --git a/websiteFunctions/models.pyc b/websiteFunctions/models.pyc index ab96a5e0a..adb24a2bb 100644 Binary files a/websiteFunctions/models.pyc and b/websiteFunctions/models.pyc differ