diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index 4e4102e9b2..a2ad437e66 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -1343,23 +1343,3 @@ function ipmiSensorName($hardwareId, $sensorIpmi, $rewriteArray) return $sensorIpmi; } } - -function get_auth_ad_user_filter($username) -{ - global $config; - $user_filter = "(samaccountname=$username)"; - if ($config['auth_ad_user_filter']) { - $user_filter = "(&{$config['auth_ad_user_filter']}$user_filter)"; - } - return $user_filter; -} - -function get_auth_ad_group_filter($groupname) -{ - global $config; - $group_filter = "(samaccountname=$groupname)"; - if ($config['auth_ad_group_filter']) { - $group_filter = "(&{$config['auth_ad_group_filter']}$group_filter)"; - } - return $group_filter; -} diff --git a/includes/common.php b/includes/common.php index 8ad5499f21..f6c0d13ffb 100644 --- a/includes/common.php +++ b/includes/common.php @@ -1460,3 +1460,23 @@ function starts_with($haystack, $needles, $case_insensitive = false) } return false; } + +function get_auth_ad_user_filter($username) +{ + global $config; + $user_filter = "(samaccountname=$username)"; + if ($config['auth_ad_user_filter']) { + $user_filter = "(&{$config['auth_ad_user_filter']}$user_filter)"; + } + return $user_filter; +} + +function get_auth_ad_group_filter($groupname) +{ + global $config; + $group_filter = "(samaccountname=$groupname)"; + if ($config['auth_ad_group_filter']) { + $group_filter = "(&{$config['auth_ad_group_filter']}$group_filter)"; + } + return $group_filter; +}