Merge pull request #326 from Churro/froxlorMerge_vhostTemplates

Vhost templates: Added a field to select the target webserver

lib/formfields/admin/vhostconfig/formfield.vhostconfig_add.php

@@ -29,6 +29,11 @@ return array(
 						'type' => 'text',
 						'maxlength' => 50
 					),
+					'webserver' => array(
+						'label' => $lng['admin']['webserver'],
+						'type' => 'select',
+						'select_var' => $webserver_options
+					),
 					'vhostsettings' => array(
 						'style' => 'align-top',
 						'label' => $lng['admin']['vhostsettings']['vhostsettings'],

lib/formfields/admin/vhostconfig/formfield.vhostconfig_edit.php

@@ -30,6 +30,11 @@ return array(
 						'maxlength' => 50,
 						'value' => $result['description']
 					),
+					'webserver' => array(
+						'label' => $lng['admin']['webserver'],
+						'type' => 'select',
+						'select_var' => $webserver_options
+					),
 					'vhostsettings' => array(
 						'style' => 'align-top',
 						'label' => $lng['admin']['vhostsettings']['vhostsettings'],

lib/version.inc.php

@@ -16,7 +16,7 @@
  */
 
 // Main version variable
-$version = '0.9.35-dev6';
+$version = '0.9.35-dev7';
 
 // Database version (unused, old stuff from SysCP)
 $dbversion = '2';