[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] [20840] update calendar
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] [20840] update calendar |
|
Date: |
Fri, 20 Nov 2009 10:27:23 +0000 |
Revision: 20840
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20840
Author: sigurdne
Date: 2009-11-20 10:27:23 +0000 (Fri, 20 Nov 2009)
Log Message:
-----------
update calendar
Modified Paths:
--------------
people/sigurdne/modules/calendar/trunk/ical.php
people/sigurdne/modules/calendar/trunk/inc/class.boalarm.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.bocalendar.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.bocustom_fields.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.boholiday.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.boicalendar.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.calendar_holiday.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.calendar_icap.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.holidaycalc.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.holidaycalc_JP.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.holidaycalc_US.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.html.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.menu.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.socalendar.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.socalendar_.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.socalendar__.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.socalendar_sql.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.soholiday.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.uialarm.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.uicalendar.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.uicustom_fields.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.uiholiday.inc.php
people/sigurdne/modules/calendar/trunk/inc/class.uiicalendar.inc.php
people/sigurdne/modules/calendar/trunk/inc/hook_deleteaccount.inc.php
people/sigurdne/modules/calendar/trunk/inc/hook_email.inc.php
people/sigurdne/modules/calendar/trunk/inc/hook_home.inc.php
people/sigurdne/modules/calendar/trunk/phpgroupware.org/accept_holiday.php
people/sigurdne/modules/calendar/trunk/preferences.php
people/sigurdne/modules/calendar/trunk/setup/phpgw_it.lang
people/sigurdne/modules/calendar/trunk/setup/phpgw_sk.lang
people/sigurdne/modules/calendar/trunk/setup/phpgw_sv.lang
people/sigurdne/modules/calendar/trunk/templates/base/header.inc.php
people/sigurdne/modules/calendar/trunk/templates/base/preference_acl.tpl
people/sigurdne/modules/calendar/trunk/templates/base/preference_acl_row.tpl
people/sigurdne/modules/calendar/trunk/templates/base/preference_colspan.tpl
Added Paths:
-----------
people/sigurdne/modules/calendar/trunk/templates/portico/
people/sigurdne/modules/calendar/trunk/templates/portico/images/
people/sigurdne/modules/calendar/trunk/templates/portico/images/navbar.png
Modified: people/sigurdne/modules/calendar/trunk/ical.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/ical.php 2009-11-20 10:27:15 UTC
(rev 20839)
+++ people/sigurdne/modules/calendar/trunk/ical.php 2009-11-20 10:27:23 UTC
(rev 20840)
@@ -80,7 +80,7 @@
$uid = $GLOBALS['phpgw']->accounts->name2id($login);
- $sessionid = $GLOBALS['phpgw']->session->create($login, $passwd,
'text');
+ $sessionid = $GLOBALS['phpgw']->session->create($login, $passwd);
$params = array('owner' =>
(int)$GLOBALS['phpgw_info']['user']['person_id']);
$owner = $params['owner'];
Modified: people/sigurdne/modules/calendar/trunk/inc/class.boalarm.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.boalarm.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.boalarm.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -1,33 +1,19 @@
<?php
- /**
- * Javascript support class
- *
- * @author Dave Hall <address@hidden>
- * @author Mark Peters <address@hidden>
- * @author Craig Knudsen <address@hidden>
- * @internal Based on WebCalender by Craig Knudsen
http://www.radix.net/~cknudsen
- * @copyright Portions Copyright (C) 2003-2008 Free Software Foundation,
Inc http://www.fsf.org/
- * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
- * @package phpgroupware
- * @subpackage phpgwapi
- * @version $Id$
- */
+ /**************************************************************************\
+ * phpGroupWare - Calendar *
+ * http://www.phpgroupware.org *
+ * Based on Webcalendar by Craig Knudsen <address@hidden> *
+ * http://www.radix.net/~cknudsen *
+ * Modified by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
+ \**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ /* $Id$ */
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
phpgw::import_class('phpgwapi.datetime');
define('PHPGW_ACL_DELETEALARM',PHPGW_ACL_DELETE); // for now
@@ -223,3 +209,4 @@
return $deleted;
}
}
+?>
Modified: people/sigurdne/modules/calendar/trunk/inc/class.bocalendar.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.bocalendar.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.bocalendar.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -1,33 +1,19 @@
<?php
- /**
- * Calendar Business Logic
- *
- * @author Dave Hall <address@hidden>
- * @author Mark Peters <address@hidden>
- * @author Craig Knudsen <address@hidden>
- * @internal Based on WebCalender by Craig Knudsen
http://www.radix.net/~cknudsen
- * @copyright Portions Copyright (C) 2003-2008 Free Software Foundation,
Inc http://www.fsf.org/
- * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
- * @package phpgroupware
- * @subpackage phpgwapi
- * @version $Id$
- */
+ /**************************************************************************\
+ * phpGroupWare - Calendar *
+ * http://www.phpgroupware.org *
+ * Based on Webcalendar by Craig Knudsen <address@hidden> *
+ * http://www.radix.net/~cknudsen *
+ * Modified by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
+ \**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ /* $Id$ */
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
phpgw::import_class('phpgwapi.datetime');
class calendar_bocalendar
@@ -113,6 +99,7 @@
// var $debug = True;
var $so;
+ var $contacts;
var $cached_events;
var $repeating_events;
@@ -157,6 +144,7 @@
public function __construct($session = false)
{
$this->cat = CreateObject('phpgwapi.categories');
+ $this->contacts = createObject('phpgwapi.contacts');
$this->grants =
$GLOBALS['phpgw']->acl->get_grants('calendar','.');
if(DEBUG_APP)
@@ -190,7 +178,7 @@
$owner = phpgw::get_var('owner', 'int');
if ( !$owner )
{
- $owner =
$GLOBALS['phpgw']->contacts->is_contact($GLOBALS['phpgw_info']['user']['account_id']);
+ $owner =
$this->contacts->is_contact($GLOBALS['phpgw_info']['user']['account_id']);
}
//_debug_array($owner);
$referer = isset($_SERVER['HTTP_REFERER']) ?
$_SERVER['HTTP_REFERER'] : '';
@@ -236,7 +224,7 @@
}
elseif(!isset($this->owner) || !$this->owner)
{
- $this->owner =
$GLOBALS['phpgw']->contacts->is_contact($GLOBALS['phpgw_info']['user']['account_id']);
+ $this->owner =
$this->contacts->is_contact($GLOBALS['phpgw_info']['user']['account_id']);
}
$this->prefs['common'] =
$GLOBALS['phpgw_info']['user']['preferences']['common'];
@@ -442,31 +430,6 @@
}
}
- /**
- * List all events.
- *
- * @return array Array of all event IDs.
- */
- function list_events($startYear, $startMonth, $startDay,
$endYear = 0,
- $endMonth = 0, $endDay = 0, $lastmod = -1)
- {
- return $this->so->list_events(
- $startYear, $startMonth, $startDay,
- $endYear, $endMonth, $endDay,
- $this->owner, $lastmod);
- }
-
- /**
- * Check existance of an event.
- *
- * @param $event_id ID of event.
- * @return bool True if exists, false if not exists.
- */
- function exists($event_id)
- {
- return !is_null($this->read_entry($event_id));
- }
-
function set_owner_to_group($owner)
{
print_debug('calendar::bocalendar::set_owner_to_group:owner',$owner);
@@ -479,7 +442,7 @@
{
foreach ( $group_owners as $group_info )
{
- if($account_id =
$GLOBALS['phpgw']->contacts->is_contact($group_info['account_id']))
+ if($account_id =
$this->contacts->is_contact($group_info['account_id']))
{
$this->g_owner[] = $account_id;
}
@@ -495,7 +458,7 @@
$group_owners =
$GLOBALS['phpgw']->accounts->membership();
while($group_owners && list($index,$group_info) =
each($group_owners))
{
- if($this->owner ==
$GLOBALS['phpgw']->contacts->is_contact($group_info['account_id']) )
+ if($this->owner ==
$this->contacts->is_contact($group_info['account_id']) )
{
return True;
}
@@ -667,7 +630,7 @@
{
if($GLOBALS['phpgw_info']['user']['apps']['admin'])
{
-
$this->so->delete_calendar($GLOBALS['phpgw']->contacts->is_contact($owner));
+
$this->so->delete_calendar($this->contacts->is_contact($owner));
}
}
@@ -677,8 +640,8 @@
{
if(is_array($params))
{
-
$this->so->change_owner($GLOBALS['phpgw']->contacts->is_contact($params['old_owner']),
-
$GLOBALS['phpgw']->contacts->is_contact($params['new_owner']));
+
$this->so->change_owner($this->contacts->is_contact($params['old_owner']),
+
$this->contacts->is_contact($params['new_owner']));
}
}
}
@@ -727,40 +690,30 @@
return
$this->so->list_events_keyword($keywords,$members);
}
- function update($params = '', $send_to_ui = TRUE)
+ function update($params = '')
{
- $l_cal = isset($params['cal']) &&
is_array($params['cal']) ?
- $params['cal'] :
- phpgw::get_var('cal', 'string', 'POST');
+ $l_cal = isset($params['cal']) && $params['cal'] ?
$params['cal'] : phpgw::get_var('cal', 'string', 'POST');
+ $l_participants = isset($params['participants']) ?
$params['participants'] : phpgw::get_var('participants', 'string', 'POST');
+ $l_categories = isset($params['categories']) ?
$params['categories'] : phpgw::get_var('categories', 'string', 'POST');
+ $l_start = isset($params['start']) && $params['start']
? $params['start'] : phpgw::get_var('start', 'string', 'POST');
+ $l_end = isset($params['end']) && $params['end'] ?
$params['end'] : phpgw::get_var('end', 'string', 'POST');
+ $l_recur_enddate = isset($params['recur_enddate']) &&
$params['recur_enddate'] ? $params['recur_enddate'] :
phpgw::get_var('recur_enddate', 'string', 'POST'); // probbaly can be bool
+ $l_recur_exception = explode(',',
phpgw::get_var('recur_exception', 'string', 'POST') );
- $l_participants = isset($params['participants']) ?
- $params['participants'] :
- phpgw::get_var('participants', 'string',
'POST');
-
- $l_categories = isset($params['categories']) ?
- $params['categories'] :
- phpgw::get_var('categories', 'string', 'POST');
-
- $l_start = isset($params['start']) && $params['start'] ?
- $params['start'] :
- phpgw::get_var('start', 'string', 'POST');
-
- $l_end = isset($params['end']) && $params['end'] ?
- $params['end'] :
- phpgw::get_var('end', 'string', 'POST');
-
- $l_recur_enddate = isset($params['recur_enddate']) &&
$params['recur_enddate'] ?
- $params['recur_enddate'] :
- phpgw::get_var('recur_enddate', 'string',
'POST');
-
- $l_recur_exception = explode(',',
phpgw::get_var('recur_exception', 'string', 'POST'));
-
+ $send_to_ui = true;
if($this->debug)
{
$send_to_ui = true;
}
- print_debug('ID', $l_cal['id']);
+ /* no idea what is meant to happen here and triggers a
lot of notices
+ if($p_cal || $p_participants || $p_start || $p_end ||
$p_recur_enddata)
+ {
+ $send_to_ui = false;
+ }
+ */
+
+ print_debug('ID',$l_cal['id']);
if( phpgw::get_var('readsess', 'bool', 'GET') )
{
@@ -776,7 +729,6 @@
'readsess' => 1
)
);
-
$GLOBALS['phpgw']->common->phpgw_exit(True);
}
$overlapping_events = False;
@@ -785,13 +737,11 @@
{
if((!$l_cal['id'] &&
!$this->check_perms(PHPGW_ACL_ADD)) || ($l_cal['id'] &&
!$this->check_perms(PHPGW_ACL_EDIT,$l_cal['id'])))
{
- debug_print_backtrace();
ExecMethod('calendar.uicalendar.index');
$GLOBALS['phpgw']->common->phpgw_exit();
}
print_debug('Prior to fix_update_time()');
-
$this->fix_update_time($l_start);
$this->fix_update_time($l_end);
@@ -807,9 +757,7 @@
}
$is_public = ($l_cal['private'] == 'public' ? 1
: 0);
-
$this->so->event_init();
-
if ( is_array($l_categories) &&
count($l_categories) >= 2)
{
$this->so->set_category(implode(',',$l_categories));
@@ -818,31 +766,13 @@
{
$this->so->set_category(strval($l_categories[0]));
}
-
$this->so->set_title($l_cal['title']);
-
$this->so->set_description($l_cal['description']);
-
- $this->so->set_start(
- $l_start['year'], $l_start['month'],
$l_start['mday'],
- $l_start['hour'], $l_start['min'], 0);
-
- $this->so->set_end(
- $l_end['year'], $l_end['month'],
$l_end['mday'],
- $l_end['hour'], $l_end['min'], 0);
-
+
$this->so->set_start($l_start['year'],$l_start['month'],$l_start['mday'],$l_start['hour'],$l_start['min'],0);
+
$this->so->set_end($l_end['year'],$l_end['month'],$l_end['mday'],$l_end['hour'],$l_end['min'],0);
$this->so->set_class($is_public);
-
- $this->so->add_attribute(
- 'reference',
- isset($l_cal['reference']) &&
$l_cal['reference'] ?
- $l_cal['reference'] : 0);
-
- $this->so->add_attribute(
- 'location',
- isset($l_cal['location']) &&
$l_cal['location'] ?
- $l_cal['location'] : '');
-
+
$this->so->add_attribute('reference',(@isset($l_cal['reference']) &&
$l_cal['reference']?$l_cal['reference']:0));
+
$this->so->add_attribute('location',(@isset($l_cal['location']) &&
$l_cal['location']?$l_cal['location']:''));
if($l_cal['id'])
{
$this->so->add_attribute('id',$l_cal['id']);
@@ -857,8 +787,7 @@
}
elseif (isset($l_recur_enddate['str']))
{
- $l_recur_enddate =
$this->_jscal->input2date(
- $l_recur_enddate['str'], False,
'mday');
+ $l_recur_enddate =
$this->_jscal->input2date($l_recur_enddate['str'],False,'mday');
}
switch(intval($l_cal['recur_type']))
@@ -891,13 +820,12 @@
break;
}
- if(is_array($l_participants) &&
count($l_participants))
+ if ( is_array($l_participants) &&
count($l_participants) )
{
$parts = $l_participants;
$minparts = min($l_participants);
foreach ( $l_participants as
$participant )
{
- // this is a group?
if ( substr($participant, 0, 2)
== 'g_' )
{
$members =
$GLOBALS['phpgw']->accounts->member(substr($participant, 2) );
@@ -905,7 +833,7 @@
{
foreach (
$members as $member )
{
-
$participant =
intval($GLOBALS['phpgw']->contacts->is_contact($member['account_id']) );
+
$participant = intval($this->contacts->is_contact($member['account_id']) );
if (
$participant )
{
$this->so->add_attribute('participants', $accept_type, $participant);
@@ -919,15 +847,12 @@
{
$accept_type =
'U';
}
-
$this->so->add_attribute('participants', $accept_type, (int) $participant);
}
}
}
-
$event = $this->get_cached_event();
-
if(!is_int($minparts))
{
$minparts = $this->owner;
@@ -950,9 +875,7 @@
}
}
- $preserved = unserialize(
- phpgw::get_var('preserved', 'raw',
'POST'));
-
+ $preserved =
unserialize(phpgw::get_var('preserved', 'raw', 'POST'));
if ( is_array($preserved) )
{
foreach($preserved as $name => $value)
@@ -960,20 +883,17 @@
switch($name)
{
case 'owner':
-
$this->so->add_attribute('participants',
-
(int)$value, $l_cal['owner']);
+
$this->so->add_attribute('participants', (int) $value, $l_cal['owner']);
break;
default:
-
$this->so->add_attribute($name,
-
phpgw::clean_value($value, 'string'));
+
$this->so->add_attribute($name, phpgw::clean_value($value, 'string') );
}
}
}
$event = $this->get_cached_event();
- if ((isset($l_cal['alarmdays']) &&
$l_cal['alarmdays'] > 0) ||
- isset($l_cal['alarmhours']) &&
$l_cal['alarmhours'] > 0 ||
- isset($l_cal['alarmminutes']) &&
$l_cal['alarmminutes'] > 0)
+ if ($l_cal['alarmdays'] > 0 ||
$l_cal['alarmhours'] > 0 ||
+ $l_cal['alarmminutes'] > 0)
{
$time =
$this->maketime($event['start']) -
($l_cal['alarmdays'] * 24 *
3600) -
@@ -990,21 +910,16 @@
$event['recur_exception'] = $l_recur_exception;
$this->store_to_appsession($event);
-
$datetime_check =
$this->validate_update($event);
-
print_debug('bo->validated_update()
returnval',$datetime_check);
-
if($datetime_check)
{
- ExecMethod(
- 'calendar.uicalendar.edit',
+ ExecMethod('calendar.uicalendar.edit',
array(
'cd' =>
$datetime_check,
'readsess' => 1
)
);
-
$GLOBALS['phpgw']->common->phpgw_exit(True);
}
@@ -1032,14 +947,12 @@
{
unset($GLOBALS['phpgw_info']['flags']['noheader']);
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-
ExecMethod('calendar.uicalendar.overlap',
array(
'o_events' =>
$overlapping_events,
'this_event' =>
$event
)
);
-
$GLOBALS['phpgw']->common->phpgw_exit(True);
}
else
@@ -1051,42 +964,30 @@
{
if ( !isset($event['id']) )
{
- print_debug('Adding event');
-
$this->so->cal->event = $event;
$this->so->add_entry($event);
-
- $this->send_update(MSG_ADDED,
$event['participants'],
- '', $this->get_cached_event());
+
$this->send_update(MSG_ADDED,$event['participants'],'',$this->get_cached_event());
}
else
{
- print_debug('Updating Event ID',
$event['id']);
-
+ print_debug('Updating Event
ID',$event['id']);
$new_event = $event;
$old_event =
$this->read_entry($event['id']);
-
$this->so->cal->event = $event;
$this->so->add_entry($event);
-
$this->prepare_recipients($new_event,$old_event);
}
-
+ $date =
sprintf("%04d%02d%02d",$event['start']['year'],$event['start']['month'],$event['start']['mday']);
if($send_to_ui)
{
$this->read_sessiondata();
-
if ($this->return_to)
{
-
$GLOBALS['phpgw']->redirect_link(
- '/index.php',
$this->return_to);
+
$GLOBALS['phpgw']->redirect_link('/index.php', $this->return_to);
+
$GLOBALS['phpgw']->common->phpgw_exit();
}
- else
- {
Execmethod('calendar.uicalendar.index');
- }
-
- $GLOBALS['phpgw']->common->phpgw_exit();
+// $GLOBALS['phpgw']->common->phpgw_exit();
}
}
}
@@ -1099,7 +1000,11 @@
$year = $this->year;
}
$holiday = CreateObject('calendar.boholiday');
- $holiday->prepare_read_holidays($year,$this->owner);
+
+ $account = $this->contacts->are_users($this->owner);
+ // _debug_array($account[0]['account_id']);
+
+
$holiday->prepare_read_holidays($year,$account[0]['account_id']);
$this->cached_holidays = $holiday->read_holiday();
unset($holiday);
}
@@ -1600,7 +1505,7 @@
{
if ( $rights & PHPGW_ACL_READ )
{
- $person_id =
$GLOBALS['phpgw']->contacts->is_contact($acct_id);
+ $person_id =
$this->contacts->is_contact($acct_id);
if ( $person_id )
{
$can_read[] = $person_id;
@@ -2496,7 +2401,7 @@
* @param $new_event Event after the change
*/
function
send_update($msg_type,$to_notify,$old_event,$new_event=False,$user=False)
- {return;
+ {
$returncode = true;
//echo
"<p>bocalendar::send_update(type=$msg_type,to_notify="; print_r($to_notify);
echo ", old_event="; print_r($old_event); echo ", new_event=";
print_r($new_event); echo ", user=$user)</p>\n";
if (!is_array($to_notify))
@@ -2635,8 +2540,7 @@
{
continue;
}
-
$GLOBALS['phpgw']->accounts->get_account_name($userid,$lid,$details['to-firstname'],$details['to-lastname']);
- $details['to-fullname'] =
$GLOBALS['phpgw']->common->display_fullname('',$details['to-firstname'],$details['to-lastname']);
+ $details['to-fullname'] = (string)
$GLOBALS['phpgw']->accounts->get($userid);
$to =
$preferences->email_address($userid);
if (empty($to) || $to[0] == '@' ||
$to[0] == '$') // we have no valid email-address
@@ -2797,7 +2701,6 @@
{
if(isset($new_event['participants'][$old_userid]))
{
- $new_status =
$new_event['participants'][$old_userid];
print_debug('Modifying event for
user',$old_userid);
$this->modified[intval($old_userid)] =
$new_status;
}
@@ -2968,8 +2871,8 @@
else
{
$arr = &$users;
- $value =
$GLOBALS['phpgw']->contacts->is_contact($id);
- $name =
$GLOBALS['phpgw']->contacts->get_name_of_person_id($value);
+ $value = $this->contacts->is_contact($id);
+ $name =
$this->contacts->get_name_of_person_id($value);
}
$arr[$name] = array(
'grantor' => $id,
@@ -2989,6 +2892,11 @@
{
$user_timezone = phpgwapi_datetime::user_timezone();
+ if ( !is_object($GLOBALS['phpgw']->contacts) )
+ {
+ $GLOBALS['phpgw']->contacts =
createObject('phpgwapi.contacts');
+ }
+
$var['title'] = array(
'field' => lang('Title'),
'data' => $event['title']
@@ -3269,7 +3177,7 @@
$criteria_search[] =
phpgwapi_sql_criteria::token_begin('org_name', $lookup);
$criteria[] =
phpgwapi_sql_criteria::_append_or($criteria_search);
- $criteria[] =
$GLOBALS['phpgw']->contacts->criteria_for_index($GLOBALS['phpgw_info']['user']['account_id']);
+ $criteria[] =
$this->contacts->criteria_for_index($GLOBALS['phpgw_info']['user']['account_id']);
if ( $cat_id )
{
@@ -3277,7 +3185,7 @@
}
$criteria_token =
phpgwapi_sql_criteria::_append_and($criteria);
- return $GLOBALS['phpgw']->contacts->get_orgs($fields,
0, 0, 'org_name', 'ASC', '', $criteria_token);
+ return $this->contacts->get_orgs($fields, 0, 0,
'org_name', 'ASC', '', $criteria_token);
}
/**
@@ -3297,7 +3205,7 @@
$criteria_search[] =
phpgwapi_sql_criteria::token_begin('per_last_name', $lookup);
$criteria[] =
phpgwapi_sql_criteria::_append_or($criteria_search);
- $criteria[] =
$GLOBALS['phpgw']->contacts->criteria_for_index((int)
$GLOBALS['phpgw_info']['user']['account_id']);
+ $criteria[] = $this->contacts->criteria_for_index((int)
$GLOBALS['phpgw_info']['user']['account_id']);
if ( $cat_id )
{
@@ -3305,7 +3213,7 @@
}
$criteria_token =
phpgwapi_sql_criteria::_append_and($criteria);
- return
$GLOBALS['phpgw']->contacts->get_persons($fields, 0, 0, 'per_first_name,
per_last_name', 'ASC', '', $criteria_token);
+ return $this->contacts->get_persons($fields, 0, 0,
'per_first_name, per_last_name', 'ASC', '', $criteria_token);
}
/**
Modified:
people/sigurdne/modules/calendar/trunk/inc/class.bocustom_fields.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.bocustom_fields.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.bocustom_fields.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -1,31 +1,17 @@
<?php
- /**
- * Calendar - Custom Fields Logic
- *
- * @author Dave Hall <address@hidden>
- * @author Ralf Becker <address@hidden>
- * @copyright Copyright (C) 2003-2008 Free Software Foundation, Inc
http://www.fsf.org/
- * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
- * @package phpgroupware
- * @subpackage phpgwapi
- * @version $Id$
- */
+ /**************************************************************************\
+ * phpGroupWare - Calendar - Custom fields and sorting *
+ * http://www.phpgroupware.org *
+ * Written by Ralf Becker <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
+ \**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ /* $Id$ */
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
class calendar_bocustom_fields
{
var $stock_fields = array
Modified: people/sigurdne/modules/calendar/trunk/inc/class.boholiday.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.boholiday.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.boholiday.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -1,34 +1,20 @@
<?php
- /**
- * Calendar - Holiday Logic
- *
- * @author Dave Hall <address@hidden>
- * @author Mark Peters <address@hidden>
- * @copyright Portions Copyright (C) 2003-2008 Free Software Foundation,
Inc http://www.fsf.org/
- * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
- * @package phpgroupware
- * @subpackage phpgwapi
- * @version $Id$
- */
+ /**************************************************************************\
+ * phpGroupWare - Holiday *
+ * http://www.phpgroupware.org *
+ * Written by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
+ \**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ /* $Id$ */
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
class calendar_boholiday
{
- public $public_functions = Array(
+ var $public_functions = Array(
'add' => True,
'delete_holiday' => True,
'delete_locale' => True,
@@ -40,24 +26,24 @@
'update_entry' => True
);
- public $debug = False;
- public $base_url = '/index.php';
+ var $debug = False;
+ var $base_url = '/index.php';
- public $ui;
- public $so;
- public $owner;
- public $year;
+ var $ui;
+ var $so;
+ var $owner;
+ var $year;
- public $id;
- public $total;
- public $start;
- public $query;
- public $sort;
+ var $id;
+ var $total;
+ var $start;
+ var $query;
+ var $sort;
- public $locales = array();
- public $holidays;
- public $cached_holidays;
- public $locale;
+ var $locales = array();
+ var $holidays;
+ var $cached_holidays;
+ var $locale;
public function __construct()
{
@@ -79,7 +65,7 @@
}
/* Begin Calendar functions */
- public function read_entry($id=0)
+ function read_entry($id=0)
{
if($this->debug)
{
@@ -101,7 +87,7 @@
return $this->so->read_holiday($id);
}
- public function delete_holiday($id=0)
+ function delete_holiday($id=0)
{
if(!$id)
{
@@ -123,7 +109,7 @@
}
}
- public function delete_locale($locale='')
+ function delete_locale($locale='')
{
if(!$locale)
{
@@ -141,7 +127,7 @@
$this->ui->admin();
}
- public function accept_holiday()
+ function accept_holiday()
{
$send_back_to =
str_replace('submitlocale','holiday_admin', phpgw::get_var('HTTP_REFERER',
'string', 'SERVER') );
if ( isset($this->locales[0]) &&
strlen($this->locales[0]) == 2 )
@@ -168,7 +154,7 @@
Header('Location: '.$send_back_to);
}
- public function get_holiday_list($locale='', $sort='',
$order='', $query='', $total='', $year=0)
+ function get_holiday_list($locale='', $sort='', $order='',
$query='', $total='', $year=0)
{
$locale = ($locale?$locale:$this->locales[0]);
$sort = ($sort?$sort:$this->sort);
@@ -178,7 +164,7 @@
return
$this->so->read_holidays($locale,$query,$order,$year);
}
- public function get_locale_list($sort='', $order='', $query='')
+ function get_locale_list($sort='', $order='', $query='')
{
$sort = ($sort?$sort:$this->sort);
$order = ($order?$order:$this->order);
@@ -186,11 +172,10 @@
return $this->so->get_locale_list($sort,$order,$query);
}
- public function prepare_read_holidays($year=0,$owner=0)
+ function prepare_read_holidays($year=0,$owner=0)
{
$this->year = (isset($year) && $year >
0?$year:$GLOBALS['phpgw']->common->show_date(time() -
phpgwapi_datetime::user_timezone(), 'Y'));
- $oCurrentUserContact =
$GLOBALS['phpgw']->contacts->is_contact($GLOBALS['phpgw_info']['user']['account_id']);
- $this->owner = ($owner?$owner:$oCurrentUserContact);
+ $this->owner =
($owner?$owner:$GLOBALS['phpgw_info']['user']['account_id']);
if($this->debug)
{
@@ -210,12 +195,9 @@
$this->locales[] = 'US';
}
- if($this->owner != $oCurrentUserContact)
- {
- $id_user =
$GLOBALS['phpgw']->contacts->is_user($this->owner);
- if($id_user)
+ if($this->owner !=
$GLOBALS['phpgw_info']['user']['account_id'])
{
- $owner_pref =
CreateObject('phpgwapi.preferences',$id_user);
+ $owner_pref =
CreateObject('phpgwapi.preferences',$owner);
$owner_prefs = $owner_pref->read();
if(@$owner_prefs['common']['country'])
{
@@ -227,7 +209,6 @@
}
unset($owner_pref);
}
- }
if (
isset($GLOBALS['phpgw_info']['server']['auto_load_holidays'])
&&
$GLOBALS['phpgw_info']['server']['auto_load_holidays'] == True
@@ -240,7 +221,7 @@
}
}
- public function auto_load_holidays($locale)
+ function auto_load_holidays($locale)
{
if($this->so->holiday_total($locale) == 0)
{
@@ -302,12 +283,12 @@
}
}
- public function save_holiday($holiday)
+ function save_holiday($holiday)
{
$this->so->save_holiday($holiday);
}
- public function add()
+ function add()
{
if ( phpgw::get_var('submit', 'bool') )
{
@@ -365,7 +346,7 @@
}
}
- public function sort_holidays_by_date($holidays)
+ function sort_holidays_by_date($holidays)
{
$c_holidays = count($holidays);
for($outer_loop=0;$outer_loop<($c_holidays -
1);$outer_loop++)
@@ -383,7 +364,7 @@
return $holidays;
}
- public function set_holidays_to_date($holidays)
+ function set_holidays_to_date($holidays)
{
$new_holidays = Array();
for($i=0;$i<count($holidays);$i++)
@@ -394,7 +375,7 @@
return $new_holidays;
}
- public function read_holiday()
+ function read_holiday()
{
if(isset($this->cached_holidays))
{
@@ -434,15 +415,15 @@
}
/* End Calendar functions */
- public function check_admin()
+ function check_admin()
{
- if (
!isset($GLOBALS['phpgw_info']['user']['apps']['admin']) )
+ if(address@hidden'phpgw_info']['user']['apps']['admin'])
{
- Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php'));
+ $GLOBALS['phpgw']->redirect_link('/index.php');
}
}
- public function rule_string($holiday)
+ function rule_string($holiday)
{
if (!is_array($holiday))
{
@@ -472,3 +453,4 @@
return $str;
}
}
+?>
Modified: people/sigurdne/modules/calendar/trunk/inc/class.boicalendar.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.boicalendar.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.boicalendar.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -3,23 +3,13 @@
* phpGroupWare - iCalendar Parser *
* http://www.phpgroupware.org *
* Written by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
\**************************************************************************/
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
/* $Id$ */
phpgw::import_class('phpgwapi.datetime');
@@ -1483,7 +1473,7 @@
(
'type'
=> 'value',
'quoted'
=> false,
- 'to_text'
=> false,
+ 'to_text'
=> true,
'properties'
=> array
(
'calscale' => true,
@@ -1643,7 +1633,7 @@
function fold($str)
{
- return $this->chunk_split ? chunk_split($str, FOLD_LENGTH,
"\r\n") : $str."\r\n";
+ return $this->chunk_split == True ?
rtrim(chunk_split($str,FOLD_LENGTH,"\r\n ") , ' ') : $str . "\r\n";
}
function strip_quotes($str)
@@ -3294,14 +3284,12 @@
{
if( ! is_array($_FILES['uploadedfile']) ||
$_FILES['uploadedfile']['tmp_name'] == '' /*||
$_FILES['uploadedfile']['tmp_name'] = 'none'*/)
{
- Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array(
'menuaction' =>
'calendar.uiicalendar.import',
'action' =>
'GetFile'
)
- )
);
- $GLOBALS['phpgw']->common->phpgw_exit();
}
$uploaddir = "{$GLOBALS['phpgw_info']['server']['temp_dir']}/";
@@ -3313,14 +3301,12 @@
$filename = $uploaddir . $newfilename;
if ( !move_uploaded_file($_FILES['uploadedfile']['tmp_name'],
$filename) )
{
- Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array(
'menuaction' =>
'calendar.uiicalendar.import',
'action' => 'GetFile'
)
- )
);
- $GLOBALS['phpgw']->common->phpgw_exit();
}
// $ftp = fopen($uploaddir . $newfilename
. '.info','wb');
//
fputs($ftp,$uploadedfile_type."\n".$uploadedfile_name."\n");
@@ -3344,14 +3330,12 @@
if($isReturn)
return false;
- Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array(
'menuaction' =>
'calendar.uiicalendar.import',
'action' =>
'GetFile'
)
- )
);
- $GLOBALS['phpgw']->common->phpgw_exit();
}
if( !isset($GLOBALS['uicalendar']) ||
!is_object($GLOBALS['uicalendar']) )
@@ -3912,14 +3896,12 @@
return false;
}
- Header('Location: '.$GLOBALS['phpgw']->link('/index.php',
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array(
'menuaction' =>
'calendar.uicalendar.view',
'cal_id' => $event['id']
)
- )
);
- $GLOBALS['phpgw']->common->phpgw_exit();
}
@@ -4275,3 +4257,4 @@
}
}
}
+?>
Modified:
people/sigurdne/modules/calendar/trunk/inc/class.calendar_holiday.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.calendar_holiday.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.calendar_holiday.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -3,23 +3,13 @@
* phpGroupWare - Calendar Holidays *
* http://www.phpgroupware.org *
* Written by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
\**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
/* $Id$ */
class calendar_holiday
@@ -327,3 +317,4 @@
return $this->holidays[$id]['name'];
}
}
+?>
Modified: people/sigurdne/modules/calendar/trunk/inc/class.calendar_icap.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.calendar_icap.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.calendar_icap.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -1,31 +1,17 @@
<?php
- /**
- * Calendar - storage logic
- *
- * @author Dave Hall <address@hidden>
- * @author Mark Peters <address@hidden>
- * @copyright Portions Copyright (C) 2003-2008 Free Software Foundation,
Inc http://www.fsf.org/
- * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
- * @package phpgroupware
- * @subpackage phpgwapi
- * @version $Id$
- */
+ /**************************************************************************\
+ * phpGroupWare - ICal Calendar *
+ * http://www.phpgroupware.org *
+ * Created by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
+ \**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ /* $Id$ */
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
phpgw::import_class('calendar.calendar__');
class calendar_calendar_ extends calendar_calendar__
Modified: people/sigurdne/modules/calendar/trunk/inc/class.holidaycalc.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.holidaycalc.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.holidaycalc.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -1,31 +1,18 @@
<?php
- /**
- * Calendar - Localised Holidays Include Handler
- *
- * @author Dave Hall <address@hidden>
- * @author Yoshihiro Kamimura <address@hidden> - http://www.itheart.com
- * @copyright Portions Copyright (C) 2003-2008 Free Software Foundation,
Inc http://www.fsf.org/
- * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
- * @package phpgroupware
- * @subpackage phpgwapi
- * @version $Id$
- */
+ /**************************************************************************\
+ * phpGroupWare - holidaycalc *
+ * http://www.phpgroupware.org *
+ * Based on Yoshihiro Kamimura <address@hidden> *
+ * http://www.itheart.com *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
+ \**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ /* $Id$ */
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
if (
!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['country'])
||
strlen($GLOBALS['phpgw_info']['user']['preferences']['common']['country']) <> 2
)
{
Modified:
people/sigurdne/modules/calendar/trunk/inc/class.holidaycalc_JP.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.holidaycalc_JP.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.holidaycalc_JP.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -1,31 +1,18 @@
<?php
- /**
- * Calendar - Localised Holidays Logic - Japan
- *
- * @author Dave Hall <address@hidden>
- * @author Yoshihiro Kamimura <address@hidden> - http://www.itheart.com
- * @copyright Portions Copyright (C) 2003-2008 Free Software Foundation,
Inc http://www.fsf.org/
- * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
- * @package phpgroupware
- * @subpackage phpgwapi
- * @version $Id$
- */
+ /**************************************************************************\
+ * phpGroupWare - holidaycalc_JP *
+ * http://www.phpgroupware.org *
+ * Based on Yoshihiro Kamimura <address@hidden> *
+ * http://www.itheart.com *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
+ \**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ /* $Id$ */
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
phpgw::import_class('phpgwapi.datetime');
class calendar_holidaycalc
@@ -166,3 +153,4 @@
return $date;
}
}
+?>
Modified:
people/sigurdne/modules/calendar/trunk/inc/class.holidaycalc_US.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.holidaycalc_US.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.holidaycalc_US.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -1,31 +1,18 @@
<?php
- /**
- * Calendar - Localised Holidays Logic - United States
- *
- * @author Dave Hall <address@hidden>
- * @author Yoshihiro Kamimura <address@hidden> - http://www.itheart.com
- * @copyright Portions Copyright (C) 2003-2008 Free Software Foundation,
Inc http://www.fsf.org/
- * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
- * @package phpgroupware
- * @subpackage phpgwapi
- * @version $Id$
- */
+ /**************************************************************************\
+ * phpGroupWare - holidaycalc_US *
+ * http://www.phpgroupware.org *
+ * Based on Yoshihiro Kamimura <address@hidden> *
+ * http://www.itheart.com *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
+ \**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ /* $Id$ */
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
phpgw::import_class('phpgwapi.datetime');
class calendar_holidaycalc
Modified: people/sigurdne/modules/calendar/trunk/inc/class.html.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.html.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.html.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -1,55 +1,42 @@
<?php
- /**
- * Calendar - HTML Builder
- *
- * @author Dave Hall <address@hidden>
- * @author Ralf Becker <address@hidden>
- * @copyright Copyright (C) 2003-2008 Free Software Foundation, Inc
http://www.fsf.org/
- * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
- * @package phpgroupware
- * @subpackage phpgwapi
- * @version $Id$
- */
+
/**************************************************************************\
+ * phpGroupWare - HTML creation class
*
+ * http://www.phpgroupware.org
*
+ * Written by Ralf Becker <address@hidden> *
+ * --------------------------------------------
*
+ * This program is free software; you can redistribute it and/or modify
it *
+ * under the terms of the GNU General Public License as published by
the *
+ * Free Software Foundation; either version 2 of the License, or (at
your *
+ * option) any later version.
*
+
\**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ /* $Id$ */
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
class calendar_html
{
- public $user_agent;
- public $ua_version;
+ var $user_agent;
+ var $ua_version;
/**
* @constructor
*/
- public function __construct()
+ function __construct()
{
//This should really be handled in API browser class - not the
html class
- if ( !preg_match('/compatible; ([a-z_]+)[\/ ]+([0-9.]+)/i',
phpgw::get_var('HTTP_USER_AGENT', 'string', 'SERVER'), $parts))
+ //Sigurd: Does not look like this is used
+/* if ( preg_match('/compatible; ([a-z_]+)[/ ]+([0-9.]+)/i',
phpgw::get_var('HTTP_USER_AGENT', 'string', 'SERVER'), $parts))
{
- preg_match('#^([a-z_]+)/([0-9.]+)#i',
phpgw::get_var('HTTP_USER_AGENT', 'string', 'SERVER'), $parts);
+ preg_match('/^([a-z_]+)/([0-9.]+)/i',
phpgw::get_var('HTTP_USER_AGENT', 'string', 'SERVER'), $parts);
}
list(,$this->user_agent,$this->ua_version) = $parts;
$this->user_agent = strtolower($this->user_agent);
-
+*/
//echo "<p>HTTP_USER_AGENT='{$_SERVER['HTTP_USER_AGENT']}',
UserAgent: '{$this->user_agent}', Version: '{$this->ua_version}'</p>\n";
}
/**
* Function: Allows to show and select one item from an array
- * Parameters: $name string with name of the
submitted public which holds the key of the selected item form array
+ * Parameters: $name string with name of the
submitted var which holds the key of the selected item form array
* $key key(s)
of already selected item(s) from $arr, eg. '1' or '1,2' or array with keys
* $arr array
with items to select, eg. $arr = array ( 'y' => 'yes','n' => 'no','m' =>
'maybe');
* $no_lang if
!$no_lang send items through lang()
@@ -57,7 +44,7 @@
* On submit $XXX is the key of the selected item
(XXX is the content of $name)
* Returns: string to set for a template or to echo
into html page
*/
- public function select($name, $key,
$arr=0,$no_lang=0,$options='',$multiple=0)
+ function select($name, $key, $arr=0,$no_lang=0,$options='',$multiple=0)
{
// should be in class common.sbox
if (!is_array($arr))
@@ -100,7 +87,7 @@
* @paeam string $options the html options of the div
* @returns string DIV element
*/
- public function div($content,$options='')
+ function div($content,$options='')
{
return "<div $options>\n$content</div>\n";
}
@@ -113,7 +100,7 @@
* @param bool $ignore_empty should empty values be ignored?
* @return string hidden form element
*/
- public function input_hidden($vars,$value='',$ignore_empty=True)
+ function input_hidden($vars,$value='',$ignore_empty=True)
{
$html = '';
if (!is_array($vars))
@@ -142,7 +129,7 @@
* @param string optios the html options of the textarea
* @returns string textarea element
*/
- public function textarea($name,$value='',$options='' )
+ function textarea($name,$value='',$options='' )
{
return "<textarea name=\"$name\"
$options>".htmlspecialchars($value)."</textarea>\n";
}
@@ -156,7 +143,7 @@
* @param string options the html options of the input element
* @returns string form input element
*/
- public function input($name, $value = '', $type = 'text', $options = '')
+ function input($name, $value = '', $type = 'text', $options = '')
{
if ( strlen($type) )
{
@@ -169,7 +156,7 @@
return "<input $type name=\"$name\"
value=\"".htmlspecialchars($value)."\" $options>\n";
}
- public function submit_button($name, $lang, $onClick='', $no_lang=0,
$options='', $image='', $app='')
+ function submit_button($name, $lang, $onClick='', $no_lang=0,
$options='', $image='', $app='')
{
if ($image != '')
{
@@ -220,7 +207,7 @@
* =
'http://domain/phpgw-path/index.php?menuaction=infolog.uiinfolog.get_list&info_id=123'
* @return string absolute URI ( parsed by $GLOBALS['phpgw']->link )
*/
- public function link($uri, $vars='')
+ function link($uri, $vars='')
{
if (!is_array($vars))
{
@@ -229,12 +216,12 @@
return $GLOBALS['phpgw']->link($uri, $vars);
}
- public function checkbox($name,$value='')
+ function checkbox($name,$value='')
{
return "<input type=\"checkbox\" name=\"$name\" value=\"True\""
.($value ? ' checked="checked"' : '') . ">\n";
}
- public function
form($content,$hidden_vars,$url,$url_vars='',$name='',$options='',$method='POST')
+ function
form($content,$hidden_vars,$url,$url_vars='',$name='',$options='',$method='POST')
{
$html = "<form method=\"$method\" ".($name != '' ?
"name=\"$name\" " : '')."action=\"".$this->link($url,$url_vars)."\"
$options>\n";
$html .= $this->input_hidden($hidden_vars);
@@ -247,7 +234,7 @@
return $html;
}
- public function
form_1button($name,$lang,$hidden_vars,$url,$url_vars='',$form_name='',$method='POST')
+ function
form_1button($name,$lang,$hidden_vars,$url,$url_vars='',$form_name='',$method='POST')
{
return $this->form($this->submit_button($name,$lang),
$hidden_vars,$url,$url_vars,$form_name,'',$method);
@@ -264,7 +251,7 @@
* table($rows,'WIDTH="100%"') = '<table WIDTH="100%"><tr><td
colspan=3>cell1</td><td>cell2</td><td width="10%">cell3</td></tr></table>'
* @return string with html-code of the table
*/
- public function table($rows,$options = '',$no_table_tr=False)
+ function table($rows,$options = '',$no_table_tr=False)
{
$html = $no_table_tr ? '' : "<table $options>\n";
@@ -304,7 +291,7 @@
return $html;
}
- public function sbox_submit( $sbox,$no_script=0 )
+ function sbox_submit( $sbox,$no_script=0 )
{
$html = str_replace('<select','<select
onChange="this.form.submit()" ',
$sbox);
@@ -315,7 +302,7 @@
return $html;
}
- public function image( $app,$name,$title='',$options='' )
+ function image( $app,$name,$title='',$options='' )
{
if (strstr($name,'.') === False)
{
@@ -336,7 +323,7 @@
return "<img src=\"$path\" $options />";
}
- public function a_href( $content,$url,$vars='',$options='')
+ function a_href( $content,$url,$vars='',$options='')
{
if (!strstr($url,'/') && count(explode('.',$url)) == 3)
{
@@ -350,18 +337,18 @@
return '<a href="'.$this->link($url,$vars).'"
'.$options.'>'.$content.'</a>';
}
- public function bold($content)
+ function bold($content)
{
return "<strong>{$content}</strong>";
}
- public function italic($content)
+ function italic($content)
{
return "<em>{$content}</em>";
}
//FIXME Deprecated Tag! use div with hr class? 1px high and
$width wide? - skwashd nov2005
- public function hr($width,$options='')
+ function hr($width,$options='')
{
if ($width)
{
@@ -379,7 +366,7 @@
* formatOptions('100%,,1','WIDTH,HEIGHT,BORDER') = ' WIDTH="100%"
BORDER="1"'
* @return option string
*/
- public function formatOptions($options, $names)
+ function formatOptions($options, $names)
{
if (!is_array($options))
{
@@ -403,7 +390,7 @@
*
* @return the classes 'th' = nextmatch header, 'row_on'+'row_off' =
alternating rows
*/
- public function themeStyles()
+ function themeStyles()
{
return $this->style($this->theme2css());
}
@@ -416,7 +403,7 @@
*
* @return the classes 'th' = nextmatch header, 'row_on'+'row_off' =
alternating rows
*/
- public function theme2css()
+ function theme2css()
{
return
".th { background-color:
{$GLOBALS['phpgw_info']['theme']['th_bg']}; font-weight: bold; }\n".
@@ -430,7 +417,7 @@
* @param string $styles the styles to be contained within the style tag
* @returns a html style tag
*/
- public function style($styles)
+ function style($styles)
{
return $styles ? "<style
type=\"text/css\">\n<!--\n$styles\n-->\n</style>" : '';
}
@@ -445,7 +432,7 @@
* @param string $options the html options for the label
* @return string the label as html
*/
- public function label($content, $id, $accesskey='', $options='')
+ function label($content, $id, $accesskey='', $options='')
{
$id = " for=\"$id\"";
if ($accesskey != '')
Modified: people/sigurdne/modules/calendar/trunk/inc/class.menu.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.menu.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.menu.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -3,16 +3,16 @@
* Calendar - Menus
*
* @author Dave Hall <address@hidden>
- * @copyright Copyright (C) 2007 - 2008 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @copyright Copyright (C) 2007 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package calendar
- * @version $Id: class.menu.inc.php 727 2008-02-08 04:13:28Z dave $
+ * @version $Id: class.menu.inc.php 1781 2008-11-02 19:51:19Z sigurd $
*/
/*
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -37,7 +37,7 @@
*
* @return array available menus for the current user
*/
- public function get_menu()
+ function get_menu()
{
$menus = array();
Modified: people/sigurdne/modules/calendar/trunk/inc/class.socalendar.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.socalendar.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.socalendar.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -5,23 +5,13 @@
* Based on Webcalendar by Craig Knudsen <address@hidden> *
* http://www.radix.net/~cknudsen *
* Modified by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
\**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
/* $Id$ */
phpgw::import_class('phpgwapi.datetime');
@@ -75,14 +65,12 @@
return $this->cal->fetch_event($id);
}
- function
list_events($startYear,$startMonth,$startDay,$endYear=0,$endMonth=0,$endDay=0,$owner_id=0,$lastmod=-1)
+ function
list_events($startYear,$startMonth,$startDay,$endYear=0,$endMonth=0,$endDay=0,$owner_id=0)
{
$user_timezone = phpgwapi_datetime::user_timezone();
$extra = (strpos($this->filter,'private')?'AND
phpgw_cal.is_public=0 ':'');
$extra .= ($this->cat_id?"AND phpgw_cal.category like
'%".$this->cat_id."%' ":'');
- $extra .= sprintf(" AND phpgw_cal.mdatetime > %d ",
$lastmod);
-
if($owner_id)
{
return
$this->cal->list_events($startYear,$startMonth,$startDay,$endYear,$endMonth,$endDay,$extra,
$user_timezone, $owner_id);
Modified: people/sigurdne/modules/calendar/trunk/inc/class.socalendar_.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.socalendar_.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.socalendar_.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -5,21 +5,26 @@
* Based on Webcalendar by Craig Knudsen <address@hidden> *
* http://www.radix.net/~cknudsen *
* Modified by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
\**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ /* $Id$ */
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ /* I think this can go - skwashd Nov 2007
+ if( isset($GLOBALS['phpgw_info']['server']['calendar_type'])
+ && $GLOBALS['phpgw_info']['server']['calendar_type'] == 'mcal'
+ && !extension_loaded('mcal') )
+ {
+ $GLOBALS['phpgw_info']['server']['calendar_type'] = 'sql';
+ }
+ else
+ {
+ $GLOBALS['phpgw_info']['server']['calendar_type'] = 'sql';
+ }
*/
$GLOBALS['phpgw_info']['server']['calendar_type'] = 'sql';
Modified: people/sigurdne/modules/calendar/trunk/inc/class.socalendar__.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.socalendar__.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.socalendar__.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -5,23 +5,13 @@
* Based on Webcalendar by Craig Knudsen <address@hidden> *
* http://www.radix.net/~cknudsen *
* Modified by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
\**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
/* $Id$ */
if ( !extension_loaded('mcal') )
Modified:
people/sigurdne/modules/calendar/trunk/inc/class.socalendar_sql.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.socalendar_sql.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.socalendar_sql.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -5,23 +5,13 @@
* Based on Webcalendar by Craig Knudsen <address@hidden> *
* http://www.radix.net/~cknudsen *
* Modified by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
\**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
/* $Id$ */
phpgw::import_class('phpgwapi.datetime');
@@ -32,6 +22,7 @@
var $cal_event;
var $today = array('raw','day','month','year','full','dow','dm','bd');
+ protected $global_lock = false;
function __construct()
{
@@ -94,15 +85,29 @@
{
$calendar = (int) $calendar;
//TODO transaction needed here
+
$this->stream->query("SELECT cal_id FROM phpgw_cal WHERE owner
= {$calendar}",__LINE__,__FILE__);
while($this->stream->next_record())
{
$this->delete_event( (int) $this->stream->f('cal_id'));
}
+// $this->stream->lock(array('phpgw_cal_user'));
+ if ( $this->stream->Transaction )
+ {
+ $this->global_lock = true;
+ }
+ else
+ {
+ $this->stream->transaction_begin();
+ }
$this->expunge();
- $this->stream->lock(array('phpgw_cal_user'));
$this->stream->query("DELETE FROM phpgw_cal_user WHERE
cal_login = {$calendar}",__LINE__,__FILE__);
- $this->stream->unlock();
+ if ( !$this->global_lock )
+ {
+ $this->stream->transaction_commit();
+ }
+
+// $this->stream->unlock();
// end transaction
return $calendar;
}
@@ -396,37 +401,24 @@
return False;
}
- if($startYear != 0 && $startMonth != 0 && $startDay != 0)
- {
- $datetime = mktime(0, 0, 0,
- (int)$startMonth, (int)$startDay,
(int)$startYear) - $tz_offset;
- }
- else
- {
- $datetime = 0;
- }
+ $datetime = mktime(0,0,0,$startMonth,$startDay,$startYear) -
$tz_offset;
$user_where = ' AND (phpgw_cal_user.cal_login in (';
-
- if(is_array($owner_id))
+ if($owner_id)
{
$user_where .= implode(',',$owner_id);
}
- else if($owner_id > 0)
- {
- $user_where .= $owner_id;
- }
else
{
$user_where .= $this->user;
}
-
$member_groups =
$GLOBALS['phpgw']->accounts->membership($this->user);
@reset($member_groups);
- while($member_groups != False && list($key,$group_info) =
each($member_groups))
+ foreach ($member_groups as $key => $group_info)
{
- $member[] = $group_info['account_id'];
+ $member[] = $group_info->id;
}
+
@reset($member);
// $user_where .= ','.implode(',',$member);
$user_where .= ')) ';
@@ -460,7 +452,6 @@
{
echo "SQL :
".$user_where.$startDate.$endDate.$extra."<br />\n";
}
-
return
$this->get_event_ids(False,$user_where.$startDate.$endDate.$extra.$order_by);
}
@@ -507,7 +498,7 @@
return 1;
}
$this_event = $this->event;
- $locks = array(
+/* $locks = array(
'phpgw_cal',
'phpgw_cal_user',
'phpgw_cal_repeats',
@@ -515,6 +506,16 @@
// OLD-ALARM 'phpgw_cal_alarm'
);
$this->stream->lock($locks);
+*/
+ if ( $this->stream->Transaction )
+ {
+ $this->global_lock = true;
+ }
+ else
+ {
+ $this->stream->transaction_begin();
+ }
+
foreach($this->deleted_events as $cal_id)
{
foreach ($locks as $table)
@@ -522,7 +523,11 @@
$this->stream->query('DELETE FROM '.$table.'
WHERE cal_id='.$cal_id,__LINE__,__FILE__);
}
}
- $this->stream->unlock();
+// $this->stream->unlock();
+ if ( !$this->global_lock )
+ {
+ $this->stream->transaction_commit();
+ }
foreach($this->deleted_events as $cal_id)
{
@@ -589,7 +594,7 @@
{
if ( $this->debug )
{
- error_log('socal_phpgwapi_sql_:: get_event_etags(' .
print_r($user_ids, true) . ", $event_id)" );
+ error_log('socal_sql:: get_event_etags(' .
print_r($user_ids, true) . ", $event_id)" );
}
if ( !is_array($user_ids) )
@@ -888,10 +893,11 @@
$member_groups =
$GLOBALS['phpgw']->accounts->membership($this->user);
@reset($member_groups);
- while($member_groups != False && list($key,$group_info) =
each($member_groups))
+ foreach ($member_groups as $key => $group_info)
{
- $member[] = intval($group_info['account_id']);
+ $member[] = $group_info->id;
}
+
@reset($member);
if($this->debug)
@@ -912,3 +918,4 @@
return
$this->get_event_ids($repeats,$user_where.$wheremod.$extra.$order_by);
}
}
+
Modified: people/sigurdne/modules/calendar/trunk/inc/class.soholiday.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.soholiday.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.soholiday.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -3,23 +3,13 @@
* phpGroupWare - Holiday *
* http://www.phpgroupware.org *
* Written by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
\**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
/* $Id$ */
class calendar_soholiday
Modified: people/sigurdne/modules/calendar/trunk/inc/class.uialarm.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.uialarm.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.uialarm.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -5,23 +5,13 @@
* Based on Webcalendar by Craig Knudsen <address@hidden> *
* http://www.radix.net/~cknudsen *
* Modified by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
\**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
/* $Id$ */
phpgw::import_class('phpgwapi.datetime');
@@ -204,32 +194,15 @@
}
$this->template->parse('rows','buttons',True);
}
-
- if ( !isset($time['days']) )
+ if
(isset($this->event['participants'][intval($GLOBALS['phpgw_info']['user']['person_id'])]))
{
- $time['days'] = 0;
- }
-
- if ( !isset($time['hours']) )
- {
- $time['hours'] = 0;
- }
-
- if ( !isset($time['mins']) )
- {
- $time['mins'] = 0;
- }
-
-
- if ( isset($this->event['participants'][ (int)
$GLOBALS['phpgw_info']['user']['person_id']]) )
- {
$time = phpgw::get_var('time', 'int', 'POST');
$this->template->set_var(Array(
'hidden_vars' =>
$this->html->input_hidden('cal_id',$this->bo->cal_id),
'input_text' => lang('Email
reminder'),
- 'input_days' =>
$this->html->select('time[days]', $time['days'], range(0,31), true).'
'.lang('days'),
- 'input_hours' =>
$this->html->select('time[hours]', $time['hours'], range(0,24), true).'
'.lang('hours'),
- 'input_minutes' =>
$this->html->select('time[mins]', $time['mins'], range(0,60), true).'
'.lang('minutes').' '.lang('before the event'),
+ 'input_days' =>
$this->html->select('time[days]', isset($time['days']) ? $time['days'] : 0,
range(0,31), True).' '.lang('days'),
+ 'input_hours' =>
$this->html->select('time[hours]', isset($time['hours']) ? $time['hours'] :
0,range(0,24),True).' '.lang('hours'),
+ 'input_minutes' =>
$this->html->select('time[mins]', isset($time['mins']) ? $time['mins'] : 0,
range(0,60),True).' '.lang('minutes').' '.lang('before the event'),
'input_owner' =>
$this->html->select('owner',$GLOBALS['phpgw_info']['user']['account_id'],$this->bo->participants($this->event,True),True),
'input_add' =>
$this->html->submit_button('add','Add Alarm')
));
Modified: people/sigurdne/modules/calendar/trunk/inc/class.uicalendar.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.uicalendar.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.uicalendar.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -5,23 +5,13 @@
* Based on Webcalendar by Craig Knudsen <address@hidden> *
* http://www.radix.net/~cknudsen *
* Modified by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
\**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
/* $Id$ */
/*
@@ -381,7 +371,7 @@
'month_identifier' =>
lang(strftime("%B",$m)).' '.$this->bo->year,
'username' => (
$this->bo->is_group
? $GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner)
-
: $GLOBALS['phpgw']->contacts->get_name_of_person_id($this->bo->owner)
),
+
: $this->bo->contacts->get_name_of_person_id($this->bo->owner) ),
'small_calendar_next' => $minical_next,
'large_month' =>
$this->display_month($this->bo->month,$this->bo->year,True,$this->bo->owner),
);
@@ -458,7 +448,7 @@
'next_week_link' =>
$next_week_link,
'username' => (
$this->bo->is_group
? $GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner)
-
: $GLOBALS['phpgw']->contacts->get_name_of_person_id($this->bo->owner)
),
+
: $this->bo->contacts->get_name_of_person_id($this->bo->owner) ),
'small_calendar_next' => $minical_next,
'week_display' =>
$this->display_weekly(
array(
@@ -803,6 +793,7 @@
if(!$this->bo->check_perms(PHPGW_ACL_EDIT,$event))
{
+ //FIXME
Header('Location: '.$this->page('view',
array('cal_id' => $cal_id), true) );
$GLOBALS['phpgw']->common->phpgw_exit();
}
@@ -834,6 +825,7 @@
$cal_id = phpgw::get_var('cal_id', 'int', 'POST');
if( !$cal_id )
{
+ //FIXME
Header('Location: ' . $this->index());
$GLOBALS['phpgw']->common->phpgw_exit();
}
@@ -991,6 +983,7 @@
}
else
{
+ //FIXME
Header('Location: ' . $this->page('', ($cd ?
array('cd' => $cd) : array()), true) );
}
$GLOBALS['phpgw']->common->phpgw_exit();
@@ -1055,13 +1048,13 @@
function delete()
{
- if ( !phpgw::get_var('cal_id', 'int', 'GET') )
+ if ( phpgw::get_var('cal_id', 'int', 'GET') )
{
+ //FIXME
Header('Location: '.$this->page('',
array('date' => sprintf('%04d%02d%02d', $this->bo->year, $this->bo->month,
$this->bo->day) ), true) );
$GLOBALS['phpgw']->common->phpgw_exit();
}
$date = sprintf('%04d%02d%02d', $this->bo->year,
$this->bo->month, $this->bo->day);
-
$cal_id = phpgw::get_var('cal_id', 'int', 'GET');
if ( $this->bo->check_perms(PHPGW_ACL_DELETE, $cal_id) )
{
@@ -1094,6 +1087,7 @@
}
else
{
+ //FIXME
Header('Location: ' . $this->page('',
array('date' => $date, 'cd' => ($cd ? $cd : '0')), true));
}
$GLOBALS['phpgw']->common->phpgw_exit();
@@ -1115,6 +1109,7 @@
$now['raw'] += phpgwapi_datetime::user_timezone();
$p = $GLOBALS['phpgw']->template;
+ $p->set_root(PHPGW_APP_TPL);
$p->set_file('day_t', 'day.tpl');
$p->set_block('day_t','day','day');
@@ -1133,7 +1128,7 @@
)),
'small_calendar' => $minical,
'date' =>
$this->bo->long_date($now),
- 'username' => (
$this->bo->is_group ?
$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner) :
$GLOBALS['phpgw']->contacts->get_name_of_person_id($this->bo->owner) ),
+ 'username' => (
$this->bo->is_group ?
$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner) :
$this->bo->contacts->get_name_of_person_id($this->bo->owner) ),
);
if ( $this->bo->debug )
@@ -1217,6 +1212,7 @@
}
else
{
+ //FIXME
Header('Location: ' . $this->page('','',
true));
}
$GLOBALS['phpgw']->common->phpgw_exit();
@@ -1255,14 +1251,14 @@
{
if
($this->bo->check_perms(PHPGW_ACL_READ,0,$id))
{
-
$this->planner_group_members[$GLOBALS['phpgw']->contacts->get_name_of_person_id($id)]
= $id;
+
$this->planner_group_members[$this->bo->contacts->get_name_of_person_id($id)] =
$id;
}
}
ksort($this->planner_group_members);
}
else
{
-
$this->planner_group_members[$GLOBALS['phpgw']->contacts->get_name_of_person_id($this->bo->owner)]
= $this->bo->owner;
+
$this->planner_group_members[$this->bo->contacts->get_name_of_person_id($this->bo->owner)]
= $this->bo->owner;
}
}
@@ -1357,11 +1353,11 @@
&&
!$this->bo->check_perms(PHPGW_ACL_ADD)
||
!$this->bo->check_perms(PHPGW_ACL_ADD,0,(isset($this->bo->save_owner)?$this->bo->save_owner:'')))
{
- $add_owner = array('owner' =>
$GLOBALS['phpgw']->contacts->is_contact($GLOBALS['phpgw_info']['user']['account_id']));
+ $add_owner = array('owner' =>
$this->bo->contacts->is_contact($GLOBALS['phpgw_info']['user']['account_id']));
}
else
{
- $add_owner = array('owner' =>
(isset($this->bo->save_owner)&&
$this->bo->save_owner?$this->bo->save_owner:$GLOBALS['phpgw']->contacts->is_contact($GLOBALS['phpgw_info']['user']['account_id'])));
+ $add_owner = array('owner' =>
(isset($this->bo->save_owner)&&
$this->bo->save_owner?$this->bo->save_owner:$this->bo->contacts->is_contact($GLOBALS['phpgw_info']['user']['account_id'])));
}
for ($d=1; $d<=$days; $d++)
@@ -1884,10 +1880,10 @@
{
foreach (
$group_members as $member )
{
- $person_id =
intval($GLOBALS['phpgw']->contacts->is_contact($member));
+ $person_id =
intval($this->bo->contacts->is_contact($member));
if ( $person_id
> 0 && !isset($users[$person_id]) )
{
-
$users[$person_id] =
$GLOBALS['phpgw']->contacts->get_name_of_person_id($person_id);
+
$users[$person_id] = $this->bo->contacts->get_name_of_person_id($person_id);
}
}
}
@@ -1895,10 +1891,10 @@
}
else
{
- $person_id =
intval($GLOBALS['phpgw']->contacts->is_contact($user));
+ $person_id =
intval($this->bo->contacts->is_contact($user));
if ( $person_id > 0 &&
!isset($users[$person_id]) )
{
- $users[$person_id] =
$GLOBALS['phpgw']->contacts->get_name_of_person_id($person_id);
+ $users[$person_id] =
$this->bo->contacts->get_name_of_person_id($person_id);
}
}
echo '<br />';
@@ -1978,7 +1974,7 @@
{
foreach($members as $member)
{
-
$person_id = $GLOBALS['phpgw']->contacts->is_contact($member['account_id']);
+
$person_id = $this->bo->contacts->is_contact($member['account_id']);
if (
$this->bo->check_perms(PHPGW_ACL_READ, 0, $person_id) )
{
$parts[$person_id] = True;
@@ -1988,7 +1984,7 @@
break;
default:
-
if($this->bo->check_perms(PHPGW_ACL_READ, 0,
$GLOBALS['phpgw']->contacts->is_contact($participant) ) )
+
if($this->bo->check_perms(PHPGW_ACL_READ, 0,
$this->bo->contacts->is_contact($participant) ) )
{
$parts[$participant] = True;
}
@@ -2576,7 +2572,7 @@
{
foreach ($event['participants'] as $participant
=> $accept)
{
- $participants[] =
$GLOBALS['phpgw']->contacts->get_name_of_person_id($participant);
+ $participants[] =
$this->bo->contacts->get_name_of_person_id($participant);
}
$str_participants = implode(', ',$participants);
}
@@ -2617,7 +2613,7 @@
{
if($GLOBALS['phpgw']->accounts->exists($user))
{
- $participants
.= $GLOBALS['phpgw']->contacts->get_name_of_person_id($user).'
('.$this->bo->get_long_status($short_status).')<br>';
+ $participants
.= $this->bo->contacts->get_name_of_person_id($user).'
('.$this->bo->get_long_status($short_status).')<br>';
}
}
}
@@ -2814,14 +2810,14 @@
$overlapped_event =
$this->bo->read_entry($overlapping_events[$i]);
if ( is_array($overlapped_event) )
{
- $overlap .= '<li>
['.$GLOBALS['phpgw']->contacts->get_name_of_person_id($overlapped_event['owner']).']
' . $this->link_to_entry($overlapped_event,$month,$mday,$year) . "</li>\n";
+ $overlap .= '<li>
['.$this->bo->contacts->get_name_of_person_id($overlapped_event['owner']).'] '
. $this->link_to_entry($overlapped_event,$month,$mday,$year) . "</li>\n";
}
else //must be private
{
// this is a hack to get around the
limitations of the current code
// FIXME remove the need for such a
nasty hack by adding a better arg to bocal::read_entry
$overlapped_event =
$this->bo->so->read_entry($overlapping_events[$i]);
- $overlap .= '<li>
['.$GLOBALS['phpgw']->contacts->get_name_of_person_id($overlapped_event['owner']).']
'. lang('private') . "</li>\n";
+ $overlap .= '<li>
['.$this->bo->contacts->get_name_of_person_id($overlapped_event['owner']).'] '.
lang('private') . "</li>\n";
}
}
@@ -2849,7 +2845,7 @@
);
$p->set_var($var);
- $date =
sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day);
+ $date =
sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->mday);
$var = array(
'action_url_button' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'calendar.bocalendar.update', 'readsess' => 1)),
'action_text_button' => lang('Ignore
Conflict'),
@@ -2885,7 +2881,7 @@
if ( ! isset($id2lid[$id]) )
{
- $id2lid[$id] =
$GLOBALS['phpgw']->contacts->get_name_of_person_id($id);
+ $id2lid[$id] =
$this->bo->contacts->get_name_of_person_id($id);
}
if (strlen($names))
@@ -2998,7 +2994,7 @@
if($display_name)
{
- $p->set_var('column_data',
$GLOBALS['phpgw']->contacts->get_name_of_person_id($owner));
+ $p->set_var('column_data',
$this->bo->contacts->get_name_of_person_id($owner));
$p->parse('column_header','month_column',True);
}
@@ -3529,7 +3525,7 @@
$participants = $param['participants'];
foreach($participants as $part => $nul)
{
- $participants[$part] =
$GLOBALS['phpgw']->contacts->get_name_of_person_id($part);
+ $participants[$part] =
$this->bo->contacts->get_name_of_person_id($part);
}
uasort($participants,'strnatcasecmp'); // sort them
after their fullname
@@ -3743,6 +3739,7 @@
$GLOBALS['phpgw']->common->phpgw_exit();
}
+ $t->set_root(PHPGW_APP_TPL);
$t->set_file( array('popup' => 'contacts_popup.tpl') );
$t->set_block('popup', 'cat_option', 'cat_options');
@@ -3814,7 +3811,7 @@
$hourformat = substr($this->bo->users_timeformat,0,1);
// $sb = CreateObject('phpgwapi.sbox');
- $sb = CreateObject('phpgwapi.sbox2');
+ $sb = CreateObject('phpgwapi.sbox');
$jscal = CreateObject('phpgwapi.jscalendar');
unset($GLOBALS['phpgw_info']['flags']['noheader']);
@@ -3998,7 +3995,7 @@
if($id != intval($event['owner']))
{
$str .= '<option value="' . $id .
$status . '" selected="selected">'
- .
$GLOBALS['phpgw']->contacts->get_name_of_person_id($id) . '</option>' . "\n";
+ .
$this->bo->contacts->get_name_of_person_id($id) . '</option>' . "\n";
}
}
$var['participants'] = array
@@ -4019,7 +4016,7 @@
$checked = '';
}
$var['owner'] = array(
- 'field' => lang('%1 participates',
$GLOBALS['phpgw']->contacts->get_name_of_person_id($event['owner']) ),
+ 'field' => lang('%1 participates',
$this->bo->contacts->get_name_of_person_id($event['owner']) ),
'data' => '<input type="checkbox"
name="participants[]" value="'.$event['owner'].'A"'.$checked.'>'
);
// Reminder
@@ -4284,7 +4281,7 @@
$p->set_block('T_edit_partlist_blocks','B_delete_btn','V_delete_btn');
global $query_addr;
- $sb = CreateObject('phpgwapi.sbox2');
+ $sb = CreateObject('phpgwapi.sbox');
$addy = $sb->getAddress('addr','',$query_addr);
$add_ext = $addy['doSearchFkt'];
Modified:
people/sigurdne/modules/calendar/trunk/inc/class.uicustom_fields.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.uicustom_fields.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.uicustom_fields.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -3,23 +3,13 @@
* phpGroupWare - Calendar - Custom fields and sorting *
* http://www.phpgroupware.org *
* Written by Ralf Becker <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
\**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
/* $Id$ */
phpgw::import_class('calendar.bocustom_fields');
Modified: people/sigurdne/modules/calendar/trunk/inc/class.uiholiday.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.uiholiday.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.uiholiday.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -5,23 +5,13 @@
* Based on Webcalendar by Craig Knudsen <address@hidden> *
* http://www.radix.net/~cknudsen *
* Modified by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
\**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
/* $Id$ */
class calendar_uiholiday
Modified: people/sigurdne/modules/calendar/trunk/inc/class.uiicalendar.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.uiicalendar.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/class.uiicalendar.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -5,23 +5,13 @@
* Based on Webcalendar by Craig Knudsen <address@hidden> *
* http://www.radix.net/~cknudsen *
* Modified by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; either version 2 of the License, or (at your *
+ * option) any later version. *
\**************************************************************************/
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
/* $Id$ */
class calendar_uiicalendar
Modified: people/sigurdne/modules/calendar/trunk/inc/hook_deleteaccount.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/hook_deleteaccount.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/hook_deleteaccount.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -11,9 +11,10 @@
\**************************************************************************/
/* $Id$ */
+ $account_id = phpgw::get_var('account_id', 'int');
+ $new_owner = phpgw::get_var('new_owner', 'int');
+
// Delete all records for a user
- $new_owner = phpgw::get_var('new_owner', 'int', 'POST');
- $account_id = phpgw::get_var('account_id', 'int', 'POST');
if ( !$new_owner )
{
ExecMethod('calendar.bocalendar.delete_calendar', $account_id);
@@ -27,4 +28,3 @@
'new_owner' => $new_owner
));
}
-?>
Modified: people/sigurdne/modules/calendar/trunk/inc/hook_email.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/hook_email.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/hook_email.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -30,12 +30,13 @@
$cal = CreateObject('calendar.uicalendar');
//echo "Event ID: $calendar_id<br />\n";
+ phpgw::import_class('phpgwapi.datetime');
if ($event = $cal->bo->read_entry($calendar_id))
{
echo $cal->timematrix(
Array(
- 'date' =>
$GLOBALS['phpgw']->datetime->localdates(mktime(0,0,0,$event['start']['month'],$event['start']['mday'],$event['start']['year'])
- $phpgw->calendar->tz_offset),
+ 'date' =>
phpgwapi_datetime::localdates(mktime(0,0,0,$event['start']['month'],$event['start']['mday'],$event['start']['year'])
- $phpgw->calendar->tz_offset),
'starttime' =>
$cal->bo->splittime('000000',False),
'endtime' => 0,
'participants' =>
$event['participants'])
@@ -51,4 +52,3 @@
}
unset($cal); unset($event);
}
-?>
Modified: people/sigurdne/modules/calendar/trunk/inc/hook_home.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/hook_home.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/inc/hook_home.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -24,7 +24,7 @@
phpgw::import_class('phpgwapi.datetime');
- $GLOBALS['date'] = date('Ymd', phpgw_datetime::user_localtime() );
+ $GLOBALS['date'] = date('Ymd', phpgwapi_datetime::user_localtime() );
$GLOBALS['g_year'] = substr($GLOBALS['date'],0,4);
$GLOBALS['g_month'] = substr($GLOBALS['date'],4,2);
$GLOBALS['g_day'] = substr($GLOBALS['date'],6,2);
Modified:
people/sigurdne/modules/calendar/trunk/phpgroupware.org/accept_holiday.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/phpgroupware.org/accept_holiday.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/phpgroupware.org/accept_holiday.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -11,8 +11,8 @@
\**************************************************************************/
/* $Id$ */
- $send_back_to =
str_replace('submitlocale','holiday_admin',$HTTP_SERVER_VARS['HTTP_REFERER']);
- $send_back_to =
str_replace('submit','admin',$HTTP_SERVER_VARS['HTTP_REFERER']); //
0.9.14.xxx
+ $send_back_to =
str_replace('submitlocale','holiday_admin',$_SERVER['HTTP_REFERER']);
+ $send_back_to = str_replace('submit','admin',$_SERVER['HTTP_REFERER']);
// 0.9.14.xxx
if(!$locale)
{
Header('Location: '.$send_back_to);
Modified: people/sigurdne/modules/calendar/trunk/preferences.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/preferences.php 2009-11-20
10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/preferences.php 2009-11-20
10:27:23 UTC (rev 20840)
@@ -88,8 +88,7 @@
$phpgw->preferences->save_repository(True);
- Header('Location: '.$phpgw->link('/preferences/index.php'));
- $phpgw->common->phpgw_exit();
+ $phpgw->redirect_link('/preferences/index.php');
}
function display_item($field,$data)
Modified: people/sigurdne/modules/calendar/trunk/setup/phpgw_it.lang
===================================================================
--- people/sigurdne/modules/calendar/trunk/setup/phpgw_it.lang 2009-11-20
10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/setup/phpgw_it.lang 2009-11-20
10:27:23 UTC (rev 20840)
@@ -192,3 +192,4 @@
your meeting that had been scheduled for calendar it Il tuo
meeting che è stato fissato per
your meeting that was scheduled for calendar it Il tuo meeting
che era fissato per
your suggested time of <b> %1 - %2 </b> conflicts with the following existing
calendar entries: calendar it L'orario suggerito <B> %1 - %2
</B> è in conflitto con i seguenti appuntamenti presenti in agenda:
+
Modified: people/sigurdne/modules/calendar/trunk/setup/phpgw_sk.lang
===================================================================
--- people/sigurdne/modules/calendar/trunk/setup/phpgw_sk.lang 2009-11-20
10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/setup/phpgw_sk.lang 2009-11-20
10:27:23 UTC (rev 20840)
@@ -1,304 +1,304 @@
%1 %2 in %3 calendar sk %1 %2 z %3
-%1 matches found calendar sk Na¹iel %1
-%1 records imported calendar sk Boo naimportovaných %1 záznamov
-%1 records read (not yet imported, you may go back and uncheck test import)
calendar sk Naèítaných %1 záznamov (zatiaµ neboli naimportované,
mô¾ete sa vráti» a vypnú» Test Importu)
-(for weekly) calendar sk (pre tý¾denné)
+%1 matches found calendar sk Na\xB9iel %1
+%1 records imported calendar sk Boo naimportovan\xFDch %1
z\xE1znamov
+%1 records read (not yet imported, you may go back and uncheck test import)
calendar sk Na\xE8\xEDtan\xFDch %1 z\xE1znamov (zatia\xB5 neboli
naimportovan\xE9, m\xF4\xBEete sa vr\xE1ti\xBB a vypn\xFA\xBB Test Importu)
+(for weekly) calendar sk (pre t\xFD\xBEdenn\xE9)
(i/v)cal calendar sk (i/v)Cal
-1 match found calendar sk Na¹iel 1
+1 match found calendar sk Na\xB9iel 1
a calendar sk
-accept calendar sk Prija»
-accepted calendar sk Prijaté
-action that caused the notify: added, canceled, accepted, rejected, ...
calendar sk Akcia ktorá spôsobila hlásenie: Pridané, Zru¹ené,
Prijaté, Odmietnuté, ...
-add a single entry by passing the fields. calendar sk Prida»
polo¾ku vyplnením políèok
-add alarm calendar sk Prida» Pripomienku
-add contact calendar sk Prida» Kontakt
-added calendar sk Pridané
-address book calendar sk Adresár
+accept calendar sk Prija\xBB
+accepted calendar sk Prijat\xE9
+action that caused the notify: added, canceled, accepted, rejected, ...
calendar sk Akcia ktor\xE1 sp\xF4sobila hl\xE1senie: Pridan\xE9,
Zru\xB9en\xE9, Prijat\xE9, Odmietnut\xE9, ...
+add a single entry by passing the fields. calendar sk
Prida\xBB polo\xBEku vyplnen\xEDm pol\xED\xE8ok
+add alarm calendar sk Prida\xBB Pripomienku
+add contact calendar sk Prida\xBB Kontakt
+added calendar sk Pridan\xE9
+address book calendar sk Adres\xE1r
alarm calendar sk pripomienka (alarm)
-alarm for %1 at %2 in %3 calendar sk Pripomenú» %1 o %2 %3
-alarm management calendar sk Správa Pripomienok (alarmov)
-alarm-management calendar sk Správa-Pripomienok (alarmov)
+alarm for %1 at %2 in %3 calendar sk Pripomen\xFA\xBB %1 o
%2 %3
+alarm management calendar sk Spr\xE1va Pripomienok (alarmov)
+alarm-management calendar sk Spr\xE1va-Pripomienok (alarmov)
alarms calendar sk Pripomienky (alarmy)
-all day calendar sk celý deò
-are you sure you want to delete this country ? calendar sk Urèite
chcete zmaza» túto Krajinu?
-are you sure you want to delete this holiday ? calendar sk Urèite
chcete zmaza» toto voµno?
-are you sure\nyou want to\ndelete these alarms? calendar sk
Urèite chcete zmaza» tieto pripomienky?
-are you sure\nyou want to\ndelete this entry ? calendar sk Urèite
chcete zmaza» túto polo¾ku?
-are you sure\nyou want to\ndelete this entry ?\n\nthis will delete\nthis entry
for all users. calendar sk Urèite chcete zmaza» túto polo¾ku?
Zma¾e sa pre V©ETKÝCH pou¾ívateµov!
-are you sure\nyou want to\ndelete this single occurence ?\n\nthis will
delete\nthis entry for all users. calendar sk Urèite chcete
zmaza» túto polo¾ku? Zma¾e sa pre V©ETKÝCH pou¾ívateµov!
-before the event calendar sk pred udalos»ou
-brief description calendar sk Struèný opis
+all day calendar sk cel\xFD de\xF2
+are you sure you want to delete this country ? calendar sk
Ur\xE8ite chcete zmaza\xBB t\xFAto Krajinu?
+are you sure you want to delete this holiday ? calendar sk
Ur\xE8ite chcete zmaza\xBB toto vo\xB5no?
+are you sure\nyou want to\ndelete these alarms? calendar sk
Ur\xE8ite chcete zmaza\xBB tieto pripomienky?
+are you sure\nyou want to\ndelete this entry ? calendar sk
Ur\xE8ite chcete zmaza\xBB t\xFAto polo\xBEku?
+are you sure\nyou want to\ndelete this entry ?\n\nthis will delete\nthis entry
for all users. calendar sk Ur\xE8ite chcete zmaza\xBB t\xFAto
polo\xBEku? Zma\xBEe sa pre V\xA9ETK\xDDCH pou\xBE\xEDvate\xB5ov!
+are you sure\nyou want to\ndelete this single occurence ?\n\nthis will
delete\nthis entry for all users. calendar sk Ur\xE8ite
chcete zmaza\xBB t\xFAto polo\xBEku? Zma\xBEe sa pre V\xA9ETK\xDDCH
pou\xBE\xEDvate\xB5ov!
+before the event calendar sk pred udalos\xBBou
+brief description calendar sk Stru\xE8n\xFD opis
business calendar sk Obchod
-calendar common sk Kalendár
-calendar - add calendar sk Kalendár - Prida»
-calendar - edit calendar sk Kalendár - Upravi»
-calendar - [iv]cal importer calendar sk Kalendár - [iv]Cal
Importér
-calendar event calendar sk Udalos» Kalendára
-calendar holiday management admin sk Správa Voµna
-calendar preferences calendar sk Voµby Kalendára
-calendar settings admin sk Nastavenia Kalendára
-calendar-fieldname calendar sk Kalendár-Názov polo¾ky
-canceled calendar sk Zru¹ené
-change all events for $params['old_owner'] to $params['new_owner'].
calendar sk Zmeni» v¹etky udalosti pre $params['old_owner'] na
$params['new_owner'].
-change status calendar sk Zmeni» Stav
-click %1here%2 to return to the calendar. calendar sk
Kliknite %1sem%2 pre návrat do kalendára.
-configuration calendar sk Koncigurácia
+calendar common sk Kalend\xE1r
+calendar - add calendar sk Kalend\xE1r - Prida\xBB
+calendar - edit calendar sk Kalend\xE1r - Upravi\xBB
+calendar - [iv]cal importer calendar sk Kalend\xE1r - [iv]Cal
Import\xE9r
+calendar event calendar sk Udalos\xBB Kalend\xE1ra
+calendar holiday management admin sk Spr\xE1va Vo\xB5na
+calendar preferences calendar sk Vo\xB5by Kalend\xE1ra
+calendar settings admin sk Nastavenia Kalend\xE1ra
+calendar-fieldname calendar sk Kalend\xE1r-N\xE1zov polo\xBEky
+canceled calendar sk Zru\xB9en\xE9
+change all events for $params['old_owner'] to $params['new_owner'].
calendar sk Zmeni\xBB v\xB9etky udalosti pre $params['old_owner']
na $params['new_owner'].
+change status calendar sk Zmeni\xBB Stav
+click %1here%2 to return to the calendar. calendar sk
Kliknite %1sem%2 pre n\xE1vrat do kalend\xE1ra.
+configuration calendar sk Koncigur\xE1cia
countries calendar sk Krajiny
country calendar sk Krajina
-csv-fieldname calendar sk CSV-názov polo¾ky
-csv-filename calendar sk CSV-názov súboru
-custom fields calendar sk Vlastné polo¾ky
-custom fields and sorting common sk Vlastné polo¾ky a triedenie
+csv-fieldname calendar sk CSV-n\xE1zov polo\xBEky
+csv-filename calendar sk CSV-n\xE1zov s\xFAboru
+custom fields calendar sk Vlastn\xE9 polo\xBEky
+custom fields and sorting common sk Vlastn\xE9 polo\xBEky a
triedenie
daily calendar sk Denne
-daily matrix view calendar sk Zobrazenie dennej tabuµky
+daily matrix view calendar sk Zobrazenie dennej tabu\xB5ky
days calendar sk dni
-days repeated calendar sk zopakované dni
-dayview calendar sk Denné zobrazenie
-default appointment length (in minutes) calendar sk
predvolená då¾ka upozornenie (v minútach)
-default calendar filter calendar sk Predvolený filter
kalendára
-default calendar view calendar sk Predvolené zobrazenie kalendára
-default length of newly created events. the length is in minutes, eg. 60 for 1
hour. calendar sk Predvolená då¾ka novovytvorených udalostí (v
minútach).
-defines the size in minutes of the lines in the day view. calendar
sk Defiuje rozlí¹enie riadkov v dennom zobrazení (v minútach).
-delete a single entry by passing the id. calendar sk Zmaza»
polo¾ku podµa id.
-delete an entire users calendar. calendar sk Zmaza» celý
kalendár pou¾ívateµa
-delete selected contacts calendar sk Zmaza» oznaèené kontakty
-delete series calendar sk Zmaza» Viac
-delete single calendar sk Zmaza» jeden
-deleted calendar sk Zmazané
+days repeated calendar sk zopakovan\xE9 dni
+dayview calendar sk Denn\xE9 zobrazenie
+default appointment length (in minutes) calendar sk
predvolen\xE1 d\xE5\xBEka upozornenie (v min\xFAtach)
+default calendar filter calendar sk Predvolen\xFD filter
kalend\xE1ra
+default calendar view calendar sk Predvolen\xE9 zobrazenie
kalend\xE1ra
+default length of newly created events. the length is in minutes, eg. 60 for 1
hour. calendar sk Predvolen\xE1 d\xE5\xBEka novovytvoren\xFDch
udalost\xED (v min\xFAtach).
+defines the size in minutes of the lines in the day view. calendar
sk Defiuje rozl\xED\xB9enie riadkov v dennom zobrazen\xED (v min\xFAtach).
+delete a single entry by passing the id. calendar sk
Zmaza\xBB polo\xBEku pod\xB5a id.
+delete an entire users calendar. calendar sk Zmaza\xBB
cel\xFD kalend\xE1r pou\xBE\xEDvate\xB5a
+delete selected contacts calendar sk Zmaza\xBB
ozna\xE8en\xE9 kontakty
+delete series calendar sk Zmaza\xBB Viac
+delete single calendar sk Zmaza\xBB jeden
+deleted calendar sk Zmazan\xE9
description calendar sk OPIS
-display interval in day view calendar sk Zobrazovací interval v
dennom zobrazení
-display mini calendars when printing calendar sk Zobrazi» mini
kalendáre poèas tlaèe
-display status of events calendar sk Zobrazi» stav udalostí
-displays your default calendar view on the startpage (page you get when you
enter phpgroupware or click on the homepage icon)? calendar sk
Zobrazí vá¹ predvolený typ kalendára na základnej stránke (tej, ktorá sa
zobrazí keï sa prihlásite do phpGroupWare alebo kliknete na ikonu Domov)?
-do you want to be notified about new or changed appointments? you be notified
about changes you make yourself.<br />you can limit the notifications to
certain changes only. each item includes all the notification listed above it.
all modifications include changes of title, description, participants, but no
participant responses. if the owner of an event requested any notifcations, he
will always get the participant responses like acceptions and rejections too.
calendar sk Chcete by» upozornení na nové alebo zmenené
pripomienky? Budete upozornení na zmeny ktoré ste sami urobili. <br />Mô¾ete
dokonca obmedzi» upozornenia dokonca na vybrané zmeny. Ka¾dá polo¾ka obsahuje
v¹etky pripomienky vypísané nad òou. V¹etky zmeny zahàòa zmeny titulku, opisu,
úèastníkov, ale nie odpovede úèastníkov. Ak vlastník udalosti po¾iadal o
upozornenia, v¾dy obdr¾í odpovede úèastníkov ako aj prijatia a odmietnutia.
-do you want to receive a regulary summary of your appointsments via email?<br
/>the summary is sent to your standard email-address on the morning of that day
or on monday for weekly summarys.<br />it is only sent when you have any
appointments on that day or week. calendar sk Chcete dostáva»
pravidelné zhrnutie Va¹ich pripomienok cez E-mail? <br />Zhrnutie sa posiela na
Va¹u ¹tandardnú E-mailovú adresu ráno daného dòa, alebo v pondelok v prípade
tý¾denných zhrnutí.<br />Posiela sa iba vtedy, keï tam nejaké pripomienky máte.
-do you wish to autoload calendar holidays files dynamically? admin sk
®eláte si automaticky dynamicky nahráva» kalendárne súbory voµna?
+display interval in day view calendar sk Zobrazovac\xED interval
v dennom zobrazen\xED
+display mini calendars when printing calendar sk Zobrazi\xBB
mini kalend\xE1re po\xE8as tla\xE8e
+display status of events calendar sk Zobrazi\xBB stav
udalost\xED
+displays your default calendar view on the startpage (page you get when you
enter phpgroupware or click on the homepage icon)? calendar sk
Zobraz\xED v\xE1\xB9 predvolen\xFD typ kalend\xE1ra na z\xE1kladnej str\xE1nke
(tej, ktor\xE1 sa zobraz\xED ke\xEF sa prihl\xE1site do phpGroupWare alebo
kliknete na ikonu Domov)?
+do you want to be notified about new or changed appointments? you be notified
about changes you make yourself.<br />you can limit the notifications to
certain changes only. each item includes all the notification listed above it.
all modifications include changes of title, description, participants, but no
participant responses. if the owner of an event requested any notifcations, he
will always get the participant responses like acceptions and rejections too.
calendar sk Chcete by\xBB upozornen\xED na nov\xE9 alebo
zmenen\xE9 pripomienky? Budete upozornen\xED na zmeny ktor\xE9 ste sami
urobili. <br />M\xF4\xBEete dokonca obmedzi\xBB upozornenia dokonca na
vybran\xE9 zmeny. Ka\xBEd\xE1 polo\xBEka obsahuje v\xB9etky pripomienky
vyp\xEDsan\xE9 nad \xF2ou. V\xB9etky zmeny zah\xE0\xF2a zmeny titulku, opisu,
\xFA\xE8astn\xEDkov, ale nie odpovede \xFA\xE8astn\xEDkov. Ak vlastn\xEDk
udalosti po\xBEiadal o upozornenia, v\xBEdy obdr\xBE\xED odpovede
\xFA\xE8astn\xEDkov ako aj prijatia a odmietnutia.
+do you want to receive a regulary summary of your appointsments via email?<br
/>the summary is sent to your standard email-address on the morning of that day
or on monday for weekly summarys.<br />it is only sent when you have any
appointments on that day or week. calendar sk Chcete
dost\xE1va\xBB pravideln\xE9 zhrnutie Va\xB9ich pripomienok cez E-mail? <br
/>Zhrnutie sa posiela na Va\xB9u \xB9tandardn\xFA E-mailov\xFA adresu r\xE1no
dan\xE9ho d\xF2a, alebo v pondelok v pr\xEDpade t\xFD\xBEdenn\xFDch
zhrnut\xED.<br />Posiela sa iba vtedy, ke\xEF tam nejak\xE9 pripomienky m\xE1te.
+do you wish to autoload calendar holidays files dynamically? admin sk
\xAEel\xE1te si automaticky dynamicky nahr\xE1va\xBB kalend\xE1rne s\xFAbory
vo\xB5na?
download calendar sk stiahnutie
duration calendar sk Trvanie
-edit series calendar sk Editova» Viacero
-edit single calendar sk Editova» Jednotlivo
-email reminder calendar sk E-mailová pripomienka
-end date/time calendar sk Dátum/èas konca
-enddate calendar sk Dátum konca
-ends calendar sk konèí
-enter output filename: ( .vcs appended ) calendar sk Zadajte
názov výstupného súboru: ( .vcs pripojené )
-event details follow calendar sk Nasledujú podrobnosti udalosti
-exceptions calendar sk Výnimky
+edit series calendar sk Editova\xBB Viacero
+edit single calendar sk Editova\xBB Jednotlivo
+email reminder calendar sk E-mailov\xE1 pripomienka
+end date/time calendar sk D\xE1tum/\xE8as konca
+enddate calendar sk D\xE1tum konca
+ends calendar sk kon\xE8\xED
+enter output filename: ( .vcs appended ) calendar sk Zadajte
n\xE1zov v\xFDstupn\xE9ho s\xFAboru: ( .vcs pripojen\xE9 )
+event details follow calendar sk Nasleduj\xFA podrobnosti
udalosti
+exceptions calendar sk V\xFDnimky
export calendar sk Export
-export a list of entries in ical format. calendar sk
Exportova» zoznam polo¾iek vo formáte iCal.
-extended calendar sk Roz¹írené
-extended updates always include the complete event-details. ical's can be
imported by certain other calendar-applications. calendar sk
Roz¹írené aktualizácie v¾dy obsahujú podrobnosti udalosti. iCal vedia
importova» rozlièné kalendárové aplikácie.
-external participants calendar sk Externí úèastníci
-failed sending message to '%1' #%2 subject='%3', sender='%4' !!!
calendar sk Nepodarilo sa posla» správu '%1' #%2 predmet='%3',
odosielateµ='%4' !!!
-fieldseparator calendar sk Oddeµovaè polí
-firstname of person to notify calendar sk Meno osoby ktorá má by»
upozornená
-format of event updates calendar sk Formát aktualizácií
udalostí
+export a list of entries in ical format. calendar sk
Exportova\xBB zoznam polo\xBEiek vo form\xE1te iCal.
+extended calendar sk Roz\xB9\xEDren\xE9
+extended updates always include the complete event-details. ical's can be
imported by certain other calendar-applications. calendar sk
Roz\xB9\xEDren\xE9 aktualiz\xE1cie v\xBEdy obsahuj\xFA podrobnosti udalosti.
iCal vedia importova\xBB rozli\xE8n\xE9 kalend\xE1rov\xE9 aplik\xE1cie.
+external participants calendar sk Extern\xED \xFA\xE8astn\xEDci
+failed sending message to '%1' #%2 subject='%3', sender='%4' !!!
calendar sk Nepodarilo sa posla\xBB spr\xE1vu '%1' #%2
predmet='%3', odosielate\xB5='%4' !!!
+fieldseparator calendar sk Odde\xB5ova\xE8 pol\xED
+firstname of person to notify calendar sk Meno osoby ktor\xE1
m\xE1 by\xBB upozornen\xE1
+format of event updates calendar sk Form\xE1t
aktualiz\xE1ci\xED udalost\xED
fr calendar sk F
-free/busy calendar sk Voµný/Zaneprázdnený
+free/busy calendar sk Vo\xB5n\xFD/Zanepr\xE1zdnen\xFD
frequency calendar sk Frekvencia
fri calendar sk Pia
-full description calendar sk Podrobný Opis
-fullname of person to notify calendar sk Úplné meno osoby ktorá
má by» upozornená
-generate printer-friendly version calendar sk Vygenerova»
verziu vhodnú pre tlaè
-global categories calendar sk Globálne Kategórie
-global public and group public calendar sk Globálny verejný a
skupinový verejný
-global public only calendar sk Iba globálny verejný
-go! calendar sk Spusti»!
-grant calendar access common sk Prideli» prístup ku kalendáru
-group planner calendar sk Skupinový Plánovaè
-group public only calendar sk Iba skupinový verejný
-here is your requested alarm. calendar sk Toto je Va¹a vy¾iadaná
pripomienka.
-high priority calendar sk vysoká priorita
-holiday calendar sk Voµno
-holiday management calendar sk Správa Voµna
-holiday-management calendar sk Správa-Voµna
+full description calendar sk Podrobn\xFD Opis
+fullname of person to notify calendar sk \xDApln\xE9 meno osoby
ktor\xE1 m\xE1 by\xBB upozornen\xE1
+generate printer-friendly version calendar sk Vygenerova\xBB
verziu vhodn\xFA pre tla\xE8
+global categories calendar sk Glob\xE1lne Kateg\xF3rie
+global public and group public calendar sk Glob\xE1lny verejn\xFD
a skupinov\xFD verejn\xFD
+global public only calendar sk Iba glob\xE1lny verejn\xFD
+go! calendar sk Spusti\xBB!
+grant calendar access common sk Prideli\xBB pr\xEDstup ku kalend\xE1ru
+group planner calendar sk Skupinov\xFD Pl\xE1nova\xE8
+group public only calendar sk Iba skupinov\xFD verejn\xFD
+here is your requested alarm. calendar sk Toto je Va\xB9a
vy\xBEiadan\xE1 pripomienka.
+high priority calendar sk vysok\xE1 priorita
+holiday calendar sk Vo\xB5no
+holiday management calendar sk Spr\xE1va Vo\xB5na
+holiday-management calendar sk Spr\xE1va-Vo\xB5na
holidays calendar sk Sviatky
hours calendar sk hodiny
-i participate calendar sk Zúèastòujem sa
+i participate calendar sk Z\xFA\xE8ast\xF2ujem sa
ical / rfc2445 calendar sk iCal / rfc2445
-if checked holidays falling on a weekend, are taken on the monday after.
calendar sk Ak je zapnuté (za¹krtnuté), sviatky vychádzajúce na
víkend sa uplatnia nasledujúci pondelok.
-ignore conflict calendar sk Ignorova» konflikt
+if checked holidays falling on a weekend, are taken on the monday after.
calendar sk Ak je zapnut\xE9 (za\xB9krtnut\xE9), sviatky
vych\xE1dzaj\xFAce na v\xEDkend sa uplatnia nasleduj\xFAci pondelok.
+ignore conflict calendar sk Ignorova\xBB konflikt
import calendar sk Import
-import csv-file into calendar calendar sk Import súboru CSV do
Kalendára
+import csv-file into calendar calendar sk Import s\xFAboru CSV do
Kalend\xE1ra
interval calendar sk Interval
-intervals in day view calendar sk Intervaly v dennom zobrazení
-intervals per day in planner view calendar sk Intervalov na
jeden deò v Plánovaèi
-invalid entry id. calendar sk Chybné id polo¾ky.
-last calendar sk posledné
-lastname of person to notify calendar sk Priezvisko osoby ktorá
má by» upozornená
-length shown<br />(emtpy for full length) calendar sk Då¾ka
ktorá má by» zobrazená<br />(prázdne znamená plnú då¾ku)
-length<br />(<= 255) calendar sk Då¾ka<br />(<= 255)
-load [iv]cal calendar sk Nahra» [iv]Cal
+intervals in day view calendar sk Intervaly v dennom zobrazen\xED
+intervals per day in planner view calendar sk Intervalov na
jeden de\xF2 v Pl\xE1nova\xE8i
+invalid entry id. calendar sk Chybn\xE9 id polo\xBEky.
+last calendar sk posledn\xE9
+lastname of person to notify calendar sk Priezvisko osoby
ktor\xE1 m\xE1 by\xBB upozornen\xE1
+length shown<br />(emtpy for full length) calendar sk
D\xE5\xBEka ktor\xE1 m\xE1 by\xBB zobrazen\xE1<br />(pr\xE1zdne znamen\xE1
pln\xFA d\xE5\xBEku)
+length<br />(<= 255) calendar sk D\xE5\xBEka<br />(<= 255)
+load [iv]cal calendar sk Nahra\xBB [iv]Cal
location calendar sk Miesto
-location to autoload from admin sk Umiestnenie, odkiaµ automaticky
nahráva»
-matrixview calendar sk Tabuµkové zobrazenie
-minutes calendar sk minúty
+location to autoload from admin sk Umiestnenie, odkia\xB5
automaticky nahr\xE1va\xBB
+matrixview calendar sk Tabu\xB5kov\xE9 zobrazenie
+minutes calendar sk min\xFAty
mo calendar sk P
-modified calendar sk Zmenené
-modify list of external participants calendar sk Upravi» zoznam
externých úèastníkov
+modified calendar sk Zmenen\xE9
+modify list of external participants calendar sk Upravi\xBB
zoznam extern\xFDch \xFA\xE8astn\xEDkov
mon calendar sk Pon
month calendar sk Mesiac
-monthly calendar sk Mesaène
-monthly (by date) calendar sk Mesaène (podµa dátumu)
-monthly (by day) calendar sk Mesaène (podµa dòa)
-monthview calendar sk Mesaèné zobrazenie
-new entry calendar sk Nová polo¾ka
-new name must not exist and not be empty!!! calendar sk Nové
meno nesmie by» prázdne ani toto¾né s u¾ existujúcim!!!
-no matches found calendar sk Nena¹iel ¾iadne.
-no response calendar sk ®iadna odpoveï.
-notification messages for added events calendar sk Upozoròujúce
správy pre pridané udalosti
-notification messages for canceled events calendar sk
Upozoròujúce správy pre zru¹ené udalosti
-notification messages for modified events calendar sk
Upozoròujúce správy pre upravené udalosti
-notification messages for your alarms calendar sk Upozoròujúce
správy pre Va¹e pripomienky
-notification messages for your responses calendar sk
Upozoròujúce správy pre Va¹e odpovede
-number of intervals per day in planner view calendar sk Poèet
intervalov na jeden deò v Plánovaèi
-number of months calendar sk Poèet mesiacov
-number of records to read (<=200) calendar sk Poèet záznamov
na naèítanie (<=200)
+monthly calendar sk Mesa\xE8ne
+monthly (by date) calendar sk Mesa\xE8ne (pod\xB5a d\xE1tumu)
+monthly (by day) calendar sk Mesa\xE8ne (pod\xB5a d\xF2a)
+monthview calendar sk Mesa\xE8n\xE9 zobrazenie
+new entry calendar sk Nov\xE1 polo\xBEka
+new name must not exist and not be empty!!! calendar sk Nov\xE9
meno nesmie by\xBB pr\xE1zdne ani toto\xBEn\xE9 s u\xBE existuj\xFAcim!!!
+no matches found calendar sk Nena\xB9iel \xBEiadne.
+no response calendar sk \xAEiadna odpove\xEF.
+notification messages for added events calendar sk
Upozor\xF2uj\xFAce spr\xE1vy pre pridan\xE9 udalosti
+notification messages for canceled events calendar sk
Upozor\xF2uj\xFAce spr\xE1vy pre zru\xB9en\xE9 udalosti
+notification messages for modified events calendar sk
Upozor\xF2uj\xFAce spr\xE1vy pre upraven\xE9 udalosti
+notification messages for your alarms calendar sk
Upozor\xF2uj\xFAce spr\xE1vy pre Va\xB9e pripomienky
+notification messages for your responses calendar sk
Upozor\xF2uj\xFAce spr\xE1vy pre Va\xB9e odpovede
+number of intervals per day in planner view calendar sk
Po\xE8et intervalov na jeden de\xF2 v Pl\xE1nova\xE8i
+number of months calendar sk Po\xE8et mesiacov
+number of records to read (<=200) calendar sk Po\xE8et
z\xE1znamov na na\xE8\xEDtanie (<=200)
observance rule calendar sk Observance Rule
occurence calendar sk Occurence
-old startdate calendar sk Starý dátum zaèiatku
-olddate calendar sk Starý dátum
-on %1 %2 %3 your meeting request for %4 calendar sk %1 %2
%3 Va¹a po¾iadavka na stretnutie kvôli %4
-on all changes calendar sk pri v¹etkých zmenách
-on all modification, but responses calendar sk pri v¹etkých
zmenách okram odpovedí
-on any time change too calendar sk tie¾ pri ka¾dej zmene èasu
-on invitation / cancelation only calendar sk len pri pozvaní
/ zru¹ení
-on participant responses too calendar sk tie¾ pri odpovediach
úèastníkov
-on time change of more than 4 hours too calendar sk tie¾
pri ka¾dej zmene èasu väè¹ej ne¾ 4 hodiny
+old startdate calendar sk Star\xFD d\xE1tum za\xE8iatku
+olddate calendar sk Star\xFD d\xE1tum
+on %1 %2 %3 your meeting request for %4 calendar sk %1 %2
%3 Va\xB9a po\xBEiadavka na stretnutie kv\xF4li %4
+on all changes calendar sk pri v\xB9etk\xFDch zmen\xE1ch
+on all modification, but responses calendar sk pri
v\xB9etk\xFDch zmen\xE1ch okram odpoved\xED
+on any time change too calendar sk tie\xBE pri ka\xBEdej zmene
\xE8asu
+on invitation / cancelation only calendar sk len pri
pozvan\xED / zru\xB9en\xED
+on participant responses too calendar sk tie\xBE pri odpovediach
\xFA\xE8astn\xEDkov
+on time change of more than 4 hours too calendar sk tie\xBE
pri ka\xBEdej zmene \xE8asu v\xE4\xE8\xB9ej ne\xBE 4 hodiny
order calendar sk Poradie
-overlap holiday calendar sk prekrývajúce sa voµná (?overlap
holiday)
-participant calendar sk Úèastník
-participants calendar sk Úèastníci
-participates calendar sk Zúèastòuje sa
+overlap holiday calendar sk prekr\xFDvaj\xFAce sa
vo\xB5n\xE1 (?overlap holiday)
+participant calendar sk \xDA\xE8astn\xEDk
+participants calendar sk \xDA\xE8astn\xEDci
+participates calendar sk Z\xFA\xE8ast\xF2uje sa
people holiday calendar sk people holiday
-permission denied calendar sk Prístup odopretý
-planner calendar sk Plánovaè
-planner by category calendar sk Plánovaè podµa kategórie
-planner by user calendar sk Plánovaè podµa pou¾ívateµa
-please confirm,accept,reject or examine changes in the corresponding entry in
your calendar calendar sk Prosím potvrïte, akceptujte,
odmietnite alebo skontrolujte zmeny v príslu¹nej polo¾ke Vá¹ho kalendára
-preselected group for entering the planner calendar sk
Predurèená skupina pre vstup do Plánovaèa
-print calendars in black & white calendar sk Tlaèi»
kalendáre èiernobielo
-print the mini calendars calendar sk Tlaèi» mini kalendáre
-printer friendly calendar sk Výstup pre tlaèiareò
-privat calendar sk Súkromné
-private and global public calendar sk Súkromné a globálne
verejné
-private and group public calendar sk Súkromné a skupinovo
verejné
-private only calendar sk Iba súkromné
-re-edit event calendar sk Znovu upravi» udalos»
-read a list of entries. calendar sk Naèíta» zoznam polo¾iek
-read a single entry by passing the id and fieldlist. calendar sk
Naèíta» polo¾ku zadaním id a zoznamu polí
-read this list of methods. calendar sk Naèíta» zoznam metód.
-receive email updates calendar sk Prija» E-mailové aktualizácie
-receive extra information in event mails calendar sk Prija»
doplnkové informácie E-mailami udalostí
-receive summary of appointments calendar sk Prija» zhrnutie
pripomienok
+permission denied calendar sk Pr\xEDstup odopret\xFD
+planner calendar sk Pl\xE1nova\xE8
+planner by category calendar sk Pl\xE1nova\xE8 pod\xB5a
kateg\xF3rie
+planner by user calendar sk Pl\xE1nova\xE8 pod\xB5a
pou\xBE\xEDvate\xB5a
+please confirm,accept,reject or examine changes in the corresponding entry in
your calendar calendar sk Pros\xEDm potvr\xEFte, akceptujte,
odmietnite alebo skontrolujte zmeny v pr\xEDslu\xB9nej polo\xBEke V\xE1\xB9ho
kalend\xE1ra
+preselected group for entering the planner calendar sk
Predur\xE8en\xE1 skupina pre vstup do Pl\xE1nova\xE8a
+print calendars in black & white calendar sk Tla\xE8i\xBB
kalend\xE1re \xE8iernobielo
+print the mini calendars calendar sk Tla\xE8i\xBB mini
kalend\xE1re
+printer friendly calendar sk V\xFDstup pre tla\xE8iare\xF2
+privat calendar sk S\xFAkromn\xE9
+private and global public calendar sk S\xFAkromn\xE9 a
glob\xE1lne verejn\xE9
+private and group public calendar sk S\xFAkromn\xE9 a
skupinovo verejn\xE9
+private only calendar sk Iba s\xFAkromn\xE9
+re-edit event calendar sk Znovu upravi\xBB udalos\xBB
+read a list of entries. calendar sk Na\xE8\xEDta\xBB zoznam
polo\xBEiek
+read a single entry by passing the id and fieldlist. calendar sk
Na\xE8\xEDta\xBB polo\xBEku zadan\xEDm id a zoznamu pol\xED
+read this list of methods. calendar sk Na\xE8\xEDta\xBB zoznam
met\xF3d.
+receive email updates calendar sk Prija\xBB E-mailov\xE9
aktualiz\xE1cie
+receive extra information in event mails calendar sk
Prija\xBB doplnkov\xE9 inform\xE1cie E-mailami udalost\xED
+receive summary of appointments calendar sk Prija\xBB
zhrnutie pripomienok
recurring event calendar sk recurring event
-refresh calendar sk Obnovi»
-reinstate calendar sk Vráti» spä»
-rejected calendar sk Odmietnuté
-repeat day calendar sk Deò opakovania
-repeat end date calendar sk Koneèný dátum opakovania
+refresh calendar sk Obnovi\xBB
+reinstate calendar sk Vr\xE1ti\xBB sp\xE4\xBB
+rejected calendar sk Odmietnut\xE9
+repeat day calendar sk De\xF2 opakovania
+repeat end date calendar sk Kone\xE8n\xFD d\xE1tum
opakovania
repeat type calendar sk Typ opakovania
-repeating event information calendar sk Informácia o opakujúcej
sa udalosti
+repeating event information calendar sk Inform\xE1cia o
opakuj\xFAcej sa udalosti
repetition calendar sk Opakovanie
-repetitiondetails (or empty) calendar sk Podrobnosti opakovania
(alebo prázdne)
+repetitiondetails (or empty) calendar sk Podrobnosti opakovania
(alebo pr\xE1zdne)
reset calendar sk Reset
rule calendar sk Pravidlo
sa calendar sk So
sat calendar sk Sob
-scheduling conflict calendar sk Konflikt plánovania
-search results calendar sk Výsledky hµadania
-selected contacts (%1) calendar sk Vybrané kontakty (%1)
-send updates via email common sk Posla» aktualizácie E-mailom
-send/receive updates via email calendar sk Posla»/Prija»
aktualizácie E-mailom
-set a year only for one-time / non-regular holidays. calendar sk
Nastavi» rok iba pre príle¾itostné / nie pravidelné sviatky
-set new events to private calendar sk Nastavi» nové udalosti
ako súkromné
-should invitations you rejected still be shown in your calendar ?<br />you can
only accept them later (eg. when your scheduling conflict is removed), if they
are still shown in your calendar! calendar sk Majú sa
pozvania, ktoré ste odmietli, naïalej zobrazova» vo Va¹om kalendári? <br />U¾
ich mô¾ete prija» len neskôr (napríklad keï pominie konflikt plánovania), ak
e¹te stále budú vo Va¹om kalendári!
-should new events created as private by default ? calendar sk
Majú sa nové udalosti vytvára» ako súkromné?
-should the mini calendars by printed / displayed in the printer friendly views
? calendar sk Majú sa mini kalendáre tlaèi» / zobrazova» vo
výstupoch pre tlaèiareò?
-should the printer friendly view be in black & white or in color (as in normal
view)? calendar sk Má by» výstup pre tlaèiareò èiernobiely alebo
farebný (ako v normálnom zobrazení)?
-should the status of the event-participants (accept, reject, ...) be shown in
brakets after each participants name ? calendar sk Má sa stav
úèastníkov udalosti (prijaté, odmietnuté, ...) ukazova» zátvorkách za menom
ka¾dého úèastníka?
-show day view on main screen calendar sk Na hlavnej stránke
zobrazi» denný pohµad
-show default view on main screen calendar sk Na hlavnej
stránke zobrazi» predvolený pohµad
-show high priority events on main screen calendar sk Na
hlavnej stránke ukáza» udalosti vysokej priority
-show invitations you rejected calendar sk Ukáza» pozvania ktoré
ste odmietli
-single event calendar sk jednotlivá udalos»
-sorry, the owner has just deleted this event calendar sk Je mi
µúto, vlastník u¾ túto udalos» zmazal
-sorry, this event does not exist calendar sk Je mi µúto,
táto udalos» neexistuje
-sorry, this event does not have exceptions defined calendar sk
Je mi µúto, táto udalos» nemá definované výnimky
-sort by calendar sk Triedi» podµa
-specifies the the number of intervals shown in the planner view.
calendar sk Nastavuje poèet intervalov zobrazených v pohµade
plánovaèa.
-start date/time calendar sk Dátum/èas zaèiatku
-start- and enddates calendar sk Dátumy zaèiatku a konca
-startdate calendar sk Dátum zaèiatku
-startrecord calendar sk Úvodný záznam
+scheduling conflict calendar sk Konflikt pl\xE1novania
+search results calendar sk V\xFDsledky h\xB5adania
+selected contacts (%1) calendar sk Vybran\xE9 kontakty (%1)
+send updates via email common sk Posla\xBB aktualiz\xE1cie E-mailom
+send/receive updates via email calendar sk Posla\xBB/Prija\xBB
aktualiz\xE1cie E-mailom
+set a year only for one-time / non-regular holidays. calendar sk
Nastavi\xBB rok iba pre pr\xEDle\xBEitostn\xE9 / nie pravideln\xE9 sviatky
+set new events to private calendar sk Nastavi\xBB nov\xE9
udalosti ako s\xFAkromn\xE9
+should invitations you rejected still be shown in your calendar ?<br />you can
only accept them later (eg. when your scheduling conflict is removed), if they
are still shown in your calendar! calendar sk Maj\xFA sa
pozvania, ktor\xE9 ste odmietli, na\xEFalej zobrazova\xBB vo Va\xB9om
kalend\xE1ri? <br />U\xBE ich m\xF4\xBEete prija\xBB len nesk\xF4r
(napr\xEDklad ke\xEF pominie konflikt pl\xE1novania), ak e\xB9te st\xE1le
bud\xFA vo Va\xB9om kalend\xE1ri!
+should new events created as private by default ? calendar sk
Maj\xFA sa nov\xE9 udalosti vytv\xE1ra\xBB ako s\xFAkromn\xE9?
+should the mini calendars by printed / displayed in the printer friendly views
? calendar sk Maj\xFA sa mini kalend\xE1re tla\xE8i\xBB /
zobrazova\xBB vo v\xFDstupoch pre tla\xE8iare\xF2?
+should the printer friendly view be in black & white or in color (as in normal
view)? calendar sk M\xE1 by\xBB v\xFDstup pre tla\xE8iare\xF2
\xE8iernobiely alebo farebn\xFD (ako v norm\xE1lnom zobrazen\xED)?
+should the status of the event-participants (accept, reject, ...) be shown in
brakets after each participants name ? calendar sk M\xE1 sa stav
\xFA\xE8astn\xEDkov udalosti (prijat\xE9, odmietnut\xE9, ...) ukazova\xBB
z\xE1tvork\xE1ch za menom ka\xBEd\xE9ho \xFA\xE8astn\xEDka?
+show day view on main screen calendar sk Na hlavnej str\xE1nke
zobrazi\xBB denn\xFD poh\xB5ad
+show default view on main screen calendar sk Na hlavnej
str\xE1nke zobrazi\xBB predvolen\xFD poh\xB5ad
+show high priority events on main screen calendar sk Na
hlavnej str\xE1nke uk\xE1za\xBB udalosti vysokej priority
+show invitations you rejected calendar sk Uk\xE1za\xBB pozvania
ktor\xE9 ste odmietli
+single event calendar sk jednotliv\xE1 udalos\xBB
+sorry, the owner has just deleted this event calendar sk Je mi
\xB5\xFAto, vlastn\xEDk u\xBE t\xFAto udalos\xBB zmazal
+sorry, this event does not exist calendar sk Je mi
\xB5\xFAto, t\xE1to udalos\xBB neexistuje
+sorry, this event does not have exceptions defined calendar sk
Je mi \xB5\xFAto, t\xE1to udalos\xBB nem\xE1 definovan\xE9 v\xFDnimky
+sort by calendar sk Triedi\xBB pod\xB5a
+specifies the the number of intervals shown in the planner view.
calendar sk Nastavuje po\xE8et intervalov zobrazen\xFDch v
poh\xB5ade pl\xE1nova\xE8a.
+start date/time calendar sk D\xE1tum/\xE8as za\xE8iatku
+start- and enddates calendar sk D\xE1tumy za\xE8iatku a konca
+startdate calendar sk D\xE1tum za\xE8iatku
+startrecord calendar sk \xDAvodn\xFD z\xE1znam
su calendar sk Ne
-submit to repository calendar sk Odosla» do záznamov
+submit to repository calendar sk Odosla\xBB do z\xE1znamov
sun calendar sk Ned
-tentative calendar sk Nezáväzný
-test import (show importable records <u>only</u> in browser) calendar
sk Testovací import (uká¾e importovateµné záznamy <u>iba</u> v prehliadaèi)
+tentative calendar sk Nez\xE1v\xE4zn\xFD
+test import (show importable records <u>only</u> in browser) calendar
sk Testovac\xED import (uk\xE1\xBEe importovate\xB5n\xE9 z\xE1znamy
<u>iba</u> v prehliada\xE8i)
text calendar sk Text
-th calendar sk ©
-the following conflicts with the suggested time:<ul>%1</ul> calendar
sk Nasledovné konflikty s navrhovaným èasom:<ul>%1</ul>
-the user %1 is not participating in this event! calendar sk
Pou¾ívateµ %1 sa nezúèastòuje na tejto udalosti!
-there was an error trying to connect to your news server.<br />please contact
your admin to check the news servername, username or password. calendar
sk Poèas pripájania na server správ sa vyskytla chyba.<br />Prosím
kontaktujte svojho administrátora, aby skontroloval názov servera správ,
pou¾ívateµské meno a heslo.
-this day is shown as first day in the week or month view. calendar
sk Tento deò sa zobrazí ako prvý deò v tý¾dennom alebo mesaènom pohµade.
-this defines the end of your dayview. events after this time, are shown below
the dayview. calendar sk Tu sa definuje koniec Vá¹ho denného
pohµadu. Udalosti nasledujúce po òom sa zobrazia pod denným pohµadom.
-this defines the start of your dayview. events before this time, are shown
above the dayview.<br />this time is also used as a default starttime for new
events. calendar sk Tu sa definuje zaèiatok Vá¹ho denného
pohµadu. Udalosti ktoré mu predchádzajú sa zobrazia nad denným pohµadom.<br
/>Tento èas sa taktie¾ pou¾ije ako predvolený èas zaèiatku pre nové udalosti.
-this group that is preselected when you enter the planner. you can change it
in the planner anytime you want. calendar sk Táto skupina je
predvolená pri Va¹om vstupe do Plánovaèa. Mô¾ete ju v Plánovaèi kedykoµvek
zmeni».
-this is mostly caused by a not or wrongly configured smtp server. notify your
administrator. calendar sk Najèastej¹ie je to zapríèinené
nenastaveným alebo zle nastaveným SMTP serverom. Upozornite Vá¹ho
administrátora.
-this message is sent for canceled or deleted events. calendar sk
Táto správa sa odosiela pri zru¹ených alebo zmazaných udalostiach.
-this message is sent for modified or moved events. calendar sk
Táto správa sa posiela pri zmenených alebo presunutých udalostiach.
-this message is sent to every participant of events you own, who has requested
notifcations about new events.<br />you can use certain variables which get
substituted with the data of the event. the first line is the subject of the
email. calendar sk Táto správa sa posiela ka¾dému úèastníkovi
Va¹ich udalostí, ktorý po¾iadal o upozornenia o nových udalostiach.<br />Mô¾ete
pou¾i» viacero premenných ktoré sa nahradia údajmi udalosti. Prvý riadok je
predmet E-mailu.
-this message is sent when you accept, tentative accept or reject an event.
calendar sk Táto správa sa posiela keï prijmete, nezáväzne prijmete
alebo odmietnete udalos».
-this message is sent when you set an alarm for a certain event. include all
information you might need. calendar sk Táto správa sa
posiela keï nastavíte Pripomienku pre niektorú udalos». Zadajte v¹etky
informácie, ktoré by ste mohli potrebova».
+th calendar sk \xA9
+the following conflicts with the suggested time:<ul>%1</ul> calendar
sk Nasledovn\xE9 konflikty s navrhovan\xFDm \xE8asom:<ul>%1</ul>
+the user %1 is not participating in this event! calendar sk
Pou\xBE\xEDvate\xB5 %1 sa nez\xFA\xE8ast\xF2uje na tejto udalosti!
+there was an error trying to connect to your news server.<br />please contact
your admin to check the news servername, username or password. calendar
sk Po\xE8as prip\xE1jania na server spr\xE1v sa vyskytla chyba.<br
/>Pros\xEDm kontaktujte svojho administr\xE1tora, aby skontroloval n\xE1zov
servera spr\xE1v, pou\xBE\xEDvate\xB5sk\xE9 meno a heslo.
+this day is shown as first day in the week or month view. calendar
sk Tento de\xF2 sa zobraz\xED ako prv\xFD de\xF2 v t\xFD\xBEdennom alebo
mesa\xE8nom poh\xB5ade.
+this defines the end of your dayview. events after this time, are shown below
the dayview. calendar sk Tu sa definuje koniec V\xE1\xB9ho
denn\xE9ho poh\xB5adu. Udalosti nasleduj\xFAce po \xF2om sa zobrazia pod
denn\xFDm poh\xB5adom.
+this defines the start of your dayview. events before this time, are shown
above the dayview.<br />this time is also used as a default starttime for new
events. calendar sk Tu sa definuje za\xE8iatok V\xE1\xB9ho
denn\xE9ho poh\xB5adu. Udalosti ktor\xE9 mu predch\xE1dzaj\xFA sa zobrazia nad
denn\xFDm poh\xB5adom.<br />Tento \xE8as sa taktie\xBE pou\xBEije ako
predvolen\xFD \xE8as za\xE8iatku pre nov\xE9 udalosti.
+this group that is preselected when you enter the planner. you can change it
in the planner anytime you want. calendar sk T\xE1to skupina je
predvolen\xE1 pri Va\xB9om vstupe do Pl\xE1nova\xE8a. M\xF4\xBEete ju v
Pl\xE1nova\xE8i kedyko\xB5vek zmeni\xBB.
+this is mostly caused by a not or wrongly configured smtp server. notify your
administrator. calendar sk Naj\xE8astej\xB9ie je to
zapr\xED\xE8inen\xE9 nenastaven\xFDm alebo zle nastaven\xFDm SMTP serverom.
Upozornite V\xE1\xB9ho administr\xE1tora.
+this message is sent for canceled or deleted events. calendar sk
T\xE1to spr\xE1va sa odosiela pri zru\xB9en\xFDch alebo zmazan\xFDch
udalostiach.
+this message is sent for modified or moved events. calendar sk
T\xE1to spr\xE1va sa posiela pri zmenen\xFDch alebo presunut\xFDch udalostiach.
+this message is sent to every participant of events you own, who has requested
notifcations about new events.<br />you can use certain variables which get
substituted with the data of the event. the first line is the subject of the
email. calendar sk T\xE1to spr\xE1va sa posiela ka\xBEd\xE9mu
\xFA\xE8astn\xEDkovi Va\xB9ich udalost\xED, ktor\xFD po\xBEiadal o upozornenia
o nov\xFDch udalostiach.<br />M\xF4\xBEete pou\xBEi\xBB viacero premenn\xFDch
ktor\xE9 sa nahradia \xFAdajmi udalosti. Prv\xFD riadok je predmet E-mailu.
+this message is sent when you accept, tentative accept or reject an event.
calendar sk T\xE1to spr\xE1va sa posiela ke\xEF prijmete,
nez\xE1v\xE4zne prijmete alebo odmietnete udalos\xBB.
+this message is sent when you set an alarm for a certain event. include all
information you might need. calendar sk T\xE1to spr\xE1va sa
posiela ke\xEF nastav\xEDte Pripomienku pre niektor\xFA udalos\xBB. Zadajte
v\xB9etky inform\xE1cie, ktor\xE9 by ste mohli potrebova\xBB.
this month calendar sk Tento mesiac
-this week calendar sk Tento tý¾deò
+this week calendar sk Tento t\xFD\xBEde\xF2
this year calendar sk Tento rok
-thu calendar sk ©tv
+thu calendar sk \xA9tv
title calendar sk Titulok
-title of the event calendar sk Názov udalosti
+title of the event calendar sk N\xE1zov udalosti
title-row calendar sk Riadok titulku
to-firstname calendar sk Komu-meno
-to-fullname calendar sk Komu-úplné meno
+to-fullname calendar sk Komu-\xFApln\xE9 meno
to-lastname calendar sk Komu-Priezvisko
today calendar sk Dnes
translation calendar sk Preklad
tu calendar sk U
tue calendar sk Uto
-update a single entry by passing the fields. calendar sk
Aktualizova» polo¾ku zadaním políèok.
-updated calendar sk Aktualizované
-use end date calendar sk Pou¾i» dátum konca
-view this entry calendar sk Zobrazi» túto polo¾ku
+update a single entry by passing the fields. calendar sk
Aktualizova\xBB polo\xBEku zadan\xEDm pol\xED\xE8ok.
+updated calendar sk Aktualizovan\xE9
+use end date calendar sk Pou\xBEi\xBB d\xE1tum konca
+view this entry calendar sk Zobrazi\xBB t\xFAto polo\xBEku
we calendar sk St
wed calendar sk Str
-week calendar sk Tý¾deò
-weekday starts on calendar sk Tý¾deò zaèína dòom
-weekly calendar sk Tý¾denne
-weekview calendar sk Tý¾denný pohµad
-when creating new events default set to private calendar sk
Nové udalosti vytvára» ako súkromné
-which events do you want to see when you enter the calendar. calendar
sk Ktoré udalosti chcete vidie» keï otvoríte Kalendár.
-which of calendar view do you want to see, when you start calendar ?
calendar sk Ktorý pohµad na Kalendár chcete zobrazi» keï ho
otvoríte?
-work day ends on calendar sk Pracovný deò konèí o
-work day starts on calendar sk Pracovný deò zaèína o
-workdayends calendar sk koniec pracovného dòa
-yearly calendar sk Roène
-yearview calendar sk Roèný pohµad
-you can either set a year or a occurence, not both !!! calendar sk
Mô¾ete nastavi» len Rok alebo Occurence, nie obidva súèasne!!!
-you can only set a year or a occurence !!! calendar sk Mô¾ete
nastavi» len rok alebo occurence!!!
-you do not have permission to add alarms to this event !!! calendar
sk Nemáte právo pridáva» pripomienky (alarm) k tejto udalosti!!!
-you do not have permission to delete this alarm !!! calendar sk
Nemáte právo zmaza» túto pripomienku (alarm)!!!
-you do not have permission to enable/disable this alarm !!! calendar
sk Nemáte právo zapína» alebo vypína» túto pripomienku (alarm)!!!
-you do not have permission to read this record! calendar sk
Nemáte právo èíta» tento záznam!
-you have %1 high priority events on your calendar today. common sk
Dnes máte v kalendári %1 udalostí vysokej priority.
-you have 1 high priority event on your calendar today. common sk Dnes
máte v kalendári 1 udalos» vysokej priority.
-you have a meeting scheduled for %1 calendar sk K %1 máte
naplánované stretnutie.
+week calendar sk T\xFD\xBEde\xF2
+weekday starts on calendar sk T\xFD\xBEde\xF2 za\xE8\xEDna
d\xF2om
+weekly calendar sk T\xFD\xBEdenne
+weekview calendar sk T\xFD\xBEdenn\xFD poh\xB5ad
+when creating new events default set to private calendar sk
Nov\xE9 udalosti vytv\xE1ra\xBB ako s\xFAkromn\xE9
+which events do you want to see when you enter the calendar. calendar
sk Ktor\xE9 udalosti chcete vidie\xBB ke\xEF otvor\xEDte Kalend\xE1r.
+which of calendar view do you want to see, when you start calendar ?
calendar sk Ktor\xFD poh\xB5ad na Kalend\xE1r chcete zobrazi\xBB
ke\xEF ho otvor\xEDte?
+work day ends on calendar sk Pracovn\xFD de\xF2 kon\xE8\xED o
+work day starts on calendar sk Pracovn\xFD de\xF2 za\xE8\xEDna
o
+workdayends calendar sk koniec pracovn\xE9ho d\xF2a
+yearly calendar sk Ro\xE8ne
+yearview calendar sk Ro\xE8n\xFD poh\xB5ad
+you can either set a year or a occurence, not both !!! calendar sk
M\xF4\xBEete nastavi\xBB len Rok alebo Occurence, nie obidva s\xFA\xE8asne!!!
+you can only set a year or a occurence !!! calendar sk
M\xF4\xBEete nastavi\xBB len rok alebo occurence!!!
+you do not have permission to add alarms to this event !!! calendar
sk Nem\xE1te pr\xE1vo prid\xE1va\xBB pripomienky (alarm) k tejto
udalosti!!!
+you do not have permission to delete this alarm !!! calendar sk
Nem\xE1te pr\xE1vo zmaza\xBB t\xFAto pripomienku (alarm)!!!
+you do not have permission to enable/disable this alarm !!! calendar
sk Nem\xE1te pr\xE1vo zap\xEDna\xBB alebo vyp\xEDna\xBB t\xFAto
pripomienku (alarm)!!!
+you do not have permission to read this record! calendar sk
Nem\xE1te pr\xE1vo \xE8\xEDta\xBB tento z\xE1znam!
+you have %1 high priority events on your calendar today. common sk
Dnes m\xE1te v kalend\xE1ri %1 udalost\xED vysokej priority.
+you have 1 high priority event on your calendar today. common sk Dnes
m\xE1te v kalend\xE1ri 1 udalos\xBB vysokej priority.
+you have a meeting scheduled for %1 calendar sk K %1 m\xE1te
napl\xE1novan\xE9 stretnutie.
you have not entered a title calendar sk Nezadali ste titulok
-you have not entered a valid date calendar sk Nezadali ste
platný dátum
-you have not entered a valid time of day calendar sk
Nezadali ste platný èas
-you have not entered participants calendar sk Nezadali ste
úèastníkov
-you must enter one or more search keywords calendar sk Musíte
zada» jedno alebo viacej slov pre vyhµadávanie
-you must select a [iv]cal. (*.[iv]cs) calendar sk Musíte vybra»
[iv]Cal. (*.[iv]cs)
-you need to set either a day or a occurence !!! calendar sk
Treba zada» buï deò alebo occurence !!!
-your meeting scheduled for %1 has been canceled calendar sk
Va¹e stretnutie plánované k %1 bolo zru¹ené
-your meeting that had been scheduled for %1 has been rescheduled to %2
calendar sk Va¹e stretnutie plánované k %1 bolo prelo¾ené na %2
-your suggested time of <b> %1 - %2 </b> conflicts with the following existing
calendar entries: calendar sk Vá¹ navrhovaný èas <B> %1 - %2
</B> je v konflikte s nasledujúcimi polo¾kami kalendára:
+you have not entered a valid date calendar sk Nezadali ste
platn\xFD d\xE1tum
+you have not entered a valid time of day calendar sk
Nezadali ste platn\xFD \xE8as
+you have not entered participants calendar sk Nezadali ste
\xFA\xE8astn\xEDkov
+you must enter one or more search keywords calendar sk
Mus\xEDte zada\xBB jedno alebo viacej slov pre vyh\xB5ad\xE1vanie
+you must select a [iv]cal. (*.[iv]cs) calendar sk Mus\xEDte
vybra\xBB [iv]Cal. (*.[iv]cs)
+you need to set either a day or a occurence !!! calendar sk
Treba zada\xBB bu\xEF de\xF2 alebo occurence !!!
+your meeting scheduled for %1 has been canceled calendar sk
Va\xB9e stretnutie pl\xE1novan\xE9 k %1 bolo zru\xB9en\xE9
+your meeting that had been scheduled for %1 has been rescheduled to %2
calendar sk Va\xB9e stretnutie pl\xE1novan\xE9 k %1 bolo
prelo\xBEen\xE9 na %2
+your suggested time of <b> %1 - %2 </b> conflicts with the following existing
calendar entries: calendar sk V\xE1\xB9 navrhovan\xFD \xE8as
<B> %1 - %2 </B> je v konflikte s nasleduj\xFAcimi polo\xBEkami kalend\xE1ra:
Modified: people/sigurdne/modules/calendar/trunk/setup/phpgw_sv.lang
===================================================================
--- people/sigurdne/modules/calendar/trunk/setup/phpgw_sv.lang 2009-11-20
10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/setup/phpgw_sv.lang 2009-11-20
10:27:23 UTC (rev 20840)
@@ -1,67 +1,67 @@
%1 %2 in %3 calendar sv %1 %2 i %3
-%1 matches found calendar sv %1 träffar
+%1 matches found calendar sv %1 tr\xE4ffar
%1 records imported calendar sv %1 poster importerade
-%1 records read (not yet imported, you may go back and uncheck test import)
calendar sv %1 poster lästa (ej importerade än, du kan gå tillbaka
och bocka av Test Import)
-(for weekly) calendar sv (för veckovis)
+%1 records read (not yet imported, you may go back and uncheck test import)
calendar sv %1 poster l\xE4sta (ej importerade \xE4n, du kan g\xE5
tillbaka och bocka av Test Import)
+(for weekly) calendar sv (f\xF6r veckovis)
(i/v)cal calendar sv (i/v)Cal
-1 match found calendar sv 1 träff
+1 match found calendar sv 1 tr\xE4ff
a calendar sv a
-accept calendar sv Godkänn
-accepted calendar sv Godkänd
-action that caused the notify: added, canceled, accepted, rejected, ...
calendar sv Händelse som orsakade noten: Lagt till, avbruten,
godkänd, avböjd, ...
-add a single entry by passing the fields. calendar sv Lägg
till en enstaka sak genom att hoppa över fälten.
-add alarm calendar sv Lägg till Alarm
-add contact calendar sv Lägg till kontakt
+accept calendar sv Godk\xE4nn
+accepted calendar sv Godk\xE4nd
+action that caused the notify: added, canceled, accepted, rejected, ...
calendar sv H\xE4ndelse som orsakade noten: Lagt till, avbruten,
godk\xE4nd, avb\xF6jd, ...
+add a single entry by passing the fields. calendar sv L\xE4gg
till en enstaka sak genom att hoppa \xF6ver f\xE4lten.
+add alarm calendar sv L\xE4gg till Alarm
+add contact calendar sv L\xE4gg till kontakt
added calendar sv Sparad
address book calendar sv Adressbok
alarm calendar sv alarm
-alarm for %1 at %2 in %3 calendar sv Alarm för %1 på %2 i %3
-alarm management calendar sv Alarm inställningar
-alarm-management calendar sv Alarm--inställning
+alarm for %1 at %2 in %3 calendar sv Alarm f\xF6r %1 p\xE5
%2 i %3
+alarm management calendar sv Alarm inst\xE4llningar
+alarm-management calendar sv Alarm--inst\xE4llning
alarms calendar sv Alarm
all calendar sv Alla
all day calendar sv Hela dagen
-are you sure you want to delete this country ? calendar sv Är du
säker på att du vill radera landet?
-are you sure you want to delete this holiday ? calendar sv Ar du
säker på att du vill radera den helgdagen?
-are you sure\nyou want to\ndelete these alarms? calendar sv
Ar du säker\n att du vill\nradera dessa alarm?
-are you sure\nyou want to\ndelete this entry ? calendar sv Är du
säker på att\ndu vill\nta bort denna?
-are you sure\nyou want to\ndelete this entry ?\n\nthis will delete\nthis entry
for all users. calendar sv Är du säker\natt du vill\ntabort denna
post?\n\nDetta tar bort den\nför alla användare.
-are you sure\nyou want to\ndelete this single occurence ?\n\nthis will
delete\nthis entry for all users. calendar sv Är du
säker\natt du vill\nradera denna engångshändelse?\n\nDetta kommer att
radera\ndenna händelse för alla användare.
-before the event calendar sv före händelsen
+are you sure you want to delete this country ? calendar sv \xC4r
du s\xE4ker p\xE5 att du vill radera landet?
+are you sure you want to delete this holiday ? calendar sv Ar du
s\xE4ker p\xE5 att du vill radera den helgdagen?
+are you sure\nyou want to\ndelete these alarms? calendar sv
Ar du s\xE4ker\n att du vill\nradera dessa alarm?
+are you sure\nyou want to\ndelete this entry ? calendar sv \xC4r
du s\xE4ker p\xE5 att\ndu vill\nta bort denna?
+are you sure\nyou want to\ndelete this entry ?\n\nthis will delete\nthis entry
for all users. calendar sv \xC4r du s\xE4ker\natt du vill\ntabort
denna post?\n\nDetta tar bort den\nf\xF6r alla anv\xE4ndare.
+are you sure\nyou want to\ndelete this single occurence ?\n\nthis will
delete\nthis entry for all users. calendar sv \xC4r du
s\xE4ker\natt du vill\nradera denna eng\xE5ngsh\xE4ndelse?\n\nDetta kommer att
radera\ndenna h\xE4ndelse f\xF6r alla anv\xE4ndare.
+before the event calendar sv f\xF6re h\xE4ndelsen
brief description calendar sv Kort beskrivning
business calendar sv Arbete
calendar common sv kalender
calendar - [iv]cal importer calendar sv Kalender - [iv]Cal
Import
-calendar - add calendar sv Kalender - Lägg till
-calendar - edit calendar sv Kalender - Ändra
-calendar event calendar sv Kalenderhändelse
-calendar holiday management admin sv Kalender helgdagsinställning
-calendar preferences calendar sv Kalender förinställningar
-calendar settings admin sv Kalender inställningar
-calendar-fieldname calendar sv Kalender-fält
+calendar - add calendar sv Kalender - L\xE4gg till
+calendar - edit calendar sv Kalender - \xC4ndra
+calendar event calendar sv Kalenderh\xE4ndelse
+calendar holiday management admin sv Kalender helgdagsinst\xE4llning
+calendar preferences calendar sv Kalender f\xF6rinst\xE4llningar
+calendar settings admin sv Kalender inst\xE4llningar
+calendar-fieldname calendar sv Kalender-f\xE4lt
canceled calendar sv Avbruten
-change all events for $params['old_owner'] to $params['new_owner'].
calendar sv Ändra alla händelser för $params['old_owner'] till
$params['new_owner'].
-change status calendar sv Ändra status
-click %1here%2 to return to the calendar. calendar sv Klicka
%1här%2 för att åtevända till kalendern.
+change all events for $params['old_owner'] to $params['new_owner'].
calendar sv \xC4ndra alla h\xE4ndelser f\xF6r $params['old_owner']
till $params['new_owner'].
+change status calendar sv \xC4ndra status
+click %1here%2 to return to the calendar. calendar sv Klicka
%1h\xE4r%2 f\xF6r att \xE5tev\xE4nda till kalendern.
configuration calendar sv Konfiguration
-countries calendar sv Länder
+countries calendar sv L\xE4nder
country calendar sv Land
-csv-fieldname calendar sv CSV-fältnamn
+csv-fieldname calendar sv CSV-f\xE4ltnamn
csv-filename calendar sv CSV-filnamn
-custom fields calendar sv Inställt fält
-custom fields and sorting common sv Inställda fält och sortering
+custom fields calendar sv Inst\xE4llt f\xE4lt
+custom fields and sorting common sv Inst\xE4llda f\xE4lt och
sortering
daily calendar sv Daglig
daily matrix view calendar sv Daglig matris vy
days calendar sv dagar
days repeated calendar sv dagar repeterade
dayview calendar sv Dagvy
-default appointment length (in minutes) calendar sv
standard möteslängd (i minuter)
+default appointment length (in minutes) calendar sv
standard m\xF6tesl\xE4ngd (i minuter)
default calendar filter calendar sv Standard kalenderfilter
default calendar view calendar sv Standard kalendervy
-default length of newly created events. the length is in minutes, eg. 60 for 1
hour. calendar sv Standard längd för nyskapade händelser. Längden
är i minuter dvs 60 för en timme.
-defines the size in minutes of the lines in the day view. calendar
sv Definierar längden i minuter för linjerna i dagvyn.
-delete a single entry by passing the id. calendar sv Radera
en enstaka händelse genom att ange id.
-delete an entire users calendar. calendar sv Radera hela
användarens kalender.
+default length of newly created events. the length is in minutes, eg. 60 for 1
hour. calendar sv Standard l\xE4ngd f\xF6r nyskapade
h\xE4ndelser. L\xE4ngden \xE4r i minuter dvs 60 f\xF6r en timme.
+defines the size in minutes of the lines in the day view. calendar
sv Definierar l\xE4ngden i minuter f\xF6r linjerna i dagvyn.
+delete a single entry by passing the id. calendar sv Radera
en enstaka h\xE4ndelse genom att ange id.
+delete an entire users calendar. calendar sv Radera hela
anv\xE4ndarens kalender.
delete selected contacts calendar sv Radera de valda
kontakterna.
delete series calendar sv Radera serier
delete single calendar sv Radera enstaka
@@ -69,55 +69,55 @@
description calendar sv BESKRIVNING
display interval in day view calendar sv Visa intervall i dagvyn
display mini calendars when printing calendar sv Visa
minikalender vid utskrift
-display status of events calendar sv Visa status på händelser
-displays your default calendar view on the startpage (page you get when you
enter phpgroupware or click on the homepage icon)? calendar sv Visa
din standard kalendervy på startsidan (sidan som du ser när du startar
phpGroupWare eller när du klickat på hem-ikonen)?
-do you want to be notified about new or changed appointments? you be notified
about changes you make yourself.<br />you can limit the notifications to
certain changes only. each item includes all the notification listed above it.
all modifications include changes of title, description, participants, but no
participant responses. if the owner of an event requested any notifcations, he
will always get the participant responses like acceptions and rejections too.
calendar sv Vill du bli påmind om nya eller ändrade möten? Du
kommer att bli påmind om ändringar du själv har gjort.<br />Du kan begränsa
påminnelserna till endast vissa ändringar. Varje (item) innehåller alla
påminnelser som är listade ovanför den. Alla ändringar innehåller förändring i
rubrik, beskrivning, deltagare, men inte deltagarnas svar. Om ägaren av en
händelse begärt någon påminnelse, kommer denne att få deltagarnas svar, även
bekräftelse eller nekande.
-do you want to receive a regulary summary of your appointsments via email?<br
/>the summary is sent to your standard email-address on the morning of that day
or on monday for weekly summarys.<br />it is only sent when you have any
appointments on that day or week. calendar sv Vill du få en
regelbunden sammandrag av dina möten via epost?<br />Sammandraget sänds till
din standard epost-adress på morgonen den dagen eller på måndagen för veckovisa
sammandrag.<br />Det sänds bara ut om du har något möte den dagen eller veckan.
+display status of events calendar sv Visa status p\xE5
h\xE4ndelser
+displays your default calendar view on the startpage (page you get when you
enter phpgroupware or click on the homepage icon)? calendar sv Visa
din standard kalendervy p\xE5 startsidan (sidan som du ser n\xE4r du startar
phpGroupWare eller n\xE4r du klickat p\xE5 hem-ikonen)?
+do you want to be notified about new or changed appointments? you be notified
about changes you make yourself.<br />you can limit the notifications to
certain changes only. each item includes all the notification listed above it.
all modifications include changes of title, description, participants, but no
participant responses. if the owner of an event requested any notifcations, he
will always get the participant responses like acceptions and rejections too.
calendar sv Vill du bli p\xE5mind om nya eller \xE4ndrade
m\xF6ten? Du kommer att bli p\xE5mind om \xE4ndringar du sj\xE4lv har gjort.<br
/>Du kan begr\xE4nsa p\xE5minnelserna till endast vissa \xE4ndringar. Varje
(item) inneh\xE5ller alla p\xE5minnelser som \xE4r listade ovanf\xF6r den. Alla
\xE4ndringar inneh\xE5ller f\xF6r\xE4ndring i rubrik, beskrivning, deltagare,
men inte deltagarnas svar. Om \xE4garen av en h\xE4ndelse beg\xE4rt n\xE5gon
p\xE5minnelse, kommer denne att f\xE5 deltagarnas svar, \xE4ven bekr\xE4ftelse
eller nekande.
+do you want to receive a regulary summary of your appointsments via email?<br
/>the summary is sent to your standard email-address on the morning of that day
or on monday for weekly summarys.<br />it is only sent when you have any
appointments on that day or week. calendar sv Vill du f\xE5
en regelbunden sammandrag av dina m\xF6ten via epost?<br />Sammandraget
s\xE4nds till din standard epost-adress p\xE5 morgonen den dagen eller p\xE5
m\xE5ndagen f\xF6r veckovisa sammandrag.<br />Det s\xE4nds bara ut om du har
n\xE5got m\xF6te den dagen eller veckan.
do you wish to autoload calendar holidays files dynamically? admin sv
Vill ladda ner kalenderns helgdags-filer dynamiskt?
download calendar sv Ladda ner
duration calendar sv Varaktighet
-edit series calendar sv Ändra serier
-edit single calendar sv Ändra enstaka
-email reminder calendar sv Epost-påminnelse
+edit series calendar sv \xC4ndra serier
+edit single calendar sv \xC4ndra enstaka
+email reminder calendar sv Epost-p\xE5minnelse
end date/time calendar sv Slut Datum/tid
enddate calendar sv Slutdatum
ends calendar sv slut
-enter output filename: ( .vcs appended ) calendar sv Fyll i
filnamn: (.vcs läggs till)
-event details follow calendar sv Detaljer för händelser kommer
+enter output filename: ( .vcs appended ) calendar sv Fyll i
filnamn: (.vcs l\xE4ggs till)
+event details follow calendar sv Detaljer f\xF6r h\xE4ndelser
kommer
exceptions calendar sv Undantag
export calendar sv Exportera
-export a list of entries in ical format. calendar sv
Exportera lista på händelser i iCal-format
+export a list of entries in ical format. calendar sv
Exportera lista p\xE5 h\xE4ndelser i iCal-format
extended calendar sv Detaljerad
-extended updates always include the complete event-details. ical's can be
imported by certain other calendar-applications. calendar sv
Detaljerade uppdateringar innehåller alltid kompletta händelsebeskrivningar.
iCal:s kan importeras av vissa andra kalender-moduler.
-external participants calendar sv Utomstående deltagare
-failed sending message to '%1' #%2 subject='%3', sender='%4' !!!
calendar sv Det gick inte att sända meddelande till '%1'#%2
subject='%3', sender='%4' !!!
-fieldseparator calendar sv Fält-avdelare
-firstname of person to notify calendar sv Förnamn på person som
ska kontaktas
-format of event updates calendar sv Format på
händelseuppdatering
+extended updates always include the complete event-details. ical's can be
imported by certain other calendar-applications. calendar sv
Detaljerade uppdateringar inneh\xE5ller alltid kompletta
h\xE4ndelsebeskrivningar. iCal:s kan importeras av vissa andra kalender-moduler.
+external participants calendar sv Utomst\xE5ende deltagare
+failed sending message to '%1' #%2 subject='%3', sender='%4' !!!
calendar sv Det gick inte att s\xE4nda meddelande till '%1'#%2
subject='%3', sender='%4' !!!
+fieldseparator calendar sv F\xE4lt-avdelare
+firstname of person to notify calendar sv F\xF6rnamn p\xE5 person
som ska kontaktas
+format of event updates calendar sv Format p\xE5
h\xE4ndelseuppdatering
fr calendar sv Fr
free/busy calendar sv Ledig/Upptagen
frequency calendar sv Hur ofta
fri calendar sv Fre
full description calendar sv Full beskrivning
-fullname of person to notify calendar sv Hela namnet på personen
som ska kontaktas
-generate printer-friendly version calendar sv Skapa
utskriftsvänlig version
+fullname of person to notify calendar sv Hela namnet p\xE5
personen som ska kontaktas
+generate printer-friendly version calendar sv Skapa
utskriftsv\xE4nlig version
global categories calendar sv Global kategori
global public and group public calendar sv Globalt publikt och
Grupp publikt
global public only calendar sv Endast Globalt publikt
-go! calendar sv Kör!
-grant calendar access common sv Tillåt tillgång till kalender
+go! calendar sv K\xF6r!
+grant calendar access common sv Till\xE5t tillg\xE5ng till kalender
group planner calendar sv Grupp-planerare
group public only calendar sv Endast grupp publikt
-here is your requested alarm. calendar sv Här kommer din
påminnelse.
-high priority calendar sv hög prioritet
+here is your requested alarm. calendar sv H\xE4r kommer din
p\xE5minnelse.
+high priority calendar sv h\xF6g prioritet
holiday calendar sv Helgdag
-holiday management calendar sv Helgdagar Inställning
-holiday-management calendar sv Helgdagsinställning
+holiday management calendar sv Helgdagar Inst\xE4llning
+holiday-management calendar sv Helgdagsinst\xE4llning
holidays calendar sv Helgdagar
hours calendar sv timmar
i participate calendar sv Jag deltar
ical / rfc2445 calendar sv iCal / rfc2445
-if checked holidays falling on a weekend, are taken on the monday after.
calendar sv Om markerade helgdagar infaller på veckoslut utfaller
det på måndagen efter.
+if checked holidays falling on a weekend, are taken on the monday after.
calendar sv Om markerade helgdagar infaller p\xE5 veckoslut
utfaller det p\xE5 m\xE5ndagen efter.
ignore conflict calendar sv Ignorera konflikt
import calendar sv Import
import csv-file into calendar calendar sv Importera CSV-fil till
kalendern
@@ -126,185 +126,185 @@
intervals per day in planner view calendar sv Intervall per
dag i planeringsvyn
invalid entry id. calendar sv Felaktigt id.
last calendar sv sista
-lastname of person to notify calendar sv Efternamn på personen
att kontakta
-length shown<br />(emtpy for full length) calendar sv Visad
längd<br />(tom för full längd)
-length<br />(<= 255) calendar sv Längd<br />(<=255)
-load [iv]cal calendar sv Läs in [iv]Cal
+lastname of person to notify calendar sv Efternamn p\xE5
personen att kontakta
+length shown<br />(emtpy for full length) calendar sv Visad
l\xE4ngd<br />(tom f\xF6r full l\xE4ngd)
+length<br />(<= 255) calendar sv L\xE4ngd<br />(<=255)
+load [iv]cal calendar sv L\xE4s in [iv]Cal
location calendar sv Plats
-location to autoload from admin sv Plats att ladda ner automatiskt
från
+location to autoload from admin sv Plats att ladda ner automatiskt
fr\xE5n
matrixview calendar sv Matrisvy
minutes calendar sv minuter
-mo calendar sv Må
+mo calendar sv M\xE5
modified calendar sv Modifierad
-modify list of external participants calendar sv Ändra lista på
utomstående deltagare
-mon calendar sv Mån
-month calendar sv Månad
-monthly calendar sv Månadsvis
-monthly (by date) calendar sv Månatligt (efter datum)
-monthly (by day) calendar sv Månatligt (efter dag)
-monthview calendar sv Månadsvy
+modify list of external participants calendar sv \xC4ndra lista
p\xE5 utomst\xE5ende deltagare
+mon calendar sv M\xE5n
+month calendar sv M\xE5nad
+monthly calendar sv M\xE5nadsvis
+monthly (by date) calendar sv M\xE5natligt (efter datum)
+monthly (by day) calendar sv M\xE5natligt (efter dag)
+monthview calendar sv M\xE5nadsvy
new entry calendar sv Ny Post
-new name must not exist and not be empty!!! calendar sv Nytt
namn får inte finnas tidigare och får inte vara tomt!!!
-no matches found calendar sv Inga träffar
-no matches found. calendar sv Ingen träff hittad.
+new name must not exist and not be empty!!! calendar sv Nytt
namn f\xE5r inte finnas tidigare och f\xE5r inte vara tomt!!!
+no matches found calendar sv Inga tr\xE4ffar
+no matches found. calendar sv Ingen tr\xE4ff hittad.
no response calendar sv Inget svar
-notification messages for added events calendar sv
Påminnelsemeddelande för sparad händelse
-notification messages for canceled events calendar sv
Påminnelsemeddelande för inställd händelse
-notification messages for modified events calendar sv
Påminnelsemeddelande för ändrad händelse
-notification messages for your alarms calendar sv
Påminnelsemeddelande för dina alarm
-notification messages for your responses calendar sv
Påminnelsemeddelande för de svarsmeddelanden du fått
+notification messages for added events calendar sv
P\xE5minnelsemeddelande f\xF6r sparad h\xE4ndelse
+notification messages for canceled events calendar sv
P\xE5minnelsemeddelande f\xF6r inst\xE4lld h\xE4ndelse
+notification messages for modified events calendar sv
P\xE5minnelsemeddelande f\xF6r \xE4ndrad h\xE4ndelse
+notification messages for your alarms calendar sv
P\xE5minnelsemeddelande f\xF6r dina alarm
+notification messages for your responses calendar sv
P\xE5minnelsemeddelande f\xF6r de svarsmeddelanden du f\xE5tt
number of intervals per day in planner view calendar sv Antal
intervall per dag i planeringsvyn
-number of months calendar sv Antal månader
-number of records to read (<=200) calendar sv Antal poster
att läsa (<=200)
-observance rule calendar sv Övervakningsregel
-occurence calendar sv Förekomst
+number of months calendar sv Antal m\xE5nader
+number of records to read (<=200) calendar sv Antal poster
att l\xE4sa (<=200)
+observance rule calendar sv \xD6vervakningsregel
+occurence calendar sv F\xF6rekomst
old startdate calendar sv Gammalt startdatum
olddate calendar sv Gammalt datum
-on %1 %2 %3 your meeting request for %4 calendar sv Den %1
%2 %3 din begäran om möte med %4
-on all changes calendar sv för alla ändringar
-on all modification, but responses calendar sv för alla
ändringar, utom svar
-on any time change too calendar sv för alla tidsändringar också
-on invitation / cancelation only calendar sv för
inbjudningar/avböjanden endast
-on participant responses too calendar sv för deltagares svar
endast
-on time change of more than 4 hours too calendar sv för
tidsändringar på mer än 4 timmar också
+on %1 %2 %3 your meeting request for %4 calendar sv Den %1
%2 %3 din beg\xE4ran om m\xF6te med %4
+on all changes calendar sv f\xF6r alla \xE4ndringar
+on all modification, but responses calendar sv f\xF6r alla
\xE4ndringar, utom svar
+on any time change too calendar sv f\xF6r alla tids\xE4ndringar
ocks\xE5
+on invitation / cancelation only calendar sv f\xF6r
inbjudningar/avb\xF6janden endast
+on participant responses too calendar sv f\xF6r deltagares svar
endast
+on time change of more than 4 hours too calendar sv f\xF6r
tids\xE4ndringar p\xE5 mer \xE4n 4 timmar ocks\xE5
order calendar sv Order
-overlap holiday calendar sv överlappande helg
+overlap holiday calendar sv \xF6verlappande helg
participant calendar sv Deltagare
participants calendar sv Deltagare
participates calendar sv Deltar
people holiday calendar sv folklig helgdag
-permission denied calendar sv Behörighet nekad
+permission denied calendar sv Beh\xF6righet nekad
planner calendar sv Planeringskalender
-planner by category calendar sv Planeringskalender för kategori
-planner by user calendar sv Planeringskalender för deltagare
-please confirm,accept,reject or examine changes in the corresponding entry in
your calendar calendar sv Ange bekräfta, neka eller undersök
ändringar i motsvarande händelse i din kalender
-preselected group for entering the planner calendar sv Förvald
grupp för tillträde till planeringskalender
+planner by category calendar sv Planeringskalender f\xF6r
kategori
+planner by user calendar sv Planeringskalender f\xF6r
deltagare
+please confirm,accept,reject or examine changes in the corresponding entry in
your calendar calendar sv Ange bekr\xE4fta, neka eller
unders\xF6k \xE4ndringar i motsvarande h\xE4ndelse i din kalender
+preselected group for entering the planner calendar sv
F\xF6rvald grupp f\xF6r tilltr\xE4de till planeringskalender
print calendars in black & white calendar sv Skriv ut
kalender i svart/vitt
print the mini calendars calendar sv Skriv ut mini-kalender
-printer friendly calendar sv Utskriftsvänlig
+printer friendly calendar sv Utskriftsv\xE4nlig
privat calendar sv Privat
private and global public calendar sv Privat och globalt
publikt
private and group public calendar sv Privat och Grupp publikt
private only calendar sv Endast privat
-re-edit event calendar sv Ändra händelse igen
-read a list of entries. calendar sv Se lista på ändringar
-read a single entry by passing the id and fieldlist. calendar sv
Se enskild ändring genom att ange id och fältlista.
-read this list of methods. calendar sv Läs lista på metoder.
+re-edit event calendar sv \xC4ndra h\xE4ndelse igen
+read a list of entries. calendar sv Se lista p\xE5
\xE4ndringar
+read a single entry by passing the id and fieldlist. calendar sv
Se enskild \xE4ndring genom att ange id och f\xE4ltlista.
+read this list of methods. calendar sv L\xE4s lista p\xE5
metoder.
receive email updates calendar sv Ta emot epost-uppdateringar
-receive extra information in event mails calendar sv Ta emot
extra information i händelse-brev
-receive summary of appointments calendar sv Ta emot
sammandrag av möten
-recurring event calendar sv återkommande händelse
+receive extra information in event mails calendar sv Ta emot
extra information i h\xE4ndelse-brev
+receive summary of appointments calendar sv Ta emot
sammandrag av m\xF6ten
+recurring event calendar sv \xE5terkommande h\xE4ndelse
refresh calendar sv Uppdatera
-reinstate calendar sv Återinsätt
+reinstate calendar sv \xC5terins\xE4tt
rejected calendar sv Nekad
repeat day calendar sv Repetera dag
repeat end date calendar sv Repetera slutdatum
repeat type calendar sv Repetera type
-repeating event information calendar sv Repetera händelse
information
+repeating event information calendar sv Repetera h\xE4ndelse
information
repetition calendar sv Repetition
-repetitiondetails (or empty) calendar sv Detaljer för repition
(eller tomt)
-reset calendar sv Återställ
+repetitiondetails (or empty) calendar sv Detaljer f\xF6r
repition (eller tomt)
+reset calendar sv \xC5terst\xE4ll
rule calendar sv Regel
-sa calendar sv Lö
-sat calendar sv Lör
+sa calendar sv L\xF6
+sat calendar sv L\xF6r
scheduling conflict calendar sv Kalenderkonflikt
-search results calendar sv Sök resultat
+search results calendar sv S\xF6k resultat
selected contacts (%1) calendar sv Markerade kontakter (%1)
send updates via email common sv Skicka uppdateringar med epost
send/receive updates via email calendar sv Skicka/ta emot
uppdateringar med epost
-set a year only for one-time / non-regular holidays. calendar sv
Ange år bara för tillfälliga (ej normala) helgdagar.
-set new events to private calendar sv Ange alla nya händelser
som privata
+set a year only for one-time / non-regular holidays. calendar sv
Ange \xE5r bara f\xF6r tillf\xE4lliga (ej normala) helgdagar.
+set new events to private calendar sv Ange alla nya
h\xE4ndelser som privata
should invitations you rejected still be shown in your calendar ?<br />you can
only accept them later (eg. when your scheduling conflict is removed), if they
are still shown in your calendar! calendar sv Ska
inbjudningar som du nekat fortfarande visas i din kalender ?<br />Du kan bara
acceptera dem senare, (dvs om en konflikt tas bort), om de fortfarande visas i
din kalender!
-should new events created as private by default ? calendar sv
Ska nya händelser skapas som privata vara normalinställning?
-should the mini calendars by printed / displayed in the printer friendly views
? calendar sv Ska minikalendern skrivas ut/visas i den
utskriftsvänliga vyn?
-should the printer friendly view be in black & white or in color (as in normal
view)? calendar sv Ska den utskriftsvänliga vyn vara i svart/vitt
eller i färg(som i den normala vyn)?
-should the status of the event-participants (accept, reject, ...) be shown in
brakets after each participants name ? calendar sv Ska status
visas på händelse-deltagare (bekräfta, neka, ...) inom parentes efter varje
deltagares namn?
-show day view on main screen calendar sv visa dagvyn på
huvudsidan
-show default view on main screen calendar sv Visa normalvyn
på huvudsidan
-show high priority events on main screen calendar sv Visa
högprioritets händelser på huvudskärmen
+should new events created as private by default ? calendar sv
Ska nya h\xE4ndelser skapas som privata vara normalinst\xE4llning?
+should the mini calendars by printed / displayed in the printer friendly views
? calendar sv Ska minikalendern skrivas ut/visas i den
utskriftsv\xE4nliga vyn?
+should the printer friendly view be in black & white or in color (as in normal
view)? calendar sv Ska den utskriftsv\xE4nliga vyn vara i
svart/vitt eller i f\xE4rg(som i den normala vyn)?
+should the status of the event-participants (accept, reject, ...) be shown in
brakets after each participants name ? calendar sv Ska status
visas p\xE5 h\xE4ndelse-deltagare (bekr\xE4fta, neka, ...) inom parentes efter
varje deltagares namn?
+show day view on main screen calendar sv visa dagvyn p\xE5
huvudsidan
+show default view on main screen calendar sv Visa normalvyn
p\xE5 huvudsidan
+show high priority events on main screen calendar sv Visa
h\xF6gprioritets h\xE4ndelser p\xE5 huvudsk\xE4rmen
show invitations you rejected calendar sv Visa inbjudningar du
nekat
-single event calendar sv enstaka händelse
-sorry, the owner has just deleted this event calendar sv Ägaren
har tyvärr just raderat denna händelse
-sorry, this event does not exist calendar sv Den här
händelsen existerar tyvärr inte
-sorry, this event does not have exceptions defined calendar sv
Den här händelsen har tyvärr inga undantag definierade
+single event calendar sv enstaka h\xE4ndelse
+sorry, the owner has just deleted this event calendar sv
\xC4garen har tyv\xE4rr just raderat denna h\xE4ndelse
+sorry, this event does not exist calendar sv Den h\xE4r
h\xE4ndelsen existerar tyv\xE4rr inte
+sorry, this event does not have exceptions defined calendar sv
Den h\xE4r h\xE4ndelsen har tyv\xE4rr inga undantag definierade
sort by calendar sv Sortera efter
specifies the the number of intervals shown in the planner view.
calendar sv Ange antal intervall som ska visas i plaeringsvyn.
start date/time calendar sv Start Datum/Tid
start- and enddates calendar sv Start- och sluttid
startdate calendar sv Startdatum
startrecord calendar sv Startpost
-su calendar sv Sö
-submit to repository calendar sv Lägg till databasen
-sun calendar sv Sön
+su calendar sv S\xF6
+submit to repository calendar sv L\xE4gg till databasen
+sun calendar sv S\xF6n
tentative calendar sv Provisorisk
-test import (show importable records <u>only</u> in browser) calendar
sv Testimport (visa importerbara poster <u>bara</u>i webläsaren)
+test import (show importable records <u>only</u> in browser) calendar
sv Testimport (visa importerbara poster <u>bara</u>i webl\xE4saren)
text calendar sv Text
th calendar sv To
-the following conflicts with the suggested time:<ul>%1</ul> calendar
sv Följande kommer i konflikt med den föreslagna tiden:<ul>%1</ul>
-the user %1 is not participating in this event! calendar sv
%1 deltar inte i denna händelse!
-there was an error trying to connect to your news server.<br />please contact
your admin to check the news servername, username or password. calendar
sv Ett fel uppstod vid uppkopplingen till din nyhetsserver.<br />Kontakta
administratören för att ta reda på vilken server som ska användas och
eventuellt användarnamn och lösenord.
-this day is shown as first day in the week or month view. calendar
sv Denna dag visas som första dag i vecko eller månadsvyn.
-this defines the end of your dayview. events after this time, are shown below
the dayview. calendar sv Detta anger slutet på din dagvy.
Händelser efter denna tid visas nedan i dagvyn.
-this defines the start of your dayview. events before this time, are shown
above the dayview.<br />this time is also used as a default starttime for new
events. calendar sv Detta anger start på dagvyn. Händelser
före denna tid vissa ovan i dagvyn.<br />Denna tid används även som normal
starttid för nya händelser.
-this group that is preselected when you enter the planner. you can change it
in the planner anytime you want. calendar sv Denna grupp är
förvald när du använder planeringskalendern. Du kan ändra det i
planeringskalendern när du vill.
-this is mostly caused by a not or wrongly configured smtp server. notify your
administrator. calendar sv Detta beror oftast på att man inte har
angett SMTP-server eller ingen SMTP-server. Kontakta din administratör.
-this message is sent for canceled or deleted events. calendar sv
Detta meddelande sänds vid inställa eller raderade händelser.
-this message is sent for modified or moved events. calendar sv
Detta meddelande sänds vid ändrade eller flyttade händelser.
-this message is sent to every participant of events you own, who has requested
notifcations about new events.<br />you can use certain variables which get
substituted with the data of the event. the first line is the subject of the
email. calendar sv Detta meddelande sänds till alla deltagare som
begärt påminnelse i de nya händelser som du äger/skapat.<br />Du kan ange vissa
variabler som läggs in i händelsernas data. Första raden är rubriken på
epost-meddelandet.
-this message is sent when you accept, tentative accept or reject an event.
calendar sv Detta meddelande sänds när du accepterar, accepterar
jakande eller nekar en händelse.
-this message is sent when you set an alarm for a certain event. include all
information you might need. calendar sv Detta meddelande
sänds när du har angett ett alarm för en särskild händelse. Lägg till den
information som du kan tänkas behöva.
-this month calendar sv Denna månaden
+the following conflicts with the suggested time:<ul>%1</ul> calendar
sv F\xF6ljande kommer i konflikt med den f\xF6reslagna tiden:<ul>%1</ul>
+the user %1 is not participating in this event! calendar sv
%1 deltar inte i denna h\xE4ndelse!
+there was an error trying to connect to your news server.<br />please contact
your admin to check the news servername, username or password. calendar
sv Ett fel uppstod vid uppkopplingen till din nyhetsserver.<br />Kontakta
administrat\xF6ren f\xF6r att ta reda p\xE5 vilken server som ska anv\xE4ndas
och eventuellt anv\xE4ndarnamn och l\xF6senord.
+this day is shown as first day in the week or month view. calendar
sv Denna dag visas som f\xF6rsta dag i vecko eller m\xE5nadsvyn.
+this defines the end of your dayview. events after this time, are shown below
the dayview. calendar sv Detta anger slutet p\xE5 din dagvy.
H\xE4ndelser efter denna tid visas nedan i dagvyn.
+this defines the start of your dayview. events before this time, are shown
above the dayview.<br />this time is also used as a default starttime for new
events. calendar sv Detta anger start p\xE5 dagvyn.
H\xE4ndelser f\xF6re denna tid vissa ovan i dagvyn.<br />Denna tid anv\xE4nds
\xE4ven som normal starttid f\xF6r nya h\xE4ndelser.
+this group that is preselected when you enter the planner. you can change it
in the planner anytime you want. calendar sv Denna grupp \xE4r
f\xF6rvald n\xE4r du anv\xE4nder planeringskalendern. Du kan \xE4ndra det i
planeringskalendern n\xE4r du vill.
+this is mostly caused by a not or wrongly configured smtp server. notify your
administrator. calendar sv Detta beror oftast p\xE5 att man inte
har angett SMTP-server eller ingen SMTP-server. Kontakta din administrat\xF6r.
+this message is sent for canceled or deleted events. calendar sv
Detta meddelande s\xE4nds vid inst\xE4lla eller raderade h\xE4ndelser.
+this message is sent for modified or moved events. calendar sv
Detta meddelande s\xE4nds vid \xE4ndrade eller flyttade h\xE4ndelser.
+this message is sent to every participant of events you own, who has requested
notifcations about new events.<br />you can use certain variables which get
substituted with the data of the event. the first line is the subject of the
email. calendar sv Detta meddelande s\xE4nds till alla deltagare
som beg\xE4rt p\xE5minnelse i de nya h\xE4ndelser som du \xE4ger/skapat.<br
/>Du kan ange vissa variabler som l\xE4ggs in i h\xE4ndelsernas data. F\xF6rsta
raden \xE4r rubriken p\xE5 epost-meddelandet.
+this message is sent when you accept, tentative accept or reject an event.
calendar sv Detta meddelande s\xE4nds n\xE4r du accepterar,
accepterar jakande eller nekar en h\xE4ndelse.
+this message is sent when you set an alarm for a certain event. include all
information you might need. calendar sv Detta meddelande
s\xE4nds n\xE4r du har angett ett alarm f\xF6r en s\xE4rskild h\xE4ndelse.
L\xE4gg till den information som du kan t\xE4nkas beh\xF6va.
+this month calendar sv Denna m\xE5naden
this week calendar sv Denna veckan
-this year calendar sv Detta år
+this year calendar sv Detta \xE5r
thu calendar sv Tor
title calendar sv RUBRIK
-title of the event calendar sv Rubrik på händelse
+title of the event calendar sv Rubrik p\xE5 h\xE4ndelse
title-row calendar sv Rubrikrad
-to-firstname calendar sv Till-förnamn
+to-firstname calendar sv Till-f\xF6rnamn
to-fullname calendar sv Till-namn
to-lastname calendar sv Till-efternamn
today calendar sv I dag
-translation calendar sv Översättning
+translation calendar sv \xD6vers\xE4ttning
tu calendar sv Ti
tue calendar sv Tis
-update a single entry by passing the fields. calendar sv
Uppdatera en enstaka ifyllning genom att passera det fältet
+update a single entry by passing the fields. calendar sv
Uppdatera en enstaka ifyllning genom att passera det f\xE4ltet
updated calendar sv Uppdaterad
-use end date calendar sv Använd slutdatum
+use end date calendar sv Anv\xE4nd slutdatum
view this entry calendar sv Visa denna post
we calendar sv On
wed calendar sv Ons
week calendar sv Vecka
-weekday starts on calendar sv Första veckodag är
+weekday starts on calendar sv F\xF6rsta veckodag \xE4r
weekly calendar sv Veckovis
weekview calendar sv Veckovy
-when creating new events default set to private calendar sv
Vid skapande av ny händelse ange som privat
-which events do you want to see when you enter the calendar. calendar
sv Vilka händelser du vill se när du startar kalendern.
-which of calendar view do you want to see, when you start calendar ?
calendar sv Vilken kalendervy vill du se när du startar kalendern?
+when creating new events default set to private calendar sv
Vid skapande av ny h\xE4ndelse ange som privat
+which events do you want to see when you enter the calendar. calendar
sv Vilka h\xE4ndelser du vill se n\xE4r du startar kalendern.
+which of calendar view do you want to see, when you start calendar ?
calendar sv Vilken kalendervy vill du se n\xE4r du startar
kalendern?
work day ends on calendar sv Arbetsdagen slutar
-work day starts on calendar sv Arbetsdagen börjar
+work day starts on calendar sv Arbetsdagen b\xF6rjar
workdayends calendar sv arbetsdagsslut
-year calendar sv År
-yearly calendar sv Årligen
-yearview calendar sv Årsvy
-you can either set a year or a occurence, not both !!! calendar sv
Du kan antingen ange ett år eller en förekomst, inte båda !!!
-you can only set a year or a occurence !!! calendar sv Du kan
bara ange ett år eller en förekomst !!!
-you do not have permission to add alarms to this event !!! calendar
sv Du har inte behörighet att lägga till ett alarm för denna händelse !!!
-you do not have permission to delete this alarm !!! calendar sv
Du har inte behörighet att radera detta alarm !!!
-you do not have permission to enable/disable this alarm !!! calendar
sv Du har inte behörighet att aktivera/deaktivera detta alarm !!!
-you do not have permission to read this record! calendar sv
Du har inte behörighet att läsa denna post!
-you have %1 high priority events on your calendar today. common sv
Du har %1 högprioritets händelse i din kalender i dag.
-you have 1 high priority event on your calendar today. common sv Du har
1 högprioritets händelse i din kalender i dag.
-you have a meeting scheduled for %1 calendar sv Du har ett möte
inplanerat till %1
-you have not entered a title calendar sv Du har inte angett
någon rubrik
-you have not entered a valid date calendar sv Du har inte
angett något gilitgt datum
-you have not entered a valid time of day calendar sv Du har
inte angett någon giltig tidpunkt
+year calendar sv \xC5r
+yearly calendar sv \xC5rligen
+yearview calendar sv \xC5rsvy
+you can either set a year or a occurence, not both !!! calendar sv
Du kan antingen ange ett \xE5r eller en f\xF6rekomst, inte b\xE5da !!!
+you can only set a year or a occurence !!! calendar sv Du kan
bara ange ett \xE5r eller en f\xF6rekomst !!!
+you do not have permission to add alarms to this event !!! calendar
sv Du har inte beh\xF6righet att l\xE4gga till ett alarm f\xF6r denna
h\xE4ndelse !!!
+you do not have permission to delete this alarm !!! calendar sv
Du har inte beh\xF6righet att radera detta alarm !!!
+you do not have permission to enable/disable this alarm !!! calendar
sv Du har inte beh\xF6righet att aktivera/deaktivera detta alarm !!!
+you do not have permission to read this record! calendar sv
Du har inte beh\xF6righet att l\xE4sa denna post!
+you have %1 high priority events on your calendar today. common sv
Du har %1 h\xF6gprioritets h\xE4ndelse i din kalender i dag.
+you have 1 high priority event on your calendar today. common sv Du har
1 h\xF6gprioritets h\xE4ndelse i din kalender i dag.
+you have a meeting scheduled for %1 calendar sv Du har ett
m\xF6te inplanerat till %1
+you have not entered a title calendar sv Du har inte angett
n\xE5gon rubrik
+you have not entered a valid date calendar sv Du har inte
angett n\xE5got gilitgt datum
+you have not entered a valid time of day calendar sv Du har
inte angett n\xE5gon giltig tidpunkt
you have not entered a\nbrief description calendar sv Du har
inte skrivit\nen beskrivning.
you have not entered a\nvalid time of day. calendar sv Du har
inte angivit\nen giltig tid.
-you have not entered participants calendar sv Du har inte
angett några deltagare
-you must enter one or more search keywords calendar sv Du
måste skriva in ett eller flera sökord
-you must select a [iv]cal. (*.[iv]cs) calendar sv Du måste välja
en [iv]Cal. (*.[iv]cs)
-you need to set either a day or a occurence !!! calendar sv
Du måste ange antingen dag eller förekomst !!!
-your meeting scheduled for %1 has been canceled calendar sv
Ditt möte %1 har blivit inställt
-your meeting that had been scheduled for %1 has been rescheduled to %2
calendar sv Ditt möte planerat till %1 har blivit flyttat till %2
-your suggested time of <b> %1 - %2 </b> conflicts with the following existing
calendar entries: calendar sv Din föreslagna tid av <B> %1 -
%2 </B> är i konflikt med de följande kalender entries:
+you have not entered participants calendar sv Du har inte
angett n\xE5gra deltagare
+you must enter one or more search keywords calendar sv Du
m\xE5ste skriva in ett eller flera s\xF6kord
+you must select a [iv]cal. (*.[iv]cs) calendar sv Du m\xE5ste
v\xE4lja en [iv]Cal. (*.[iv]cs)
+you need to set either a day or a occurence !!! calendar sv
Du m\xE5ste ange antingen dag eller f\xF6rekomst !!!
+your meeting scheduled for %1 has been canceled calendar sv
Ditt m\xF6te %1 har blivit inst\xE4llt
+your meeting that had been scheduled for %1 has been rescheduled to %2
calendar sv Ditt m\xF6te planerat till %1 har blivit flyttat till %2
+your suggested time of <b> %1 - %2 </b> conflicts with the following existing
calendar entries: calendar sv Din f\xF6reslagna tid av <B>
%1 - %2 </B> \xE4r i konflikt med de f\xF6ljande kalender entries:
Modified: people/sigurdne/modules/calendar/trunk/templates/base/header.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/templates/base/header.inc.php
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/templates/base/header.inc.php
2009-11-20 10:27:23 UTC (rev 20840)
@@ -44,9 +44,9 @@
{
$tpl->set_var('cols',7);
}
+ phpgw::import_class('phpgwapi.datetime');
+ $today = date('Ymd',phpgwapi_datetime::user_localtime());
- $today = date('Ymd', phpgwapi_datetime::user_localtime());
-
$col_width = 12;
add_col($tpl,' <td width="2%"> </td>');
@@ -225,4 +225,3 @@
$tpl->set_var('str','<td align="right"
valign="bottom">'.$button.'</td>');
$tpl->parse('header_column','head_col',True);
echo $tpl->parse('row','head_table',True);
-?>
Modified:
people/sigurdne/modules/calendar/trunk/templates/base/preference_acl.tpl
===================================================================
--- people/sigurdne/modules/calendar/trunk/templates/base/preference_acl.tpl
2009-11-20 10:27:15 UTC (rev 20839)
+++ people/sigurdne/modules/calendar/trunk/templates/base/preference_acl.tpl
2009-11-20 10:27:23 UTC (rev 20840)
@@ -5,7 +5,7 @@
{nml}
<td width="40%">
<div align="center">
- <form method="POST" action="{action_url}">
+ <form method="post" action="{action_url}">
{common_hidden_vars}
<input type="text" name="query" value="{search_value}">
<input type="submit" name="search" value="{search}">
@@ -15,7 +15,7 @@
{nmr}
</tr>
</table>
-<form method="POST" action="{action_url}">
+<form method="post" action="{action_url}">
<table border="0" align="center" width="50%" cols="4">
{row}
</table>
Modified:
people/sigurdne/modules/calendar/trunk/templates/base/preference_acl_row.tpl
===================================================================
---
people/sigurdne/modules/calendar/trunk/templates/base/preference_acl_row.tpl
2009-11-20 10:27:15 UTC (rev 20839)
+++
people/sigurdne/modules/calendar/trunk/templates/base/preference_acl_row.tpl
2009-11-20 10:27:23 UTC (rev 20840)
@@ -1,5 +1,5 @@
<!-- $Id$ -->
- <tr class="{row_color}">
+ <tr class="{row_class}">
<td>{user}</td>
<td align="center"><input type="checkbox" name="{read}"
value="Y"{read_selected}></td>
<td align="center"><input type="checkbox" name="{add}"
value="Y"{add_selected}></td>
Modified:
people/sigurdne/modules/calendar/trunk/templates/base/preference_colspan.tpl
===================================================================
---
people/sigurdne/modules/calendar/trunk/templates/base/preference_colspan.tpl
2009-11-20 10:27:15 UTC (rev 20839)
+++
people/sigurdne/modules/calendar/trunk/templates/base/preference_colspan.tpl
2009-11-20 10:27:23 UTC (rev 20840)
@@ -1,5 +1,4 @@
-<thead>
- <tr class="{bg_color}">
+ <tr class="th">
<td>{string}</td>
<td align="center">{lang_read}</td>
<td align="center">{lang_add}</td>
@@ -7,5 +6,3 @@
<td align="center">{lang_delete}</td>
<td align="center">{lang_private}</td>
</tr>
-</thead>
-<tbody>
Added:
people/sigurdne/modules/calendar/trunk/templates/portico/images/navbar.png
===================================================================
(Binary files differ)
Property changes on:
people/sigurdne/modules/calendar/trunk/templates/portico/images/navbar.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] [20840] update calendar,
Sigurd Nes <=