From 8e83c5f7883622cb7607fb5171c323c720b1b462 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Sat, 12 Feb 2011 18:27:32 +0100
Subject: [PATCH] bugfix domain-formfields (again)

---
 .../customer/domains/formfield.domains_add.php         | 10 +++++++---
 templates/Classic/customer/domains/domains_add.tpl     |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php
index e1bda09b..ad88b3d3 100644
--- a/lib/formfields/customer/domains/formfield.domains_add.php
+++ b/lib/formfields/customer/domains/formfield.domains_add.php
@@ -24,10 +24,15 @@ return array(
 				'title' => $lng['domains']['subdomain_add'],
 				'image' => 'icons/domain_add.png',
 				'fields' => array(
-					'domain' => array(
+					'subdomain' => array(
 						'label' => $lng['domains']['domainname'],
 						'type' => 'text'
 					),
+					'domain' => array(
+						'label' => '@TODO up to subdomain-part',
+						'type' => 'select',
+						'select_var' => $domains
+					),
 					'alias' => array(
 						'label' => $lng['domains']['aliasdomain'],
 						'type' => 'select',
@@ -42,8 +47,7 @@ return array(
 					'url' => array(
 						'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
 						'label' => $lng['panel']['urloverridespath'],
-						'type' => 'text',
-						'value' => $urlvalue
+						'type' => 'text'
 					),
 					'redirectcode' => array(
 						'visible' => (($settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1') ? true : false),
diff --git a/templates/Classic/customer/domains/domains_add.tpl b/templates/Classic/customer/domains/domains_add.tpl
index 7dfe3990..d9862601 100644
--- a/templates/Classic/customer/domains/domains_add.tpl
+++ b/templates/Classic/customer/domains/domains_add.tpl
@@ -28,7 +28,7 @@ $header
 				</tr>
 				<tr>
 					<td class="main_field_name">{$lng['panel']['urloverridespath']}:</td>
-					<td class="main_field_display"><input type="text" class="text" name="url" value="{$urlvalue}" size="30" /></td>
+					<td class="main_field_display"><input type="text" class="text" name="url" value="" size="30" /></td>
 				</tr>
 			</if>
 			<if $settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1'>