[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: calendar/inc class.socalendar.inc.php, 1.22.2.5.
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: calendar/inc class.socalendar.inc.php, 1.22.2.5.2.2, 1.22.2.5.2.3 class.socalendar_sql.inc.php, 1.28.2.4.2.4, 1.28.2.4.2.5 |
Date: |
Mon, 11 Aug 2003 08:56:31 -0400 |
Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv9180
Modified Files:
Tag: Version-0_9_16-branch
class.socalendar.inc.php class.socalendar_sql.inc.php
Log Message:
extended the search to the custom-fields and location
Index: class.socalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.socalendar.inc.php,v
retrieving revision 1.22.2.5.2.2
retrieving revision 1.22.2.5.2.3
diff -C2 -r1.22.2.5.2.2 -r1.22.2.5.2.3
*** class.socalendar.inc.php 23 Jul 2003 01:42:02 -0000 1.22.2.5.2.2
--- class.socalendar.inc.php 11 Aug 2003 12:56:29 -0000 1.22.2.5.2.3
***************
*** 149,153 ****
$sql .= $i > 0 ? ' OR ' : '';
$sql .= "(UPPER(phpgw_cal.title) LIKE
UPPER('%".addslashes($word)."%') OR "
! . "UPPER(phpgw_cal.description)
LIKE UPPER('%".addslashes($word)."%'))";
}
$sql .= ') ';
--- 149,155 ----
$sql .= $i > 0 ? ' OR ' : '';
$sql .= "(UPPER(phpgw_cal.title) LIKE
UPPER('%".addslashes($word)."%') OR "
! . "UPPER(phpgw_cal.description)
LIKE UPPER('%".addslashes($word)."%') OR "
! . "UPPER(phpgw_cal.location)
LIKE UPPER('%".addslashes($word)."%') OR "
! .
"UPPER(phpgw_cal_extra.cal_extra_value) LIKE UPPER('%".addslashes($word)."%'))";
}
$sql .= ') ';
***************
*** 157,161 ****
$sql .= 'ORDER BY phpgw_cal.datetime ASC,
phpgw_cal.edatetime ASC, phpgw_cal.priority ASC';
! return $this->get_event_ids(False,$sql);
}
--- 159,163 ----
$sql .= 'ORDER BY phpgw_cal.datetime ASC,
phpgw_cal.edatetime ASC, phpgw_cal.priority ASC';
! return $this->get_event_ids(False,$sql,True);
}
***************
*** 171,177 ****
}
! function get_event_ids($include_repeats=False, $sql='')
{
! return $this->cal->get_event_ids($include_repeats,$sql);
}
--- 173,179 ----
}
! function get_event_ids($search_repeats=False,
$sql='',$search_extra=False)
{
! return
$this->cal->get_event_ids($search_repeats,$sql,$search_extra);
}
Index: class.socalendar_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.socalendar_sql.inc.php,v
retrieving revision 1.28.2.4.2.4
retrieving revision 1.28.2.4.2.5
diff -C2 -r1.28.2.4.2.4 -r1.28.2.4.2.5
*** class.socalendar_sql.inc.php 9 Aug 2003 00:33:26 -0000
1.28.2.4.2.4
--- class.socalendar_sql.inc.php 11 Aug 2003 12:56:29 -0000
1.28.2.4.2.5
***************
*** 512,535 ****
/***************** Local functions for SQL based Calendar
*****************/
! function get_event_ids($search_repeats=False,$extra='')
{
! if($search_repeats == True)
{
! $repeats_from = ', phpgw_cal_repeats ';
! $repeats_where = 'AND (phpgw_cal_repeats.cal_id =
phpgw_cal.cal_id) ';
}
! else
{
! $repeats_from = ' ';
! $repeats_where = '';
}
!
$sql = 'SELECT DISTINCT phpgw_cal.cal_id,'
. 'phpgw_cal.datetime,phpgw_cal.edatetime,'
. 'phpgw_cal.priority '
. 'FROM phpgw_cal, phpgw_cal_user'
! . $repeats_from
. 'WHERE (phpgw_cal_user.cal_id =
phpgw_cal.cal_id) '
! . $repeats_where . $extra;
if($this->debug)
--- 512,535 ----
/***************** Local functions for SQL based Calendar
*****************/
! function
get_event_ids($search_repeats=False,$extra='',$search_extra=False)
{
! $from = $where = ' ';
! if($search_repeats)
{
! $from = ', phpgw_cal_repeats ';
! $where = 'AND (phpgw_cal_repeats.cal_id =
phpgw_cal.cal_id) ';
}
! if($search_extra)
{
! $from .= 'LEFT JOIN phpgw_cal_extra ON
phpgw_cal_extra.cal_id = phpgw_cal.cal_id ';
}
!
$sql = 'SELECT DISTINCT phpgw_cal.cal_id,'
. 'phpgw_cal.datetime,phpgw_cal.edatetime,'
. 'phpgw_cal.priority '
. 'FROM phpgw_cal, phpgw_cal_user'
! . $from
. 'WHERE (phpgw_cal_user.cal_id =
phpgw_cal.cal_id) '
! . $where . $extra;
if($this->debug)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/inc class.socalendar.inc.php, 1.22.2.5.2.2, 1.22.2.5.2.3 class.socalendar_sql.inc.php, 1.28.2.4.2.4, 1.28.2.4.2.5,
Ralf Becker <address@hidden> <=