holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"remembering admins previous selection for:

Browse Source 
- country
- usage_type"
This commit is contained in:
Ralf Becker 2009-11-17 20:31:48 +00:00
parent 4181ddaecf
commit 118a2e0874
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
admin/inc/class.admin_statistics.inc.php
View File

@ -19,6 +19,8 @@ class admin_statistics
const CONFIG_LAST_SUBMIT = 'last_statistics_submit'; const CONFIG_LAST_SUBMIT = 'last_statistics_submit';
const CONFIG_POSTPONE_SUBMIT = 'postpone_statistics_submit'; const CONFIG_POSTPONE_SUBMIT = 'postpone_statistics_submit';
const CONFIG_SUBMIT_ID = 'statistics_submit_id'; const CONFIG_SUBMIT_ID = 'statistics_submit_id';
const CONFIG_COUNTRY = 'country_submit';
const CONFIG_USAGE_TYPE = 'usage_type_submit';
const CONFIG_INSTALL_TYPE = 'install_type_submit'; const CONFIG_INSTALL_TYPE = 'install_type_submit';
const SUBMIT_URL = 'http://www.egroupware-server.org/usage-statistic'; const SUBMIT_URL = 'http://www.egroupware-server.org/usage-statistic';
@ -54,6 +56,8 @@ class admin_statistics
{ {
config::save_value(self::CONFIG_LAST_SUBMIT,time(),self::CONFIG_APP); config::save_value(self::CONFIG_LAST_SUBMIT,time(),self::CONFIG_APP);
config::save_value(self::CONFIG_SUBMIT_ID,empty($content['submit_id']) ? '***none***' : $content['submit_id'],self::CONFIG_APP); config::save_value(self::CONFIG_SUBMIT_ID,empty($content['submit_id']) ? '***none***' : $content['submit_id'],self::CONFIG_APP);
config::save_value(self::CONFIG_COUNTRY,empty($content['country']) ? '***multinational***' : $content['country'],self::CONFIG_APP);
config::save_value(self::CONFIG_USAGE_TYPE,$content['usage_type'],self::CONFIG_APP);
config::save_value(self::CONFIG_INSTALL_TYPE,$content['install_type'],self::CONFIG_APP); config::save_value(self::CONFIG_INSTALL_TYPE,$content['install_type'],self::CONFIG_APP);
config::save_value(self::CONFIG_POSTPONE_SUBMIT,null,self::CONFIG_APP); // remove evtl. postpone time config::save_value(self::CONFIG_POSTPONE_SUBMIT,null,self::CONFIG_APP); // remove evtl. postpone time
$what = 'submited'; $what = 'submited';
@ -95,11 +99,21 @@ class admin_statistics
)); ));
//_debug_array($content); //_debug_array($content);
// use previous submit ID // show previous submit ID
if ($config['statistics_submit_id']) if ($config['statistics_submit_id'])
{ {
$content['submit_id'] = $config['statistics_submit_id'] == '***none***' ? '' : $config['statistics_submit_id']; $content['submit_id'] = $config['statistics_submit_id'] == '***none***' ? '' : $config['statistics_submit_id'];
} }
// show previous country
if ($config[self::CONFIG_COUNTRY])
{
$content['country'] = $config[self::CONFIG_COUNTRY] == '***multinational***' ? '' : $config[self::CONFIG_COUNTRY];
}
// show previous usage_type
if ($config[self::CONFIG_USAGE_TYPE])
{
$content['usage_type'] = $config[self::CONFIG_USAGE_TYPE];
}
// check if we detected svn or rpm/deb packages --> readonly // check if we detected svn or rpm/deb packages --> readonly
if ($content['install_type'] && isset($sel_options['install_type'][$content['install_type']])) if ($content['install_type'] && isset($sel_options['install_type'][$content['install_type']]))
{ {