bit
/
taskman_env
25
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Making env check more strict

This commit is contained in:
Pavel Shevaev 2022-10-03 17:25:03 +03:00
parent 910b4fffdb
commit d1c03f9a19
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
env.inc.php
View File

@ -63,12 +63,6 @@ function include_env()
global $GAME_ROOT; global $GAME_ROOT;
$env_filename = get_env_file(); $env_filename = get_env_file();
$root_env = get_root_env_name();
if($env_filename && !file_exists($env_filename))
throw new Exception("Error setting environment. No such env file $env_filename");
else if($env_filename === null && file_exists("$GAME_ROOT/$root_env"))
$env_filename = "$GAME_ROOT/$root_env";
if($env_filename) if($env_filename)
include($env_filename); include($env_filename);
@ -83,13 +77,18 @@ function get_env_file()
$env = getenv("GAME_ENV"); $env = getenv("GAME_ENV");
if($env) if($env)
{
$env_filename = "$GAME_ROOT/env/$env.props.php"; $env_filename = "$GAME_ROOT/env/$env.props.php";
else if(!file_exists($env_filename))
$env_filename = "$GAME_ROOT/" . get_root_env_name(); throw new Exception("No such env file $env_filename");
if(file_exists($env_filename))
return $env_filename; return $env_filename;
}
return null; else
{
$env_filename = "$GAME_ROOT/" . get_root_env_name();
if(!file_exists($env_filename))
return null;
return $env_filename;
}
} }