Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Load INI path from outside of Toolkit directory #161

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: Load INI path from outside of Toolkit directory #161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7ce7dc
Load INI path from outside of Toolkit directory
NattyNarwhal May 31, 2021
2bdaf46
Correct non-i INI path
NattyNarwhal Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion ToolkitApi/Toolkit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2479,7 +2479,26 @@ static function getConfigValue($heading, $key, $default = null)
// if we haven't read config file yet, do so.
if (!isset(self::$_config)) {
// read/stat INI once and only once per request
self::$_config = parse_ini_file(CONFIG_FILE, true);
// We'll try these locations for the INI in order:
// - an environment variable (i.e so it can be set per-site)
// - a system dir (/QOpenSys prefixed on i)
// - where Toolkit is installed to (for back compat)
// It's clearer if we dynamically build it.
$locations = array(
CONFIG_FILE
);
array_unshift($locations, PHP_OS == "OS400" ?
"/QOpenSys/etc/php-toolkit.ini" : "/etc/php-toolkit.ini");
$custom_ini_path = getenv("PHP_TOOLKIT_INI");
if ($custom_ini_path) {
array_unshift($locations, $custom_ini_path);
}
foreach ($locations as $location) {
self::$_config = parse_ini_file($location, true);
if (self::$_config !== false) {
break;
}
}
}

if (isset(self::$_config[$heading][$key])) {
Expand Down