From ffdda29a35ada04ed275316fe65d00909ec8ca69 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Mon, 15 Apr 2024 16:09:25 +0800 Subject: [PATCH] * Adjust config file build logic. --- module/install/zen.php | 59 +++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/module/install/zen.php b/module/install/zen.php index 15d2550095..9042ba0901 100644 --- a/module/install/zen.php +++ b/module/install/zen.php @@ -309,36 +309,37 @@ class installZen extends install /* Set the session save path when the session save path is null. */ $customSession = $this->setSessionPath(); $configContent = <<installed = (bool)getenv('ZT_INSTALLED'); - \$config->debug = (int)getenv('ZT_DEBUG'); - \$config->requestType = getenv('ZT_REQUEST_TYPE'); - \$config->timezone = getenv('ZT_TIMEZONE'); - \$config->db->driver = getenv('ZT_DB_DRIVER'); - \$config->db->host = getenv('ZT_DB_HOST'); - \$config->db->port = getenv('ZT_DB_PORT'); - \$config->db->name = getenv('ZT_DB_NAME'); - \$config->db->user = getenv('ZT_DB_USER'); - \$config->db->encoding = getenv('ZT_DB_ENCODING'); - \$config->db->password = getenv('ZT_DB_PASSWORD'); - \$config->db->prefix = getenv('ZT_DB_PREFIX'); - \$config->webRoot = getWebRoot(); - \$config->default->lang = getenv('ZT_DEFAULT_LANG'); +installed = (bool)getenv('ZT_INSTALLED'); +\$config->debug = (int)getenv('ZT_DEBUG'); +\$config->requestType = getenv('ZT_REQUEST_TYPE'); +\$config->timezone = getenv('ZT_TIMEZONE'); +\$config->db->driver = getenv('ZT_DB_DRIVER'); +\$config->db->host = getenv('ZT_DB_HOST'); +\$config->db->port = getenv('ZT_DB_PORT'); +\$config->db->name = getenv('ZT_DB_NAME'); +\$config->db->user = getenv('ZT_DB_USER'); +\$config->db->encoding = getenv('ZT_DB_ENCODING'); +\$config->db->password = getenv('ZT_DB_PASSWORD'); +\$config->db->prefix = getenv('ZT_DB_PREFIX'); +\$config->webRoot = getWebRoot(); +\$config->default->lang = getenv('ZT_DEFAULT_LANG'); - \$hasSlaveDB = (string)getenv('ENABLE_DB_SLAVE'); - if(\$hasSlaveDB) - { - \$slaveDB = new stdclass(); - \$slaveDB->host = getenv('ZT_SLAVE_DB_HOST'); - \$slaveDB->port = getenv('ZT_SLAVE_DB_PORT'); - \$slaveDB->name = getenv('ZT_SLAVE_DB_NAME'); - \$slaveDB->user = getenv('ZT_SLAVE_DB_USER'); - \$slaveDB->password = getenv('ZT_SLAVE_DB_PASSWORD'); - \$slaveDB->driver = getenv('ZT_DB_DRIVER'); - \$slaveDB->encoding = getenv('ZT_DB_ENCODING'); - \$slaveDB->prefix = getenv('ZT_DB_PREFIX'); - \$config->slaveDBList = array(\$slaveDB); - EOT; +\$hasSlaveDB = (string)getenv('ENABLE_DB_SLAVE'); +if(\$hasSlaveDB) +{ + \$slaveDB = new stdclass(); + \$slaveDB->host = getenv('ZT_SLAVE_DB_HOST'); + \$slaveDB->port = getenv('ZT_SLAVE_DB_PORT'); + \$slaveDB->name = getenv('ZT_SLAVE_DB_NAME'); + \$slaveDB->user = getenv('ZT_SLAVE_DB_USER'); + \$slaveDB->password = getenv('ZT_SLAVE_DB_PASSWORD'); + \$slaveDB->driver = getenv('ZT_DB_DRIVER'); + \$slaveDB->encoding = getenv('ZT_DB_ENCODING'); + \$slaveDB->prefix = getenv('ZT_DB_PREFIX'); + \$config->slaveDBList = array(\$slaveDB); +} +EOT; if($customSession) $configContent .= "\n\$config->customSession = true;";