forked from extern/egroupware
- fail with error message, if user trys to export more entries then allowed (previously entries were silently cut down to allowed number, even 0!)
- fixed path of document-actions if more then one directory with subdirectories were given
This commit is contained in:
Ralf Becker
parent
16d59dc3b4
commit
92ddeca1fb
@ -22,12 +22,6 @@ class addressbook_merge extends bo_merge
|
||||
*/
|
||||
var $public_functions = array('show_replacements' => true);
|
||||
|
||||
/**
|
||||
* Addressbook defines its own export limit, which should take precidence over
|
||||
* global limit.
|
||||
*/
|
||||
private $exported = 0;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
@ -36,7 +30,12 @@ class addressbook_merge extends bo_merge
|
||||
function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
$GLOBALS['egw_info']['server']['contact_export_limit'];
|
||||
|
||||
// overwrite global export-limit, if an addressbook one is set
|
||||
if ($GLOBALS['egw_info']['server']['contact_export_limit'])
|
||||
{
|
||||
$this->export_limit = $GLOBALS['egw_info']['server']['contact_export_limit'];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -48,11 +47,6 @@ class addressbook_merge extends bo_merge
|
||||
*/
|
||||
protected function get_replacements($id,&$content=null)
|
||||
{
|
||||
if($GLOBALS['egw_info']['server']['contact_export_limit'] && !$GLOBALS['egw_info']['user']['apps']['admin'])
|
||||
{
|
||||
if($GLOBALS['egw_info']['server']['contact_export_limit'] == 'no') return false;
|
||||
if($this->exported > $GLOBALS['egw_info']['server']['contact_export_limit']) return false;
|
||||
}
|
||||
if (!($replacements = $this->contact_replacements($id)))
|
||||
{
|
||||
return false;
|
||||
@ -61,7 +55,6 @@ class addressbook_merge extends bo_merge
|
||||
{
|
||||
$replacements += $this->calendar_replacements($id,!(strpos($content,'$$calendar/-1/') === false));
|
||||
}
|
||||
$this->exported++;
|
||||
return $replacements;
|
||||
}
|
||||
|
||||
|
||||
@ -583,7 +583,7 @@ class addressbook_ui extends addressbook_bo
|
||||
|
||||
$actions['documents'] = addressbook_merge::document_action(
|
||||
$this->prefs['document_dir'], $group, 'Insert in document', 'document_',
|
||||
$this->prefs['default_document']
|
||||
$this->prefs['default_document'], $this->config['contact_export_limit']
|
||||
);
|
||||
|
||||
++$group;
|
||||
@ -860,6 +860,7 @@ class addressbook_ui extends addressbook_bo
|
||||
if (!$document) $document = $this->prefs['default_document'];
|
||||
$document_merge = new addressbook_merge();
|
||||
$msg = $document_merge->download($document, $checked, '', $this->prefs['document_dir']);
|
||||
$failed = count($checked);
|
||||
return false;
|
||||
|
||||
case 'infolog_add':
|
||||
|
||||
@ -47,6 +47,15 @@ abstract class bo_merge
|
||||
*/
|
||||
var $table_plugins = array();
|
||||
|
||||
/**
|
||||
* Export limit in number of entries or some non-numerical value, if no export allowed at all, empty means no limit
|
||||
*
|
||||
* Set by constructor to $GLOBALS[egw_info][server][export_limit]
|
||||
*
|
||||
* @var int|string
|
||||
*/
|
||||
public $export_limit;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
@ -58,6 +67,8 @@ abstract class bo_merge
|
||||
|
||||
$this->datetime_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' '.
|
||||
($GLOBALS['egw_info']['user']['preferences']['common']['timeformat']==12 ? 'h:i a' : 'H:i');
|
||||
|
||||
$this->export_limit = $GLOBALS['egw_info']['server']['export_limit'];
|
||||
}
|
||||
|
||||
/**
|
||||
@ -281,16 +292,20 @@ abstract class bo_merge
|
||||
$err = lang("Document '%1' does not exist or is not readable for you!",$document);
|
||||
return false;
|
||||
}
|
||||
|
||||
// check export-limit and fail if user tries to export more entries then allowed
|
||||
if ($this->export_limit && //!$GLOBALS['egw_info']['user']['apps']['admin'] &&
|
||||
count($ids) > (int)$this->export_limit)
|
||||
{
|
||||
$err = lang('No rights to export more then %1 entries!',(int)$this->export_limit);
|
||||
return false;
|
||||
}
|
||||
|
||||
// fix application/msword mimetype for rtf files
|
||||
if ($mimetype == 'application/msword' && strtolower(substr($document,-4)) == '.rtf')
|
||||
{
|
||||
$mimetype = 'application/rtf';
|
||||
}
|
||||
|
||||
$config = config::read('phpgwapi');
|
||||
if($config['export_limit'] && !$GLOBALS['egw_info']['user']['apps']['admin']) {
|
||||
$ids = array_slice($ids, 0, (int)$config['export_limit']);
|
||||
}
|
||||
return $this->merge_string($content,$ids,$err,$mimetype,$fix);
|
||||
}
|
||||
|
||||
@ -757,6 +772,7 @@ abstract class bo_merge
|
||||
*/
|
||||
public function download($document, $ids, $name='', $dirs='')
|
||||
{
|
||||
//error_log(__METHOD__."('$document', ".array2string($ids).", '$name', dirs='$dirs')");
|
||||
if (($error = $this->check_document($document, $dirs)))
|
||||
{
|
||||
return $error;
|
||||
@ -808,6 +824,7 @@ abstract class bo_merge
|
||||
}
|
||||
if (!($merged =& $this->merge($content_url,$ids,$err,$mimetype,$fix)))
|
||||
{
|
||||
//error_log(__METHOD__."() !this->merge() err=$err");
|
||||
return $err;
|
||||
}
|
||||
if(!empty($name))
|
||||
@ -864,21 +881,22 @@ abstract class bo_merge
|
||||
/**
|
||||
* Get a list of document actions / files from the given directory
|
||||
*
|
||||
* @param dir Directory to search
|
||||
*
|
||||
* @param string $dirs Directory(s comma or space separated) to search
|
||||
* @return List of documents, suitable for a selectbox. The key is document_<filename>.
|
||||
*/
|
||||
public static function get_documents($dir, $prefix='document_')
|
||||
public static function get_documents($dirs, $prefix='document_')
|
||||
{
|
||||
if (!$dir) return array();
|
||||
if (!$dirs) return array();
|
||||
|
||||
// split multiple comma or whitespace separated directories
|
||||
// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
|
||||
if (count($dir = preg_split('/[,\s]+\//', $dir)) > 1)
|
||||
if (count($dirs = preg_split('/[,\s]+\//', $dirs)) > 1)
|
||||
{
|
||||
foreach($dir as $n => &$d) if ($n) $d = '/'.$d; // re-adding trailing slash removed by split
|
||||
foreach($dirs as $n => &$d) if ($n) $d = '/'.$d; // re-adding trailing slash removed by split
|
||||
}
|
||||
$list = array();
|
||||
foreach($dirs as $dir)
|
||||
{
|
||||
if (($files = egw_vfs::find($dir,array('need_mime'=>true),true)))
|
||||
{
|
||||
foreach($files as $file)
|
||||
@ -889,6 +907,7 @@ abstract class bo_merge
|
||||
$list[$prefix.$file['name']] = egw_vfs::decodePath($file['name']);
|
||||
}
|
||||
}
|
||||
}
|
||||
return $list;
|
||||
}
|
||||
|
||||
@ -902,15 +921,19 @@ abstract class bo_merge
|
||||
*
|
||||
* If more then SHOW_DOCS_BY_MIME_LIMIT=10 documents found, they are displayed in submenus by mime type.
|
||||
*
|
||||
* @param string $dir
|
||||
* @param string $dirs Directory(s comma or space separated) to search
|
||||
* @param int $group see nextmatch_widget::egw_actions
|
||||
* @param string $caption='Insert in document'
|
||||
* @param string $prefix='document_'
|
||||
* @param string $default_doc='' full path to default document to show on top with action == 'document'!
|
||||
* @param int|string $export_limit=null export-limit, default $GLOBALS['egw_info']['server']['export_limit']
|
||||
* @return array see nextmatch_widget::egw_actions
|
||||
*/
|
||||
public static function document_action($dir, $group=0, $caption='Insert in document', $prefix='document_', $default_doc='')
|
||||
public static function document_action($dirs, $group=0, $caption='Insert in document', $prefix='document_', $default_doc='',
|
||||
$export_limit=null)
|
||||
{
|
||||
if (is_null($export_limit)) $export_limit = $GLOBALS['egw_info']['server']['export_limit'];
|
||||
|
||||
$documents = array();
|
||||
|
||||
if ($default_doc && ($file = egw_vfs::stat($default_doc))) // put default document on top
|
||||
@ -922,22 +945,29 @@ abstract class bo_merge
|
||||
);
|
||||
}
|
||||
|
||||
$files = array();
|
||||
if ($dirs)
|
||||
{
|
||||
// split multiple comma or whitespace separated directories
|
||||
// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
|
||||
if ($dir && count($dir = preg_split('/[,\s]+\//', $dir)) > 1)
|
||||
if (count($dirs = preg_split('/[,\s]+\//', $dirs)) > 1)
|
||||
{
|
||||
foreach($dir as $n => &$d) if ($n) $d = '/'.$d; // re-adding trailing slash removed by split
|
||||
foreach($dirs as $n => &$d) if ($n) $d = '/'.$d; // re-adding trailing slash removed by split
|
||||
}
|
||||
if ($dir && ($files = egw_vfs::find($dir,array(
|
||||
foreach($dirs as $dir)
|
||||
{
|
||||
$files += egw_vfs::find($dir,array(
|
||||
'need_mime' => true,
|
||||
'order' => 'fs_name',
|
||||
'sort' => 'ASC',
|
||||
),true)))
|
||||
{
|
||||
),true);
|
||||
}
|
||||
}
|
||||
foreach($files as $key => $file)
|
||||
{
|
||||
// use only the mime-types we support
|
||||
if (!self::is_implemented($file['mime'],'.'.array_pop($parts=explode('.',$file['name']))) ||
|
||||
!egw_vfs::check_access($file['path'], egw_vfs::READABLE, $file) || // remove files not readable by user
|
||||
$file['path'] === $default_doc) // default doc already added
|
||||
{
|
||||
unset($files[$key]);
|
||||
@ -967,14 +997,14 @@ abstract class bo_merge
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return array(
|
||||
'icon' => 'etemplate/merge',
|
||||
'caption' => $caption,
|
||||
'children' => $documents,
|
||||
'enabled' => (boolean)$documents,
|
||||
'hideOnDisabled' => true, // do not show 'Insert in document', if no documents defined
|
||||
// disable action if no document or export completly forbidden for non-admins
|
||||
'enabled' => (boolean)$documents && (empty($export_limit) ||
|
||||
(int)$export_limit > 0 || $GLOBALS['egw_info']['user']['apps']['admin']),
|
||||
'hideOnDisabled' => true, // do not show 'Insert in document', if no documents defined or no export allowed
|
||||
'group' => $group,
|
||||
);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user