opensourcemirror
/
opnsense-ui_devtools
mirror of https://github.com/opnsense/ui_devtools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

also register contrib directory in package dir if it exists

This commit is contained in:
Ad Schellevis 2018-03-14 14:26:02 +01:00
parent 6fb4c60d1b
commit 683fcaf96e
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config/config.php
View File

@ -50,15 +50,21 @@ foreach ($conf->environment->packages as $package) {
"viewsDir" => preg_replace('#/+#','/',"{$package}/src/opnsense/mvc/app/views/"),
"libraryDir" => preg_replace('#/+#','/',"{$package}/src/opnsense/mvc/app/library/"),
"docroot" => preg_replace('#/+#','/',"{$package}/src/opnsense/www/"),
"contrib" => preg_replace('#/+#','/',"{$package}/src/opnsense/contrib/")
"contrib" => array(
preg_replace('#/+#','/',"{$package}/src/opnsense/contrib/"),
preg_replace('#/+#','/',"{$package}/contrib/")
)
);
foreach ($packageDirs as $packageDir => $location) {
if (is_dir($location)) {
if (!isset($conf->application->$packageDir) || !in_array($location,
$conf->application->$packageDir->toArray())) {
// merge configuration
$conf->merge(new \Phalcon\Config(["application" => [$packageDir => array($location),],]));
foreach ($packageDirs as $packageDir => $loc) {
$locations = is_array($loc) ? $loc : array($loc);
foreach ($locations as $location) {
if (is_dir($location)) {
if (!isset($conf->application->$packageDir) || !in_array($location,
$conf->application->$packageDir->toArray())) {
// merge configuration
$conf->merge(new \Phalcon\Config(["application" => [$packageDir => array($location),],]));
}
}
}
}