mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix install_dir in include_dir and add optional regex

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1369 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-07-16 09:23:02 +00:00
parent b27f7e08c6
commit 103187e4f4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
includes/functions.php
View File

@@ -697,17 +697,17 @@ function isHexString($str)
}
# Include all .inc.php files in $dir
function include_dir($dir)
function include_dir($dir, $regex = "/\.inc\.php$/")
{
global $device, $config;
if ($handle = opendir($dir))
if ($handle = opendir($config['install_dir'] . '/' . $dir))
{
while (false !== ($file = readdir($handle)))
{
if (filetype($dir . '/' . $file) == 'file' && substr($file,strlen($file)-8) == '.inc.php')
if (filetype($config['install_dir'] . '/' . $dir . '/' . $file) == 'file' && preg_match($regex, $file))
{
include($dir . '/' . $file);
include($config['install_dir'] . '/' . $dir . '/' . $file);
}
}