X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Ffunctions.inc;h=ec1d945f9d081d7dddb91b0f38672d7e0eeb4ee5;hb=343367db13017701f67f4d3ed11eae1fbc25dfa2;hp=cc724f8a62807467cc5b295ac272ba36fa7dbcac;hpb=99804a3a530a241361cd8c07050ff470a6517299;p=gosa.git diff --git a/include/functions.inc b/include/functions.inc index cc724f8a6..ec1d945f9 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -18,9 +18,24 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* Configuration file location */ -define ("CONFIG_DIR", "/etc/gosa"); -define ("CONFIG_FILE", "gosa.conf"); +/* Allow setting the config patih in the apache configuration + e.g. SetEnv CONFIG_FILE /etc/path + */ +if(!isset($_SERVER['CONFIG_DIR'])){ + define ("CONFIG_DIR", "/etc/gosa"); +}else{ + define ("CONFIG_DIR",$_SERVER['CONFIG_DIR']); +} + +/* Allow setting the config file in the apache configuration + e.g. SetEnv CONFIG_FILE gosa.conf.2.5 + */ +if(!isset($_SERVER['CONFIG_FILE'])){ + define ("CONFIG_FILE", "gosa.conf"); +}else{ + define ("CONFIG_FILE",$_SERVER['CONFIG_FILE']); +} + define ("CONFIG_TEMPLATE_DIR", "../contrib/"); define ("HELP_BASEDIR", "/var/www/doc/"); @@ -153,17 +168,19 @@ function get_browser_language() /* Try to use users primary language */ global $config; $ui= get_userinfo(); - if ($ui != NULL){ + if (isset($ui) && $ui !== NULL){ if ($ui->language != ""){ return ($ui->language.".UTF-8"); } } - /* Try to use users primary language */ - if ($ui != NULL){ - if ($ui->language != ""){ - return ($ui->language.".UTF-8"); + /* Check for global language settings in gosa.conf */ + if(isset($config->data['MAIN']['LANG']) && !empty($config->data['MAIN']['LANG'])) { + $lang = $config->data['MAIN']['LANG']; + if(!preg_match("/utf/i",$lang)){ + $lang .= ".UTF-8"; } + return($lang); } /* Load supported languages */ @@ -314,7 +331,7 @@ function ldap_login_user ($username, $password) /* Check if mail address is also a valid auth name */ $auth_mail = FALSE; - if(isset($config->current['AUTH_MAIL']) && preg_match("/true/",$config->current['AUTH_MAIL'])){ + if(isset($config->current['AUTH_MAIL']) && preg_match("/^true$/i",$config->current['AUTH_MAIL'])){ $auth_mail = TRUE; } @@ -344,7 +361,7 @@ function ldap_login_user ($username, $password) /* LDAP schema is not case sensitive. Perform additional check. */ $attrs= $ldap->fetch(); if($auth_mail){ - if ($attrs['uid'][0] != $username && $attrs['mail'][0] != $username){ + if ($attrs['uid'][0] != $username && strcasecmp($attrs['mail'][0], $username) != 0){ return(NULL); } }else{ @@ -2062,34 +2079,33 @@ function progressbar($percentage,$width=100,$height=15,$showvalue=false) $progress = (int)(($percentage /100)*$width); - /* Abort printing out percentage, if divs are to small */ - - /* If theres a better solution for this, use it... */ - $str = " -