Adding note about max length of mysql username

myvesta · myvesta · commit 8cabb5414aa8 · 2016-10-07T17:41:27.000Z
diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php
@@ -746,6 +746,8 @@
     '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
@@ -745,4 +745,5 @@
     'No encryption' => 'Bez enkripcije',
     'Do not use encryption' => 'Nemoj koristiti enkripciju',
 
+	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
 );
diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php
@@ -746,4 +746,5 @@
     '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
@@ -747,4 +747,5 @@
     '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
@@ -748,4 +748,5 @@
     '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
@@ -746,4 +746,5 @@
     '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
@@ -747,4 +747,5 @@
     '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
@@ -747,4 +747,6 @@
     '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
@@ -744,4 +744,5 @@
     '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
@@ -749,6 +749,8 @@
     '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
@@ -748,6 +748,8 @@
     '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
@@ -746,6 +746,8 @@
     '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
@@ -750,6 +750,8 @@
     '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
@@ -749,4 +749,5 @@
     '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
@@ -747,4 +747,5 @@
     '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
@@ -746,4 +746,5 @@
     '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
@@ -746,4 +746,5 @@
     '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
@@ -747,4 +747,5 @@
     '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
@@ -747,4 +747,5 @@
     '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
@@ -746,4 +746,5 @@
     '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
@@ -746,4 +746,5 @@
     '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
@@ -746,4 +746,5 @@
     '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
@@ -747,4 +747,5 @@
     '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
@@ -747,4 +747,5 @@
     '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
@@ -746,4 +746,5 @@
     '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
@@ -747,4 +747,5 @@
     '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
@@ -769,4 +769,5 @@
     '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
@@ -747,4 +747,5 @@
     '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/vi.php b/web/inc/i18n/vi.php
@@ -745,4 +745,5 @@
     '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
@@ -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
@@ -42,7 +42,7 @@
                         <table class="data-col2" width="600px">
                             <tr>
                                 <td class="step-top hint" style="color:#777;" >
-                                    <?php print __('Prefix will be automaticaly added to database name and database user',$user."_");?>
+                                    <?php print __('Prefix will be automaticaly added to database name and database user',"<b>".$user."_</b>");?>
                                 </td>
                             </tr>
                             <tr>
@@ -58,7 +58,10 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('User');?>
+                                    <?php
+                                        print __('User');
+                                        if (is_it_mysql_or_mariadb()=='mysql') echo "&nbsp;&nbsp;&nbsp;&nbsp;<em><small>(".__('maximum 16 characters length, including prefix').")</small></em>";
+                                    ?>
                                 </td>
                             </tr>
                             <tr>
