mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

环境变量不区分大小写

Browse Source
This commit is contained in:
yunwuxin
2016-06-29 15:35:32 +08:00
parent 73fdd13482
commit d9a9599043
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
base.php
View File

@@ -44,9 +44,11 @@ require CORE_PATH . 'Loader.php';
if (is_file(ROOT_PATH . 'env' . EXT)) { if (is_file(ROOT_PATH . 'env' . EXT)) {
$env = include ROOT_PATH . 'env' . EXT; $env = include ROOT_PATH . 'env' . EXT;
foreach ($env as $key => $val) { foreach ($env as $key => $val) {
$name = ENV_PREFIX . $key; $name = ENV_PREFIX . strtoupper($key);
if (is_bool($val)) { if (is_bool($val)) {
$val = $val ? 1 : 0; $val = $val ? 1 : 0;
} elseif (!is_scalar($val)) {
continue;
} }
putenv("$name=$val"); putenv("$name=$val");
} }

5
library/think/App.php
View File

@@ -352,9 +352,12 @@ class App
} else { } else {
//重新申请一块比较大的buffer //重新申请一块比较大的buffer
if (ob_get_level() > 0) { if (ob_get_level() > 0) {
ob_end_clean(); $output = ob_get_clean();
} }
ob_start(); ob_start();
if (!empty($output)) {
echo $output;
}
} }
// 应用命名空间 // 应用命名空间

8
library/think/Config.php
View File

@@ -81,7 +81,7 @@ class Config
if (!strpos($name, '.')) { if (!strpos($name, '.')) {
// 判断环境变量 // 判断环境变量
$result = getenv(ENV_PREFIX . $name); $result = getenv(ENV_PREFIX . strtoupper($name));
if (false !== $result) { if (false !== $result) {
return $result; return $result;
} }
@@ -89,7 +89,7 @@ class Config
} else { } else {
// 二维数组设置和获取支持 // 二维数组设置和获取支持
$name = explode('.', $name); $name = explode('.', $name);
$result = getenv(ENV_PREFIX . $name[0] . '_' . $name[1]); $result = getenv(ENV_PREFIX . strtoupper($name[0] . '_' . $name[1]));
// 判断环境变量 // 判断环境变量
if (false !== $result) { if (false !== $result) {
return $result; return $result;
@@ -113,7 +113,7 @@ class Config
} }
if (!strpos($name, '.')) { if (!strpos($name, '.')) {
$result = getenv(ENV_PREFIX . $name); $result = getenv(ENV_PREFIX . strtoupper($name));
if (false !== $result) { if (false !== $result) {
return $result; return $result;
} }
@@ -122,7 +122,7 @@ class Config
} else { } else {
// 二维数组设置和获取支持 // 二维数组设置和获取支持
$name = explode('.', $name); $name = explode('.', $name);
$result = getenv(ENV_PREFIX . $name[0] . '_' . $name[1]); $result = getenv(ENV_PREFIX . strtoupper($name[0] . '_' . $name[1]));
// 判断环境变量 // 判断环境变量
if (false !== $result) { if (false !== $result) {
return $result; return $result;

7
tpl/think_exception.tpl
View File

@@ -83,11 +83,11 @@
<meta name="robots" content="noindex,nofollow" /> <meta name="robots" content="noindex,nofollow" />
<style> <style>
/* Base */ /* Base */
body{ body {
color: #333; color: #333;
font: 16px Verdana, "Helvetica Neue", helvetica, Arial, 'Microsoft YaHei', sans-serif; font: 16px Verdana, "Helvetica Neue", helvetica, Arial, 'Microsoft YaHei', sans-serif;
margin: 0px; margin: 0px;
padding: 20px; padding: 0 20px 20px;
} }
h1{ h1{
margin: 10px 0 0; margin: 10px 0 0;
@@ -145,6 +145,9 @@
} }
/* Exception Info */ /* Exception Info */
.exception {
margin-top: 20px;
}
.exception .message{ .exception .message{
padding: 12px; padding: 12px;
border: 1px solid #ddd; border: 1px solid #ddd;