From e719809b48b482442b22f757f08d9c9f5213f653 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 26 Oct 2010 09:21:28 -0400
Subject: [PATCH] Changed: FS#1357 - PHP open_basedir field has to be longer Removed: documentroot_www field which has never been used.
---
install/sql/ispconfig3.sql | 7 +++----
server/plugins-available/apache2_plugin.inc.php | 2 --
install/sql/incremental/upd_0004.sql | 4 ++++
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/install/sql/incremental/upd_0004.sql b/install/sql/incremental/upd_0004.sql
new file mode 100644
index 0000000..9cddb99
--- /dev/null
+++ b/install/sql/incremental/upd_0004.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `web_domain` CHANGE `apache_directives` `apache_directives` MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;
+ALTER TABLE `web_domain` CHANGE `php_open_basedir` `php_open_basedir` MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;
+ALTER TABLE `web_domain` CHANGE `custom_php_ini` `custom_php_ini` MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;
+ALTER TABLE `web_domain` DROP `document_root_www`;
\ No newline at end of file
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 2825b1b..c653615 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1102,7 +1102,6 @@
`parent_domain_id` int(11) unsigned NOT NULL default '0',
`vhost_type` varchar(32) default NULL,
`document_root` varchar(255) default NULL,
- `document_root_www` varchar(255) default NULL,
`system_user` varchar(255) default NULL,
`system_group` varchar(255) default NULL,
`hd_quota` bigint(20) NOT NULL default '0',
@@ -1131,9 +1130,9 @@
`stats_password` varchar(255) default NULL,
`stats_type` varchar(255) default 'webalizer',
`allow_override` varchar(255) NOT NULL default 'All',
- `apache_directives` text,
- `php_open_basedir` text,
- `custom_php_ini` text,
+ `apache_directives` mediumtext,
+ `php_open_basedir` mediumtext,
+ `custom_php_ini` mediumtext,
`backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none',
`backup_copies` INT NOT NULL DEFAULT '1',
`active` enum('n','y') NOT NULL default 'y',
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 5117b42..5ba9add 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1255,8 +1255,6 @@
*/
$fn = substr($file, 0, strlen($file) - strlen('.htdigest'));
$output .= "\n";
- //$output .= " Alias /" . $fn . " " . $webdavRoot . "/" . $fn . "\n";
- //$output .= " <Location /" . $fn . ">\n";
$output .= " Alias /webdav/" . $fn . ' ' . $webdavRoot . '/' . $fn . "\n";
$output .= " <Location /webdav/" . $fn . ">\n";
$output .= " DAV On\n";
--
Gitblit v1.9.1