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

* CalDAV: preference to overwrite default on how many days to sync into past or future

Browse Source
This commit is contained in:
Ralf Becker 2013-03-14 17:13:59 +00:00
parent 382b12b29a
commit fc4545d1ea
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
calendar/inc/class.calendar_groupdav.inc.php
View File

@ -127,6 +127,9 @@ class calendar_groupdav extends groupdav_handler
return $name;
}
const PAST_LIMIT = 100;
const FUTURE_LIMIT = 365;
/**
* Handle propfind in the calendar folder
*
@ -152,13 +155,22 @@ class calendar_groupdav extends groupdav_handler
// ToDo: add parameter to only return id & etag
$filter = array(
'users' => $user,
'start' => $this->bo->now - 100*24*3600, // default one month back -30 breaks all sync recurrences
'end' => $this->bo->now + 365*24*3600, // default one year into the future +365
'enum_recuring' => false,
'daywise' => false,
'date_format' => 'server',
'no_total' => true, // we need no total number of rows (saves extra query)
);
foreach(array(
'start' => $GLOBALS['egw_info']['user']['preferences']['groupdav']['calendar-past-limit'],
'end' => $GLOBALS['egw_info']['user']['preferences']['groupdav']['calendar-future-limit'],
) as $name => $value)
{
if (!is_numeric($value))
{
$value = $name == 'start' ? self::PAST_LIMIT : self::FUTURE_LIMIT;
}
$filter[$name] = $this->bo->now + 24*2600*($name == 'start' ? -1 : 1)*abs($value);
}
if ($this->client_shared_uid_exceptions) // do NOT return (non-virtual) exceptions
{
$filter['query'] = array('cal_reference' => 0);
@ -1527,6 +1539,22 @@ class calendar_groupdav extends groupdav_handler
'xmlrpc' => True,
'admin' => False,
);
$settings['calendar-past-limit'] = array(
'type' => 'input',
'label' => lang('How many days to sync in the past (default %1)', self::PAST_LIMIT),
'name' => 'calendar-past-limit',
'help' => 'Clients not explicitly stating a limit get limited to these many days. A too high limit may cause problems with some clients.',
'xmlrpc' => True,
'admin' => False,
);
$settings['calendar-future-limit'] = array(
'type' => 'input',
'label' => lang('How many days to sync in the future (default %1)', self::FUTURE_LIMIT),
'name' => 'calendar-future-limit',
'help' => 'Clients not explicitly stating a limit get limited to these many days. A too high limit may cause problems with some clients.',
'xmlrpc' => True,
'admin' => False,
);
// allow to subscribe to resources
if ($GLOBALS['egw_info']['user']['apps']['resources'] && ($all_resources = groupdav_principals::get_resources()))

3
phpgwapi/lang/egw_de.lang
View File

@ -170,6 +170,7 @@ click here to resume your egroupware session. common de Hier klicken um die EGro
click or mouse over to show menus common de Klicken oder "mit dem Mauszeiger darüber fahren" um das Menü anzuzeigen.
click or mouse over to show menus? common de Klicken oder "mit dem Mauszeiger darüber fahren" um das Menü anzuzeigen?
click this image on the navbar: %1 common de Klicken Sie auf dieses Symbol in der Navigation: %1
clients not explicitly stating a limit get limited to these many days. a too high limit may cause problems with some clients. groupdav de Geräte die kein explicites Limit setzen, verwenden die angegebene Anzahl Tage. Ein zu hohes Limit kann bei einigen Geräte zu Problemen führen.
close common de Schließen
close sidebox common de Seitenmenü schließen
cocos (keeling) islands common de COCOS INSELN
@ -359,6 +360,8 @@ home common de Home
home email common de private E-Mail
honduras common de HONDURAS
hong kong common de HONG KONG
how many days to sync in the future (default %1) groupdav de Wie viele Tage soll in die Zukunft gesynced werden (Vorgabe %1)
how many days to sync in the past (default %1) groupdav de Wie viele Tage soll in die Vergangenheit gesynced werden (Vorgabe %1)
how many icons should be shown in the navbar (top of the page). additional icons go into a kind of pulldown menu, callable by the icon on the far right side of the navbar. common de Wie viele Icons sollen in der Navigation angezeigt werden (die obere Navigation). Weitere Applikationen werden über ein Auswahlmenü angeboten. Das Auswahlmenü kann über das rechte Icon geöffnet werden
how to show the general egroupware menu ? common de Wie soll das allgemeine EGroupware Menü angezeigt werden?
hungary common de UNGARN

3
phpgwapi/lang/egw_en.lang
View File

@ -170,6 +170,7 @@ click here to resume your egroupware session. common en Click to resume your EGr
click or mouse over to show menus common en Click or mouse over to show menus.
click or mouse over to show menus? common en Click or mouse over to show menus.
click this image on the navbar: %1 common en Click this image on the navbar: %1
clients not explicitly stating a limit get limited to these many days. a too high limit may cause problems with some clients. groupdav en Clients not explicitly stating a limit get limited to these many days. A too high limit may cause problems with some clients.
close common en Close
close sidebox common en Close side menu
cocos (keeling) islands common en COCOS (KEELING) ISLANDS
@ -359,6 +360,8 @@ home common en Home
home email common en Home email
honduras common en HONDURAS
hong kong common en HONG KONG
how many days to sync in the future (default %1) groupdav en How many days to sync in the future (default %1)
how many days to sync in the past (default %1) groupdav en How many days to sync in the past (default %1)
how many icons should be shown in the navbar (top of the page). additional icons go into a kind of pulldown menu, callable by the icon on the far right side of the navbar. common en How many icons should be shown in the top navigation bar. Additional icons go into a pull down menu, callable by the icon on the far right side of the navigation bar.
how to show the general egroupware menu ? common en How to show the general EGroupware menu
hungary common en HUNGARY