Skip to content

Commit bfead93

Browse files
authored
Merge pull request #2160 from elcreator/installer-install-dir-removal-fix
fix remove install dir after web install and default encoding for MySQL 8
2 parents d6ecb76 + 63c25fc commit bfead93

23 files changed

Lines changed: 46 additions & 45 deletions

install/src/lang/az.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@
137137
'please_correct_errors' => '. Zəhmət olmasa, xətaları düzəldin',
138138
'plugins' => 'Plaqinlər',
139139
'preinstall_validation' => 'Quraşdırmadan əvvəl yoxlama',
140-
'recommend_collation' => 'utf8mb4_general_ci',
141-
'recommend_collations_order' => 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
140+
'recommend_collation' => 'utf8mb4_0900_ai_ci',
141+
'recommend_collations_order' => 'utf8mb4_0900_ai_ci,utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
142142
'recommend_setting_change_title' => 'Tövsiyə olunan parametrlərin dəyişdirilməsi',
143143
'recommend_setting_change_validate_referer_confirmation' => 'Parametr dəyişdirilməsi: <em>HTTP_REFERER başlıqlarını yoxlamaq?</em>',
144144
'recommend_setting_change_validate_referer_description' => 'Saytınızın Menecerə daxil olan sorğuların HTTP_REFERER başlıqlarını yoxlamaq üçün konfiqurasiya olunmadığını göstərir. Biz bu parametri aktiv etməyi şiddətlə tövsiyə edirik, beləliklə CSRF (Cross Site Request Forgery) hücumlarının riskini azaldır.',

install/src/lang/be.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@
137137
'please_correct_errors' => '. Please correct the errors',
138138
'plugins' => 'Plugins',
139139
'preinstall_validation' => 'Pre-install validation',
140-
'recommend_collation' => 'utf8mb4_general_ci',
141-
'recommend_collations_order' => 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
140+
'recommend_collation' => 'utf8mb4_0900_ai_ci',
141+
'recommend_collations_order' => 'utf8mb4_0900_ai_ci,utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
142142
'recommend_setting_change_title' => 'Recommended Setting Change',
143143
'recommend_setting_change_validate_referer_confirmation' => 'Setting change: <em>Validate HTTP_REFERER headers?</em>',
144144
'recommend_setting_change_validate_referer_description' => 'Your site is not configured to validate the HTTP_REFERER of incoming requests to the Manager. We strongly recommend enabling this setting to reduce the risk of a CSRF (Cross Site Request Forgery) attack.',

install/src/lang/bg.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@
137137
'please_correct_errors' => '. Моля, коригирайте грешките',
138138
'plugins' => 'Плъгини',
139139
'preinstall_validation' => 'Потвърждаване на инсталацията',
140-
'recommend_collation' => 'utf8mb4_general_ci',
141-
'recommend_collations_order' => 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
140+
'recommend_collation' => 'utf8mb4_0900_ai_ci',
141+
'recommend_collations_order' => 'utf8mb4_0900_ai_ci,utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
142142
'recommend_setting_change_title' => 'Recommended Setting Change',
143143
'recommend_setting_change_validate_referer_confirmation' => 'Setting change: <em>Validate HTTP_REFERER headers?</em>',
144144
'recommend_setting_change_validate_referer_description' => 'Your site is not configured to validate the HTTP_REFERER of incoming requests to the Manager. We strongly recommend enabling this setting to reduce the risk of a CSRF (Cross Site Request Forgery) attack.',

install/src/lang/cs.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@
137137
'please_correct_errors' => '.Opravte chyby',
138138
'plugins' => 'Pluginy',
139139
'preinstall_validation' => 'Před-instalační kontrola',
140-
'recommend_collation' => 'utf8mb4_general_ci',
141-
'recommend_collations_order' => 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
140+
'recommend_collation' => 'utf8mb4_0900_ai_ci',
141+
'recommend_collations_order' => 'utf8mb4_0900_ai_ci,utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
142142
'recommend_setting_change_title' => 'Doporučené změny konfigurace',
143143
'recommend_setting_change_validate_referer_confirmation' => 'Změna nastavení: <em>Ověřit hlavičky HTTP_REFERER?</em>',
144144
'recommend_setting_change_validate_referer_description' => 'Na portálu není nastaveno ověřování hlaviček HTTP_REFERER pří přístupu do správce obsahu. Důrazně doporučujeme aktivovat toto nastavení, které vede ke snížení rizika útoků CSRF (Cross Site Request Forgery).',

install/src/lang/da.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@
137137
'please_correct_errors' => '. Ret venligst fejlene',
138138
'plugins' => 'Plugins',
139139
'preinstall_validation' => 'Præ-installation kontrol',
140-
'recommend_collation' => 'utf8mb4_general_ci',
141-
'recommend_collations_order' => 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
140+
'recommend_collation' => 'utf8mb4_0900_ai_ci',
141+
'recommend_collations_order' => 'utf8mb4_0900_ai_ci,utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
142142
'recommend_setting_change_title' => 'Anbefalet konfigurationsændring',
143143
'recommend_setting_change_validate_referer_confirmation' => 'Konfigurationsændring: <em>Validere HTTP_REFERER headers?</em>',
144144
'recommend_setting_change_validate_referer_description' => 'Dit website er ikke konfigureret til at validere indgående HTTP_REFERER forespørgelser til administrationsmodulet. Det anbefales på det kraftigeste at aktivere denne indstilling, for at nedsætte risici for CSRF (Cross Site Request Forgery) angreb.',

