X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Ffunctions.inc;h=4acc2419e139f5e12f46570541bdad03092454fd;hb=f9e2a15ea3578c6c86efef30a0c8ebededefbb9e;hp=65c9fa53a16f485c081ec2d128c2b1441f04b0f4;hpb=5c145ba027a1ebacc9a06434c4a1bb7c0012704c;p=gosa.git diff --git a/include/functions.inc b/include/functions.inc index 65c9fa53a..4acc2419e 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -20,6 +20,7 @@ /* Configuration file location */ define ("CONFIG_DIR", "/etc/gosa"); +define ("CONFIG_FILE", "gosa.conf-trunk"); define ("CONFIG_TEMPLATE_DIR", "../contrib/"); define ("HELP_BASEDIR", "/var/www/doc/"); @@ -2162,7 +2163,7 @@ function get_base_from_hook($dn, $attrib) if (check_command($command)){ @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute"); exec($command, $output); - if (preg_match("/^[0-9]+$/", $output)){ + if (preg_match("/^[0-9]+$/", $output[0])){ return ($output[0]); } else { print_red(_("Warning - base_hook is not avialable. Using default base."));