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

Hide exporting for admins too, if they've disabled exporting site-wide

Browse Source
This commit is contained in:
Nathan Gray 2011-02-23 16:45:19 +00:00
parent c4165cbe55
commit 75ba2fc475
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php
View File

@ -33,7 +33,7 @@ class importexport_admin_prefs_sidebox_hooks
), ),
); );
$config = config::read('phpgwapi'); $config = config::read('phpgwapi');
if($GLOBALS['egw_info']['user']['apps']['admin'] || $config['export_limit'] !== 'no') if($config['export_limit'] !== 'no')
{ {
$file[] = array( $file[] = array(
'text' => 'Export', 'text' => 'Export',

11
importexport/inc/class.importexport_definitions_ui.inc.php
View File

@ -83,16 +83,13 @@ class importexport_definitions_ui
if(!$GLOBALS['egw_info']['user']['apps']['admin']) { if(!$GLOBALS['egw_info']['user']['apps']['admin']) {
// Filter private definitions // Filter private definitions
$filter['owner'] = $GLOBALS['egw_info']['user']['account_id']; $filter['owner'] = $GLOBALS['egw_info']['user']['account_id'];
$config = config::read('phpgwapi');
if($config['export_limit'] == 'no') {
$filter['type'] = 'import';
}
} else { } else {
$filter[] = '!owner || owner IS NULL'; $filter[] = '!owner || owner IS NULL';
} }
$config = config::read('phpgwapi');
if($config['export_limit'] == 'no') {
$filter['type'] = 'import';
}
$bodefinitions = new importexport_definitions_bo($filter, true); $bodefinitions = new importexport_definitions_bo($filter, true);
if (is_array($content)) if (is_array($content))

9
importexport/inc/class.importexport_export_ui.inc.php
View File

@ -49,12 +49,11 @@ class importexport_export_ui {
$preserv = array(); $preserv = array();
// Check global setting // Check global setting
if(!$GLOBALS['egw_info']['user']['apps']['admin']) { $config = config::read('phpgwapi');
$config = config::read('phpgwapi'); if($config['export_limit'] == 'no') {
if($config['export_limit'] == 'no') { die(lang('Admin disabled exporting'));
die(lang('Admin disabled exporting'));
}
} }
$et = new etemplate(self::_appname. '.export_dialog'); $et = new etemplate(self::_appname. '.export_dialog');
$_appname = $_content['appname'] ? $_content['appname'] : $_GET['appname']; $_appname = $_content['appname'] ? $_content['appname'] : $_GET['appname'];
$_definition = $_content['definition'] ? $_content['definition'] : $_GET['definition']; $_definition = $_content['definition'] ? $_content['definition'] : $_GET['definition'];