From 8cabb5414aa8e15ee628db6ee7ade01e9c77fc02 Mon Sep 17 00:00:00 2001 From: dpeca Date: Fri, 7 Oct 2016 17:41:27 +0000 Subject: [PATCH] Adding note about max length of mysql username --- web/inc/i18n/ar.php | 2 ++ web/inc/i18n/bs.php | 1 + web/inc/i18n/cn.php | 1 + web/inc/i18n/cz.php | 1 + web/inc/i18n/da.php | 1 + web/inc/i18n/de.php | 1 + web/inc/i18n/el.php | 1 + web/inc/i18n/en.php | 2 ++ web/inc/i18n/es.php | 1 + web/inc/i18n/fa.php | 2 ++ web/inc/i18n/fi.php | 2 ++ web/inc/i18n/fr.php | 2 ++ web/inc/i18n/hu.php | 2 ++ web/inc/i18n/id.php | 1 + web/inc/i18n/it.php | 1 + web/inc/i18n/ja.php | 1 + web/inc/i18n/ka.php | 1 + web/inc/i18n/nl.php | 1 + web/inc/i18n/no.php | 1 + web/inc/i18n/pl.php | 1 + web/inc/i18n/pt-BR.php | 1 + web/inc/i18n/pt.php | 1 + web/inc/i18n/ro.php | 1 + web/inc/i18n/ru.php | 1 + web/inc/i18n/se.php | 1 + web/inc/i18n/tr.php | 1 + web/inc/i18n/tw.php | 1 + web/inc/i18n/ua.php | 1 + web/inc/i18n/vi.php | 1 + web/inc/main.php | 9 +++++++++ web/templates/admin/add_db.html | 7 +++++-- 31 files changed, 49 insertions(+), 2 deletions(-) diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php index 16953710..714f3c8f 100644 --- a/web/inc/i18n/ar.php +++ b/web/inc/i18n/ar.php @@ -746,6 +746,8 @@ $LANG['ar'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', + // Texts below doesn't exist in en.php '%s rule' => 'قواعد %s', 'MainDomain' => 'النطاق الرئيسي', diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php index f092c57f..0f8af03d 100644 --- a/web/inc/i18n/bs.php +++ b/web/inc/i18n/bs.php @@ -745,4 +745,5 @@ $LANG['bs'] = array( 'No encryption' => 'Bez enkripcije', 'Do not use encryption' => 'Nemoj koristiti enkripciju', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); \ No newline at end of file diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php index c87c753e..1c9366fa 100644 --- a/web/inc/i18n/cn.php +++ b/web/inc/i18n/cn.php @@ -746,4 +746,5 @@ $LANG['cn'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php index 6839078f..13d36c62 100644 --- a/web/inc/i18n/cz.php +++ b/web/inc/i18n/cz.php @@ -747,4 +747,5 @@ $LANG['cz'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/da.php b/web/inc/i18n/da.php index ab1c5840..58fa964f 100644 --- a/web/inc/i18n/da.php +++ b/web/inc/i18n/da.php @@ -748,4 +748,5 @@ $LANG['da'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php index 82be962b..b79f639a 100644 --- a/web/inc/i18n/de.php +++ b/web/inc/i18n/de.php @@ -746,4 +746,5 @@ $LANG['de'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php index 901e67a1..faece051 100644 --- a/web/inc/i18n/el.php +++ b/web/inc/i18n/el.php @@ -747,4 +747,5 @@ $LANG['el'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index 8a687f73..755946ee 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -747,4 +747,6 @@ $LANG['en'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', + ); diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php index 5a851eec..dd4fe2eb 100644 --- a/web/inc/i18n/es.php +++ b/web/inc/i18n/es.php @@ -744,4 +744,5 @@ $LANG['es'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/fa.php b/web/inc/i18n/fa.php index 06f31723..500a2ef7 100644 --- a/web/inc/i18n/fa.php +++ b/web/inc/i18n/fa.php @@ -749,6 +749,8 @@ $LANG['fa'] = [ 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', + // Texts below doesn't exist in en.php '70 خط اخر %s.%s.log' => 'هفتاد خط انتهايي از %s.%s.log', ]; diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php index db0e960d..9da1cf66 100644 --- a/web/inc/i18n/fi.php +++ b/web/inc/i18n/fi.php @@ -748,6 +748,8 @@ $LANG['fi'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', + // Texts below doesn't exist in en.php 'traffic' => 'tiedonsiirto', 'disk' => 'levytila', diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php index 496e1b9e..0df3c683 100644 --- a/web/inc/i18n/fr.php +++ b/web/inc/i18n/fr.php @@ -746,6 +746,8 @@ $LANG['fr'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', + // Texts below doesn't exist in en.php 'disk' => 'disque', 'traffic' => 'traffic', diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php index 3653682a..0a503c11 100644 --- a/web/inc/i18n/hu.php +++ b/web/inc/i18n/hu.php @@ -750,6 +750,8 @@ $LANG['hu'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', + // Texts below doesn't exist in en.php 'Bandwidth Usage eth1' => 'eth1 sávszélesség használat', ); diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php index 2b884bd1..af3b4fe8 100644 --- a/web/inc/i18n/id.php +++ b/web/inc/i18n/id.php @@ -749,4 +749,5 @@ $LANG['id'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php index 439f5a37..095647b7 100644 --- a/web/inc/i18n/it.php +++ b/web/inc/i18n/it.php @@ -747,4 +747,5 @@ $LANG['it'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/ja.php b/web/inc/i18n/ja.php index 501129a1..d6169fcc 100644 --- a/web/inc/i18n/ja.php +++ b/web/inc/i18n/ja.php @@ -746,4 +746,5 @@ $LANG['ja'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/ka.php b/web/inc/i18n/ka.php index f690b9aa..14890c58 100644 --- a/web/inc/i18n/ka.php +++ b/web/inc/i18n/ka.php @@ -746,4 +746,5 @@ $LANG['ka'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index 1f64efba..9e33a1b8 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -747,4 +747,5 @@ $LANG['nl'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php index 37c9b62e..90c6ac77 100644 --- a/web/inc/i18n/no.php +++ b/web/inc/i18n/no.php @@ -747,4 +747,5 @@ $LANG['no'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/pl.php b/web/inc/i18n/pl.php index f9f423bb..96f3660a 100644 --- a/web/inc/i18n/pl.php +++ b/web/inc/i18n/pl.php @@ -746,4 +746,5 @@ $LANG['pl'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/pt-BR.php b/web/inc/i18n/pt-BR.php index b80960e8..25089dfd 100644 --- a/web/inc/i18n/pt-BR.php +++ b/web/inc/i18n/pt-BR.php @@ -746,4 +746,5 @@ $LANG['pt-BR'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php index eb572e86..7fb02e7d 100644 --- a/web/inc/i18n/pt.php +++ b/web/inc/i18n/pt.php @@ -746,4 +746,5 @@ $LANG['pt'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php index c12a190f..988fec1b 100644 --- a/web/inc/i18n/ro.php +++ b/web/inc/i18n/ro.php @@ -747,4 +747,5 @@ $LANG['ro'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index c6ff96eb..e9fdf667 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -747,4 +747,5 @@ $LANG['ru'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php index ea791671..ceaa4d91 100644 --- a/web/inc/i18n/se.php +++ b/web/inc/i18n/se.php @@ -746,4 +746,5 @@ $LANG['se'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php index 8c8297fc..ba2686e5 100644 --- a/web/inc/i18n/tr.php +++ b/web/inc/i18n/tr.php @@ -747,4 +747,5 @@ $LANG['tr'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php index 99374311..d4652ad3 100644 --- a/web/inc/i18n/tw.php +++ b/web/inc/i18n/tw.php @@ -769,4 +769,5 @@ $LANG['tw'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index c64210bc..2f818389 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -747,4 +747,5 @@ $LANG['ua'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); \ No newline at end of file diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php index 5d8b5763..47363191 100644 --- a/web/inc/i18n/vi.php +++ b/web/inc/i18n/vi.php @@ -745,4 +745,5 @@ $LANG['vi'] = array( 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/main.php b/web/inc/main.php index e0761013..13a093c9 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -345,3 +345,12 @@ function list_timezones() { } return $timezone_list; } + +function is_it_mysql_or_mariadb() { + exec (VESTA_CMD."v-list-sys-services json", $output, $return_var); + $data = json_decode(implode('', $output), true); + unset($output); + $mysqltype='mysql'; + if (isset($data['mariadb'])) $mysqltype='mariadb'; + return $mysqltype; +} diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html index 63062690..a618bc1b 100644 --- a/web/templates/admin/add_db.html +++ b/web/templates/admin/add_db.html @@ -42,7 +42,7 @@ @@ -58,7 +58,10 @@
- + ".$user."_");?>
- + (".__('maximum 16 characters length, including prefix').")"; + ?>