From 897a8504c29aaf13f4d3f4dd484a0954ab0d1f84 Mon Sep 17 00:00:00 2001 From: usmannasir <01-134132-158@student.bahria.edu.pk> Date: Mon, 30 Oct 2017 14:34:07 +0500 Subject: [PATCH] Language updates and Bug fixes to user managment. --- README.md | 4 +- .../baseTemplate/custom-js/system-status.js | 1 - .../templates/baseTemplate/homePage.html | 144 +++++++- install/install.py | 4 +- locale/cn/LC_MESSAGES/django.mo | Bin 36173 -> 38779 bytes locale/cn/LC_MESSAGES/django.po | 329 +++++++----------- loginSystem/templates/loginSystem/login.html | 2 +- loginSystem/views.py | 2 +- packages/views.py | 10 + plogical/upgrade.py | 2 + .../baseTemplate/custom-js/system-status.js | 1 - static/userManagment/userManagment.js | 6 +- .../static/userManagment/userManagment.js | 6 +- .../templates/userManagment/createUser.html | 2 +- .../templates/userManagment/modifyUser.html | 1 - userManagment/views.py | 36 +- websiteFunctions/views.py | 68 ++++ 17 files changed, 391 insertions(+), 227 deletions(-) diff --git a/README.md b/README.md index 254ef9dbc..ebe4719f7 100644 --- a/README.md +++ b/README.md @@ -38,8 +38,8 @@ python install.py [IP Address] # Resources -* [Official Site.](http://cyberpanel.net) -* [Documentation.](http://docs.cyberpanel.net) +* [Official Site.](https://cyberpanel.net) +* [Documentation.](https://docs.cyberpanel.net) * [Forums.](https://forums.cyberpanel.net) diff --git a/baseTemplate/static/baseTemplate/custom-js/system-status.js b/baseTemplate/static/baseTemplate/custom-js/system-status.js index 899b204ed..b68fdf590 100644 --- a/baseTemplate/static/baseTemplate/custom-js/system-status.js +++ b/baseTemplate/static/baseTemplate/custom-js/system-status.js @@ -127,7 +127,6 @@ app.controller('adminController', function($scope,$http,$timeout) { $("#remoteBackups").hide(); $("#packageHome").hide(); $("#packageSub").hide(); - $("#createWebsite").hide(); } } diff --git a/baseTemplate/templates/baseTemplate/homePage.html b/baseTemplate/templates/baseTemplate/homePage.html index 5ca274c0e..b5a8fdbac 100644 --- a/baseTemplate/templates/baseTemplate/homePage.html +++ b/baseTemplate/templates/baseTemplate/homePage.html @@ -15,9 +15,9 @@

{% trans "Home" %}

+ {% if type < 3 %} - -
+

{% trans "Usage" %} @@ -164,6 +164,8 @@

{% trans "Available Functions" %}

+ {% if type == 1 %} +
@@ -286,7 +288,7 @@

- {% if type == 1 %} +
2 @@ -299,7 +301,7 @@

- {% endif %} + @@ -309,7 +311,7 @@

- {% if type == 1 %} +
@@ -348,7 +350,7 @@

- {% endif %} + @@ -357,7 +359,7 @@

- {% if type == 1 %} +
@@ -371,15 +373,139 @@

+
+

+ + + {% else %} - {% endif %} + +
+
+ +
+ + 4 +
+ {% trans "Users" %} +
+
+ +
+ +
+ + +
+ + 5 +
+ {% trans "Websites" %} +
+
+ +
+ +
+ + +
+ + 3 +
+ {% trans "Databases" %} +
+
+ +
+ +
+ + + +
+ + + + + +
+ + +
+ + 4 +
+ {% trans "DNS" %} +
+
+ +
+ +
+ + +
+ + 2 +
+ {% trans "FTP" %} +
+
+ +
+ +
+ +
+ + 2 +
+ {% trans "Back up" %} +
+
+ +
+ +
+ + + +
+ +
+ + + +
+ + 4 +
+ {% trans "Emails" %} +
+
+ +
+ +
+ + + + +
-