install/src/lang/de.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@
137137
'please_correct_errors' => '. Bitte beheben Sie die Fehler',
138138
'plugins' => 'Plugins',
139139
'preinstall_validation' => 'Prüfung vor der Installation',
140-
'recommend_collation' => 'utf8mb4_general_ci',
141-
'recommend_collations_order' => 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
140+
'recommend_collation' => 'utf8mb4_0900_ai_ci',
141+
'recommend_collations_order' => 'utf8mb4_0900_ai_ci,utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
142142
'recommend_setting_change_title' => 'Empfohlene Änderung der Konfiguration',
143143
'recommend_setting_change_validate_referer_confirmation' => 'Einstellung aktivieren: <em>HTTP_REFERER-Header überprüfen?</em>',
144144
'recommend_setting_change_validate_referer_description' => 'Ihre Seite überprüft momentan nicht die HTTP_REFERER von eingehenden Requests. Wir empfehlen dringend, diese Einstellung vorzunehmen, um das Risiko von CSFR-Attacken (Cross Site Request Forgery) zu reduzieren.',

install/src/lang/en.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@
137137
'please_correct_errors' => '. Please correct the errors',
138138
'plugins' => 'Plugins',
139139
'preinstall_validation' => 'Pre-install validation',
140-
'recommend_collation' => 'utf8mb4_general_ci',
141-
'recommend_collations_order' => 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
140+
'recommend_collation' => 'utf8mb4_0900_ai_ci',
141+
'recommend_collations_order' => 'utf8mb4_0900_ai_ci,utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
142142
'recommend_setting_change_title' => 'Recommended Setting Change',
143143
'recommend_setting_change_validate_referer_confirmation' => 'Setting change: <em>Validate HTTP_REFERER headers?</em>',
144144
'recommend_setting_change_validate_referer_description' => 'Your site is not configured to validate the HTTP_REFERER of incoming requests to the Manager. We strongly recommend enabling this setting to reduce the risk of a CSRF (Cross Site Request Forgery) attack.',

install/src/lang/es.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
'plugins' => 'Plugins',
139139
'preinstall_validation' => 'Validación previa a la instalación',
140140
'recommend_collation' => 'utf8_general_ci',
141-
'recommend_collations_order' => 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
141+
'recommend_collations_order' => 'utf8mb4_0900_ai_ci,utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
142142
'recommend_setting_change_title' => 'Se Recomienda cambiar configuración',
143143
'recommend_setting_change_validate_referer_confirmation' => 'Cambiar configuración: <em>¿ Validar cabeceras HTTP_REFERER ?</em>',
144144
'recommend_setting_change_validate_referer_description' => 'Su sitio web no está configurado para validar las peticiones entrantes HTTP_REFERER al Manager. Recomendamos habilitar esta configuración para reducir el riesgo de un ataque CSRF (Falsificación de petición en sitios cruzados).',

install/src/lang/fa.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@
137137
'please_correct_errors' => '. لطفا خطا های موجود را درست کنید.',
138138
'plugins' => 'پلاگینها',
139139
'preinstall_validation' => 'بازبینی قبل از نصب »',
140-
'recommend_collation' => 'utf8mb4_general_ci',
141-
'recommend_collations_order' => 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
140+
'recommend_collation' => 'utf8mb4_0900_ai_ci',
141+
'recommend_collations_order' => 'utf8mb4_0900_ai_ci,utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
142142
'recommend_setting_change_title' => 'Recommended Setting Change',
143143
'recommend_setting_change_validate_referer_confirmation' => 'Setting change: <em>Validate HTTP_REFERER headers?</em>',
144144
'recommend_setting_change_validate_referer_description' => 'Your site is not configured to validate the HTTP_REFERER of incoming requests to the Manager. We strongly recommend enabling this setting to reduce the risk of a CSRF (Cross Site Request Forgery) attack.',

install/src/lang/fi.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@
137137
'please_correct_errors' => '. Ole hyvä ja korjaa seuraavat virheet',
138138
'plugins' => 'Liitännäiset',
139139
'preinstall_validation' => 'Ennen asennusta suoritettava tarkastus',
140-
'recommend_collation' => 'utf8mb4_general_ci',
141-
'recommend_collations_order' => 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
140+
'recommend_collation' => 'utf8mb4_0900_ai_ci',
141+
'recommend_collations_order' => 'utf8mb4_0900_ai_ci,utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci',
142142
'recommend_setting_change_title' => 'Suositeltava asetusten muutos',
143143
'recommend_setting_change_validate_referer_confirmation' => 'Asetuksen muutos: <em>Validoi HTTP_REFERER otsikkotieto?</em>',
144144
'recommend_setting_change_validate_referer_description' => 'Sivustolla ei ole käytössä ylläpidon HTTP_REFERER tunnisteiden tarkistusta. On suositeltavaa ottaa tarkistus käyttöön CSFR-verkkohyökkäysten (Cross Site Request Forgery) estämiseksi.',

0 commit comments

Comments
 (0)