diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php index 714f3c8fd..ebc6bc59b 100644 --- a/web/inc/i18n/ar.php +++ b/web/inc/i18n/ar.php @@ -746,7 +746,7 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', // Texts below doesn't exist in en.php '%s rule' => 'قواعد %s', diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php index 0f8af03d5..ff4e8185b 100644 --- a/web/inc/i18n/bs.php +++ b/web/inc/i18n/bs.php @@ -745,5 +745,6 @@ $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', + 'maximum characters length, including prefix' => 'maksimalna dužina sme biti %s karaktera, uključujući i prefix', + ); \ No newline at end of file diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php index 1c9366fa5..aedcf6773 100644 --- a/web/inc/i18n/cn.php +++ b/web/inc/i18n/cn.php @@ -746,5 +746,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php index 13d36c62f..5c90c07d7 100644 --- a/web/inc/i18n/cz.php +++ b/web/inc/i18n/cz.php @@ -747,5 +747,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/da.php b/web/inc/i18n/da.php index 58fa964fe..4def825a4 100644 --- a/web/inc/i18n/da.php +++ b/web/inc/i18n/da.php @@ -748,5 +748,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php index b79f639aa..850005351 100644 --- a/web/inc/i18n/de.php +++ b/web/inc/i18n/de.php @@ -746,5 +746,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php index faece051e..cda090a1c 100644 --- a/web/inc/i18n/el.php +++ b/web/inc/i18n/el.php @@ -747,5 +747,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index 755946ee2..871fa1644 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -747,6 +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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', ); diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php index dd4fe2ebc..3aa494fd9 100644 --- a/web/inc/i18n/es.php +++ b/web/inc/i18n/es.php @@ -744,5 +744,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/fa.php b/web/inc/i18n/fa.php index 500a2ef7c..b3eb2e845 100644 --- a/web/inc/i18n/fa.php +++ b/web/inc/i18n/fa.php @@ -749,7 +749,7 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s 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 9da1cf663..0d36ae295 100644 --- a/web/inc/i18n/fi.php +++ b/web/inc/i18n/fi.php @@ -748,7 +748,7 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', // Texts below doesn't exist in en.php 'traffic' => 'tiedonsiirto', diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php index 0df3c683c..6527528b6 100644 --- a/web/inc/i18n/fr.php +++ b/web/inc/i18n/fr.php @@ -746,7 +746,7 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', // Texts below doesn't exist in en.php 'disk' => 'disque', diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php index 0a503c110..90b0c3354 100644 --- a/web/inc/i18n/hu.php +++ b/web/inc/i18n/hu.php @@ -750,7 +750,7 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s 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 af3b4fe86..e7cb5fcb9 100644 --- a/web/inc/i18n/id.php +++ b/web/inc/i18n/id.php @@ -749,5 +749,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php index 095647b7d..146a694e1 100644 --- a/web/inc/i18n/it.php +++ b/web/inc/i18n/it.php @@ -747,5 +747,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/ja.php b/web/inc/i18n/ja.php index d6169fcc6..4425637ad 100644 --- a/web/inc/i18n/ja.php +++ b/web/inc/i18n/ja.php @@ -746,5 +746,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/ka.php b/web/inc/i18n/ka.php index 14890c589..18e6ede35 100644 --- a/web/inc/i18n/ka.php +++ b/web/inc/i18n/ka.php @@ -746,5 +746,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index 9e33a1b85..c7c6735de 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -747,5 +747,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php index 90c6ac775..bf83dc890 100644 --- a/web/inc/i18n/no.php +++ b/web/inc/i18n/no.php @@ -747,5 +747,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/pl.php b/web/inc/i18n/pl.php index 96f3660a5..96fdefd46 100644 --- a/web/inc/i18n/pl.php +++ b/web/inc/i18n/pl.php @@ -746,5 +746,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/pt-BR.php b/web/inc/i18n/pt-BR.php index 25089dfd0..86cfc124b 100644 --- a/web/inc/i18n/pt-BR.php +++ b/web/inc/i18n/pt-BR.php @@ -746,5 +746,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php index 7fb02e7df..3eb635f17 100644 --- a/web/inc/i18n/pt.php +++ b/web/inc/i18n/pt.php @@ -746,5 +746,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php index 988fec1b1..edeb818e8 100644 --- a/web/inc/i18n/ro.php +++ b/web/inc/i18n/ro.php @@ -747,5 +747,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index e9fdf6675..8751490e8 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -747,5 +747,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php index ceaa4d912..a5df6758d 100644 --- a/web/inc/i18n/se.php +++ b/web/inc/i18n/se.php @@ -746,5 +746,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php index ba2686e50..4ee35f7f9 100644 --- a/web/inc/i18n/tr.php +++ b/web/inc/i18n/tr.php @@ -747,5 +747,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php index d4652ad3b..6b5ef3c84 100644 --- a/web/inc/i18n/tw.php +++ b/web/inc/i18n/tw.php @@ -769,5 +769,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index 2f8183899..30753f246 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -747,5 +747,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s 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 473631918..3337fc108 100644 --- a/web/inc/i18n/vi.php +++ b/web/inc/i18n/vi.php @@ -745,5 +745,6 @@ $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', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + ); diff --git a/web/inc/main.php b/web/inc/main.php index 13a093c96..9eccb1249 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -3,7 +3,7 @@ session_start(); define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/'); -define('JS_LATEST_UPDATE', '1467758417'); +define('JS_LATEST_UPDATE', '1476144160'); $i = 0; @@ -346,11 +346,25 @@ function list_timezones() { return $timezone_list; } +/** + * A function that tells is it MySQL installed on the system, or it is MariaDB. + * + * Explaination: + * $_SESSION['DB_SYSTEM'] has 'mysql' value even if MariaDB is installed, so you can't figure out is it really MySQL or it's MariaDB. + * So, this function will make it clear. + * + * If MySQL is installed, function will return 'mysql' as a string. + * If MariaDB is installed, function will return 'mariadb' as a string. + * + * Hint: if you want to check if PostgreSQL is installed - check value of $_SESSION['DB_SYSTEM'] + * + * @return string + */ 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; + 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 a618bc1b3..e5a714946 100644 --- a/web/templates/admin/add_db.html +++ b/web/templates/admin/add_db.html @@ -60,7 +60,8 @@ (".__('maximum 16 characters length, including prefix').")"; + // if (is_it_mysql_or_mariadb()=='mysql') + echo "    (".__('maximum characters length, including prefix', 16).")"; ?>