+ + + + {% endif %} + +
+
diff --git a/install/install.py b/install/install.py index bbe306014..20acaec5c 100644 --- a/install/install.py +++ b/install/install.py @@ -601,7 +601,7 @@ def download_install_CyberPanel(self,mysqlPassword): cmd = [] cmd.append("wget") - cmd.append("http://cyberpanel.net/CyberPanel.1.4.tar.gz") + cmd.append("http://cyberpanel.net/CyberPanel.1.5.tar.gz") res = subprocess.call(cmd) @@ -620,7 +620,7 @@ def download_install_CyberPanel(self,mysqlPassword): cmd.append("tar") cmd.append("zxf") - cmd.append("CyberPanel.1.4.tar.gz") + cmd.append("CyberPanel.1.5.tar.gz") res = subprocess.call(cmd) diff --git a/locale/cn/LC_MESSAGES/django.mo b/locale/cn/LC_MESSAGES/django.mo index 9eebaa1bfe097aa0cb54d7c1192a8aa256035752..eca7af4abcb7a55c1fc565c1e988d3c62ff8e038 100644 GIT binary patch delta 14071 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 delta 11838 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\n" +"POT-Creation-Date: 2017-10-30 10:05+0500\n" +"PO-Revision-Date: 2017-10-29 19:32+0100\n" +"Last-Translator: \n" "Language-Team: LANGUAGE \n" -"Language: \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.0.4\n" #: CyberCP/settings.py:167 msgid "English" @@ -47,7 +48,7 @@ msgstr "日语" #: CyberCP/settings.py:172 msgid "Bosnian" -msgstr "" +msgstr "波斯尼亚语" #: backup/templates/backup/backup.html:3 backup/templates/backup/backup.html:13 #: backup/templates/backup/backup.html:20 @@ -107,10 +108,8 @@ msgid "Create Back up" msgstr "创建备份" #: backup/templates/backup/backup.html:87 -#, fuzzy -#| msgid "Create Back up" msgid "Cancel Backup" -msgstr "创建备份" +msgstr "取消备份" #: backup/templates/backup/backup.html:101 #: backup/templates/backup/backupDestinations.html:90 @@ -302,7 +301,7 @@ msgstr "备份 - CyberPanel" #: baseTemplate/templates/baseTemplate/homePage.html:269 #: baseTemplate/templates/baseTemplate/index.html:554 #: baseTemplate/templates/baseTemplate/index.html:556 -#: baseTemplate/templates/baseTemplate/index.html:572 +#: baseTemplate/templates/baseTemplate/index.html:573 msgid "Back up" msgstr "备份" @@ -327,8 +326,6 @@ msgid "Available Functions" msgstr "可用功能" #: backup/templates/backup/index.html:27 backup/templates/backup/index.html:43 -#, fuzzy -#| msgid "Back up Website" msgid "Back up Site" msgstr "备份网站" @@ -343,68 +340,50 @@ msgid "Restore" msgstr "还原" #: backup/templates/backup/remoteBackups.html:3 -#, fuzzy -#| msgid "Websites Hosted - CyberPanel" msgid "Transfer Websites from Remote Server - CyberPanel" -msgstr "当前已创建的网站 - CyberPanel" +msgstr "从远程服务器恢复网站 - CyberPanel" #: backup/templates/backup/remoteBackups.html:14 #: backup/templates/backup/remoteBackups.html:21 -#, fuzzy -#| msgid "Restore Back up" msgid "Remote Backups" -msgstr "还原备份" +msgstr "远程备份" #: backup/templates/backup/remoteBackups.html:15 msgid "This feature can import website(s) from remote server" -msgstr "" +msgstr "此功能可以从远程服务器导入网站" #: backup/templates/backup/remoteBackups.html:46 -#, fuzzy -#| msgid "FTP Accounts" msgid "Fetch Accounts" -msgstr "FTP用户数量" +msgstr "读取" #: backup/templates/backup/remoteBackups.html:55 msgid "Start Transfer" -msgstr "" +msgstr "开始迁移" #: backup/templates/backup/remoteBackups.html:59 #: websiteFunctions/templates/websiteFunctions/website.html:269 -#, fuzzy -#| msgid "Create Back up" msgid "Cancel" -msgstr "创建备份" +msgstr "取消" #: backup/templates/backup/remoteBackups.html:72 -#, fuzzy -#| msgid "Could not connect. Please refresh this page." msgid "Could not connect, please refresh this page." -msgstr "无法连接, 请刷新此页面" +msgstr "无法连接, 请刷新此页面." #: backup/templates/backup/remoteBackups.html:76 -#, fuzzy -#| msgid "Records successfully fetched for" msgid "Accounts Successfully Fetched from remote server." -msgstr "成功读取记录" +msgstr "成功读取记录." #: backup/templates/backup/remoteBackups.html:80 -#, fuzzy -#| msgid " is successfully created." msgid "Backup Process successfully started." -msgstr " 已成功创建" +msgstr " 已成功创建." #: backup/templates/backup/remoteBackups.html:84 -#, fuzzy -#| msgid "is successfully created." msgid "Backup successfully cancelled." -msgstr "已成功添加" +msgstr "已成功添加." #: backup/templates/backup/remoteBackups.html:96 -#, fuzzy -#| msgid "Select Account" msgid "Search Accounts.." -msgstr "选择用户" +msgstr "搜索用户..." #: backup/templates/backup/remoteBackups.html:107 #: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65 @@ -413,8 +392,8 @@ msgstr "网站" #: backup/templates/backup/remoteBackups.html:108 #: baseTemplate/templates/baseTemplate/homePage.html:331 -#: baseTemplate/templates/baseTemplate/index.html:625 -#: baseTemplate/templates/baseTemplate/index.html:627 +#: baseTemplate/templates/baseTemplate/index.html:626 +#: baseTemplate/templates/baseTemplate/index.html:628 #: managePHP/templates/managePHP/installExtensions.html:62 msgid "PHP" msgstr "PHP" @@ -545,10 +524,8 @@ msgid "Websites" msgstr "网站" #: baseTemplate/templates/baseTemplate/homePage.html:199 -#, fuzzy -#| msgid "Modify Package" msgid "Add/Modify Packages" -msgstr "修改套餐" +msgstr "创建/修改套餐" #: baseTemplate/templates/baseTemplate/homePage.html:202 #: baseTemplate/templates/baseTemplate/index.html:366 @@ -612,30 +589,28 @@ msgstr "服务器设置" #: baseTemplate/templates/baseTemplate/homePage.html:315 #: baseTemplate/templates/baseTemplate/homePage.html:318 -#: baseTemplate/templates/baseTemplate/index.html:606 -#: baseTemplate/templates/baseTemplate/index.html:608 -#: baseTemplate/templates/baseTemplate/index.html:641 +#: baseTemplate/templates/baseTemplate/index.html:607 +#: baseTemplate/templates/baseTemplate/index.html:609 +#: baseTemplate/templates/baseTemplate/index.html:642 #: serverStatus/templates/serverStatus/index.html:13 msgid "Server Status" msgstr "服务器状态" #: baseTemplate/templates/baseTemplate/homePage.html:328 -#, fuzzy -#| msgid "Edit PHP Configurations" msgid "PHP Configurations" msgstr "设置PHP参数" #: baseTemplate/templates/baseTemplate/homePage.html:340 #: baseTemplate/templates/baseTemplate/homePage.html:343 -#: baseTemplate/templates/baseTemplate/index.html:643 +#: baseTemplate/templates/baseTemplate/index.html:644 #: websiteFunctions/templates/websiteFunctions/website.html:113 msgid "Logs" msgstr "日志" #: baseTemplate/templates/baseTemplate/homePage.html:363 #: baseTemplate/templates/baseTemplate/homePage.html:366 -#: baseTemplate/templates/baseTemplate/index.html:659 -#: baseTemplate/templates/baseTemplate/index.html:661 +#: baseTemplate/templates/baseTemplate/index.html:660 +#: baseTemplate/templates/baseTemplate/index.html:662 msgid "Security" msgstr "安全" @@ -652,10 +627,8 @@ msgstr "硬盘使用量" #: baseTemplate/templates/baseTemplate/index.html:275 #: baseTemplate/templates/baseTemplate/index.html:278 #: baseTemplate/templates/baseTemplate/index.html:282 -#, fuzzy -#| msgid "Home - CyberPanel" msgid "CyberPanel" -msgstr "主页 - Cyberpanel" +msgstr "CyberPanel" #: baseTemplate/templates/baseTemplate/index.html:280 #: baseTemplate/templates/baseTemplate/index.html:284 @@ -667,10 +640,8 @@ msgid "Close sidebar" msgstr "关闭侧边栏" #: baseTemplate/templates/baseTemplate/index.html:292 -#, fuzzy -#| msgid "FTP Accounts" msgid "My Account" -msgstr "FTP用户数量" +msgstr "我的账号" #: baseTemplate/templates/baseTemplate/index.html:309 msgid "Edit profile" @@ -699,20 +670,16 @@ msgid "Fullscreen" msgstr "全屏模式" #: baseTemplate/templates/baseTemplate/index.html:345 -#, fuzzy -#| msgid "Server Status" msgid "System Status" -msgstr "服务器状态" +msgstr "系统状态" #: baseTemplate/templates/baseTemplate/index.html:350 -#, fuzzy -#| msgid "Dashboard" msgid "Dashboard Quick Menu" msgstr "仪表盘" #: baseTemplate/templates/baseTemplate/index.html:384 -#: baseTemplate/templates/baseTemplate/index.html:590 -#: baseTemplate/templates/baseTemplate/index.html:592 +#: baseTemplate/templates/baseTemplate/index.html:591 +#: baseTemplate/templates/baseTemplate/index.html:593 msgid "Tuning" msgstr "服务器设置" @@ -951,78 +918,84 @@ msgstr "查看FTP用户" msgid "Add/Delete Destination" msgstr "添加/删除远程目录" -#: baseTemplate/templates/baseTemplate/index.html:573 +#: baseTemplate/templates/baseTemplate/index.html:565 +#, fuzzy +#| msgid "Remote Backups" +msgid "Remote Back ups" +msgstr "远程备份" + #: baseTemplate/templates/baseTemplate/index.html:574 +#: baseTemplate/templates/baseTemplate/index.html:575 msgid "SSL" msgstr "SSL" -#: baseTemplate/templates/baseTemplate/index.html:579 +#: baseTemplate/templates/baseTemplate/index.html:580 #: manageSSL/templates/manageSSL/index.html:28 #: manageSSL/templates/manageSSL/manageSSL.html:13 #: manageSSL/templates/manageSSL/manageSSL.html:20 msgid "Manage SSL" msgstr "管理SSL" -#: baseTemplate/templates/baseTemplate/index.html:580 +#: baseTemplate/templates/baseTemplate/index.html:581 #: manageSSL/templates/manageSSL/index.html:40 msgid "Hostname SSL" msgstr "面板SSL" -#: baseTemplate/templates/baseTemplate/index.html:588 +#: baseTemplate/templates/baseTemplate/index.html:589 msgid "Server" msgstr "服务器设置" -#: baseTemplate/templates/baseTemplate/index.html:593 +#: baseTemplate/templates/baseTemplate/index.html:594 msgid "NEW" msgstr "新功能" -#: baseTemplate/templates/baseTemplate/index.html:598 +#: baseTemplate/templates/baseTemplate/index.html:599 #: tuning/templates/tuning/index.html:24 tuning/templates/tuning/index.html:26 #: tuning/templates/tuning/liteSpeedTuning.html:12 msgid "LiteSpeed Tuning" msgstr "LiteSpeed设置" -#: baseTemplate/templates/baseTemplate/index.html:599 +#: baseTemplate/templates/baseTemplate/index.html:600 #: tuning/templates/tuning/index.html:36 tuning/templates/tuning/index.html:38 #: tuning/templates/tuning/phpTuning.html:13 msgid "PHP Tuning" msgstr "PHP设置" -#: baseTemplate/templates/baseTemplate/index.html:614 +#: baseTemplate/templates/baseTemplate/index.html:615 #: serverStatus/templates/serverStatus/index.html:25 #: serverStatus/templates/serverStatus/index.html:27 msgid "LiteSpeed Status" msgstr "LiteSpeed状态" -#: baseTemplate/templates/baseTemplate/index.html:615 +#: baseTemplate/templates/baseTemplate/index.html:616 #: serverStatus/templates/serverStatus/cybercpmainlogfile.html:15 #: serverStatus/templates/serverStatus/index.html:37 #: serverStatus/templates/serverStatus/index.html:39 msgid "CyberPanel Main Log File" msgstr "Cybapenl主日志" -#: baseTemplate/templates/baseTemplate/index.html:632 +#: baseTemplate/templates/baseTemplate/index.html:633 #: managePHP/templates/managePHP/installExtensions.html:13 msgid "Install PHP Extensions" msgstr "安装PHP扩展" -#: baseTemplate/templates/baseTemplate/index.html:632 +#: baseTemplate/templates/baseTemplate/index.html:633 #: managePHP/templates/managePHP/index.html:24 #: managePHP/templates/managePHP/index.html:26 msgid "Install Extensions" msgstr "安装扩展" -#: baseTemplate/templates/baseTemplate/index.html:633 +#: baseTemplate/templates/baseTemplate/index.html:634 #: managePHP/templates/managePHP/index.html:36 #: managePHP/templates/managePHP/index.html:38 msgid "Edit PHP Configs" msgstr "编辑PHP配置" -#: baseTemplate/templates/baseTemplate/index.html:648 +#: baseTemplate/templates/baseTemplate/index.html:649 msgid "Access Log" msgstr "访问日志" -#: baseTemplate/templates/baseTemplate/index.html:649 +#: baseTemplate/templates/baseTemplate/index.html:650 #: serverLogs/templates/serverLogs/errorLogs.html:14 #: serverLogs/templates/serverLogs/index.html:37 #: serverLogs/templates/serverLogs/index.html:39 @@ -1030,37 +1003,35 @@ msgstr "访问日志" msgid "Error Logs" msgstr "错误日志" -#: baseTemplate/templates/baseTemplate/index.html:650 +#: baseTemplate/templates/baseTemplate/index.html:651 #: serverLogs/templates/serverLogs/emailLogs.html:14 #: serverLogs/templates/serverLogs/index.html:49 #: serverLogs/templates/serverLogs/index.html:51 msgid "Email Logs" msgstr "Email日志" -#: baseTemplate/templates/baseTemplate/index.html:650 +#: baseTemplate/templates/baseTemplate/index.html:651 msgid "Email Log" msgstr "Email日志" -#: baseTemplate/templates/baseTemplate/index.html:651 +#: baseTemplate/templates/baseTemplate/index.html:652 #: serverLogs/templates/serverLogs/ftplogs.html:14 #: serverLogs/templates/serverLogs/index.html:61 #: serverLogs/templates/serverLogs/index.html:63 msgid "FTP Logs" msgstr "FTP日志" -#: baseTemplate/templates/baseTemplate/index.html:666 -#, fuzzy -#| msgid "Firewall" +#: baseTemplate/templates/baseTemplate/index.html:667 msgid "Firewall Home" msgstr "防火墙" -#: baseTemplate/templates/baseTemplate/index.html:666 +#: baseTemplate/templates/baseTemplate/index.html:667 #: firewall/templates/firewall/index.html:25 #: firewall/templates/firewall/index.html:27 msgid "Firewall" msgstr "防火墙" -#: baseTemplate/templates/baseTemplate/index.html:667 +#: baseTemplate/templates/baseTemplate/index.html:668 #: firewall/templates/firewall/index.html:36 #: firewall/templates/firewall/index.html:38 #: firewall/templates/firewall/secureSSH.html:13 @@ -1192,10 +1163,8 @@ msgid "Records successfully fetched for" msgstr "成功读取记录" #: databases/templates/databases/listDataBases.html:50 -#, fuzzy -#| msgid "Password changed for" msgid "Password changed for: " -msgstr "已为修改密码" +msgstr "已为修改密码 " #: databases/templates/databases/listDataBases.html:54 msgid "Cannot change password for " @@ -1402,8 +1371,6 @@ msgid "Create, edit and delete DNS zones on this page." msgstr "在此页面添加, 修改, 删除DNS区域" #: dns/templates/dns/index.html:53 dns/templates/dns/index.html:108 -#, fuzzy -#| msgid "Add/Delete Records" msgid "Add Delete Records" msgstr "添加/删除记录" @@ -1479,10 +1446,8 @@ msgid "Secure SSH - CyberPanel" msgstr "SSH加固 - CyberPanel" #: firewall/templates/firewall/secureSSH.html:14 -#, fuzzy -#| msgid "SSH Configurations Saved." msgid "Secure or harden SSH Configurations." -msgstr "SSH设置已保存" +msgstr "SSH设置已保存." #: firewall/templates/firewall/secureSSH.html:28 #: managePHP/templates/managePHP/editPHPConfig.html:29 @@ -1798,10 +1763,8 @@ msgid "Select PHP Version" msgstr "选择PHP版本" #: managePHP/templates/managePHP/installExtensions.html:48 -#, fuzzy -#| msgid "Install Extensions" msgid "Search Extensions.." -msgstr "安装扩展" +msgstr "搜索扩展..." #: managePHP/templates/managePHP/installExtensions.html:63 msgid "Extension Name" @@ -1914,15 +1877,11 @@ msgstr "套餐名称" #: packages/templates/packages/createPackage.html:35 #: packages/templates/packages/modifyPackage.html:40 #: websiteFunctions/templates/websiteFunctions/website.html:223 -#, fuzzy -#| msgid "Domain Name" msgid "Domains" msgstr "域名" #: packages/templates/packages/createPackage.html:39 #: packages/templates/packages/modifyPackage.html:44 -#, fuzzy -#| msgid "( 0 = Unlimited )" msgid "(0 = Unlimited)" msgstr "(0为无限制 )" @@ -2103,12 +2062,12 @@ msgstr "LiteSpeed状态 - CyberPanel" #: serverStatus/templates/serverStatus/litespeedStatus.html:16 msgid "LiteSpeed Status:" -msgstr "LiteSpeed状态: " +msgstr "LiteSpeed状态:" #: serverStatus/templates/serverStatus/litespeedStatus.html:17 msgid "" "On this page you can get information regarding your LiteSpeed processes." -msgstr "此页面可以查看LiteSpeed进程信息" +msgstr "此页面可以查看LiteSpeed进程信息." #: serverStatus/templates/serverStatus/litespeedStatus.html:32 msgid "LiteSpeed Processes" @@ -2134,11 +2093,9 @@ msgstr "工作进程" msgid "" "Could not fetch details, either LiteSpeed is not running or some error " "occurred, please see CyberPanel Main log file." -msgstr "无法获取详情, LiteSpeed没有运行或者有错误发生 请检查CyberPnael日志" +msgstr "无法获取详情, LiteSpeed没有运行或者有错误发生 请检查CyberPnael日志." #: serverStatus/templates/serverStatus/litespeedStatus.html:72 -#, fuzzy -#| msgid "Reboot LiteSpeed" msgid "Reboot Litespeed" msgstr "重启LiteSpeed" @@ -2148,11 +2105,11 @@ msgstr "停止LiteSpeed" #: serverStatus/templates/serverStatus/litespeedStatus.html:90 msgid "Error Occurred. See CyberPanel main log file." -msgstr "发生错误, 请查看CyberPanel主日志" +msgstr "发生错误, 请查看CyberPanel主日志." #: serverStatus/templates/serverStatus/litespeedStatus.html:95 msgid "Could not connect to server." -msgstr "无法连接到服务器" +msgstr "无法连接到服务器." #: tuning/templates/tuning/index.html:3 msgid "Server Tuning - CyberPanel" @@ -2162,7 +2119,7 @@ msgstr "服务器设置 - CyberPanel" msgid "" "On this page you can set runing parameters for your webserver depending on " "your hardware." -msgstr "此页面您可以根据您的服务器硬件调整Web服务器参数 " +msgstr "此页面您可以根据您的服务器硬件调整Web服务器参数 ." #: tuning/templates/tuning/liteSpeedTuning.html:3 msgid "LiteSpeed Tuning - CyberPanel" @@ -2172,7 +2129,7 @@ msgstr "LiteSpeed设置 - CyberPanel" msgid "" "You can use this page to tweak your server according to your website " "requirments." -msgstr "此页面您可以根据您的网站要求调整服务器参数 " +msgstr "此页面您可以根据您的网站要求调整服务器参数." #: tuning/templates/tuning/liteSpeedTuning.html:18 msgid "Tuning Details" @@ -2217,7 +2174,7 @@ msgstr "关闭" #: tuning/templates/tuning/phpTuning.html:97 #: userManagment/templates/userManagment/modifyUser.html:78 msgid "Currently:" -msgstr "当前: " +msgstr "当前:" #: tuning/templates/tuning/liteSpeedTuning.html:82 msgid "Tune Web Server" @@ -2237,7 +2194,7 @@ msgstr "无法保存设置, 错误信息: " #: tuning/templates/tuning/liteSpeedTuning.html:102 msgid "Web Server Successfully tuned." -msgstr "Web服务器设置成功保存" +msgstr "Web服务器设置成功保存." #: tuning/templates/tuning/phpTuning.html:3 msgid "PHP Tuning - CyberPanel" @@ -2245,7 +2202,7 @@ msgstr "PHP设置 - CyberPanel" #: tuning/templates/tuning/phpTuning.html:14 msgid "Set how each version of PHP behaves in your server here." -msgstr "在此调整每个PHP版本" +msgstr "在此调整每个PHP版本." #: tuning/templates/tuning/phpTuning.html:45 msgid "Initial Request Timeout (secs)" @@ -2277,19 +2234,19 @@ msgstr "设置PHP" #: tuning/templates/tuning/phpTuning.html:118 msgid "Cannot tune. Error message:" -msgstr "无法保存设置, 错误信息: " +msgstr "无法保存设置, 错误信息:" #: tuning/templates/tuning/phpTuning.html:123 msgid "Details Successfully fetched." -msgstr "详情读取成功" +msgstr "详情读取成功." #: tuning/templates/tuning/phpTuning.html:127 msgid "PHP version " -msgstr "PHP版本" +msgstr "PHP版本 " #: tuning/templates/tuning/phpTuning.html:127 msgid "Successfully tuned." -msgstr "已成功保存" +msgstr "已成功保存." #: userManagment/templates/userManagment/createUser.html:3 msgid "Create New User - CyberPanel" @@ -2297,7 +2254,7 @@ msgstr "创建新用户 - CyberPanel" #: userManagment/templates/userManagment/createUser.html:13 msgid "Create root, reseller or normal users on this page." -msgstr "在此页面创建管理员, 分销商以及普通用户" +msgstr "在此页面创建管理员, 分销商以及普通用户." #: userManagment/templates/userManagment/createUser.html:19 msgid "User Details" @@ -2311,7 +2268,7 @@ msgstr "名" #: userManagment/templates/userManagment/createUser.html:32 msgid "First Name should contain only alphabetic characters." -msgstr "名 中只能包含字母" +msgstr "名 中只能包含字母." #: userManagment/templates/userManagment/createUser.html:37 #: userManagment/templates/userManagment/modifyUser.html:46 @@ -2321,7 +2278,7 @@ msgstr "姓" #: userManagment/templates/userManagment/createUser.html:41 msgid "Last Name should contain only alphabetic characters." -msgstr "姓 中只能包含字母" +msgstr "姓 中只能包含字母." #: userManagment/templates/userManagment/createUser.html:51 #: websiteFunctions/templates/websiteFunctions/createWebsite.html:64 @@ -2370,11 +2327,11 @@ msgstr "用户名" #: userManagment/templates/userManagment/createUser.html:117 msgid "Username should be lowercase alphanumeric." -msgstr "用户名应当为小写字母" +msgstr "用户名应当为小写字母." #: userManagment/templates/userManagment/createUser.html:127 msgid "Must contain one number and one special character." -msgstr "必须一个数字和一个特殊符号" +msgstr "必须一个数字和一个字母." #: userManagment/templates/userManagment/createUser.html:143 #: userManagment/templates/userManagment/index.html:40 @@ -2385,17 +2342,17 @@ msgstr "创建用户" #: userManagment/templates/userManagment/createUser.html:154 #: userManagment/templates/userManagment/modifyUser.html:131 msgid "Account with username:" -msgstr "用户名为: " +msgstr "用户名为:" #: userManagment/templates/userManagment/createUser.html:158 msgid "Cannot create user. Error message:" -msgstr "无法创建用户, 错误信息: " +msgstr "无法创建用户, 错误信息:" #: userManagment/templates/userManagment/createUser.html:166 msgid "" "Length of first and last name combined should be less than or equal to 20 " "characters" -msgstr "姓名总和的长度应该小于或等于20 " +msgstr "姓名总和的长度应该小于或等于20" #: userManagment/templates/userManagment/deleteUser.html:3 msgid "Delete User - CyberPanel" @@ -2403,7 +2360,7 @@ msgstr "删除用户 - CyberPanel" #: userManagment/templates/userManagment/deleteUser.html:14 msgid "Websites owned by this user will automatically transfer to the root." -msgstr "此用户拥有的网站将自动移动到根目录" +msgstr "此用户拥有的网站将自动移动到根目录." #: userManagment/templates/userManagment/deleteUser.html:29 msgid "Select User" @@ -2411,11 +2368,11 @@ msgstr "选择用户" #: userManagment/templates/userManagment/deleteUser.html:61 msgid "Cannot delete user. Error message:" -msgstr "无法删除用户, 错误信息: " +msgstr "无法删除用户, 错误信息:" #: userManagment/templates/userManagment/deleteUser.html:65 msgid "User " -msgstr "用户" +msgstr "用户 " #: userManagment/templates/userManagment/index.html:3 msgid "User Functions - CyberPanel" @@ -2423,7 +2380,7 @@ msgstr "用户功能 - CyberPanel" #: userManagment/templates/userManagment/index.html:14 msgid "Create, edit and delete users on this page." -msgstr "在此页面创建, 编辑和删除用户" +msgstr "在此页面创建, 编辑和删除用户." #: userManagment/templates/userManagment/modifyUser.html:3 msgid "Modify User - CyberPanel" @@ -2431,7 +2388,7 @@ msgstr "编辑用户 - CyberPanel" #: userManagment/templates/userManagment/modifyUser.html:13 msgid "Modify existing user settings on this page." -msgstr "在此页面编辑已存在用户" +msgstr "在此页面编辑已存在用户." #: userManagment/templates/userManagment/modifyUser.html:26 msgid "Select Account" @@ -2443,15 +2400,15 @@ msgstr "Admin" #: userManagment/templates/userManagment/modifyUser.html:131 msgid " is successfully modified." -msgstr "已成功修改" +msgstr "已成功修改." #: userManagment/templates/userManagment/modifyUser.html:135 msgid "Cannot modify user. Error message:" -msgstr "无法编辑用户, 错误信息: " +msgstr "无法编辑用户, 错误信息:" #: userManagment/templates/userManagment/modifyUser.html:148 msgid "Details fetched." -msgstr "详情已更新" +msgstr "详情已更新." #: userManagment/templates/userManagment/userProfile.html:3 msgid "Account Details - CyberPanel" @@ -2464,7 +2421,7 @@ msgstr "用户详情" #: userManagment/templates/userManagment/userProfile.html:13 msgid "List the account details for the currently logged in user." -msgstr "查看当前用户详情" +msgstr "查看当前用户详情." #: userManagment/templates/userManagment/userProfile.html:58 msgid "Account Level" @@ -2486,7 +2443,7 @@ msgstr "创建新网站 - CyberPanel" msgid "" "On this page you can launch, list, modify and delete websites from your " "server." -msgstr "在此页面可以创建,查看,修改和删除您服务器上的网站 " +msgstr "在此页面可以创建,查看,修改和删除您服务器上的网站." #: websiteFunctions/templates/websiteFunctions/createWebsite.html:20 msgid "Website Details" @@ -2515,12 +2472,12 @@ msgid "" "SSL will be issued, you can add your own SSL later." msgstr "" "为确定SSL证书的正确签发,域名必须指向此服务器,否则将会签发自签名证书 您可以在" -"之后添加自有证书或重新申请签发Let's Encrypt证书" +"之后添加自有证书或重新申请签发Let's Encrypt证书." #: websiteFunctions/templates/websiteFunctions/createWebsite.html:113 #: websiteFunctions/templates/websiteFunctions/website.html:328 msgid "Cannot create website. Error message:" -msgstr "无法创建网站, 错误信息: " +msgstr "无法创建网站, 错误信息:" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:117 #: websiteFunctions/templates/websiteFunctions/website.html:332 @@ -2540,7 +2497,7 @@ msgstr "删除网站 - CyberPanel" msgid "" "This page can be used to delete website, once deleted it can not be " "recovered." -msgstr "在此页面可以删除网站,此操作不可逆 " +msgstr "在此页面可以删除网站,此操作不可逆." #: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:61 msgid "Cannot delete website, Error message: " @@ -2548,7 +2505,7 @@ msgstr "无法删除网站, 错误信息: " #: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65 msgid "Successfully Deleted." -msgstr "成功删除" +msgstr "成功删除." #: websiteFunctions/templates/websiteFunctions/index.html:3 msgid "Website Functions - CyberPanel" @@ -2567,7 +2524,7 @@ msgstr "当前已创建的网站 - CyberPanel" #: websiteFunctions/templates/websiteFunctions/listWebsites.html:51 msgid "Cannot list websites. Error message:" -msgstr "无法查看网站, 错误信息: " +msgstr "无法查看网站, 错误信息:" #: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:3 msgid "Modify Website - CyberPanel" @@ -2575,19 +2532,19 @@ msgstr "修改网站 - CyberPanel" #: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:51 msgid "Current Package:" -msgstr "当前套餐: " +msgstr "当前套餐:" #: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:62 msgid "Current Owner:" -msgstr "当前拥有者: " +msgstr "当前拥有者:" #: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:104 msgid "Cannot fetch website details. Error message:" -msgstr "无法更新网站详情, 错误信息: " +msgstr "无法更新网站详情, 错误信息:" #: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:108 msgid "Cannot modify website. Error message:" -msgstr "无法修改网站, 错误信息: " +msgstr "无法修改网站, 错误信息:" #: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:112 msgid "Website Details Successfully fetched" @@ -2599,7 +2556,7 @@ msgstr "禁用/启用网站 - CyberPanel" #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:14 msgid "This page can be used to suspend/unsuspend website." -msgstr "此页面可以禁用/启用网站" +msgstr "此页面可以禁用/启用网站." #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:44 msgid "Suspend" @@ -2615,19 +2572,19 @@ msgstr "无法禁用网站, 错误信息: " #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:69 msgid "Cannot unsuspend website. Error message:" -msgstr "无法启用网站, 错误信息: " +msgstr "无法启用网站, 错误信息:" #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:73 msgid "Website " -msgstr "网站" +msgstr "网站 " #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:73 msgid "Successfully " -msgstr "成功" +msgstr "成功 " #: websiteFunctions/templates/websiteFunctions/website.html:15 msgid "All functions related to a particular site." -msgstr "所有与网站相关的功能" +msgstr "所有与网站相关的功能." #: websiteFunctions/templates/websiteFunctions/website.html:23 msgid "Resource Usage" @@ -2647,16 +2604,12 @@ msgid "Bandwidth Usage" msgstr "流量使用量" #: websiteFunctions/templates/websiteFunctions/website.html:119 -#, fuzzy -#| msgid "Access Logs" msgid "Load Access Logs" -msgstr "访问日志" +msgstr "读取访问日志" #: websiteFunctions/templates/websiteFunctions/website.html:131 -#, fuzzy -#| msgid "Error Logs" msgid "Load Error Logs" -msgstr "错误日志" +msgstr "读取错误日志" #: websiteFunctions/templates/websiteFunctions/website.html:147 msgid "Logs Fetched" @@ -2677,17 +2630,13 @@ msgstr "上一个" #: websiteFunctions/templates/websiteFunctions/website.html:230 #: websiteFunctions/templates/websiteFunctions/website.html:232 -#, fuzzy -#| msgid "Add Destination" msgid "Add Domains" -msgstr "添加远程目录" +msgstr "添加域名" #: websiteFunctions/templates/websiteFunctions/website.html:242 #: websiteFunctions/templates/websiteFunctions/website.html:244 -#, fuzzy -#| msgid "Select Domain" msgid "List Domains" -msgstr "选择域名" +msgstr "查看域名" #: websiteFunctions/templates/websiteFunctions/website.html:274 #: websiteFunctions/templates/websiteFunctions/website.html:733 @@ -2696,45 +2645,33 @@ msgstr "路径" #: websiteFunctions/templates/websiteFunctions/website.html:276 msgid "This path is relative to: " -msgstr "" +msgstr "此目录相对与:" #: websiteFunctions/templates/websiteFunctions/website.html:276 -#, fuzzy -#| msgid "Leave empty to select default home directory." msgid "Leave empty to set default." -msgstr "留空则设置为默认根目录" +msgstr "留空则设置为默认根目录." #: websiteFunctions/templates/websiteFunctions/website.html:317 -#, fuzzy -#| msgid "Create Email" msgid "Create Domain" -msgstr "创建Email" +msgstr "创建域名" #: websiteFunctions/templates/websiteFunctions/website.html:360 -#, fuzzy -#| msgid "Version Management" msgid "PHP Version Changed to:" -msgstr "版本管理" +msgstr "版本管理:" #: websiteFunctions/templates/websiteFunctions/website.html:364 -#, fuzzy -#| msgid "Delete" msgid "Deleted:" -msgstr "删除" +msgstr "删除:" #: websiteFunctions/templates/websiteFunctions/website.html:368 -#, fuzzy -#| msgid "SSL Issued for" msgid "SSL Issued:" -msgstr "已为签发证书" +msgstr "已为签发证书:" #: websiteFunctions/templates/websiteFunctions/website.html:391 msgid "Close" -msgstr "" +msgstr "关闭" #: websiteFunctions/templates/websiteFunctions/website.html:423 -#, fuzzy -#| msgid "Issue SSL" msgid "Issue" msgstr "签发SSL证书" @@ -2743,8 +2680,6 @@ msgid "Configurations" msgstr "配置" #: websiteFunctions/templates/websiteFunctions/website.html:457 -#, fuzzy -#| msgid "Edit vHost Main Configurations" msgid "Edit Virtual Host Main Configurations" msgstr "编辑vHost主配置" @@ -2758,8 +2693,6 @@ msgid "Add Rewrite Rules (.htaccess)" msgstr "添加Rewrite Rules (.htaccess)" #: websiteFunctions/templates/websiteFunctions/website.html:481 -#, fuzzy -#| msgid "Add SSL" msgid "Add Your Own SSL" msgstr "添加SSL证书" @@ -2773,33 +2706,33 @@ msgstr "SSL证书已保存" #: websiteFunctions/templates/websiteFunctions/website.html:503 msgid "Could not save SSL. Error message:" -msgstr "无法保存SSL证书, 错误信息: " +msgstr "无法保存SSL证书, 错误信息:" #: websiteFunctions/templates/websiteFunctions/website.html:553 msgid "Current configuration in the file fetched." -msgstr "当前配置读取成功" +msgstr "当前配置读取成功." #: websiteFunctions/templates/websiteFunctions/website.html:558 #: websiteFunctions/templates/websiteFunctions/website.html:571 msgid "Could not fetch current configuration. Error message:" -msgstr "无法读取当前配置, 错误信息: " +msgstr "无法读取当前配置, 错误信息:" #: websiteFunctions/templates/websiteFunctions/website.html:567 #: websiteFunctions/templates/websiteFunctions/website.html:622 msgid "Configuration saved. Restart LiteSpeed put them in effect." -msgstr "配置已保存, 重启LiteSpeed以生效" +msgstr "配置已保存, 重启LiteSpeed以生效." #: websiteFunctions/templates/websiteFunctions/website.html:608 msgid "Current rewrite rules in the file fetched." -msgstr "当前Rewrite rules读取成功" +msgstr "当前Rewrite rules读取成功." #: websiteFunctions/templates/websiteFunctions/website.html:613 msgid "Could not fetch current rewrite rules. Error message:" -msgstr "无法读取当前Rewrite rules, 错误信息: " +msgstr "无法读取当前Rewrite rules, 错误信息:" #: websiteFunctions/templates/websiteFunctions/website.html:626 msgid "Could not save rewrite rules. Error message:" -msgstr "无法保存Rewrite rules, 错误信息: " +msgstr "无法保存Rewrite rules, 错误信息:" #: websiteFunctions/templates/websiteFunctions/website.html:642 msgid "Save Rewrite Rules" @@ -2819,10 +2752,8 @@ msgid "Application Installer" msgstr "应用安装器" #: websiteFunctions/templates/websiteFunctions/website.html:719 -#, fuzzy -#| msgid "Wordpress with LSCache" msgid "Install wordpress with LSCache" -msgstr "Wordpress和LS Cache" +msgstr "安装Wordpress和LS Cache" #: websiteFunctions/templates/websiteFunctions/website.html:721 msgid "Wordpress with LSCache" @@ -2830,11 +2761,11 @@ msgstr "Wordpress和LS Cache" #: websiteFunctions/templates/websiteFunctions/website.html:755 msgid "Installation failed. Error message:" -msgstr "安装失败, 错误信息: " +msgstr "安装失败, 错误信息:" #: websiteFunctions/templates/websiteFunctions/website.html:759 msgid "Installation successful. To complete the setup visit:" -msgstr "安装成功, 请访问网站以完成设置" +msgstr "安装成功, 请访问网站以完成设置:" #~ msgid "Urdu" #~ msgstr "乌尔都语" diff --git a/loginSystem/templates/loginSystem/login.html b/loginSystem/templates/loginSystem/login.html index 61362c908..691f3ab9b 100755 --- a/loginSystem/templates/loginSystem/login.html +++ b/loginSystem/templates/loginSystem/login.html @@ -199,7 +199,7 @@
-

