extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-02 11:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for: calling setup, sets some config values to default, all the time

Browse Source
This commit is contained in:
Klaus Leithoff 2010-04-06 15:30:36 +00:00
parent 9262a0adf3
commit f69c071685
1 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
phpgwapi/inc/class.egw_session.inc.php
View File

@ -167,55 +167,59 @@ class egw_session
$this->egw_domains = $domain_names; $this->egw_domains = $domain_names;
// verfiy and if necessary create and save our config settings if (!isset($GLOBALS['egw_setup']))
//
$save_rep = false;
if (!isset($GLOBALS['egw_info']['server']['max_access_log_age']))
{ {
$GLOBALS['egw_info']['server']['max_access_log_age'] = 90; // default 90 days // verfiy and if necessary create and save our config settings
$save_rep = true; //
} $save_rep = false;
if (!isset($GLOBALS['egw_info']['server']['block_time'])) if (!isset($GLOBALS['egw_info']['server']['max_access_log_age']))
{ {
$GLOBALS['egw_info']['server']['block_time'] = 5; // default 5min $GLOBALS['egw_info']['server']['max_access_log_age'] = 90; // default 90 days
$save_rep = true; $save_rep = true;
} }
if (!isset($GLOBALS['egw_info']['server']['num_unsuccessful_id'])) if (!isset($GLOBALS['egw_info']['server']['block_time']))
{ {
$GLOBALS['egw_info']['server']['num_unsuccessful_id'] = 3; // default 3 trys per id $GLOBALS['egw_info']['server']['block_time'] = 5; // default 5min
$save_rep = true; $save_rep = true;
} }
if (!isset($GLOBALS['egw_info']['server']['num_unsuccessful_ip'])) if (!isset($GLOBALS['egw_info']['server']['num_unsuccessful_id']))
{ {
$GLOBALS['egw_info']['server']['num_unsuccessful_ip'] = $GLOBALS['egw_info']['server']['num_unsuccessful_id']; // default same as for id $GLOBALS['egw_info']['server']['num_unsuccessful_id'] = 3; // default 3 trys per id
$save_rep = true; $save_rep = true;
} }
if (!isset($GLOBALS['egw_info']['server']['install_id'])) if (!isset($GLOBALS['egw_info']['server']['num_unsuccessful_ip']))
{ {
$GLOBALS['egw_info']['server']['install_id'] = md5(common::randomstring(15)); $GLOBALS['egw_info']['server']['num_unsuccessful_ip'] = $GLOBALS['egw_info']['server']['num_unsuccessful_id']; // default same as for id
} $save_rep = true;
if (!isset($GLOBALS['egw_info']['server']['sessions_timeout'])) }
{ if (!isset($GLOBALS['egw_info']['server']['install_id']))
$GLOBALS['egw_info']['server']['sessions_timeout'] = 14400; {
$save_rep = true; $GLOBALS['egw_info']['server']['install_id'] = md5(common::randomstring(15));
} }
if (!isset($GLOBALS['egw_info']['server']['max_history'])) if (!isset($GLOBALS['egw_info']['server']['sessions_timeout']))
{ {
$GLOBALS['egw_info']['server']['max_history'] = 20; $GLOBALS['egw_info']['server']['sessions_timeout'] = 14400;
$save_rep = true; $save_rep = true;
} }
if ($save_rep) if (!isset($GLOBALS['egw_info']['server']['max_history']))
{ {
$config = new config('phpgwapi'); $GLOBALS['egw_info']['server']['max_history'] = 20;
$config->read_repository(); $save_rep = true;
$config->value('max_access_log_age',$GLOBALS['egw_info']['server']['max_access_log_age']); }
$config->value('block_time',$GLOBALS['egw_info']['server']['block_time']);
$config->value('num_unsuccessful_id',$GLOBALS['egw_info']['server']['num_unsuccessful_id']); if ($save_rep)
$config->value('num_unsuccessful_ip',$GLOBALS['egw_info']['server']['num_unsuccessful_ip']); {
$config->value('install_id',$GLOBALS['egw_info']['server']['install_id']); $config = new config('phpgwapi');
$config->value('sessions_timeout',$GLOBALS['egw_info']['server']['sessions_timeout']); $config->read_repository();
$config->value('max_history',$GLOBALS['egw_info']['server']['max_history']); $config->value('max_access_log_age',$GLOBALS['egw_info']['server']['max_access_log_age']);
$config->save_repository(); $config->value('block_time',$GLOBALS['egw_info']['server']['block_time']);
$config->value('num_unsuccessful_id',$GLOBALS['egw_info']['server']['num_unsuccessful_id']);
$config->value('num_unsuccessful_ip',$GLOBALS['egw_info']['server']['num_unsuccessful_ip']);
$config->value('install_id',$GLOBALS['egw_info']['server']['install_id']);
$config->value('sessions_timeout',$GLOBALS['egw_info']['server']['sessions_timeout']);
$config->value('max_history',$GLOBALS['egw_info']['server']['max_history']);
$config->save_repository();
}
} }
self::set_cookiedomain(); self::set_cookiedomain();
ini_set('session.gc_maxlifetime', $GLOBALS['egw_info']['server']['sessions_timeout']); ini_set('session.gc_maxlifetime', $GLOBALS['egw_info']['server']['sessions_timeout']);