}
// Database access and other passwords when on the web
-function setconfigfromoldsources ($sec, $var, $serv, $env, $glob) {
+function setconfigfromenv ($sec, $var, $serv, $env) {
if (getenv ('SERVER_SOFTWARE')) {
if (function_exists ('apache_request_headers')) {
$headers = apache_request_headers() ;
if (isset ($headers[$serv])) {
forge_define_config_item ($var, $sec,
$headers[$serv]) ;
- return ;
+ return true;
}
}
if (isset ($_ENV[$env])) {
forge_define_config_item ($var, $sec,
getenv($env)) ;
- return ;
+ return true;
+ }
+ return false;
+}
+
+function setconfigfromoldsources ($sec, $var, $serv, $env, $glob) {
+ if (setconfigfromenv($sec, $var, $serv, $env)) {
+ return true;
}
if (isset ($GLOBALS[$glob])) {
forge_define_config_item ($var, $sec,
$GLOBALS[$glob]) ;
- return ;
+ return true;
}
+ return false;
}
if (isset($gfcgfile) && file_exists ($gfcgfile)) {
forge_define_config_item ('config_path', 'core', '/etc/gforge') ;
require_once $gfcommon.'include/config-vars.php';
+} else {
+ setconfigfromenv ('core', 'database_host',
+ 'GForgeDbhost', 'sys_gfdbhost') ;
+ setconfigfromenv ('core', 'database_port',
+ 'GForgeDbport', 'sys_gfdbport') ;
+ setconfigfromenv ('core', 'database_name',
+ 'GForgeDbname', 'sys_gfdbname') ;
+ setconfigfromenv ('core', 'database_user',
+ 'GForgeDbuser', 'sys_gfdbuser') ;
+ setconfigfromenv ('core', 'database_password',
+ 'GForgeDbpasswd', 'sys_gfdbpasswd') ;
+ setconfigfromenv ('core', 'ldap_password',
+ 'GForgeLdapPasswd', 'sys_gfldap_passwd') ;
+ setconfigfromenv ('core', 'jabber_password',
+ 'GForgeJabberPasswd', 'sys_gfjabber_pass') ;
}
forge_read_config_file ($gfconfig.'/config.ini') ;
}
// Insert this page view into the database
- require_once $gfwww.'include/logger.php';
+ require_once $gfcommon.'include/logger.php';
// If logged in, set up a $LUSER var referencing
// the logged in user's object
if (session_loggedin()) {
$LUSER =& session_get_user();
$use_tooltips = $LUSER->usesTooltips();
- putenv ('TZ='. $LUSER->getTimeZone());
header ('Cache-Control: private');
require_once forge_get_config('themes_root').'/'.$LUSER->setUpTheme().'/Theme.class.php';
} else {
require_once $gfcommon.'include/gettext.php';
require_once $gfcommon.'include/group_section_texts.php';
+ setup_tz_from_context();
setup_gettext_from_context();
}