From 9c79b871d955efaf5178ed9e20ef7b66c7d3dfdd Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 22 Jan 2025 13:53:44 +0800
Subject: [PATCH] * [misc] adjust getenv method call name.

---
 module/install/zen.php                     | 44 +++++++++++-----------
 module/space/ui/createapplication.html.php |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/module/install/zen.php b/module/install/zen.php
index 8d622b8fad..908e4a9aec 100644
--- a/module/install/zen.php
+++ b/module/install/zen.php
@@ -318,33 +318,33 @@ class installZen extends install
         $customSession = $this->setSessionPath();
         $configContent = <<<EOT
 <?php
-\$config->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->installed     = getEnvData('ZT_INSTALLED', true, 'bool');
+\$config->debug         = getEnvData('ZT_DEBUG', 0, 'int');
+\$config->requestType   = getEnvData('ZT_REQUEST_TYPE');
+\$config->timezone      = getEnvData('ZT_TIMEZONE', 'Asia/Shanghai');
+\$config->db->driver    = getEnvData('ZT_DB_DRIVER', 'mysql');
+\$config->db->host      = getEnvData('ZT_DB_HOST');
+\$config->db->port      = getEnvData('ZT_DB_PORT');
+\$config->db->name      = getEnvData('ZT_DB_NAME');
+\$config->db->user      = getEnvData('ZT_DB_USER');
+\$config->db->encoding  = getEnvData('ZT_DB_ENCODING', 'UTF8');
+\$config->db->password  = getEnvData('ZT_DB_PASSWORD');
+\$config->db->prefix    = getEnvData('ZT_DB_PREFIX');
 \$config->webRoot       = getWebRoot();
-\$config->default->lang = getenv('ZT_DEFAULT_LANG');
+\$config->default->lang = getEnvData('ZT_DEFAULT_LANG');
 
-\$hasSlaveDB = (string)getenv('ENABLE_DB_SLAVE');
+\$hasSlaveDB = (string)getEnvData('ENABLE_DB_SLAVE');
 if(\$hasSlaveDB && \$hasSlaveDB != 'false')
 {
     \$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');
+    \$slaveDB->host        = getEnvData('ZT_SLAVE_DB_HOST');
+    \$slaveDB->port        = getEnvData('ZT_SLAVE_DB_PORT');
+    \$slaveDB->name        = getEnvData('ZT_SLAVE_DB_NAME');
+    \$slaveDB->user        = getEnvData('ZT_SLAVE_DB_USER');
+    \$slaveDB->password    = getEnvData('ZT_SLAVE_DB_PASSWORD');
+    \$slaveDB->driver      = getEnvData('ZT_DB_DRIVER');
+    \$slaveDB->encoding    = getEnvData('ZT_DB_ENCODING');
+    \$slaveDB->prefix      = getEnvData('ZT_DB_PREFIX');
     \$config->slaveDBList  = array(\$slaveDB);
 }
 EOT;
diff --git a/module/space/ui/createapplication.html.php b/module/space/ui/createapplication.html.php
index 8467a56a50..41566c5b9c 100644
--- a/module/space/ui/createapplication.html.php
+++ b/module/space/ui/createapplication.html.php
@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace zin;
 
 $service     = key($lang->space->appType);
-$showVersion = getenv('ALLOW_SELECT_VERSION') && (strtolower(getenv('ALLOW_SELECT_VERSION')) == 'true' || strtolower(getenv('ALLOW_SELECT_VERSION')) == '1');
+$showVersion = getEnvData('ALLOW_SELECT_VERSION');
 $dbTypeItems = array();
 foreach($lang->instance->dbTypes as $type => $db) $dbTypeItems[] = array('text' => $db, 'value' => $type);