From 64f3d750ab045c8e7395c035be3097ee6cd9025a Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 08 Nov 2011 05:28:59 -0500
Subject: [PATCH] - Bugfix in DNS template wizard - Removed unused code in server.php - Commented out FcgidMaxProcesses in vhost template
---
server/conf/vhost.conf.master | 2 +-
interface/web/dns/templates/dns_wizard.htm | 2 +-
server/server.php | 13 -------------
install/update.php | 4 ----
install/autoupdate.php | 5 -----
5 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/install/autoupdate.php b/install/autoupdate.php
index e3fa094..b77ff49 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -79,10 +79,6 @@
if($dist['id'] == '') die('Linux distribution or version not recognized.');
-//** Check version
-// if(compare_ispconfig_version('3.0.3',ISPC_APP_VERSION) < 0) die("This updater is for ISPConfig versions > 3.0.3.0. Please Update to ISPConfig 3.0.3.3 first before you update to the current ISPConfig version.\n");
-
-
//** Include the distribution-specific installer class library and configuration
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
include_once('dist/lib/'.$dist['id'].'.lib.php');
@@ -160,7 +156,6 @@
//* initialize the database
$inst->db = new db();
-// $inst->db->dbName = $conf["mysql"]["database"];
/*
* The next line is a bit tricky!
diff --git a/install/update.php b/install/update.php
index 2767f60..58b366f 100644
--- a/install/update.php
+++ b/install/update.php
@@ -78,9 +78,6 @@
if($dist['id'] == '') die('Linux distribution or version not recognized.');
-//** Check version
-// if(compare_ispconfig_version('3.0.3',ISPC_APP_VERSION) < 0) die("This updater is for ISPConfig versions > 3.0.3.0. Please Update to ISPConfig 3.0.3.3 first before you update to the current ISPConfig version.\n");
-
//** Include the distribution-specific installer class library and configuration
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
include_once('dist/lib/'.$dist['id'].'.lib.php');
@@ -155,7 +152,6 @@
//* initialize the database
$inst->db = new db();
-// $inst->db->dbName = $conf["mysql"]["database"];
//* initialize the master DB, if we have a multiserver setup
if($conf['mysql']['master_slave_setup'] == 'y') {
diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm
index 5d56331..b353094 100644
--- a/interface/web/dns/templates/dns_wizard.htm
+++ b/interface/web/dns/templates/dns_wizard.htm
@@ -11,7 +11,7 @@
<fieldset class="inlineLabels"><legend>DNS Zone</legend>
<div class="ctrlHolder">
<label for="template_id">{tmpl_var name='template_id_txt'}</label>
- <select name="template_id" id="template_id" class="selectInput">
+ <select name="template_id" id="template_id" class="selectInput" onChange="submitForm('pageForm','dns/dns_wizard.php')">
{tmpl_var name='template_id_option'}
</select>
</div>
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 7b7cf80..3345e0b 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -176,7 +176,7 @@
<tmpl_if name='fastcgi_config_syntax' op='==' value='2'>
FcgidIdleTimeout 300
FcgidProcessLifeTime 3600
- FcgidMaxProcesses 1000
+ # FcgidMaxProcesses 1000
FcgidMinProcessesPerClass 0
FcgidMaxProcessesPerClass 100
FcgidConnectTimeout 3
diff --git a/server/server.php b/server/server.php
index c5ff5ac..5e27cb5 100644
--- a/server/server.php
+++ b/server/server.php
@@ -38,19 +38,6 @@
$conf['server_id'] = intval($conf['server_id']);
/*
- // Get server record, if updates where available for this server
- $server_db_record = $app->db->queryOneRecord("SELECT * FROM server WHERE update = 1 AND server_id = ".$conf['server_id']);
- if($server_db_record == false) {
- $app->log('Nothing to update for server_id '.$conf['server_id']);
- die();
- } else {
- // Set update status to 0, so we dont start the update process twice
- $app->db->query("UPDATE server SET update = 0 WHERE server_id = ".$conf['server_id']);
- $app->log('Begin update.');
- }
- */
-
-/*
* Try to Load the server configuration from the master-db
*/
if ($app->dbmaster->connect()) {
--
Gitblit v1.9.1