extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 09:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar - add filters to iCal export definitions

Browse Source
This commit is contained in:
nathangray 2018-12-05 11:13:29 -07:00
parent b67fc51893
commit e05ab4e7b7
2 changed files with 109 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
calendar/inc/class.calendar_export_ical.inc.php
View File

@ -34,8 +34,9 @@ class calendar_export_ical extends calendar_export_csv {
$limit_exception = Api\Storage\Merge::is_export_limit_excepted();
if (!$limit_exception) $export_limit = Api\Storage\Merge::getExportLimit('calendar');
if($options['selection'] == 'criteria')
switch($options['selection'])
{
case 'criteria':
$query = array(
'start' => $options['criteria']['start'],
'end' => $options['criteria']['end'] ? strtotime('+1 day',$options['criteria']['end'])-1 : null,
@ -49,35 +50,75 @@ class calendar_export_ical extends calendar_export_csv {
$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
}
$events =& $this->bo->search($query);
}
// Scheduled export will use 'all', which we don't allow through UI
elseif ($options['selection'] == 'search_results' || $options['selection'] == 'all')
{
break;
case 'search_results':
$states = $this->bo->cal_prefs['saved_states'];
$query = Api\Cache::getSession('calendar', 'calendar_list');
$query['num_rows'] = -1; // all
$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
$query['start'] = 0;
$query['cfs'] = $cfs;
if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
{
$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
}
$ui = new calendar_uilist();
if($states['view'] == 'listview')
{
$unused = null;
$ui->get_rows($query, $events, $unused);
}
else
{
$query = Api\Cache::getSession('calendar', 'session_data');
$query['users'] = explode(',', $query['owner']);
$query['num_rows'] = -1;
$query['filter'] = 'custom';
$events = array();
$ui->get_rows($query, $events, $unused);
}
// Filter out extra things like sel_options
unset($events['sel_options']);
break;
case 'filter':
$fields = importexport_helper_functions::get_filter_fields($_definition->application, $this);
$filter = $_definition->filter;
if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
{
$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
}
// Handle ranges
foreach($filter as $field => $value)
{
if($field == 'filter' && $value)
{
$query['filter'] = $value;
continue;
}
if(!is_array($value) || (!$value['from'] && !$value['to']))
{
$query['query']["cal_$field"] = $value;
continue;
}
// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
if($value['from']) $query['sql_filter'][] = "cal_$field >= " . (int)$value['from'];
if($value['to']) $query['sql_filter'][] = "cal_$field <= " . (int)$value['to'];
}
if($query['sql_filter'] && is_array($query['sql_filter']))
{
// Set as an extra parameter
$sql_filter = implode(' AND ',$query['sql_filter']);
}
// Fall through
case 'all':
$events = $this->bo->search($query + array(
'offset' => 0,
'order' => 'cal_start',
),$sql_filter);
break;
}
// compile list of unique cal_id's, as iCal should contain whole series, not recurrences
// calendar_ical->exportVCal needs to read events again, to get them in server-time
@ -147,7 +188,6 @@ class calendar_export_ical extends calendar_export_csv {
*/
public function get_selectors_etpl($definition = null) {
$data = parent::get_selectors_etpl($definition);
$data['content']['no_filter'] = true;
return $data;
}
/**

26
calendar/inc/class.calendar_wizard_export_ical.inc.php Normal file
View File

@ -0,0 +1,26 @@
<?php
/**
* Wizard for exporting iCal
*
* @link http://www.egroupware.org
* @author Nathan Gray
* @package calendar
* @subpackage importexport
* @copyright (c) 2018 Nathan Gray
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
*/
use EGroupware\Api;
class calendar_wizard_export_ical extends importexport_wizard_basic_export_csv {
public function __construct() {
parent::__construct();
$this->steps = array(
'wizard_step80' => lang('Filters'),
);
}
}