Merge branch 'master' of git.ispconfig.org:florian030/ispconfig3

Author: Florian Schaal

.gitignore

@@ -584,7 +584,7 @@
 			'value'  => ''
 		),
 		'mail_servers' => array (
-			'datatype' => 'INTEGER',
+			'datatype' => 'VARCHAR',
 			'formtype' => 'MULTIPLE',
 			'separator' => ',',
 			'default' => '1',
@@ -1125,7 +1125,7 @@
 			'value'  => ''
 		),
 		'dns_servers' => array (
-			'datatype' => 'INTEGER',
+			'datatype' => 'VARCHAR',
 			'formtype' => 'MULTIPLE',
 			'separator' => ',',
 			'default' => '1',
@@ -1223,7 +1223,7 @@
 			'value'  => ''
 		),
 		'db_servers' => array (
-			'datatype' => 'INTEGER',
+			'datatype' => 'VARCHAR',
 			'formtype' => 'MULTIPLE',
 			'separator' => ',',
 			'default' => '1',

interface/web/client/form/reseller.tform.php

@@ -31,12 +31,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr>
-                            <td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="domain"}</a></td>
-                            <td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="system_user"}</a></td>
-                            <td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="used"}</a></td>
-                            <td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="soft"}</a></td>
-                            <td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="hard"}</a></td>
-                            <td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="files"}</a></td>
+                            <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="domain"}</a></td>
+                            <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="system_user"}</a></td>
+                            <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="used"}</a></td>
+                            <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="soft"}</a></td>
+                            <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="hard"}</a></td>
+                            <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="files"}</a></td>
                             <td class="text-right"></td>
                         </tr>
                     </tmpl_loop>
@@ -54,4 +54,4 @@ <h1><tmpl_var name="list_head_txt"></h1>
             </table>
 </div>
 
-    </div>
+    </div>