Merge pull request hestiacp#1782 from jaapmarcus/fix/prefix-user-name

Fix issues where prefix db / ftp users

Author: Kristan Kenney

web/templates/header.html

@@ -10,9 +10,9 @@
     //  GLOBAL SETTINGS
     //
     var GLOBAL = {};
-    GLOBAL.FTP_USER_PREFIX = 'admin_';
-    GLOBAL.DB_USER_PREFIX = 'admin_';
-    GLOBAL.DB_DBNAME_PREFIX = 'admin_';
+    GLOBAL.FTP_USER_PREFIX = '';
+    GLOBAL.DB_USER_PREFIX = '';
+    GLOBAL.DB_DBNAME_PREFIX = '';
     GLOBAL.AJAX_URL = '';
   </script>
 </head>

web/templates/pages/add_db.html

@@ -240,6 +240,6 @@
 </div>
 
 <script>
-	GLOBAL.DB_USER_PREFIX = <?php json_encode($user.'_') ?>;
-	GLOBAL.DB_DBNAME_PREFIX = <?php json_encode($user.'_') ?>;
+GLOBAL.DB_USER_PREFIX = "<?php echo htmlentities($user.'_');?>";
+GLOBAL.DB_DBNAME_PREFIX = "<?php echo htmlentities($user.'_')?>";
 </script>

web/templates/pages/edit_db.html

@@ -139,6 +139,6 @@
 </div>
 <?php if ($v_type == 'pgsql'){ $user=strtolower($user); } ?>
 <script>
-	GLOBAL.DB_USER_PREFIX = <?php json_encode($user.'_') ?>;
-	GLOBAL.DB_DBNAME_PREFIX = <?php json_encode($user.'_') ?>;
+    GLOBAL.DB_USER_PREFIX = "<?php echo htmlentities($user.'_');?>";
+    GLOBAL.DB_DBNAME_PREFIX = "<?php echo htmlentities($user.'_')?>";
 </script>

web/templates/pages/edit_web.html

@@ -680,5 +680,5 @@
 	</div>
 </div>
 <script>
-	GLOBAL.FTP_USER_PREFIX = <?php json_encode($user.'_') ?>;
+	GLOBAL.FTP_USER_PREFIX = "<?php echo htmlentities($user.'_') ?>";
 </script>