From ef6969eba7756cd971aefb2cbeec4e897a794e92 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 18 Oct 2009 13:23:17 -0400
Subject: [PATCH] Added missing newline at the end of apache_ispconfig.conf.master
---
interface/web/sites/form/web_domain.tform.php | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
index 0140ac9..c4494e9 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -139,6 +139,7 @@
'width' => '7',
'maxlength' => '7'
),
+ /*
'traffic_quota' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
@@ -150,6 +151,7 @@
'width' => '7',
'maxlength' => '7'
),
+ */
'cgi' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
@@ -174,11 +176,11 @@
'default' => '1',
'value' => array(0 => '0',1 => '1')
),
- 'is_subdomainwww' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'CHECKBOX',
- 'default' => '1',
- 'value' => array(0 => '0',1 => '1')
+ 'subdomain' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => 'y',
+ 'value' => array('none' => 'none', 'www' => 'www.', '*' => '*.')
),
'ssl' => array (
'datatype' => 'VARCHAR',
@@ -189,8 +191,9 @@
'php' => array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
- 'default' => 'y',
- 'value' => array('' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP')
+ 'default' => 'fast-cgi',
+ 'valuelimit' => 'client:web_php_options',
+ 'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP')
),
'active' => array (
'datatype' => 'VARCHAR',
@@ -218,7 +221,7 @@
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => '',
- 'value' => array('' => 'No redirect', 'R' => 'R', 'L' => 'L')
+ 'value' => array('' => 'No redirect', 'no' => 'No flag', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L')
),
'redirect_path' => array (
'datatype' => 'VARCHAR',
@@ -319,6 +322,31 @@
)
);
+//* Statistics
+$form["tabs"]['stats'] = array (
+ 'title' => "Stats",
+ 'width' => 100,
+ 'template' => "templates/web_domain_stats.htm",
+ 'readonly' => false,
+ 'fields' => array (
+ ##################################
+ # Begin Datatable fields
+ ##################################
+ 'stats_password' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'PASSWORD',
+ 'encryption' => 'CRYPT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '30',
+ 'maxlength' => '255'
+ ),
+ ##################################
+ # ENDE Datatable fields
+ ##################################
+ )
+);
+
if($_SESSION["s"]["user"]["typ"] == 'admin') {
$form["tabs"]['advanced'] = array (
--
Gitblit v1.9.1