Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only accept zip files if supported; use filename part only for temp file

Browse source
This commit is contained in:
Thomas Bruederli 2013-10-23 14:23:24 +02:00
parent 6d7acac603
commit a694b7ad9e
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/calendar.php
View file

@ -1014,7 +1014,7 @@ class calendar extends rcube_plugin
for ($i = 0; $i < $zip->numFiles; $i++) { for ($i = 0; $i < $zip->numFiles; $i++) {
$filename = $zip->getNameIndex($i); $filename = $zip->getNameIndex($i);
if (preg_match('/\.ics$/i', $filename)) { if (preg_match('/\.ics$/i', $filename)) {
$tmpfile = $tmpdir . '/' . $filename; $tmpfile = $tmpdir . '/' . basename($filename);
if (copy('zip://' . $_FILES['_data']['tmp_name'] . '#'.$filename, $tmpfile)) { if (copy('zip://' . $_FILES['_data']['tmp_name'] . '#'.$filename, $tmpfile)) {
$count += $this->import_from_file($tmpfile, $calendar, $rangestart, $errors); $count += $this->import_from_file($tmpfile, $calendar, $rangestart, $errors);
unlink($tmpfile); unlink($tmpfile);

7
plugins/calendar/lib/calendar_ui.php
View file

@ -536,9 +536,14 @@ class calendar_ui
// Get max filesize, enable upload progress bar // Get max filesize, enable upload progress bar
$max_filesize = rcube_upload_init(); $max_filesize = rcube_upload_init();
$accept = '.ics, text/calendar, text/x-vcalendar, application/ics';
if (class_exists('ZipArchive', false)) {
$accept .= ', .zip, application/zip';
}
$input = new html_inputfield(array( $input = new html_inputfield(array(
'type' => 'file', 'name' => '_data', 'size' => $attrib['uploadfieldsize'], 'type' => 'file', 'name' => '_data', 'size' => $attrib['uploadfieldsize'],
'accept' => '.ics, text/calendar, text/x-vcalendar, application/ics, .zip, application/zip')); 'accept' => $accept));
$select = new html_select(array('name' => '_range', 'id' => 'event-import-range')); $select = new html_select(array('name' => '_range', 'id' => 'event-import-range'));
$select->add(array( $select->add(array(