CyberPanel v 1.0

+

CyberPanel v 1.5

Web Hosting Control Panel

    diff --git a/loginSystem/views.py b/loginSystem/views.py index 6b660cfc8..dca4a21bf 100644 --- a/loginSystem/views.py +++ b/loginSystem/views.py @@ -116,7 +116,7 @@ def loadLoginPage(request): firstName="Cyber",lastName="Panel") admin.save() - vers = version(currentVersion="1.0",build=4) + vers = version(currentVersion="1.0",build=5) vers.save() package = Package(admin=admin, packageName="Default", diskSpace=1000, diff --git a/packages/views.py b/packages/views.py index fa26f1017..ebf038c13 100644 --- a/packages/views.py +++ b/packages/views.py @@ -26,8 +26,12 @@ def createPacakge(request): try: val = request.session['userID'] + admin = Administrator.objects.get(pk=val) + if admin.type == 3: + return HttpResponse("You don't have enough privileges to access this page.") + except KeyError: return redirect(loadLoginPage) @@ -42,6 +46,9 @@ def deletePacakge(request): admin = Administrator.objects.get(pk=val) + if admin.type == 3: + return HttpResponse("You don't have enough privileges to access this page.") + if admin.type == 1: packages = Package.objects.all() else: @@ -130,6 +137,9 @@ def modifyPackage(request): try: admin = Administrator.objects.get(pk=val) + if admin.type == 3: + return HttpResponse("You don't have enough privileges to access this page.") + if admin.type == 1: packages = Package.objects.all() else: diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 1d7601333..8eafb2519 100644 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -100,6 +100,8 @@ def upgrade(currentVersion,currentBuild): upgradeLog.close() + + print("Upgrade Completed.") @staticmethod diff --git a/static/baseTemplate/custom-js/system-status.js b/static/baseTemplate/custom-js/system-status.js index 899b204ed..b68fdf590 100644 --- a/static/baseTemplate/custom-js/system-status.js +++ b/static/baseTemplate/custom-js/system-status.js @@ -127,7 +127,6 @@ app.controller('adminController', function($scope,$http,$timeout) { $("#remoteBackups").hide(); $("#packageHome").hide(); $("#packageSub").hide(); - $("#createWebsite").hide(); } } diff --git a/static/userManagment/userManagment.js b/static/userManagment/userManagment.js index 515dee333..41b45d219 100644 --- a/static/userManagment/userManagment.js +++ b/static/userManagment/userManagment.js @@ -22,10 +22,14 @@ app.controller('createUserCtr', function($scope,$http) { $scope.webLimits = false; $scope.acctsLimit = true; } - else{ + else if($scope.accountType == "Reseller"){ $scope.webLimits = false; $scope.acctsLimit = false; } + else{ + $scope.webLimits = true; + $scope.acctsLimit = true; + } } diff --git a/userManagment/static/userManagment/userManagment.js b/userManagment/static/userManagment/userManagment.js index 515dee333..41b45d219 100644 --- a/userManagment/static/userManagment/userManagment.js +++ b/userManagment/static/userManagment/userManagment.js @@ -22,10 +22,14 @@ app.controller('createUserCtr', function($scope,$http) { $scope.webLimits = false; $scope.acctsLimit = true; } - else{ + else if($scope.accountType == "Reseller"){ $scope.webLimits = false; $scope.acctsLimit = false; } + else{ + $scope.webLimits = true; + $scope.acctsLimit = true; + } } diff --git a/userManagment/templates/userManagment/createUser.html b/userManagment/templates/userManagment/createUser.html index d3e723e29..e49e5e675 100644 --- a/userManagment/templates/userManagment/createUser.html +++ b/userManagment/templates/userManagment/createUser.html @@ -64,7 +64,7 @@

    diff --git a/userManagment/templates/userManagment/modifyUser.html b/userManagment/templates/userManagment/modifyUser.html index a22bef09e..2dfeb62e6 100644 --- a/userManagment/templates/userManagment/modifyUser.html +++ b/userManagment/templates/userManagment/modifyUser.html @@ -70,7 +70,6 @@

    diff --git a/userManagment/views.py b/userManagment/views.py index 5dc67461c..9fbcd59ae 100644 --- a/userManagment/views.py +++ b/userManagment/views.py @@ -88,21 +88,24 @@ def submitUserCreation(request): currentAdmin = Administrator.objects.get(pk=val) + childUsers = Administrator.objects.filter(owner=currentAdmin.pk).count() + if currentAdmin.type == 1: pass else: if currentAdmin.initWebsitesLimit == 0: - currentAdmin.userAccountsLimit = currentAdmin.userAccountsLimit + 1 + pass - elif currentAdmin.userAccountsLimit != currentAdmin.initUserAccountsLimit: - currentAdmin.userAccountsLimit = currentAdmin.userAccountsLimit + 1 - else: + elif currentAdmin.initUserAccountsLimit == childUsers: data_ret = {'createStatus': 0, 'error_message': "Reached Maximum User Creation Limit"} final_json = json.dumps(data_ret) return HttpResponse(final_json) + else: + pass + if request.method == 'POST': data = json.loads(request.body) @@ -116,7 +119,27 @@ def submitUserCreation(request): accountType = data['accountType'] - if accountType == "Normal User": + if accountType == "Admin": + + newAdmin = Administrator(firstName=firstName, + lastName=lastName, + email=email, + type=1, + userName=userName, + password=password, + initWebsitesLimit=0, + owner=currentAdmin.pk + ) + newAdmin.save() + currentAdmin.save() + + data_ret = {'createStatus': 1, + 'error_message': "None"} + + final_json = json.dumps(data_ret) + return HttpResponse(final_json) + + elif accountType == "Normal User": websitesLimit = data['websitesLimit'] newAdmin = Administrator(firstName=firstName, @@ -136,7 +159,6 @@ def submitUserCreation(request): final_json = json.dumps(data_ret) return HttpResponse(final_json) - else: websitesLimit = data['websitesLimit'] userAccountsLimit = data['userAccountsLimit'] @@ -357,7 +379,7 @@ def deleteUser(request): admins = Administrator.objects.all() adminNames = [] for items in admins: - if not items.type == 1: + if not items.userName == "admin": adminNames.append(items.userName) else: admins = Administrator.objects.filter(owner=admin.pk) diff --git a/websiteFunctions/views.py b/websiteFunctions/views.py index 78983a12c..4b594c9fd 100644 --- a/websiteFunctions/views.py +++ b/websiteFunctions/views.py @@ -25,6 +25,8 @@ from shutil import move from filemanager_app import views as fileManage from plogical.findBWUsage import findBWUsage +from dns.models import Domains,Records +import requests # Create your views here. @@ -226,6 +228,15 @@ def submitWebsiteCreation(request): except: pass + try: + website = ChildDomains.objects.get(domain=domain) + data_ret = {"existsStatus": 0, 'createWebSiteStatus': 0, + 'error_message': "Website Already Exists"} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + except: + pass + ####### Limitations check @@ -312,6 +323,63 @@ def submitWebsiteCreation(request): json_data = json.dumps(data_ret) return HttpResponse(json_data) + + ## zone creation and + try: + + newZone = Domains(admin=admin, name=domain, type="NATIVE") + newZone.save() + + content = "ns1." + domain + " hostmaster." + domain + " 1 10800 3600 604800 3600" + + soaRecord = Records(domainOwner=newZone, + domain_id=newZone.id, + name=domain, + type="SOA", + content=content, + ttl=3600, + prio=0, + disabled=0, + auth=1) + soaRecord.save() + + try: + recordContentA = requests.get('https://api.ipify.org').text + zone = Domains.objects.get(name=domain) + record = Records(domainOwner=zone, + domain_id=zone.id, + name=domain, + type="A", + content=recordContentA, + ttl=3600, + prio=0, + disabled=0, + auth=1) + record.save() + except: + pass + + except: + try: + recordContentA = requests.get('https://api.ipify.org').text + zone = Domains.objects.get(name=domain) + record = Records(domainOwner=zone, + domain_id=zone.id, + name=domain, + type="A", + content=recordContentA, + ttl=3600, + prio=0, + disabled=0, + auth=1) + record.save() + except: + pass + + ## zone creation + + + selectedPackage = Package.objects.get(packageName=packageName) website = Websites(admin=admin, package=selectedPackage, domain=domain, adminEmail=adminEmail,