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

code cleanup: as bo_merge::is_export_limit_excepted checks for ->is Admin<- already

Browse Source
This commit is contained in:
Klaus Leithoff 2011-08-30 15:27:47 +00:00
parent 1d8034e17b
commit 25fcf25bdb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ class importexport_admin_prefs_sidebox_hooks
), ),
); );
$config = config::read('phpgwapi'); $config = config::read('phpgwapi');
if($GLOBALS['egw_info']['user']['apps']['admin'] || bo_merge::is_export_limit_excepted() || $config['export_limit'] !== 'no') if(bo_merge::is_export_limit_excepted() || $config['export_limit'] !== 'no')
{ {
$file[] = array( $file[] = array(
'text' => 'Export', 'text' => 'Export',
@ -122,7 +122,7 @@ class importexport_admin_prefs_sidebox_hooks
} }
} }
$config = config::read('phpgwapi'); $config = config::read('phpgwapi');
if (($GLOBALS['egw_info']['user']['apps']['admin'] || bo_merge::is_export_limit_excepted() || !$config['export_limit'] || $config['export_limit'] > 0) && $cache[$appname]['export']) if ((bo_merge::is_export_limit_excepted() || !$config['export_limit'] || $config['export_limit'] > 0) && $cache[$appname]['export'])
{ {
$file['Export CSV'] = array('link' => "javascript:egw_openWindowCentered2('". $file['Export CSV'] = array('link' => "javascript:egw_openWindowCentered2('".
egw::link('/index.php',array( egw::link('/index.php',array(

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

@ -101,7 +101,7 @@ class importexport_export_csv implements importexport_iface_export_record
$this->csv_options = array_merge( $this->csv_options, $_options ); $this->csv_options = array_merge( $this->csv_options, $_options );
} }
if(!($GLOBALS['egw_info']['user']['apps']['admin'] || bo_merge::is_export_limit_excepted())) { if(!bo_merge::is_export_limit_excepted()) {
$config = config::read('phpgwapi'); $config = config::read('phpgwapi');
if($config['export_limit'] == 'no') throw new egw_exception_no_permission_admin('Export disabled'); if($config['export_limit'] == 'no') throw new egw_exception_no_permission_admin('Export disabled');
$this->export_limit = (int)$config['export_limit']; $this->export_limit = (int)$config['export_limit'];

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

@ -49,7 +49,7 @@ class importexport_export_ui {
$preserv = array(); $preserv = array();
// Check global setting // Check global setting
if(!($GLOBALS['egw_info']['user']['apps']['admin'] || bo_merge::is_export_limit_excepted())) { if(!bo_merge::is_export_limit_excepted()) {
$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'));