[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php class.boc...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php class.boc... |
|
Date: |
Wed, 06 Dec 2006 15:12:46 +0000 |
CVSROOT: /sources/phpgroupware
Module name: calendar
Changes by: Sigurd Nes <sigurdne> 06/12/06 15:12:46
Modified files:
inc : class.uicalendar.inc.php
class.bocalendar.inc.php
class.uiicalendar.inc.php
class.uiholiday.inc.php
class.uicustom_fields.inc.php
class.socalendar_sql.inc.php
Log message:
some fixes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uicalendar.inc.php?cvsroot=phpgroupware&r1=1.128&r2=1.129
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.bocalendar.inc.php?cvsroot=phpgroupware&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uiicalendar.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uiholiday.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uicustom_fields.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.socalendar_sql.inc.php?cvsroot=phpgroupware&r1=1.44&r2=1.45
Patches:
Index: class.uicalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- class.uicalendar.inc.php 5 Dec 2006 08:59:41 -0000 1.128
+++ class.uicalendar.inc.php 6 Dec 2006 15:12:46 -0000 1.129
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uicalendar.inc.php,v 1.128 2006/12/05 08:59:41 skwashd
Exp $ */
+ /* $Id: class.uicalendar.inc.php,v 1.129 2006/12/06 15:12:46 sigurdne
Exp $ */
class uicalendar
{
@@ -427,10 +427,13 @@
$var = array(
'small_calendar_prev' => $minical_prev,
- 'prev_week_link' =>
$this->page($week_type_name,'&date='.$prev['full']),
+// 'prev_week_link' =>
$this->page($week_type_name,'&date='.$prev['full']),
+ 'prev_week_link' => '<a href="'.
$this->page($week_type_name,'&date='.$prev['full']).'"><<</a>',
'small_calendar_this' => $minical_this,
'week_identifier' =>
$this->bo->get_week_label(),
- 'next_week_link' =>
$this->page($week_type_name,'&date='.$next['full']),
+// 'next_week_link' =>
$this->page($week_type_name,'&date='.$next['full']),
+ 'next_week_link' => '<a href="'.
$this->page($week_type_name,'&date='.$next['full']).'">>></a>',
+
'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) ),
@@ -969,8 +972,11 @@
$starthour =
intval(get_var('hour',array('GET'),$this->bo->prefs['calendar']['workdaystarts']));
$startmin =
intval(get_var('minute',array('GET'),0));
$endmin = $startmin +
intval($this->bo->prefs['calendar']['defaultlength']);
- $endhour = $starthour +
$this->bo->normalizeminutes($endmin);
- ;
+ // $endhour = $starthour +
$this->bo->normalizeminutes($endmin);
+ $end_time =
$this->bo->normalizeminutes($endmin);
+ $endhour = $starthour + $end_time['hour'];
+ unset($end_time);
+
$this->bo->set_start($this->bo->year,$this->bo->month,$this->bo->day,$starthour,$startmin,0);
$this->bo->set_end($this->bo->year,$this->bo->month,$this->bo->day,$endhour,$endmin,0);
$this->bo->set_title('');
Index: class.bocalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- class.bocalendar.inc.php 31 Oct 2006 10:38:05 -0000 1.109
+++ class.bocalendar.inc.php 6 Dec 2006 15:12:46 -0000 1.110
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.bocalendar.inc.php,v 1.109 2006/10/31 10:38:05 sigurdne
Exp $ */
+ /* $Id: class.bocalendar.inc.php,v 1.110 2006/12/06 15:12:46 sigurdne
Exp $ */
class bocalendar
{
@@ -1391,10 +1391,12 @@
if ( $event === 0)
{
//convert back to phpgw account id for acls
- $owner =
$GLOBALS['phpgw']->accounts->search_person($other > 0
+ /* $owner =
$GLOBALS['phpgw']->accounts->search_person($other > 0
? $other
: $this->owner
);
+ */
+ $owner = ($other > 0 ?
$GLOBALS['phpgw']->accounts->search_person($other):
$GLOBALS['phpgw_info']['user']['account_id']);
}
else
{
@@ -1625,7 +1627,7 @@
return ($this->long_date($first,$last));
}
- function normalizeminutes(&$minutes)
+ function normalizeminutes($minutes)
{
$hour = 0;
$min = intval($minutes);
@@ -1636,7 +1638,10 @@
}
settype($minutes,'integer');
$minutes = $min;
- return $hour;
+ $time['hour'] = $hour;
+ $time['minutes'] = $minutes;
+
+ return $time;
}
function splittime($time,$follow_24_rule=True)
@@ -1646,7 +1651,11 @@
$second = intval(strrev(substr($time,0,2)));
$minute = intval(strrev(substr($time,2,2)));
$hour = intval(strrev(substr($time,4)));
- $hour += $this->normalizeminutes(&$minute);
+// $hour += $this->normalizeminutes(&$minute);
+ $time_new = $this->normalizeminutes($minute);
+ $hour += $time_new['hour'];
+ $minute = $time_new['minutes'];
+ unset($time_new);
$temp['second'] = $second;
$temp['minute'] = $minute;
$temp['hour'] = $hour;
Index: class.uiicalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uiicalendar.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.uiicalendar.inc.php 17 Oct 2006 10:46:30 -0000 1.11
+++ class.uiicalendar.inc.php 6 Dec 2006 15:12:46 -0000 1.12
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uiicalendar.inc.php,v 1.11 2006/10/17 10:46:30 sigurdne
Exp $ */
+ /* $Id: class.uiicalendar.inc.php,v 1.12 2006/12/06 15:12:46 sigurdne
Exp $ */
class uiicalendar
{
@@ -170,7 +170,7 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['nonappheader'] = True;
$GLOBALS['phpgw_info']['flags']['nonappfooter'] = True;
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(True);
$this->template->set_root(PHPGW_APP_TPL);
if(address@hidden($GLOBALS['phpgw_info']['server']['temp_dir']))
Index: class.uiholiday.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uiholiday.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- class.uiholiday.inc.php 15 May 2005 06:57:37 -0000 1.9
+++ class.uiholiday.inc.php 6 Dec 2006 15:12:46 -0000 1.10
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uiholiday.inc.php,v 1.9 2005/05/15 06:57:37 skwashd Exp $
*/
+ /* $Id: class.uiholiday.inc.php,v 1.10 2006/12/06 15:12:46 sigurdne Exp
$ */
class uiholiday
{
@@ -51,14 +51,15 @@
unset($GLOBALS['phpgw_info']['flags']['noheader']);
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(true);
$p = &$GLOBALS['phpgw']->template;
+ $p->set_root(PHPGW_APP_TPL);
$p->set_file(Array('locales'=>'locales.tpl'));
$p->set_block('locales','list','list');
$p->set_block('locales','row','row');
$p->set_block('locales','row_empty','row_empty');
-
$p->set_block('locales','submit_column','submit_column');
+ //
$p->set_block('locales','submit_column','submit_column');
$var = Array(
'th_bg' =>
$GLOBALS['phpgw_info']['theme']['th_bg'],
@@ -240,9 +241,10 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
$GLOBALS['phpgw_info']['flags']['app_header'] =
$GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.($this->bo->id ?
lang('Edit') : lang('Add')).' '.lang('Holiday');
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(true);
$t = &$GLOBALS['phpgw']->template;
+ $t->set_root(PHPGW_APP_TPL);
$t->set_file(Array('holiday'=>'holiday.tpl','form_button'=>'form_button_script.tpl'));
$t->set_block('holiday','form','form');
$t->set_block('holiday','list','list');
Index: class.uicustom_fields.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uicustom_fields.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- class.uicustom_fields.inc.php 15 May 2005 06:57:37 -0000 1.2
+++ class.uicustom_fields.inc.php 6 Dec 2006 15:12:46 -0000 1.3
@@ -10,7 +10,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uicustom_fields.inc.php,v 1.2 2005/05/15 06:57:37 skwashd
Exp $ */
+ /* $Id: class.uicustom_fields.inc.php,v 1.3 2006/12/06 15:12:46
sigurdne Exp $ */
require_once(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.bocustom_fields.inc.php');
$GLOBALS['phpgw_info']['flags']['included_classes']['bocustom_fields']
= True; // for 0.9.14
@@ -39,10 +39,10 @@
unset($GLOBALS['phpgw_info']['flags']['noheader']);
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['app_header'] =
$GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Custom fields
and sorting');
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(true);
$this->tpl = $GLOBALS['phpgw']->template;
-
+ $this->tpl->set_root(PHPGW_APP_TPL);
$this->tpl->set_unknowns('remove');
$this->tpl->set_file(array(
'custom_fields_tpl' => 'custom_fields.tpl'
Index: class.socalendar_sql.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.socalendar_sql.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- class.socalendar_sql.inc.php 9 Sep 2006 14:43:07 -0000 1.44
+++ class.socalendar_sql.inc.php 6 Dec 2006 15:12:46 -0000 1.45
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.socalendar_sql.inc.php,v 1.44 2006/09/09 14:43:07 skwashd Exp
$ */
+ /* $Id: class.socalendar_sql.inc.php,v 1.45 2006/12/06 15:12:46 sigurdne Exp
$ */
class socalendar_ extends socalendar__
{
@@ -443,7 +443,7 @@
function store_event()
{
- return $this->save_event(&$this->event);
+ return $this->save_event($this->event);
}
function delete_event($event_id)
@@ -614,7 +614,7 @@
return $retval;
}
- function save_event(&$event)
+ function save_event($event)
{
$locks = array(
'phpgw_cal',
@@ -758,6 +758,7 @@
}
}
$GLOBALS['phpgw_info']['cal_new_event_id'] = $event['id'];
+ $this->event = $event;
return True;
}
- [Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php class.boc...,
Sigurd Nes <=