[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php class.boh...
From: |
Dave Hall |
Subject: |
[Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php class.boh... |
Date: |
Wed, 06 Sep 2006 00:52:29 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: calendar
Changes by: Dave Hall <skwashd> 06/09/06 00:52:29
Modified files:
inc : class.bocalendar.inc.php
class.boholiday.inc.php
class.socalendar_sql.inc.php
Log message:
more E_ALL fixes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.bocalendar.inc.php?cvsroot=phpgroupware&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.boholiday.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.socalendar_sql.inc.php?cvsroot=phpgroupware&r1=1.42&r2=1.43
Patches:
Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- class.bocalendar.inc.php 5 Sep 2006 14:19:48 -0000 1.107
+++ class.bocalendar.inc.php 6 Sep 2006 00:52:28 -0000 1.108
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.bocalendar.inc.php,v 1.107 2006/09/05 14:19:48 skwashd
Exp $ */
+ /* $Id: class.bocalendar.inc.php,v 1.108 2006/09/06 00:52:28 skwashd
Exp $ */
class bocalendar
{
@@ -177,11 +177,12 @@
$owner =
$this->contacts->is_contact($GLOBALS['phpgw_info']['user']['account_id']);
}
-
ereg('menuaction=([a-zA-Z.]+)',$_SERVER['HTTP_REFERER'],$regs);
+ $referer = isset($_SERVER['HTTP_REFERER']) ?
$_SERVER['HTTP_REFERER'] : '';
+ ereg('menuaction=([a-zA-Z.]+)', $referer, $regs);
$from = $regs[1];
if ((substr($_SERVER['PHP_SELF'],-8) == 'home.php' &&
substr($this->prefs['calendar']['defaultcalendar'],0,7) == 'planner'
- || $GLOBALS['phpgw_info']['menuaction'] ==
'calendar.uicalendar.planner' &&
- $from != 'calendar.uicalendar.planner'
&& !$this->save_owner)
+ || (
isset($GLOBALS['phpgw_info']['menuaction']) &&
$GLOBALS['phpgw_info']['menuaction'] == 'calendar.uicalendar.planner')
+ && $from != 'calendar.uicalendar.planner' &&
!$this->save_owner)
&&
intval($this->prefs['calendar']['planner_start_with_group']) > 0)
{
// entering planner for the first time ==>
saving owner in save_owner, setting owner to default
@@ -189,7 +190,8 @@
$this->save_owner = $this->owner;
$owner =
'g_'.$this->prefs['calendar']['planner_start_with_group'];
}
- elseif ( $GLOBALS['phpgw_info']['menuaction'] !=
'calendar.uicalendar.planner'
+ else if ( isset($GLOBALS['phpgw_info']['menuaction'])
+ && $GLOBALS['phpgw_info']['menuaction'] !=
'calendar.uicalendar.planner'
&& $this->save_owner )
{
// leaving planner with an unchanged user/owner
==> setting owner back to save_owner
@@ -3068,6 +3070,7 @@
'show_descrpt_title'=> '1',
'show_time_line' => '1'
);
+ $need_save = false;
foreach($defaults as $var => $default)
{
if (!isset($default_prefs[$var]) ||
$default_prefs[$var] == '')
@@ -3081,7 +3084,8 @@
$prefs =
$GLOBALS['phpgw']->preferences->save_repository(False,'default');
$this->prefs['calendar'] = $prefs['calendar'];
}
- if ($this->prefs['calendar']['send_updates'] &&
!isset($this->prefs['calendar']['receive_updates']))
+ if (isset($this->prefs['calendar']['send_updates']) &&
$this->prefs['calendar']['send_updates']
+ &&
!isset($this->prefs['calendar']['receive_updates']))
{
$this->prefs['calendar']['receive_updates'] =
$this->prefs['calendar']['send_updates'];
$GLOBALS['phpgw']->preferences->add('calendar','receive_updates',$this->prefs['calendar']['send_updates']);
Index: class.boholiday.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.boholiday.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- class.boholiday.inc.php 15 May 2005 06:57:37 -0000 1.14
+++ class.boholiday.inc.php 6 Sep 2006 00:52:29 -0000 1.15
@@ -10,7 +10,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.boholiday.inc.php,v 1.14 2005/05/15 06:57:37 skwashd Exp
$ */
+ /* $Id: class.boholiday.inc.php,v 1.15 2006/09/06 00:52:29 skwashd Exp
$ */
class boholiday
{
@@ -53,11 +53,7 @@
$this->order = get_var('order',Array('POST','GET'));
$this->id = get_var('id',array('POST','GET'));
$this->year =
get_var('year',array('POST','GET','DEFAULT'),date('Y'));
- $this->locale = get_var('locale',array('POST','GET'));
- if ($this->locale)
- {
- $this->locales[] = $this->locale;
- }
+ $this->locales=
array(get_var('locale',array('POST','GET'), ''));
if($this->debug)
{
@@ -209,12 +205,13 @@
unset($owner_pref);
}
- @reset($this->locales);
-
if($GLOBALS['phpgw_info']['server']['auto_load_holidays'] == True)
+ if (
isset($GLOBALS['phpgw_info']['server']['auto_load_holidays'])
+ &&
$GLOBALS['phpgw_info']['server']['auto_load_holidays'] == True
+ && is_array($this->locales) )
{
- while(list($key,$value) = each($this->locales))
+ foreach ( $this->locales as $locale )
{
- $this->auto_load_holidays($value);
+ $this->auto_load_holidays($locale);
}
}
}
Index: class.socalendar_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.socalendar_sql.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- class.socalendar_sql.inc.php 5 Sep 2006 14:19:48 -0000 1.42
+++ class.socalendar_sql.inc.php 6 Sep 2006 00:52:29 -0000 1.43
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.socalendar_sql.inc.php,v 1.42 2006/09/05 14:19:48 skwashd Exp
$ */
+ /* $Id: class.socalendar_sql.inc.php,v 1.43 2006/09/06 00:52:29 skwashd Exp
$ */
if (@$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar_'])
{
@@ -417,7 +417,7 @@
$startDate = 'AND ( ( (phpgw_cal.datetime >= '.$datetime.') ';
- $enddate = '';
+ $endDate = '';
if($endYear != 0 && $endMonth != 0 && $endDay != 0)
{
$edatetime =
mktime(23,59,59,intval($endMonth),intval($endDay),intval($endYear)) -
$tz_offset;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php class.boh...,
Dave Hall <=