From b5a0dc34a3bebd221fe8a564595d4c644122e11d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 16 Dec 2010 17:21:13 -0500
Subject: [PATCH] Merged revisions 2144-2150 from stable branch.

---
 interface/web/admin/form/system_config.tform.php |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 828b390..db43fc8 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -180,6 +180,22 @@
 			'width'		=> '30',
 			'maxlength'	=> '255'
 		),
+		'admin_mail' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'value'		=> '',
+			'width'		=> '30',
+			'maxlength'	=> '255'
+		),
+		'admin_name' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'value'		=> '',
+			'width'		=> '30',
+			'maxlength'	=> '255'
+		),
 	##################################
 	# ENDE Datatable fields
 	##################################
@@ -212,5 +228,25 @@
 	)
 );
 
+$form["tabs"]['misc'] = array (
+	'title' 	=> "Misc",
+	'width' 	=> 70,
+	'template' 	=> "templates/system_config_misc_edit.htm",
+	'fields' 	=> array (
+	##################################
+	# Begin Datatable fields
+	##################################
+		'dashboard_atom_url' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> 'http://www.ispconfig.org/atom',
+			'value'		=> ''
+		),
+	##################################
+	# ENDE Datatable fields
+	##################################
+	)
+);
 
-?>
\ No newline at end of file
+
+?>

--
Gitblit v1.9.1