Skip to content

Commit 8dcfb56

Browse files
jaapmarcusjaapmarcus
authored
Merge pull request hestiacp#1264 from hestiacp/main
Sync Features with main branch
2 parents 8f23d7e + f755067 commit 8dcfb56

File tree

48 files changed

+4151
-3659
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+4151
-3659
lines changed

‎install/hst-install-debian.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,8 @@ set_default_lang() {
134134
if [ -z "$lang" ]; then
135135
eval lang=$1
136136
fi
137-
lang_list="
138-
ar cz el fa hu ja no pt se ua
139-
bs da en fi id ka pl ro tr vi
140-
cn de es fr it nl pt-BR ru tw
141-
bg ko sr th ur"
137+
lang_list="ar az bg bs cs da de el en es fa fi fr hr hu id it ja ka ko nl no pl pt pt-br ro
138+
ru sr sv th uk ur vi zh-cn zh-tw"
142139
if !(echo $lang_list |grep -w $lang > /dev/null 2>&1); then
143140
eval lang=$1
144141
fi
@@ -1081,7 +1078,7 @@ echo "BACKUP_MODE='zstd'" >> $HESTIA/conf/hestia.conf
10811078
echo "LANGUAGE='$lang'" >> $HESTIA/conf/hestia.conf
10821079

10831080
# Login in screen
1084-
echo "LOGIN_STYLE='default" >> $HESTIA/conf/hestia.conf
1081+
echo "LOGIN_STYLE='default'" >> $HESTIA/conf/hestia.conf
10851082

10861083
# Version & Release Branch
10871084
echo "VERSION='${HESTIA_INSTALL_VER}'" >> $HESTIA/conf/hestia.conf
@@ -1323,8 +1320,11 @@ if [ "$mysql" = 'yes' ]; then
13231320
if [ $memory -gt 3900000 ]; then
13241321
mycnf="my-large.cnf"
13251322
fi
1326-
1327-
# Configuring MariaDB
1323+
1324+
# Remove symbolic link
1325+
rm -f /etc/mysql/my.cnf
1326+
1327+
# Configuring MariaDB
13281328
cp -f $HESTIA_INSTALL_DIR/mysql/$mycnf /etc/mysql/my.cnf
13291329
mysql_install_db >> $LOG
13301330

‎install/hst-install-ubuntu.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,8 @@ set_default_lang() {
116116
if [ -z "$lang" ]; then
117117
eval lang=$1
118118
fi
119-
lang_list="
120-
ar cz el fa hu ja no pt se ua
121-
bs da en fi id ka pl ro tr vi
122-
cn de es fr it nl pt-BR ru tw
123-
bg ko sr th ur"
119+
lang_list="ar az bg bs cs da de el en es fa fi fr hr hu id it ja ka ko nl no pl pt pt-br ro
120+
ru sr sv th uk ur vi zh-cn zh-tw"
124121
if !(echo $lang_list |grep -w $lang > /dev/null 2>&1); then
125122
eval lang=$1
126123
fi
@@ -1119,7 +1116,7 @@ echo "BACKUP_MODE='zstd'" >> $HESTIA/conf/hestia.conf
11191116
echo "LANGUAGE='$lang'" >> $HESTIA/conf/hestia.conf
11201117

11211118
# Login in screen
1122-
echo "LOGIN_STYLE='default" >> $HESTIA/conf/hestia.conf
1119+
echo "LOGIN_STYLE='default'" >> $HESTIA/conf/hestia.conf
11231120

11241121
# Version & Release Branch
11251122
echo "VERSION='${HESTIA_INSTALL_VER}'" >> $HESTIA/conf/hestia.conf
@@ -1364,6 +1361,9 @@ if [ "$mysql" = 'yes' ]; then
13641361
mycnf="my-large.cnf"
13651362
fi
13661363

1364+
# Remove symbolic link
1365+
rm -f /etc/mysql/my.cnf
1366+
13671367
# Configuring MariaDB
13681368
cp -f $HESTIA_INSTALL_DIR/mysql/$mycnf /etc/mysql/my.cnf
13691369
mysql_install_db >> $LOG

‎src/hst_bootstrap_install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Clean installation bootstrap for development purposes only
44
# Usage: ./hst_bootstrap_install.sh [fork] [branch] [os]
5-
# Example: ./hst_bootstrap_install.sh hestiacp master ubuntu
5+
# Example: ./hst_bootstrap_install.sh hestiacp main ubuntu
66

77
# Define variables
88
fork=$1
@@ -15,7 +15,7 @@ wget https://raw.githubusercontent.com/$fork/hestiacp/$branch/src/hst_autocompil
1515

1616
# Execute compiler and build hestia core package
1717
chmod +x hst_autocompile.sh
18-
./hst_autocompile.sh --hestia master no
18+
./hst_autocompile.sh --hestia $branch no
1919

2020
# Execute Hestia Control Panel installer with default dummy options for testing
2121
bash hst-install-$os.sh -f -y no -e admin@test.local -p P@ssw0rd -s hestia-$branch-$os.test.local --with-debs /tmp/hestiacp-src/debs

‎web/add/key/index.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
$v_key_parts = explode(' ',$_POST['v_key']);
3333
$key_id = trim($v_key_parts[2]);
3434
if($v_key_parts[2] == ''){
35-
$_SESSION['error_msg'] = _('SSH KEY is invalid');
35+
$v_key_parts[2] = md5(time());
36+
$_POST['v_key'] .= ' '.$v_key_parts[2];
3637
}
3738

3839
//for deleting / revoking key the last part user@domain is used therefore needs to be unique

‎web/add/mail/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123

124124
// Check password length
125125
if (empty($_SESSION['error_msg']) && !empty($_POST['v_fwd_only']) ) {
126-
if (!validate_password($_POST['v_password'])) { $_SESSION['error_msg'] = __('Password does not match the minimum requirements');}
126+
if (!validate_password($_POST['v_password'])) { $_SESSION['error_msg'] = _('Password does not match the minimum requirements');}
127127
}
128128

129129
// Protect input

‎web/edit/db/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
// Change database password
6565
if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) {
6666
if (!validate_password($_POST['v_password'])) {
67-
$_SESSION['error_msg'] = __('Password does not match the minimum requirements');
67+
$_SESSION['error_msg'] = _('Password does not match the minimum requirements');
6868
}else{
6969
$v_password = tempnam("/tmp","vst");
7070
$fp = fopen($v_password, "w");

‎web/edit/mail/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@
399399
// Change password
400400
if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) {
401401
if (!validate_password($_POST['v_password'])) {
402-
$_SESSION['error_msg'] = __('Password does not match the minimum requirements');
402+
$_SESSION['error_msg'] = _('Password does not match the minimum requirements');
403403
}else{
404404
$v_password = tempnam("/tmp","vst");
405405
$fp = fopen($v_password, "w");

‎web/edit/user/index.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@
101101
if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) {
102102
// Check password length
103103
$pw_len = strlen($_POST['v_password']);
104-
if (!validate_password($_POST['v_password'])) {
105-
$_SESSION['error_msg'] = __('Password does not match the minimum requirements');
104+
if (!validate_password($_POST['v_password'])){
105+
$_SESSION['error_msg'] = _('Password does not match the minimum requirements');
106106
}
107107
if (empty($_SESSION['error_msg'])) {
108108
$v_password = tempnam("/tmp","vst");

‎web/locale/ar/LC_MESSAGES/hestiacp.po‎

Lines changed: 44 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@ msgstr ""
1111
"Language: ar\n"
1212
"Project-Id-Version: Hestia CP\n"
1313

14+
#: ../../web/templates/admin/edit_server.html:857
15+
msgid "Login screen style"
16+
msgstr ""
17+
18+
#: ../../web/templates/admin/edit_server.html:848
19+
msgid "Security"
20+
msgstr ""
21+
22+
#: ../../web/templates/admin/edit_server.html:864
23+
msgid "Old Style"
24+
msgstr ""
25+
1426
#: ../../web/templates/admin/edit_server.html:618
1527
msgid "Compression"
1628
msgstr ""
@@ -117,7 +129,7 @@ msgstr "إرسال إشعار بالبريد الإلكتروني عند تثب
117129
msgid "SYSTEM_UPGRADE_SEND_EMAIL_LOG"
118130
msgstr "أرسل سجل تثبيت التحديث بالبريد الإلكتروني"
119131

120-
#: ../../web/templates/admin/edit_server.html:884
132+
#: ../../web/templates/admin/edit_server.html:885
121133
msgid "Filemanager"
122134
msgstr ""
123135

@@ -1824,16 +1836,16 @@ msgstr "PUB_KEY"
18241836
msgid "ISSUER"
18251837
msgstr "ISSUER"
18261838

1827-
#: ../../web/templates/admin/edit_server.html:875
1839+
#: ../../web/templates/admin/edit_server.html:876
18281840
msgid "Hestia Control Panel Plugins"
18291841
msgstr "إضافات لوحة التحكم فيستا"
18301842

1831-
#: ../../web/templates/admin/edit_server.html:898
1843+
#: ../../web/templates/admin/edit_server.html:899
18321844
msgid "FileSystem Disk Quota"
18331845
msgstr "نظام تخصيص حجوم الملفات (Quota)"
18341846

18351847
#: ../../web/templates/admin/list_services.html:7
1836-
#: ../../web/templates/admin/edit_server.html:912
1848+
#: ../../web/templates/admin/edit_server.html:913
18371849
msgid "Firewall"
18381850
msgstr "جدار الحماية"
18391851

@@ -2092,6 +2104,7 @@ msgstr "جاري تعديل السحجل بالنظام"
20922104
msgid "DELETE_RECORD_CONFIRMATION"
20932105
msgstr "هل تريد فعلا حذف السجل %s?"
20942106

2107+
#: ../../web/templates/admin/edit_server.html:863
20952108
#: ../../web/templates/admin/list_dns_rec.html:88
20962109
msgid "Default"
20972110
msgstr ""
@@ -2762,9 +2775,9 @@ msgstr "عناقيد DNS"
27622775
#: ../../web/templates/admin/edit_server.html:449
27632776
#: ../../web/templates/admin/edit_server.html:529
27642777
#: ../../web/templates/admin/edit_server.html:610
2765-
#: ../../web/templates/admin/edit_server.html:890
2766-
#: ../../web/templates/admin/edit_server.html:904
2767-
#: ../../web/templates/admin/edit_server.html:918
2778+
#: ../../web/templates/admin/edit_server.html:891
2779+
#: ../../web/templates/admin/edit_server.html:905
2780+
#: ../../web/templates/admin/edit_server.html:919
27682781
msgid "no"
27692782
msgstr "لا"
27702783

@@ -2779,9 +2792,9 @@ msgstr "لا"
27792792
#: ../../web/templates/admin/edit_server.html:450
27802793
#: ../../web/templates/admin/edit_server.html:530
27812794
#: ../../web/templates/admin/edit_server.html:611
2782-
#: ../../web/templates/admin/edit_server.html:891
2783-
#: ../../web/templates/admin/edit_server.html:905
2784-
#: ../../web/templates/admin/edit_server.html:919
2795+
#: ../../web/templates/admin/edit_server.html:892
2796+
#: ../../web/templates/admin/edit_server.html:906
2797+
#: ../../web/templates/admin/edit_server.html:920
27852798
msgid "yes"
27862799
msgstr "نعم"
27872800

@@ -2970,9 +2983,9 @@ msgid "MAIL_RESET_SUBJECT"
29702983
msgstr "تم إعادة تعيين كلمة المرور %s"
29712984

29722985
#: ../../web/add/mail/index.php:207 ../../web/add/user/index.php:94
2973-
#: ../../web/add/db/index.php:92 ../../web/add/web/index.php:324
2974-
#: ../../web/edit/mail/index.php:523 ../../web/edit/web/index.php:659
2975-
#: ../../web/edit/web/index.php:733 ../../web/reset/index.php:33
2986+
#: ../../web/add/db/index.php:92 ../../web/add/web/index.php:329
2987+
#: ../../web/edit/mail/index.php:523 ../../web/edit/web/index.php:663
2988+
#: ../../web/edit/web/index.php:737 ../../web/reset/index.php:33
29762989
msgid "MAIL_FROM"
29772990
msgstr "Hestia لوحة تحكم <noreply@%s>"
29782991

@@ -3043,14 +3056,14 @@ msgstr "إعادة تشغيل"
30433056
#: ../../web/add/dns/index.php:116 ../../web/add/cron/index.php:33
30443057
#: ../../web/add/mail/index.php:47 ../../web/add/mail/index.php:114
30453058
#: ../../web/add/user/index.php:38 ../../web/add/db/index.php:33
3046-
#: ../../web/add/web/index.php:31 ../../web/add/web/index.php:291
3059+
#: ../../web/add/web/index.php:31 ../../web/add/web/index.php:296
30473060
#: ../../web/add/package/index.php:60
30483061
#: ../../web/add/firewall/banlist/index.php:35
30493062
#: ../../web/add/firewall/ipset/index.php:38
30503063
#: ../../web/add/firewall/index.php:54 ../../web/edit/mail/index.php:314
3051-
#: ../../web/edit/web/index.php:448 ../../web/edit/web/index.php:578
3052-
#: ../../web/edit/web/index.php:604 ../../web/edit/web/index.php:640
3053-
#: ../../web/edit/web/index.php:709 ../../web/edit/package/index.php:137
3064+
#: ../../web/edit/web/index.php:452 ../../web/edit/web/index.php:582
3065+
#: ../../web/edit/web/index.php:608 ../../web/edit/web/index.php:644
3066+
#: ../../web/edit/web/index.php:713 ../../web/edit/package/index.php:137
30543067
#: ../../web/generate/ssl/index.php:59
30553068
msgid "Field \"%s\" can not be blank."
30563069
msgstr "العنصر \"%s\" لا يمكن أن يبقى فارغا."
@@ -3080,40 +3093,40 @@ msgstr "العنصر \"%s\" لا يمكن أن يبقى فارغا."
30803093
#: ../../web/edit/server/named/index.php:42
30813094
#: ../../web/edit/server/php5-fpm/index.php:42
30823095
#: ../../web/edit/server/clamav-daemon/index.php:42
3083-
#: ../../web/edit/server/index.php:566 ../../web/edit/server/exim4/index.php:42
3096+
#: ../../web/edit/server/index.php:590 ../../web/edit/server/exim4/index.php:42
30843097
#: ../../web/edit/backup/exclusions/index.php:120
30853098
#: ../../web/edit/user/index.php:247 ../../web/edit/db/index.php:83
3086-
#: ../../web/edit/web/index.php:801 ../../web/edit/package/index.php:226
3099+
#: ../../web/edit/web/index.php:809 ../../web/edit/package/index.php:226
30873100
#: ../../web/edit/firewall/index.php:96
30883101
msgid "Changes has been saved."
30893102
msgstr "تم حفظ التغييرات بنجاح."
30903103

30913104
#: ../../web/add/mail/index.php:120 ../../web/add/user/index.php:43
3092-
#: ../../web/add/db/index.php:39 ../../web/add/web/index.php:280
3093-
#: ../../web/add/web/index.php:296 ../../web/edit/mail/index.php:386
3094-
#: ../../web/edit/user/index.php:191 ../../web/edit/web/index.php:630
3105+
#: ../../web/add/db/index.php:39 ../../web/add/web/index.php:285
3106+
#: ../../web/add/web/index.php:301 ../../web/edit/mail/index.php:386
3107+
#: ../../web/edit/user/index.php:191 ../../web/edit/web/index.php:634
30953108
msgid "Please enter valid email address."
30963109
msgstr "برجاء إدخال عنوان بريد إلكتروني صحيح."
30973110

30983111
#: ../../web/add/mail/index.php:205 ../../web/edit/mail/index.php:521
30993112
msgid "Email Credentials"
31003113
msgstr "Email Credentials"
31013114

3102-
#: ../../web/edit/web/index.php:569
3115+
#: ../../web/edit/web/index.php:573
31033116
msgid "stats username"
31043117
msgstr "مستخدم الإحصائيات"
31053118

3106-
#: ../../web/edit/web/index.php:595
3119+
#: ../../web/edit/web/index.php:599
31073120
msgid "stats user"
31083121
msgstr ""
31093122

3110-
#: ../../web/add/web/index.php:323 ../../web/edit/web/index.php:657
3111-
#: ../../web/edit/web/index.php:731
3123+
#: ../../web/add/web/index.php:328 ../../web/edit/web/index.php:661
3124+
#: ../../web/edit/web/index.php:735
31123125
msgid "FTP login credentials"
31133126
msgstr "معلومات اعتماد الدخول لبروتوكول نقل الملفات"
31143127

3115-
#: ../../web/add/web/index.php:325 ../../web/edit/web/index.php:660
3116-
#: ../../web/edit/web/index.php:734
3128+
#: ../../web/add/web/index.php:330 ../../web/edit/web/index.php:664
3129+
#: ../../web/edit/web/index.php:738
31173130
msgid "FTP_ACCOUNT_READY"
31183131
msgstr ""
31193132
"تم إنشاء حساب بروتوكول نقل الملفات وهو جاهز للاستخدام.\n"
@@ -3125,7 +3138,7 @@ msgstr ""
31253138
"--\n"
31263139
"Hestia Control Panel"
31273140

3128-
#: ../../web/edit/web/index.php:700
3141+
#: ../../web/edit/web/index.php:704
31293142
msgid "ftp user"
31303143
msgstr "مستخدم FTP"
31313144

@@ -3254,11 +3267,11 @@ msgstr "شهادة طبقة مقبس آمن SSL"
32543267
msgid "ssl key"
32553268
msgstr "مفتاح طبقة مقبس آمن SSL"
32563269

3257-
#: ../../web/add/web/index.php:38 ../../web/add/web/index.php:303
3270+
#: ../../web/add/web/index.php:38 ../../web/add/web/index.php:308
32583271
msgid "Password is too short."
32593272
msgstr "كلمة المرور قصيرة جدا (على الأقل ح حروف)"
32603273

3261-
#: ../../web/add/web/index.php:354 ../../web/add/web/index.php:364
3274+
#: ../../web/add/web/index.php:359 ../../web/add/web/index.php:369
32623275
msgid "WEB_DOMAIN_CREATED_OK"
32633276
msgstr "النطاق <a href=\"/edit/web/?domain=%s\"><b>%s</b></a>تم إنشائه بنجاح ."
32643277

0 commit comments

Comments
 (0)