WebApps/Observium_CE
1
0
Fork 0
Code Pull Requests Activity

Commit version 24.12.13800

Browse Source
This commit is contained in:
Chris Hammer
2025-01-06 17:35:06 -05:00
parent b7f6a79c2c
commit 55d9218816
6133 changed files with 4239740 additions and 1374287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
includes/include-dir.inc.php
View File

@ -4,9 +4,9 @@
*
* This file is part of Observium.
*
* @package observium
* @subpackage libs
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2020 Observium Limited
* @package observium
* @subpackage common
* @copyright (C) Adam Armstrong
*
*/
@ -20,69 +20,32 @@
// This is an include so that we don't lose variable scope.
if (!isset($include_dir_regexp) || $include_dir_regexp === '')
{
$include_dir_regexp = "/\.inc\.php$/";
if (!isset($include_dir_regexp) || $include_dir_regexp === '') {
$include_dir_regexp = "/\.inc\.php$/";
}
if (!isset($include_dir_depth) || !is_numeric($include_dir_depth))
{
// Do not include files from (one level) subdir by default
$include_dir_depth = 0;
if (!isset($include_dir_depth) || !is_numeric($include_dir_depth)) {
// Do not include files from (one level) subdir by default
$include_dir_depth = 0;
}
// Sort results?
$include_dir_sort = isset($include_dir_sort) && $include_dir_sort;
$include_paths = [];
foreach (get_recursive_directory_iterator($config['install_dir'] . '/' . $include_dir, (int)$include_dir_depth) as $file => $info)
{
if (preg_match($include_dir_regexp, $info->getFilename()))
{
if ($include_dir_sort)
{
$include_paths[] = $file;
continue;
foreach (get_recursive_directory_iterator($config['install_dir'] . '/' . $include_dir, (int)$include_dir_depth) as $file => $info) {
if (preg_match($include_dir_regexp, $info -> getFilename())) {
$include_paths[] = $file;
}
// do not use print_debug, which not included for definitions!
//if (OBS_DEBUG > 1) { echo('Including: ' . $file . PHP_EOL); }
include($file);
}
}
// This loop used only when sorting includes
if ($include_dir_sort)
{
asort($include_paths);
if (isset($include_dir_sort) && $include_dir_sort) {
asort($include_paths);
}
foreach ($include_paths as $file)
{
// do not use print_debug, which not included for definitions!
//if (OBS_DEBUG > 1) { echo('Including sorted: ' . $file . PHP_EOL); }
foreach ($include_paths as $file) {
// do not use print_debug, which not included for definitions!
//if (OBS_DEBUG > 1) { echo('Including sorted: ' . $file . PHP_EOL); }
include($file);
include($file);
}
/* old
if ($handle = opendir($config['install_dir'] . '/' . $include_dir))
{
while (false !== ($file = readdir($handle)))
{
$file_path = $config['install_dir'] . '/' . $include_dir . '/' . $file;
if (preg_match($include_dir_regexp, $file) && is_file($file_path))
{
// do not use print_debug, which not included for definitions!
if (OBS_DEBUG > 1)
{
echo('Including: ' . $file_path . PHP_EOL);
}
include($file_path);
}
}
closedir($handle);
}
*/
unset($include_dir_regexp, $include_dir_depth, $include_dir, $include_paths);
unset($include_dir_regexp, $include_dir_depth, $include_dir, $include_paths, $file);
// EOF